updates for ruby 1.9.1

5 files changed, 24 insertions, 14 deletions

diff --git a/README b/README
index b3807ef..e41e3fb 100644
--- a/README
+++ b/README
@@ -16,6 +16,9 @@ INSTALL
   gem install systemu
 
 HISTORY
+  1.3.1
+    - updates for ruby 1.9.1
+
   1.3.0
     - move to github
 
@@ -47,7 +50,7 @@ SAMPLES
 
   ~ > ruby samples/a.rb
 
-    [#<Process::Status: pid=5138,exited(0)>, "Thu Jan 07 13:19:37 -0700 2010\n", "Thu Jan 07 13:19:37 -0700 2010\n"]
+    [#<Process::Status: pid=2891,exited(0)>, "Thu May 20 13:16:02 -0600 2010\n", "Thu May 20 13:16:02 -0600 2010\n"]
 
 
   <========< samples/b.rb >========>
@@ -69,7 +72,7 @@ SAMPLES
 
   ~ > ruby samples/b.rb
 
-    [#<Process::Status: pid=5143,exited(0)>, "Thu Jan 07 13:19:38 -0700 2010\n", "Thu Jan 07 13:19:38 -0700 2010\n"]
+    [#<Process::Status: pid=2896,exited(0)>, "Thu May 20 13:16:02 -0600 2010\n", "Thu May 20 13:16:02 -0600 2010\n"]
 
 
   <========< samples/c.rb >========>
@@ -157,7 +160,7 @@ SAMPLES
 
   ~ > ruby samples/f.rb
 
-    #<Process::Status: pid=5163,signaled(SIGKILL=9)>
-    "1262895578\n1262895579\n1262895580\n"
+    #<Process::Status: pid=2916,signaled(SIGKILL=9)>
+    "1274382962\n1274382963\n1274382964\n"
 
 
diff --git a/README.erb b/README.erb
index 7b823c4..f5dd6a2 100644
--- a/README.erb
+++ b/README.erb
@@ -16,6 +16,9 @@ INSTALL
   gem install systemu
 
 HISTORY
+  1.3.1
+    - updates for ruby 1.9.1
+
   1.3.0
     - move to github
 
diff --git a/Rakefile b/Rakefile
index cd11779..963c4ac 100644
--- a/Rakefile
+++ b/Rakefile
@@ -208,23 +208,27 @@ BEGIN {
 
     def unindent(s)
       indent = nil
-      s.each do |line|
-      next if line =~ %r/^\s*$/
-      indent = line[%r/^\s*/] and break
+      s.each_line do |line|
+        next if line =~ %r/^\s*$/
+        indent = line[%r/^\s*/] and break
+      end
+      indent ? s.gsub(%r/^#{ indent }/, "") : s
     end
-    indent ? s.gsub(%r/^#{ indent }/, "") : s
-  end
+
     extend self
   end
 
   class Template
     def initialize(&block)
       @block = block
+      @binding = @block.respond_to?(:binding) ? @block.binding : @block
       @template = block.call.to_s
     end
+
     def expand(b=nil)
-      ERB.new(Util.unindent(@template)).result(b||@block)
+      ERB.new(Util.unindent(@template)).result(b||@binding)
     end
+
     alias_method 'to_s', 'expand'
   end
   def Template(*args, &block) Template.new(*args, &block) end
diff --git a/lib/systemu.rb b/lib/systemu.rb
index a29087c..bf5e829 100644
--- a/lib/systemu.rb
+++ b/lib/systemu.rb
@@ -14,7 +14,7 @@ class SystemUniversal
 #
 # constants
 #
-  SystemUniversal::VERSION = '1.3.0' unless defined?  SystemUniversal::VERSION
+  SystemUniversal::VERSION = '1.4.0' unless defined?  SystemUniversal::VERSION
   def SystemUniversal.version() SystemUniversal::VERSION end
   def version() SystemUniversal::VERSION end
 #
@@ -235,10 +235,10 @@ class SystemUniversal
   def getopts opts = {}
     lambda do |*args|
       keys, default, ignored = args
-      catch('opt') do
+      catch(:opt) do
         [keys].flatten.each do |key|
           [key, key.to_s, key.to_s.intern].each do |key|
-            throw 'opt', opts[key] if opts.has_key?(key)
+            throw :opt, opts[key] if opts.has_key?(key)
           end
         end
         default
diff --git a/systemu.gemspec b/systemu.gemspec
index 1f38a94..bc8841b 100644
--- a/systemu.gemspec
+++ b/systemu.gemspec
@@ -8,7 +8,7 @@ Gem::Specification::new do |spec|
   spec.summary = "systemu"
   spec.description = "description: systemu kicks the ass"
 
-  spec.files = ["lib", "lib/systemu.rb", "LICENSE", "Rakefile", "README.erb", "samples", "samples/a.rb", "samples/b.rb", "samples/c.rb", "samples/d.rb", "samples/e.rb", "samples/f.rb", "systemu.gemspec"]
+  spec.files = ["lib", "lib/systemu.rb", "LICENSE", "Rakefile", "README", "README.erb", "samples", "samples/a.rb", "samples/b.rb", "samples/c.rb", "samples/d.rb", "samples/e.rb", "samples/f.rb", "systemu.gemspec"]
   spec.executables = []
   
   spec.require_path = "lib"