thor 0.14.1 → 0.14.2

data/lib/thor/actions/file_manipulation.rb

@@ -86,7 +86,7 @@ class Thor
       context = instance_eval('binding')
 
       create_file destination, nil, config do
-        content = ERB.new(::File.binread(source), nil, '-').result(context)
+        content = ERB.new(::File.binread(source), nil, '-', '@output_buffer').result(context)
         content = block.call(content) if block
         content
       end
@@ -225,5 +225,22 @@ class Thor
     end
     alias :remove_dir :remove_file
 
+  private
+    attr_accessor :output_buffer
+    def concat(string)
+      @output_buffer.concat(string)
+    end
+
+    def capture(*args, &block)
+      with_output_buffer { block.call(*args) }
+    end
+
+    def with_output_buffer(buf = '') #:nodoc:
+      self.output_buffer, old_buffer = buf, output_buffer
+      yield
+      output_buffer
+    ensure
+      self.output_buffer = old_buffer
+    end
   end
 end

data/lib/thor/parser/options.rb

@@ -50,7 +50,7 @@ class Thor
     end
 
     def parse(args)
-      @pile = args.dup
+      @pile = except_underscores(args.dup)
 
       while peek
         if current_is_switch?
@@ -169,6 +169,12 @@ class Thor
         @non_assigned_required.delete(option)
         send(:"parse_#{option.type}", switch)
       end
+      
+      # Except underscores in commandline switches
+      def except_underscores(args)
+        args.map {|x| x =~ /^--/ ? x.gsub('_', '-') : x }
+      end
+      
 
   end
 end

data/lib/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.14.1".freeze
+  VERSION = "0.14.2".freeze
 end

data/spec/actions/file_manipulation_spec.rb

@@ -117,6 +117,13 @@ describe Thor::Actions do
   end
 
   describe "#template" do
+    it "allows using block helpers in the template" do
+      action :template, "doc/block_helper.rb"
+
+      file = File.join(destination_root, "doc/block_helper.rb")
+      File.read(file).must == "Hello world!"
+    end
+
     it "evaluates the template given as source" do
       runner.instance_variable_set("@klass", "Config")
       action :template, "doc/config.rb"

data/spec/fixtures/doc/block_helper.rb

@@ -0,0 +1,3 @@
+<% world do -%>
+Hello
+<% end -%>

data/spec/fixtures/group.thor

@@ -37,6 +37,13 @@ FOO
     super
     base.source_paths.unshift(File.expand_path(File.join(File.dirname(__FILE__), "doc")))
   end
+
+  no_tasks do
+    def world(&block)
+      result = capture(&block)
+      concat(result.strip + " world!")
+    end
+  end
 end
 
 class ClearCounter < MyCounter
@@ -85,4 +92,4 @@ class TaskConflict < Thor::Group
   def group
     puts "group"
   end
-end
+end

data/spec/parser/options_spec.rb

@@ -47,6 +47,11 @@ describe Thor::Options do
     it "accepts hashes" do
       Thor::Options.to_switches(:count => {:a => :b}).must == "--count a:b"
     end
+    
+    it "accepts underscored options" do
+      Thor::Options.to_switches(:under_score_option => "foo bar").must == '--under_score_option "foo bar"'
+    end
+    
   end
 
   describe "#parse" do
@@ -115,6 +120,19 @@ describe Thor::Options do
       parse("--asdf---asdf", "baz", "--foo", "--asdf---dsf--asdf").must == {"foo" => "--asdf---dsf--asdf"}
       check_unknown!
     end
+    
+    it "excepts underscores in commandline args hash for boolean" do
+      create :foo_bar => :boolean
+      parse("--foo_bar")["foo_bar"].must == true
+      parse("--no_foo_bar")["foo_bar"].must == false
+    end
+    
+    it "excepts underscores in commandline args hash for strings" do
+      create :foo_bar => :string, :baz_foo => :string
+      parse("--foo_bar", "baz")["foo_bar"].must == "baz"
+      parse("--baz_foo", "foo bar")["baz_foo"].must == "foo bar"
+    end
+    
 
     describe "with no input" do
       it "and no switches returns an empty hash" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: false
   segments: 
   - 0
   - 14
-  - 1
-  version: 0.14.1
+  - 2
+  version: 0.14.2
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 +02:00
+date: 2010-09-24 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -78,6 +78,7 @@ files:
 - spec/core_ext/ordered_hash_spec.rb
 - spec/fixtures/application.rb
 - spec/fixtures/bundle/execute.rb
+- spec/fixtures/doc/block_helper.rb
 - spec/fixtures/doc/config.rb
 - spec/group_spec.rb
 - spec/invocation_spec.rb
@@ -151,6 +152,7 @@ test_files:
 - spec/core_ext/ordered_hash_spec.rb
 - spec/fixtures/application.rb
 - spec/fixtures/bundle/execute.rb
+- spec/fixtures/doc/block_helper.rb
 - spec/fixtures/doc/config.rb
 - spec/group_spec.rb
 - spec/invocation_spec.rb