thor 0.13.4 → 0.14.3

data/spec/shell/basic_spec.rb

@@ -27,11 +27,11 @@ describe Thor::Shell::Basic do
     it "asks the user and returns true if the user replies yes" do
       $stdout.should_receive(:print).with("Should I overwrite it? ")
         $stdin.should_receive(:gets).and_return('y')
-      shell.yes?("Should I overwrite it?").must be_true
+      shell.yes?("Should I overwrite it?").must === true
 
       $stdout.should_receive(:print).with("Should I overwrite it? ")
         $stdin.should_receive(:gets).and_return('n')
-      shell.yes?("Should I overwrite it?").must_not be_true
+      shell.yes?("Should I overwrite it?").must_not === true
     end
   end
 
@@ -39,11 +39,11 @@ describe Thor::Shell::Basic do
     it "asks the user and returns true if the user replies no" do
       $stdout.should_receive(:print).with("Should I overwrite it? ")
         $stdin.should_receive(:gets).and_return('n')
-      shell.no?("Should I overwrite it?").must be_true
+      shell.no?("Should I overwrite it?").must === true
 
       $stdout.should_receive(:print).with("Should I overwrite it? ")
         $stdin.should_receive(:gets).and_return('Yes')
-      shell.no?("Should I overwrite it?").must be_false
+      shell.no?("Should I overwrite it?").must === false
     end
   end
 
@@ -129,6 +129,15 @@ TABLE
   abc  #123  firs...
        #0    empty
   xyz  #786  last...
+TABLE
+    end
+
+    it "honors the colwidth option" do
+      content = capture(:stdout){ shell.print_table(@table, :colwidth => 10)}
+      content.must == <<-TABLE
+abc         #123  first three
+            #0    empty
+xyz         #786  last three
 TABLE
     end
   end

data/spec/shell/html_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Thor::Shell::HTML do
+  def shell
+    @shell ||= Thor::Shell::HTML.new
+  end
+
+  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
+    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
+    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')
+      shell.say_status :conflict, "README", :red
+    end
+  end
+
+end

data/spec/shell_spec.rb

@@ -21,6 +21,18 @@ describe Thor::Shell do
     it "returns the shell in use" do
       MyCounter.new([1,2]).shell.must be_kind_of(Thor::Base.shell)
     end
+    
+    it "uses $THOR_SHELL" do
+      class Thor::Shell::TestShell < Thor::Shell::Basic; end
+      
+      Thor::Base.shell.must == shell.class
+      ENV['THOR_SHELL'] = 'TestShell'
+      Thor::Base.shell = nil
+      Thor::Base.shell.must == Thor::Shell::TestShell
+      ENV['THOR_SHELL'] = ''
+      Thor::Base.shell = shell.class
+      Thor::Base.shell.must == shell.class
+    end
   end
 
   describe "with_padding" do
@@ -31,4 +43,5 @@ describe Thor::Shell do
       end
     end
   end
+  
 end

data/spec/spec_helper.rb

@@ -10,7 +10,11 @@ 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).
 
+# Set shell to basic
+$0 = "thor"
 $thor_runner = true
+ARGV.clear
+Thor::Base.shell = Thor::Shell::Basic
 
 # Load fixtures
 load File.join(File.dirname(__FILE__), "fixtures", "task.thor")
@@ -18,9 +22,6 @@ load File.join(File.dirname(__FILE__), "fixtures", "group.thor")
 load File.join(File.dirname(__FILE__), "fixtures", "script.thor")
 load File.join(File.dirname(__FILE__), "fixtures", "invoke.thor")
 
-# Set shell to basic
-Thor::Base.shell = Thor::Shell::Basic
-
 Kernel.module_eval do
   alias_method :must, :should
   alias_method :must_not, :should_not

data/spec/task_spec.rb

@@ -6,7 +6,7 @@ describe Thor::Task do
       options[key] = Thor::Option.parse(key, value)
     end
 
-    @task ||= Thor::Task.new(:can_has, "I can has cheezburger", "can_has", options)
+    @task ||= Thor::Task.new(:can_has, "I can has cheezburger", "I can has cheezburger\nLots and lots of it", "can_has", options)
   end
 
   describe "#formatted_usage" do
@@ -31,22 +31,22 @@ describe Thor::Task do
 
   describe "#dynamic" do
     it "creates a dynamic task with the given name" do
-      Thor::Task::Dynamic.new('task').name.must == 'task'
-      Thor::Task::Dynamic.new('task').description.must == 'A dynamically-generated task'
-      Thor::Task::Dynamic.new('task').usage.must == 'task'
-      Thor::Task::Dynamic.new('task').options.must == {}
+      Thor::DynamicTask.new('task').name.must == 'task'
+      Thor::DynamicTask.new('task').description.must == 'A dynamically-generated task'
+      Thor::DynamicTask.new('task').usage.must == 'task'
+      Thor::DynamicTask.new('task').options.must == {}
     end
 
     it "does not invoke an existing method" do
       mock = mock()
       mock.class.should_receive(:handle_no_task_error).with("to_s")
