thor 0.13.3 → 0.13.4

data/CHANGELOG.rdoc

@@ -3,6 +3,7 @@
 * Several bug fixes
 * Decoupled Thor::Group and Thor, so it's easier to vendor
 * Added check_unknown_options! in case you want error messages to be raised in valid switches.
+* run(command) should return the results of command
 
 == 0.12, released 2010-01-02
 

data/lib/thor/actions.rb

@@ -184,7 +184,7 @@ class Thor
       shell.padding -= 1 if verbose
     end
 
-    # Executes a command.
+    # Executes a command returning the contents of the command.
     #
     # ==== Parameters
     # command<String>:: the command to be executed.
@@ -209,7 +209,7 @@ class Thor
       end
 
       say_status :run, desc, config.fetch(:verbose, true)
-      system(command) unless options[:pretend]
+      `#{command}` unless options[:pretend]
     end
 
     # Executes a ruby script (taking into account WIN32 platform quirks).
@@ -220,7 +220,7 @@ class Thor
     #
     def run_ruby_script(command, config={})
       return unless behavior == :invoke
-      run "#{command}", config.merge(:with => Thor::Util.ruby_command)
+      run command, config.merge(:with => Thor::Util.ruby_command)
     end
 
     # Run a thor command. A hash of options can be given and it's converted to 
@@ -243,12 +243,13 @@ class Thor
     def thor(task, *args)
       config  = args.last.is_a?(Hash) ? args.pop : {}
       verbose = config.key?(:verbose) ? config.delete(:verbose) : true
+      pretend = config.key?(:pretend) ? config.delete(:pretend) : false
 
       args.unshift task
       args.push Thor::Options.to_switches(config)
       command = args.join(' ').strip
 
-      run command, :with => :thor, :verbose => verbose
+      run command, :with => :thor, :verbose => verbose, :pretend => pretend
     end
 
     protected

data/lib/thor/actions/file_manipulation.rb

@@ -48,7 +48,7 @@ class Thor
     #
     def get(source, destination=nil, config={}, &block)
       source = File.expand_path(find_in_source_paths(source.to_s)) unless source =~ /^http\:\/\//
-      render = File.binread(source)
+      render = open(source).binmode.read
 
       destination ||= if block_given?
         block.arity == 1 ? block.call(render) : block.call

data/lib/thor/group.rb

@@ -253,22 +253,19 @@ class Thor::Group
   # Shortcut to invoke with padding and block handling. Use internally by
   # invoke and invoke_from_option class methods.
   def _invoke_for_class_method(klass, task=nil, *args, &block) #:nodoc:
-    shell.padding += 1
-
-    result = if block_given?
-      case block.arity
-      when 3
-        block.call(self, klass, task)
-      when 2
-        block.call(self, klass)
-      when 1
-        instance_exec(klass, &block)
+    with_padding do
+      if block
+        case block.arity
+        when 3
+          block.call(self, klass, task)
+        when 2
+          block.call(self, klass)
+        when 1
+          instance_exec(klass, &block)
+        end
+      else
+        invoke klass, task, *args
       end
-    else
-      invoke klass, task, *args
     end
-
-    shell.padding -= 1
-    result
   end
 end

data/lib/thor/invocation.rb

@@ -119,6 +119,11 @@ class Thor
       end
     end
 
+    # Invokes using shell padding.
+    def invoke_with_padding(*args)
+      with_padding { invoke(*args) }
+    end
+
     protected
 
       # Configuration values that are shared between invocations.

data/lib/thor/parser/arguments.rb

@@ -51,6 +51,10 @@ class Thor
 
     private
 
+      def last?
+        @pile.empty?
+      end
+
       def peek
         @pile.first
       end

data/lib/thor/parser/options.rb

@@ -3,9 +3,9 @@ class Thor
   # under Ruby's license.
   #
   class Options < Arguments #:nodoc:
-    LONG_RE     = /^(--\w+[-\w+]*)$/
+    LONG_RE     = /^(--\w+(?:-\w+)*)$/
     SHORT_RE    = /^(-[a-z])$/i
-    EQ_RE       = /^(--\w+[-\w+]*|-[a-z])=(.*)$/i
+    EQ_RE       = /^(--\w+(?:-\w+)*|-[a-z])=(.*)$/i
     SHORT_SQ_RE = /^-([a-z]{2,})$/i # Allow either -x -v or -xv style for single char args
     SHORT_NUM   = /^(-[a-z])#{NUMERIC}$/i
 
@@ -68,7 +68,7 @@ class Thor
           switch = normalize_switch(switch)
           option = switch_option(switch)
           @assigns[option.human_name] = parse_peek(switch, option)
-        elsif peek =~ /^\-/
+        elsif current_is_switch_formatted?
           @unknown << shift
         else
           shift
@@ -99,6 +99,19 @@ class Thor
         end
       end
 
+      def switch_formatted?(arg)
+        case arg
+        when LONG_RE, SHORT_RE, EQ_RE, SHORT_NUM, SHORT_SQ_RE
+          true
+        else
+          false
+        end
+      end
+
+      def current_is_switch_formatted?
+        switch_formatted? peek
+      end
+
       def switch?(arg)
         switch_option(arg) || @shorts.key?(arg)
       end
@@ -135,13 +148,14 @@ class Thor
       # Parse the value at the peek analyzing if it requires an input or not.
       #
       def parse_peek(switch, option)
-        unless current_is_value?
+        if current_is_switch_formatted? || last?
           if option.boolean?
             # No problem for boolean types
           elsif no_or_skip?(switch)
             return nil # User set value to nil
           elsif option.string? && !option.required?
-            return option.human_name # Return the option name
+            # Return the default if there is one, else the human name
+            return option.default || option.human_name
           else
             raise MalformattedArgumentError, "No value provided for option '#{switch}'"
           end

data/lib/thor/shell.rb

@@ -45,19 +45,16 @@ class Thor
 
     # Holds the shell for the given Thor instance. If no shell is given,
     # it gets a default shell from Thor::Base.shell.
-    #
     def shell
       @shell ||= Thor::Base.shell.new
     end
 
     # Sets the shell for this thor class.
-    #
     def shell=(shell)
       @shell = shell
     end
 
     # Common methods that are delegated to the shell.
-    #
     SHELL_DELEGATED_METHODS.each do |method|
       module_eval <<-METHOD, __FILE__, __LINE__
         def #{method}(*args)
@@ -66,6 +63,14 @@ class Thor
       METHOD
     end
 
+    # Yields the given block with padding.
+    def with_padding
+      shell.padding += 1
+      yield
+    ensure
+      shell.padding -= 1
+    end
+
     protected
 
       # Allow shell to be shared between invocations.

data/lib/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.13.3".freeze
+  VERSION = "0.13.4".freeze
 end

data/spec/actions/file_manipulation_spec.rb

@@ -105,6 +105,15 @@ describe Thor::Actions do
     it "logs status" do
       action(:get, "doc/README", "docs/README").must == "      create  docs/README\n"
     end
+
+    it "accepts http remote sources" do
+      body = "__start__\nHTTPFILE\n__end__\n"
+      FakeWeb.register_uri(:get, 'http://example.com/file.txt', :body => body)
+      action :get, 'http://example.com/file.txt' do |content|
+        content.must == body
+      end
+      FakeWeb.clean_registry
+    end
   end
 
   describe "#template" do

data/spec/actions_spec.rb

@@ -220,7 +220,7 @@ describe Thor::Actions do
 
   describe "#run" do
     before(:each) do
-      runner.should_receive(:system).with("ls")
+      runner.should_receive(:`).with("ls")
     end
 
     it "executes the command given" do
@@ -244,7 +244,7 @@ describe Thor::Actions do
   describe "#run_ruby_script" do
     before(:each) do
       Thor::Util.stub!(:ruby_command).and_return("/opt/jruby")
-      runner.should_receive(:system).with("/opt/jruby script.rb")
+      runner.should_receive(:`).with("/opt/jruby script.rb")
     end
 
     it "executes the ruby script" do
