thor 0.14.6 → 0.15.0

data/spec/shell/color_spec.rb

@@ -7,20 +7,60 @@ describe Thor::Shell::Color do
 
   describe "#say" do
     it "set the color if specified" do
-      $stdout.should_receive(:puts).with("\e[32mWow! Now we have colors!\e[0m")
-      shell.say "Wow! Now we have colors!", :green
+      out = capture(:stdout) do
+        shell.say "Wow! Now we have colors!", :green
+      end
+
+      out.chomp.should == "\e[32mWow! Now we have colors!\e[0m"
     end
 
     it "does not use a new line even with colors" do
-      $stdout.should_receive(:print).with("\e[32mWow! Now we have colors! \e[0m")
-      shell.say "Wow! Now we have colors! ", :green
+      out = capture(:stdout) do
+        shell.say "Wow! Now we have colors! ", :green
+      end
+
+      out.chomp.should == "\e[32mWow! Now we have colors! \e[0m"
+    end
+
+    it "handles an Array of colors" do
+      out = capture(:stdout) do
+        shell.say "Wow! Now we have colors *and* background colors", [:green, :on_red, :bold]
+      end
+
+      out.chomp.should == "\e[32m\e[41m\e[1mWow! Now we have colors *and* background colors\e[0m"
     end
   end
 
   describe "#say_status" do
     it "uses color to say status" do
-      $stdout.should_receive(:puts).with("\e[1m\e[31m    conflict\e[0m  README")
-      shell.say_status :conflict, "README", :red
+      out = capture(:stdout) do
+        shell.say_status :conflict, "README", :red
+      end
+
+      out.chomp.should == "\e[1m\e[31m    conflict\e[0m  README"
+    end
+  end
+
+  describe "#set_color" do
+    it "colors a string with a foreground color" do
+      red = shell.set_color "hi!", :red
+      red.should == "\e[31mhi!\e[0m"
+    end
+
+    it "colors a string with a background color" do
+      on_red = shell.set_color "hi!", :white, :on_red
+      on_red.should == "\e[37m\e[41mhi!\e[0m"
+    end
+
+    it "colors a string with a bold color" do
+      bold = shell.set_color "hi!", :white, true
+      bold.should == "\e[1m\e[37mhi!\e[0m"
+
+      bold = shell.set_color "hi!", :white, :bold
+      bold.should == "\e[37m\e[1mhi!\e[0m"
+
+      bold = shell.set_color "hi!", :white, :on_red, :bold
+      bold.should == "\e[37m\e[41m\e[1mhi!\e[0m"
     end
   end
 

data/spec/shell/html_spec.rb

@@ -7,19 +7,24 @@ describe Thor::Shell::HTML do
 
   describe "#say" do
     it "set the color if specified" do
-      $stdout.should_receive(:puts).with('<span style="color: green;">Wow! Now we have colors!</span>')
-      shell.say "Wow! Now we have colors!", :green
+      out = capture(:stdout) { shell.say "Wow! Now we have colors!", :green }
+      out.chomp.should == '<span style="color: green;">Wow! Now we have colors!</span>'
+    end
+
+    it "sets bold if specified" do
+      out = capture(:stdout) { shell.say "Wow! Now we have colors *and* bold!", [:green, :bold] }
+      out.chomp.should == '<span style="color: green; font-weight: bold;">Wow! Now we have colors *and* bold!</span>'
     end
 
     it "does not use a new line even with colors" do
-      $stdout.should_receive(:print).with('<span style="color: green;">Wow! Now we have colors! </span>')
-      shell.say "Wow! Now we have colors! ", :green
+      out = capture(:stdout) { shell.say "Wow! Now we have colors! ", :green }
+      out.chomp.should == '<span style="color: green;">Wow! Now we have colors! </span>'
     end
   end
 
   describe "#say_status" do
     it "uses color to say status" do
-      $stdout.should_receive(:puts).with('<strong><span style="color: red;">    conflict</span></strong>  README')
+      $stdout.should_receive(:puts).with('<span style="color: red; font-weight: bold;">    conflict</span>  README')
       shell.say_status :conflict, "README", :red
     end
   end

data/spec/spec_helper.rb

