[TWiki-Dev] [SVN] TimotheLitt r23472 - in twiki/trunk: BuildContrib/lib/TWiki/Contrib IpPlugin/data/TWiki IpPlugin/lib/TWiki/Plugins IpPlugin/lib/TWiki/Plugins/IpPlugin

[<de...@de...>]

Author: TimotheLitt
Date: 2012-10-02 09:58:49 -0500 (Tue, 02 Oct 2012)
New Revision: 23472
Trac url: http://develop.twiki.org/trac/changeset/23472

Added:
   twiki/trunk/IpPlugin/lib/TWiki/Plugins/IpPlugin/
   twiki/trunk/IpPlugin/lib/TWiki/Plugins/IpPlugin/DEPENDENCIES
   twiki/trunk/IpPlugin/lib/TWiki/Plugins/IpPlugin/MANIFEST
   twiki/trunk/IpPlugin/lib/TWiki/Plugins/IpPlugin/build.pl
Modified:
   twiki/trunk/BuildContrib/lib/TWiki/Contrib/Build.pm
   twiki/trunk/IpPlugin/data/TWiki/IpPlugin.txt
Log:
Item6955: IpPlugin - add installer.  BuildContrib - Fix typo in HEREIS doc

Modified: twiki/trunk/BuildContrib/lib/TWiki/Contrib/Build.pm
===================================================================
--- twiki/trunk/BuildContrib/lib/TWiki/Contrib/Build.pm	2012-10-02 06:15:32 UTC (rev 23471)
+++ twiki/trunk/BuildContrib/lib/TWiki/Contrib/Build.pm	2012-10-02 14:58:49 UTC (rev 23472)
@@ -291,7 +291,7 @@
 
    * Or, follow these __manual installation__ steps:
       * Download the ZIP file from the extension home on twiki.org (see below).
-      * Unzip ==%\TOPIC\%.zip== in your twiki installation directory.
+      * Unzip ==\%TOPIC\%.zip== in your twiki installation directory.
       * Set the ownership of the extracted directories and files to the webserver user.
       * Install the dependencies (if any).
 HERE