@@ -262,30 +262,30 @@ describe Thor::Actions do
 
   describe "#thor" do
     it "executes the thor command" do
-      runner.should_receive(:system).with("thor list")
+      runner.should_receive(:`).with("thor list")
       action :thor, :list, :verbose => true
     end
 
     it "converts extra arguments to command arguments" do
-      runner.should_receive(:system).with("thor list foo bar")
+      runner.should_receive(:`).with("thor list foo bar")
       action :thor, :list, "foo", "bar"
     end
 
     it "converts options hash to switches" do
-      runner.should_receive(:system).with("thor list foo bar --foo")
+      runner.should_receive(:`).with("thor list foo bar --foo")
       action :thor, :list, "foo", "bar", :foo => true
 
-      runner.should_receive(:system).with("thor list --foo 1 2 3")
+      runner.should_receive(:`).with("thor list --foo 1 2 3")
       action :thor, :list, :foo => [1,2,3]
     end
 
     it "logs status" do
-      runner.should_receive(:system).with("thor list")
+      runner.should_receive(:`).with("thor list")
       action(:thor, :list).must == "         run  thor list from \".\"\n"
     end
 
     it "does not log status if required" do
-      runner.should_receive(:system).with("thor list --foo 1 2 3")
+      runner.should_receive(:`).with("thor list --foo 1 2 3")
       action(:thor, :list, :foo => [1,2,3], :verbose => false).must be_empty
     end
   end

data/spec/parser/options_spec.rb

@@ -103,6 +103,18 @@ describe Thor::Options do
       parse("--bar", "baz", "--baz", "unknown")
       lambda { check_unknown! }.must raise_error(Thor::UnknownArgumentError, "Unknown switches '--baz'")
     end
+    
+    it "skips leading non-switches" do
+      create(:foo => "baz")
+      
+      parse("asdf", "--foo", "bar").must == {"foo" => "bar"}
+    end
+
+    it "correctly recognizes things that look kind of like options, but aren't, as not options" do
+      create(:foo => "baz")
+      parse("--asdf---asdf", "baz", "--foo", "--asdf---dsf--asdf").must == {"foo" => "--asdf---dsf--asdf"}
+      check_unknown!
+    end
 
     describe "with no input" do
       it "and no switches returns an empty hash" do
@@ -165,9 +177,14 @@ describe Thor::Options do
       end
 
       it "accepts a --switch format on non required types" do
-        create "--foo" => "bar"
+        create "--foo" => :string
         parse("--foo")["foo"].must == "foo"
       end
+      
+      it "accepts a --switch format on non required types with default values" do
+        create "--baz" => :string, "--foo" => "bar"
+        parse("--baz", "bang", "--foo")["foo"].must == "bar"
+      end
 
       it "overwrites earlier values with later values" do
         parse("--foo=bar", "--foo", "12")["foo"].must == "12"

data/spec/shell_spec.rb

@@ -22,4 +22,13 @@ describe Thor::Shell do
       MyCounter.new([1,2]).shell.must be_kind_of(Thor::Base.shell)
     end
   end
+
+  describe "with_padding" do
+    it "uses padding for inside block outputs" do
+      base = MyCounter.new([1,2])
+      base.with_padding do
+        capture(:stdout){ base.say_status :padding, "cool" }.strip.must == "padding    cool"
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'stringio'
 require 'rubygems'
 require 'rdoc'
 require 'diff/lcs' # You need diff/lcs installed to run specs (but not to run Thor).
+require 'fakeweb'  # You need fakeweb installed to run specs (but not to run Thor).
 
 $thor_runner = true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 +01:00
+date: 2010-02-26 00:00:00 +01:00
 default_executable: 
 dependencies: []