@@ -29,6 +29,10 @@ load File.join(File.dirname(__FILE__), "fixtures", "script.thor")
 load File.join(File.dirname(__FILE__), "fixtures", "invoke.thor")
 
 RSpec.configure do |config|
+  config.before :each do
+    ARGV.replace []
+  end
+
   def capture(stream)
     begin
       stream = stream.to_s

data/spec/task_spec.rb

@@ -11,21 +11,23 @@ describe Thor::Task do
 
   describe "#formatted_usage" do
     it "includes namespace within usage" do
-      Object.stub!(:namespace).and_return("foo")
-      Object.stub!(:arguments).and_return([])
-      task(:bar => :required).formatted_usage(Object).should == "foo:can_has --bar=BAR"
+      object = Struct.new(:namespace, :arguments).new("foo", [])
+      task(:bar => :required).formatted_usage(object).should == "foo:can_has --bar=BAR"
+    end
+
+    it "includes subcommand name within subcommand usage" do
+      object = Struct.new(:namespace, :arguments).new("main:foo", [])
+      task(:bar => :required).formatted_usage(object, false, true).should == "foo can_has --bar=BAR"
     end
 
     it "removes default from namespace" do
-      Object.stub!(:namespace).and_return("default:foo")
-      Object.stub!(:arguments).and_return([])
-      task(:bar => :required).formatted_usage(Object).should == ":foo:can_has --bar=BAR"
+      object = Struct.new(:namespace, :arguments).new("default:foo", [])
+      task(:bar => :required).formatted_usage(object).should == ":foo:can_has --bar=BAR"
     end
 
     it "injects arguments into usage" do
-      Object.stub!(:namespace).and_return("foo")
-      Object.stub!(:arguments).and_return([ Thor::Argument.new(:bar, nil, true, :string) ])
-      task(:foo => :required).formatted_usage(Object).should == "foo:can_has BAR --foo=FOO"
+      object = Struct.new(:namespace, :arguments).new("foo", [Thor::Argument.new(:bar, nil, true, :string)])
+      task(:foo => :required).formatted_usage(object).should == "foo:can_has BAR --foo=FOO"
     end
   end
 
@@ -48,22 +50,30 @@ describe Thor::Task do
     it "dup options hash" do
       task = Thor::Task.new("can_has", nil, nil, nil, :foo => true, :bar => :required)
       task.dup.options.delete(:foo)
-      task.options[:foo].should_not be_nil
+      task.options[:foo].should be
     end
   end
 
   describe "#run" do
     it "runs a task by calling a method in the given instance" do
       mock = mock()
-      mock.should_receive(:send).with("can_has", 1, 2, 3)
-      task.run(mock, [1, 2, 3])
+      mock.should_receive(:can_has).and_return {|*args| args }
+      task.run(mock, [1, 2, 3]).should == [1, 2, 3]
     end
 
     it "raises an error if the method to be invoked is private" do
-      mock = mock()
-      mock.should_receive(:private_methods).and_return(['can_has'])
-      mock.class.should_receive(:handle_no_task_error).with("can_has")
-      task.run(mock)
+      klass = Class.new do
+        def self.handle_no_task_error(name)
+          name
+        end
+
+      private
+        def can_has
+          "fail"
+        end
+      end
+
+      task.run(klass.new).should == "can_has"
     end
   end
 end

data/spec/thor_spec.rb

@@ -61,7 +61,7 @@ describe Thor do
         end
 
         it "adds a task to the tasks list if the updated task is on the parent class" do
-          Scripts::MyScript.tasks["example_default_task"].should_not be_nil
+          Scripts::MyScript.tasks["example_default_task"].should be
         end
 
         it "clones the parent task" do
@@ -168,11 +168,11 @@ describe Thor do
     end
 
     it "does not set options in attributes" do
-      MyScript.start(["with_optional", "--all"]).should == [nil, { "all" => true }]
+      MyScript.start(["with_optional", "--all"]).should == [nil, { "all" => true }, []]
     end
 
     it "raises an error if a required param is not provided" do