-      Thor::Task::Dynamic.new('to_s').run(mock)
+      Thor::DynamicTask.new('to_s').run(mock)
     end
   end
 
   describe "#dup" do
     it "dup options hash" do
-      task = Thor::Task.new("can_has", nil, nil, :foo => true, :bar => :required)
+      task = Thor::Task.new("can_has", nil, nil, nil, :foo => true, :bar => :required)
       task.dup.options.delete(:foo)
       task.options[:foo].must_not be_nil
     end

data/spec/thor_spec.rb

@@ -8,6 +8,45 @@ describe Thor do
       options.must == { "force" => true }
     end
 
+    describe ":lazy_default" do
+      it "is absent when option is not specified" do
+        arg, options = MyScript.start(["with_optional"])
+        options.must == {}
+      end
+
+      it "sets a default that can be overridden for strings" do
+        arg, options = MyScript.start(["with_optional", "--lazy"])
+        options.must == { "lazy" => "yes" }
+
+        arg, options = MyScript.start(["with_optional", "--lazy", "yesyes!"])
+        options.must == { "lazy" => "yesyes!" }
+      end
+
+      it "sets a default that can be overridden for numerics" do
+        arg, options = MyScript.start(["with_optional", "--lazy-numeric"])
+        options.must == { "lazy_numeric" => 42 }
+
+        arg, options = MyScript.start(["with_optional", "--lazy-numeric", 20000])
+        options.must == { "lazy_numeric" => 20000 }
+      end
+
+      it "sets a default that can be overridden for arrays" do
+        arg, options = MyScript.start(["with_optional", "--lazy-array"])
+        options.must == { "lazy_array" => %w[eat at joes] }
+
+        arg, options = MyScript.start(["with_optional", "--lazy-array", "hello", "there"])
+        options.must == { "lazy_array" => %w[hello there] }
+      end
+
+      it "sets a default that can be overridden for hashes" do
+        arg, options = MyScript.start(["with_optional", "--lazy-hash"])
+        options.must == { "lazy_hash" => {'swedish' => 'meatballs'} }
+
+        arg, options = MyScript.start(["with_optional", "--lazy-hash", "polish:sausage"])
+        options.must == { "lazy_hash" => {'polish' => 'sausage'} }
+      end
+    end
+
     describe "when :for is supplied" do
       it "updates an already defined task" do
         args, options = MyChildScript.start(["animal", "horse", "--other=fish"])
@@ -41,6 +80,10 @@ describe Thor do
       MyScript.start([]).must == "default task"
     end
 
+    it "invokes the default task if no command is specified even if switches are given" do
+      MyScript.start(["--with", "option"]).must == {"with"=>"option"}
+    end
+
     it "inherits the default task from parent" do
       MyChildScript.default_task.must == "example_default_task"
     end
@@ -62,12 +105,19 @@ describe Thor do
   end
 
   describe "#desc" do
-    before(:all) do
-      @content = capture(:stdout) { MyScript.start(["help"]) }
+    it "provides description for a task" do
+      content = capture(:stdout) { MyScript.start(["help"]) }
+      content.must =~ /thor my_script:zoo\s+# zoo around/m
     end
 
-    it "provides description for a task" do
-      @content.must =~ /zoo\s+# zoo around/m
+    it "provides no namespace if $thor_runner is false" do
+      begin
+        $thor_runner = false
+        content = capture(:stdout) { MyScript.start(["help"]) }
+        content.must =~ /thor zoo\s+# zoo around/m
+      ensure
+        $thor_runner = true
+      end
     end
 
     describe "when :for is supplied" do
@@ -75,6 +125,16 @@ describe Thor do
         capture(:stdout) { MyChildScript.start(["help"]) }.must =~ /animal KIND \s+# fish around/m
       end
     end
+
+    describe "when :hide is supplied" do
+      it "does not show the task in help" do
+        capture(:stdout) { MyScript.start(["help"]) }.must_not =~ /this is hidden/m
+      end
+
+      it "but the task is still invokcable not show the task in help" do
+        MyScript.start(["hidden", "yesyes"]).must == ["yesyes"]
+      end
+    end
   end
 
   describe "#method_options" do
@@ -112,7 +172,7 @@ describe Thor do
     end
 
     it "raises an error if a required param is not provided" do
-      capture(:stderr) { MyScript.start(["animal"]) }.strip.must == '"animal" was called incorrectly. Call as "my_script:animal TYPE".'
+      capture(:stderr) { MyScript.start(["animal"]) }.strip.must == '"animal" was called incorrectly. Call as "thor my_script:animal TYPE".'
     end
 
     it "raises an error if the invoked task does not exist" do
@@ -137,6 +197,25 @@ describe Thor do
     end
   end
 