Modified: twiki/trunk/IpPlugin/data/TWiki/IpPlugin.txt
===================================================================
--- twiki/trunk/IpPlugin/data/TWiki/IpPlugin.txt	2012-10-02 06:15:32 UTC (rev 23471)
+++ twiki/trunk/IpPlugin/data/TWiki/IpPlugin.txt	2012-10-02 14:58:49 UTC (rev 23472)
@@ -100,15 +100,22 @@
 __Note:__ You do not need to install anything on the browser to use this plugin. The following instructions are for the administrator who installs the plugin on the TWiki server.
 
    * Make sure you have an up-to-date Socket (get the latest from cpan) You may need a patch - see [[https://rt.cpan.org/Public/Bug/Display.html?id=79557][This bug report]]
-   * Download the ZIP file from the Plugin Home (see below)
-   * Unzip *%TOPIC%.zip* in your twiki installation directory. Content:
+   * Download the =.zip= or =.tgz= file from the Plugin Home (see below)
+   * Optional: Download the =.md5= file and verify that the checksums match.  On most systems:
+      * =md5sum -c %TOPIC%.md5=
+   * ==unzip %TOPIC%.zip== or ==tar -xzf %TOPIC%.tgz== in your twiki installation directory.
+   * You may have to correct permissions/ownership to the webserver user
+   * You can use the automated installer. 
+      * Run ==%TOPIC%_installer== _as the webserver user_ to automatically check and install other modules that this module depends on, and enable the plugin.
+   * Alternatively,
+      * Ensure that the dependencies listed below are met,  
  | *File:* | *Description:* |
  | ==data/TWiki/%TOPIC%.txt== | Plugin topic |
  | ==data/TWiki/%TOPIC%.txt,v== | Plugin topic repository |
  | ==pub/TWiki/%TOPIC%/IPv4-gray.png== | Sample graphic |
  | ==pub/TWiki/%TOPIC%/IPv6-green.png== | Sample graphic |
  | ==lib/TWiki/Plugins/%TOPIC%.pm== | Plugin Perl module |
-   * Set the ownership of the extracted directories and files to the webserver user.
+      * Set the ownership of the extracted directories and files to the webserver user.
    * Configure the Plugin: 
       * Run the [[%SCRIPTURL%/configure%SCRIPTSUFFIX%][configure]] script to enable the Plugin
    * Test the plugin by viewing the [[TWiki.IpPlugin#Test][IpPlugin]] topic on your system and verify that the [[#Test][Test]] section indicates that !IpPlugin is installed and active.
@@ -118,9 +125,10 @@
 | Plugin Author: | TWiki:Main.TimotheLitt |
 | Copyright: |  2012, TWiki:Main.TimotheLitt |
 | License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
-| Plugin Version: | 21 Dec 2012 (V1.000) |
+| Plugin Version: | 24 Sep 2012 (V1.000) |
 | Change History: | <!-- versions below in reverse order --> |
 | 24 Sep 2012: | Initial version |
+| 02 Oct 2012: | Add automated installer.  No functional changes. |
 | TWiki Dependency: | $TWiki::Plugins::VERSION 1.1 |
 | CPAN Dependencies: | CPAN:Socket, CPAN:Net::IP |
 | Other Dependencies: | none |

Added: twiki/trunk/IpPlugin/lib/TWiki/Plugins/IpPlugin/DEPENDENCIES
===================================================================
--- twiki/trunk/IpPlugin/lib/TWiki/Plugins/IpPlugin/DEPENDENCIES	                        (rev 0)
+++ twiki/trunk/IpPlugin/lib/TWiki/Plugins/IpPlugin/DEPENDENCIES	2012-10-02 14:58:49 UTC (rev 23472)
@@ -0,0 +1 @@
+Net::IP,>=1.25,cpan,Required

Added: twiki/trunk/IpPlugin/lib/TWiki/Plugins/IpPlugin/MANIFEST
===================================================================
--- twiki/trunk/IpPlugin/lib/TWiki/Plugins/IpPlugin/MANIFEST	                        (rev 0)
+++ twiki/trunk/IpPlugin/lib/TWiki/Plugins/IpPlugin/MANIFEST	2012-10-02 14:58:49 UTC (rev 23472)
@@ -0,0 +1,4 @@
+data/TWiki/IpPlugin.txt 0664 Documentation
+pub/TWiki/IpPlugin/IPv4-gray.png 0444 Graphic
+pub/TWiki/IpPlugin/IPv6-green.png 0444 Graphic
+lib/TWiki/Plugins/IpPlugin.pm 0444 Perl module

Added: twiki/trunk/IpPlugin/lib/TWiki/Plugins/IpPlugin/build.pl
===================================================================
--- twiki/trunk/IpPlugin/lib/TWiki/Plugins/IpPlugin/build.pl	                        (rev 0)
+++ twiki/trunk/IpPlugin/lib/TWiki/Plugins/IpPlugin/build.pl	2012-10-02 14:58:49 UTC (rev 23472)
@@ -0,0 +1,26 @@
+#!/usr/bin/perl -w
+BEGIN {
+    unshift @INC, split( /:/, $ENV{TWIKI_LIBS} );
+}
+use TWiki::Contrib::Build;
+
+# Create the build object
+$build = new TWiki::Contrib::Build('IpPlugin');
+
+# (Optional) Set the details of the repository for uploads.
+# This can be any web on any accessible TWiki installation.
+# These defaults will be used when expanding tokens in .txt
+# files, but be warned, they can be overridden at upload time!
+
+# name of web to upload to
+$build->{UPLOADTARGETWEB} = 'Plugins';
+# Full URL of pub directory
+$build->{UPLOADTARGETPUB} = 'http://twiki.org/p/pub';
+# Full URL of bin directory
+$build->{UPLOADTARGETSCRIPT} = 'http://twiki.org/cgi-bin';
+# Script extension
+$build->{UPLOADTARGETSUFFIX} = '';
+
+# Build the target on the command line, or the default target
+$build->build($build->{target});
+


Property changes on: twiki/trunk/IpPlugin/lib/TWiki/Plugins/IpPlugin/build.pl
___________________________________________________________________
Name: svn:executable
   + *