-      capture(:stderr) { MyScript.start(["animal"]) }.strip.should == '"animal" was called incorrectly. Call as "thor my_script:animal TYPE".'
+      capture(:stderr) { MyScript.start(["animal"]) }.strip.should == 'thor animal requires at least 1 argument: "thor my_script:animal TYPE".'
     end
 
     it "raises an error if the invoked task does not exist" do
@@ -195,6 +195,31 @@ describe Thor do
     it "raises when an exception happens within the task call" do
       lambda { MyScript.start(["call_myself_with_wrong_arity"]) }.should raise_error(ArgumentError)
     end
+
+    context "when the user enters an unambiguous substring of a command" do
+      it "should invoke a command" do
+        MyScript.start(["z"]).should == MyScript.start(["zoo"])
+      end
+
+      it "should invoke a command, even when there's an alias the resolves to the same command" do
+        MyScript.start(["hi"]).should == MyScript.start(["hidden"])
+      end
+
+      it "should invoke an alias" do
+        MyScript.start(["animal_pri"]).should == MyScript.start(["zoo"])
+      end
+    end
+
+    context "when the user enters an ambiguous substring of a command" do
+      it "should raise an exception that explains the ambiguity" do
+        lambda { MyScript.start(["call"]) }.should raise_error(ArgumentError, 'Ambiguous task call matches [call_myself_with_wrong_arity, call_unexistent_method]')
+      end
+
+      it "should raise an exception when there is an alias" do
+        lambda { MyScript.start(["f"]) }.should raise_error(ArgumentError, 'Ambiguous task f matches [foo, fu]')
+      end
+    end
+
   end
 
   describe "#subcommand" do
@@ -331,4 +356,32 @@ HELP
       }.should be_empty
     end
   end
+
+  describe "edge-cases" do
+    it "can handle boolean options followed by arguments" do
+      klass = Class.new(Thor) do
+        method_option :loud, :type => :boolean
+        desc "hi NAME", "say hi to name"
+        def hi(name)
+          name.upcase! if options[:loud]
+          "Hi #{name}"
+        end
+      end
+
+      klass.start(["hi", "jose"]).should == "Hi jose"
+      klass.start(["hi", "jose", "--loud"]).should == "Hi JOSE"
+      klass.start(["hi", "--loud", "jose"]).should == "Hi JOSE"
+    end
+
+    it "passes through unknown options" do
+      klass = Class.new(Thor) do
+        desc "unknown", "passing unknown options"
+        def unknown(*args)
+          args
+        end
+      end
+
+      klass.start(["unknown", "foo", "--bar", "baz", "bat", "--bam"]).should == ["foo", "--bar", "baz", "bat", "--bam"]
+    end
+  end
 end

data/thor.gemspec

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/thor/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.add_development_dependency 'bundler', '~> 1.0'
+  s.add_development_dependency 'fakeweb', '~> 1.3'
+  s.add_development_dependency 'rake', '~> 0.9'
+  s.add_development_dependency 'rdoc', '~> 3.9'
+  s.add_development_dependency 'rspec', '~> 2.3'
+  s.add_development_dependency 'simplecov', '~> 0.4'
+  s.add_development_dependency 'childlabor'
+  s.authors = ['Yehuda Katz', 'José Valim']
+  s.description = %q{A scripting framework that replaces rake, sake and rubigen}
+  s.email = 'ruby-thor@googlegroups.com'
+  s.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
+  s.extra_rdoc_files = ['CHANGELOG.rdoc', 'LICENSE.md', 'README.md', 'Thorfile']
+  s.files = `git ls-files`.split("\n")
+  s.homepage = 'http://github.com/wycats/thor'
+  s.name = 'thor'
+  s.rdoc_options = ['--charset=UTF-8']
+  s.require_paths = ['lib']
+  s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')
+  s.summary = s.description
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.version = Thor::VERSION
+end

metadata

@@ -1,128 +1,152 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: thor
-version: !ruby/object:Gem::Version 
-  hash: 43
-  prerelease: false
-  segments: 
-  - 0
-  - 14
-  - 6
-  version: 0.14.6
+version: !ruby/object:Gem::Version
+  version: 0.15.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Yehuda Katz
-- "Jos\xC3\xA9 Valim"
+- José Valim
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-20 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
-        version: "2.5"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.9'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
-        version: "2.1"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
   name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: childlabor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A scripting framework that replaces rake, sake and rubigen
