wunderbar 0.8.12 → 0.8.13

data/demo/wiki.html

@@ -48,6 +48,8 @@ typically <code>www-data</code> on Unix or <code>www</code> on Mac OS/X.</li>
     AddHandler cgi-script .cgi
 </code></pre>
 
+<blockquote><p>Optionally configure <a href="http://httpd.apache.org/docs/2.4/howto/auth.html">Authentication</a> for multiple users.</p></blockquote>
+
 <p>Install scripts:</p>
 
 <ul>
@@ -61,6 +63,8 @@ document root</li>
 <pre><code>    ruby wiki.rb --install=/var/www/wikiname.cgi --WIKIDATA="/full/path/to/data/directory"
 </code></pre>
 
+<blockquote><p>Optionally tailor the setting of the $EMAIL variable in the script.  The current default logic is based on a Unix like operating system (such as Linux, Mac OS/X) with users having email addresses on this machine.  Replace as needed.</p></blockquote>
+
 <p>Access your wiki:</p>
 
 <pre><code>    http://localhost/wikiname/

data/demo/wiki.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/ruby
 require 'wunderbar'
 require 'rdiscount'
-require 'shellwords'
 require 'digest/md5'
 
 Dir.chdir WIKIDATA
@@ -49,7 +48,13 @@ W_.html do
             _p 'Nothing changed'
           else
             _.system "git add #{file}"
-            _.system "git commit -m #{@comment.shellescape} #{file}"
+
+            commit = %w(git commit) 
+            commit << '--author' << $EMAIL if defined? $EMAIL and $EMAIL
+            commit << '--message' << @comment
+            commit << file 
+
+            _.system commit
           end
         end
       end
@@ -198,3 +203,12 @@ end
 __END__
 # Customize where the wiki data is stored
 WIKIDATA = '/full/path/to/data/directory'
+
+# git author e-mail address override
+require 'etc'
+begin
+  name = Etc.getpwnam($USER).gecos.split(',').first
+  $EMAIL = "#{name} <#{$USER}@#{$env.SERVER_NAME}>"
+  $EMAIL = nil if %w(www-data _www).include?($USER)
+rescue
+end

data/lib/wunderbar/builder.rb

@@ -103,6 +103,18 @@ module Wunderbar
 
     # execute a system command, echoing stdin, stdout, and stderr
     def system(command, opts={})
+      if command.respond_to? :join
+        begin
+          # if available, use escape as it does prettier quoting
+          require 'escape'
+          command = Escape.shell_command(command)
+        rescue LoadError
+          # std-lib function that gets the job done
+          require 'shellwords'
+          command = Shellwords.join(command)
+        end
+      end
+
       require 'open3'
       tag  = opts[:tag]  || 'pre'
       output_class = opts[:class] || {}

data/lib/wunderbar/version.rb

@@ -2,7 +2,7 @@ module Wunderbar
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 8
-    TINY  = 12
+    TINY  = 13
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/wunderbar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderbar"
-  s.version = "0.8.12"
+  s.version = "0.8.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-03-23"
+  s.date = "2012-03-24"
   s.description = "    Provides a number of globals, helper methods, and monkey patches which\n    simplify the generation of HTML and the development of CGI scripts.\n"
   s.email = "rubys@intertwingly.net"
   s.extra_rdoc_files = ["COPYING", "README.md", "lib/wunderbar.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/installation.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/version.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wunderbar
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000Z
+date: 2012-03-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &20890340 !ruby/object:Gem::Requirement
+  requirement: &13219860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20890340
+  version_requirements: *13219860
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &20889580 !ruby/object:Gem::Requirement
+  requirement: &13219000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20889580
+  version_requirements: *13219000
 description: ! "    Provides a number of globals, helper methods, and monkey patches
   which\n    simplify the generation of HTML and the development of CGI scripts.\n"
 email: rubys@intertwingly.net