+  describe "#subcommand" do
+    it "maps a given subcommand to another Thor subclass" do
+      barn_help = capture(:stdout){ Scripts::MyDefaults.start(["barn"]) }
+      barn_help.must include("barn help [COMMAND]  # Describe subcommands or one specific subcommand")
+    end
+
+    it "passes commands to subcommand classes" do
+      capture(:stdout){ Scripts::MyDefaults.start(["barn", "open"]) }.strip.must == "Open sesame!"
+    end
+
+    it "passes arguments to subcommand classes" do
+      capture(:stdout){ Scripts::MyDefaults.start(["barn", "open", "shotgun"]) }.strip.must == "That's going to leave a mark."
+    end
+
+    it "ignores unknown options (the subcommand class will handle them)" do
+      capture(:stdout){ Scripts::MyDefaults.start(["barn", "paint", "blue", "--coats", "4"])}.strip.must == "4 coats of blue paint"
+    end
+  end
+
   describe "#help" do
     def shell
       @shell ||= Thor::Base.shell.new
@@ -184,7 +263,7 @@ describe Thor do
 
     describe "for a specific task" do
       it "provides full help info when talking about a specific task" do
-        capture(:stdout) { MyScript.task_help(shell, "foo") }.must == <<END
+        capture(:stdout) { MyScript.task_help(shell, "foo") }.must == <<-END
 Usage:
   thor my_script:foo BAR
 
@@ -206,6 +285,24 @@ END
       it "normalizes names before claiming they don't exist" do
         capture(:stdout) { MyScript.task_help(shell, "name-with-dashes") }.must =~ /thor my_script:name-with-dashes/
       end
+
+      it "uses the long description if it exists" do
+        capture(:stdout) { MyScript.task_help(shell, "long_description") }.must == <<-HELP
+Usage:
+  thor my_script:long_description
+
+Description:
+  This is a really really really long description. Here you go. So very long.
+
+  It even has two paragraphs.
+HELP
+      end
+
+      it "doesn't assign the long description to the next task without one" do
+        capture(:stdout) do
+          MyScript.task_help(shell, "name_with_dashes")
+        end.must_not =~ /so very long/i
+      end
     end
 
     describe "instance method" do

data/spec/util_spec.rb

@@ -100,18 +100,14 @@ describe Thor::Util do
       Thor::Util.find_class_and_task_by_namespace("thor:help").must == [Thor, "help"]
     end
 
-    it "fallbacks in the namespace:task look up even if a full namespace does not match" do
+    it "falls back in the namespace:task look up even if a full namespace does not match" do
       Thor.const_set(:Help, Module.new)
       Thor::Util.find_class_and_task_by_namespace("thor:help").must == [Thor, "help"]
       Thor.send :remove_const, :Help
     end
 
-    describe 'errors' do
-      it "raises an error if the Thor class or task can't be found" do
-        lambda {
-          Thor::Util.find_class_and_task_by_namespace!("foobar")
-        }.must raise_error(Thor::Error, 'Could not find namespace or task "foobar".')
-      end
+    it "falls back on the default namespace class if nothing else matches" do
+      Thor::Util.find_class_and_task_by_namespace("test").must == [Scripts::MyDefaults, "test"]
     end
   end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
-  version: 0.13.4
+  hash: 33
+  prerelease: false
+  segments: 
+  - 0
+  - 14
+  - 3
+  version: 0.14.3
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -10,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 +01:00
+date: 2010-10-04 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -24,12 +30,12 @@ extensions: []
 extra_rdoc_files: 
 - CHANGELOG.rdoc
 - LICENSE
-- README.rdoc
+- README.md
 - Thorfile
 files: 
 - CHANGELOG.rdoc
 - LICENSE
-- README.rdoc
+- README.md
 - Thorfile
 - bin/rake2thor
 - bin/thor
@@ -57,9 +63,49 @@ files:
 - lib/thor/shell.rb
 - lib/thor/shell/basic.rb
 - lib/thor/shell/color.rb
+- lib/thor/shell/html.rb
 - lib/thor/task.rb
 - lib/thor/util.rb
 - lib/thor/version.rb
+- spec/actions/create_file_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/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
+- 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/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
+- spec/fixtures/bundle/main.thor
+- spec/fixtures/doc/%file_name%.rb.tt
+- spec/fixtures/doc/README
+- spec/fixtures/group.thor
+- spec/fixtures/invoke.thor
+- spec/fixtures/path with spaces
+- spec/fixtures/script.thor
+- spec/fixtures/task.thor
+- spec/spec.opts
+- spec/fixtures/doc/components/.empty_directory
 has_rdoc: true
 homepage: http://yehudakatz.com
 licenses: []
@@ -70,21 +116,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: textmate
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A scripting framework that replaces rake, sake and rubigen
@@ -100,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
@@ -111,6 +164,7 @@ test_files:
 - 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
@@ -121,6 +175,8 @@ test_files:
 - spec/fixtures/doc/README
 - spec/fixtures/group.thor
 - spec/fixtures/invoke.thor
+- spec/fixtures/path with spaces
 - spec/fixtures/script.thor
 - spec/fixtures/task.thor
 - spec/spec.opts
+- spec/fixtures/doc/components/.empty_directory