-email: 
-- ruby-thor@googlegroups.com
-executables: 
+email: ruby-thor@googlegroups.com
+executables:
 - rake2thor
 - thor
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGELOG.rdoc
-- LICENSE
+- LICENSE.md
+- README.md
+- Thorfile
+files:
+- .autotest
+- .document
+- .gemtest
+- .gitignore
+- .rspec
+- .travis.yml
+- CHANGELOG.rdoc
+- Gemfile
+- LICENSE.md
 - README.md
 - Thorfile
-files: 
 - bin/rake2thor
 - bin/thor
 - lib/thor.rb
@@ -155,6 +179,7 @@ files:
 - lib/thor/util.rb
 - lib/thor/version.rb
 - spec/actions/create_file_spec.rb
+- spec/actions/create_link_spec.rb
 - spec/actions/directory_spec.rb
 - spec/actions/empty_directory_spec.rb
 - spec/actions/file_manipulation_spec.rb
@@ -163,14 +188,17 @@ files:
 - spec/base_spec.rb
 - spec/core_ext/hash_with_indifferent_access_spec.rb
 - spec/core_ext/ordered_hash_spec.rb
+- spec/exit_condition_spec.rb
 - spec/fixtures/application.rb
 - spec/fixtures/bundle/execute.rb
 - spec/fixtures/bundle/main.thor
 - spec/fixtures/doc/%file_name%.rb.tt
+- spec/fixtures/doc/COMMENTER
 - spec/fixtures/doc/README
 - spec/fixtures/doc/block_helper.rb
 - spec/fixtures/doc/components/.empty_directory
 - spec/fixtures/doc/config.rb
+- spec/fixtures/doc/config.yaml.tt
 - spec/fixtures/group.thor
 - spec/fixtures/invoke.thor
 - spec/fixtures/path with spaces
@@ -193,45 +221,74 @@ files:
 - spec/task_spec.rb
 - spec/thor_spec.rb
 - spec/util_spec.rb
-- CHANGELOG.rdoc
-- LICENSE
-- README.md
-- Thorfile
-has_rdoc: true
+- thor.gemspec
 homepage: http://github.com/wycats/thor
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A scripting framework that replaces rake, sake and rubigen
-test_files: []
-
+test_files:
+- spec/actions/create_file_spec.rb
+- spec/actions/create_link_spec.rb
+- spec/actions/directory_spec.rb
+- spec/actions/empty_directory_spec.rb
+- spec/actions/file_manipulation_spec.rb
+- spec/actions/inject_into_file_spec.rb
+- spec/actions_spec.rb
+- spec/base_spec.rb
+- spec/core_ext/hash_with_indifferent_access_spec.rb
+- spec/core_ext/ordered_hash_spec.rb
+- spec/exit_condition_spec.rb
+- spec/fixtures/application.rb
+- spec/fixtures/bundle/execute.rb
+- spec/fixtures/bundle/main.thor
+- spec/fixtures/doc/%file_name%.rb.tt
+- spec/fixtures/doc/COMMENTER
+- spec/fixtures/doc/README
+- spec/fixtures/doc/block_helper.rb
+- spec/fixtures/doc/components/.empty_directory
+- spec/fixtures/doc/config.rb
+- spec/fixtures/doc/config.yaml.tt
+- spec/fixtures/group.thor
+- spec/fixtures/invoke.thor
+- spec/fixtures/path with spaces
+- spec/fixtures/script.thor
+- spec/fixtures/task.thor
+- spec/group_spec.rb
+- spec/invocation_spec.rb
+- spec/parser/argument_spec.rb
+- spec/parser/arguments_spec.rb
+- spec/parser/option_spec.rb
+- spec/parser/options_spec.rb
+- spec/rake_compat_spec.rb
+- spec/register_spec.rb
+- spec/runner_spec.rb
+- spec/shell/basic_spec.rb
+- spec/shell/color_spec.rb
+- spec/shell/html_spec.rb
+- spec/shell_spec.rb
+- spec/spec_helper.rb
+- spec/task_spec.rb
+- spec/thor_spec.rb
+- spec/util_spec.rb
+has_rdoc: