thor 0.12.0 → 0.12.2

data/spec/fixtures/task.thor

@@ -0,0 +1,10 @@
+# module: random
+
+class Amazing < Thor
+  desc "describe NAME", "say that someone is amazing"
+  method_options :forcefully => :boolean
+  def describe(name, opts)
+    ret = "#{name} is amazing"
+    puts opts["forcefully"] ? ret.upcase : ret
+  end
+end

data/spec/runner_spec.rb

@@ -78,12 +78,12 @@ describe Thor::Runner do
       lambda { Thor::Runner.start }.must raise_error(NoMethodError)
     end
 
-    it "does not swallow Thor::Group ArgumentError" do
+    it "does not swallow Thor::Group InvocationError" do
       ARGV.replace ["whiny_generator"]
       lambda { Thor::Runner.start }.must raise_error(ArgumentError, /Are you sure it has arity equals to 0\?/)
     end
 
-    it "does not swallow Thor ArgumentError" do
+    it "does not swallow Thor InvocationError" do
       ARGV.replace ["my_script:animal"]
       capture(:stderr) { Thor::Runner.start }.must =~ /'animal' was called incorrectly\. Call as 'my_script:animal TYPE'/
     end
@@ -110,7 +110,7 @@ describe Thor::Runner do
       it "gives a list of the available tasks" do
         ARGV.replace ["list"]
         content = capture(:stdout) { Thor::Runner.start }
-        content.must =~ /amazing:describe NAME \[\-\-forcefully\]\s+# say that someone is amazing/m
+        content.must =~ /amazing:describe NAME\s+# say that someone is amazing/m
       end
 
       it "gives a list of the available Thor::Group classes" do
@@ -141,7 +141,7 @@ describe Thor::Runner do
 
       it "presents tasks in the default namespace with an empty namespace" do
         ARGV.replace ["list"]
-        capture(:stdout) { Thor::Runner.start }.must =~ /^:test\s+# prints 'test'/m
+        capture(:stdout) { Thor::Runner.start }.must =~ /^thor :test\s+# prints 'test'/m
       end
 
       it "runs tasks with an empty namespace from the default namespace" do
@@ -183,7 +183,7 @@ describe Thor::Runner do
       it "displays the modules installed in a pretty way" do
         stdout = capture(:stdout) { Thor::Runner.start(["installed"]) }
         stdout.must =~ /random\s*amazing/
-        stdout.must =~ /amazing:describe NAME \[\-\-forcefully\]\s+# say that someone is amazing/m
+        stdout.must =~ /amazing:describe NAME\s+# say that someone is amazing/m
       end
     end
 

data/spec/shell/basic_spec.rb

@@ -96,28 +96,6 @@ describe Thor::Shell::Basic do
     end
   end
 
-  describe "#print_list" do
-    before(:each) do
-      @list = ["abc", "#123", "first three"]
-    end
-
-    it "prints a list" do
-      content = capture(:stdout){ shell.print_list(@list) }
-      content.must == <<-LIST
-abc
-#123
-first three
-LIST
-    end
-
-    it "prints a list inline" do
-      content = capture(:stdout){ shell.print_list(@list, :mode => :inline) }
-      content.must == <<-LIST
-abc, #123, and first three
-LIST
-    end
-  end
-
   describe "#print_table" do
     before(:each) do
       @table = []
@@ -141,6 +119,16 @@ TABLE
   abc  #123  first three
        #0    empty
   xyz  #786  last three
+TABLE
+    end
+
+    it "uses maximum terminal width" do
+      mock(shell).terminal_width { 20 }
+      content = capture(:stdout){ shell.print_table(@table, :ident => 2, :truncate => true) }
+      content.must == <<-TABLE
+  abc  #123  firs...
+       #0    empty
+  xyz  #786  last...
 TABLE
     end
   end
@@ -152,6 +140,12 @@ TABLE
       shell.file_collision('foo')
     end
 
+    it "returns true if the user choose default option" do
+      stub($stdout).print
+      mock($stdin).gets{ '' }
+      shell.file_collision('foo').must be_true
+    end
+
     it "returns false if the user choose no" do
       stub($stdout).print
       mock($stdin).gets{ 'n' }

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/spec/task_spec.rb

@@ -10,32 +10,22 @@ describe Thor::Task do
   end
 
   describe "#formatted_usage" do
-    it "shows usage with options" do
-      task('foo' => true, :bar => :required).formatted_usage.must == "can_has --bar=BAR [--foo]"
-    end
-
     it "includes namespace within usage" do
       stub(Object).namespace{ "foo" }
       stub(Object).arguments{ [] }
-      task(:bar => :required).formatted_usage(Object, true).must == "foo:can_has --bar=BAR"
-    end
-
-    it "does not show options if required" do
-      stub(Object).namespace{ "foo" }
-      stub(Object).arguments{ [] }
-      task(:bar => :required).formatted_usage(Object, true, false).must == "foo:can_has"
+      task(:bar => :required).formatted_usage(Object).must == "foo:can_has --bar=BAR"
     end
 
     it "removes default from namespace" do
       stub(Object).namespace{ "default:foo" }
       stub(Object).arguments{ [] }
-      task(:bar => :required).formatted_usage(Object, true).must == ":foo:can_has --bar=BAR"
+      task(:bar => :required).formatted_usage(Object).must == ":foo:can_has --bar=BAR"
     end
 
     it "injects arguments into usage" do
       stub(Object).namespace{ "foo" }
       stub(Object).arguments{ [ Thor::Argument.new(:bar, nil, true, :string) ] }
-      task(:foo => true).formatted_usage(Object).must == "can_has BAR [--foo]"
+      task(:foo => :required).formatted_usage(Object).must == "foo:can_has BAR --foo=FOO"
     end
   end
 
@@ -75,14 +65,4 @@ describe Thor::Task do
       }.must raise_error(Thor::UndefinedTaskError, "the 'can_has' task of Object is private")
     end
   end
-
-  describe "#short_description" do
-    it "returns the first line of the description" do
-      Thor::Task.new(:task, "I can has\ncheezburger", "can_has").short_description == "I can has"
-    end
-
-    it "returns the whole description if it's one line" do
-      Thor::Task.new(:task, "I can has cheezburger", "can_has").short_description == "I can has cheezburger"
-    end
-  end
 end

data/spec/thor_spec.rb

@@ -72,7 +72,7 @@ describe Thor do
 
     describe "when :for is supplied" do
       it "overwrites a previous defined task" do
-        capture(:stdout) { MyChildScript.start(["help"]) }.must =~ /animal KIND \[\-\-other=OTHER\]\s+# fish around/m
+        capture(:stdout) { MyChildScript.start(["help"]) }.must =~ /animal KIND \s+# fish around/m
       end
     end
   end
@@ -133,7 +133,7 @@ describe Thor do
     end
 
     it "raises when an exception happens within the task call" do
-      lambda { MyScript.start(["call_myself_with_wrong_arity"]) }.must raise_error
+      lambda { MyScript.start(["call_myself_with_wrong_arity", "--debug"]) }.must raise_error
     end
   end
 
@@ -148,25 +148,31 @@ describe Thor do
       end
 
       it "provides useful help info for the help method itself" do
-        @content.must =~ /help \[TASK\]\s+# Describe available tasks/m
+        @content.must =~ /help \[TASK\]\s+# Describe available tasks/
       end
 
       it "provides useful help info for a method with params" do
-        @content.must =~ /animal TYPE\s+# horse around/m
+        @content.must =~ /animal TYPE\s+# horse around/
+      end
+
+      it "uses the maximum terminal size to show tasks" do
+        mock(@shell).terminal_width { 80 }
+        @content = capture(:stdout){ MyScript.help(shell) }
+        @content.must =~ /aaa\.\.\.$/
       end
 
       it "provides description for tasks from classes in the same namespace" do
-        @content.must =~ /baz\s+# do some bazing/m
+        @content.must =~ /baz\s+# do some bazing/
       end
 
       it "shows superclass tasks" do
         content = capture(:stdout){ MyChildScript.help(shell) }
-        content.must =~ /foo BAR \[\-\-force\]\s+# do some fooing/m
+        content.must =~ /foo BAR \s+# do some fooing/
       end
 
       it "shows class options information" do
         content = capture(:stdout){ MyChildScript.help(shell) }
-        content.must =~ /Class options\:/
+        content.must =~ /Options\:/
         content.must =~ /\[\-\-param=N\]/
       end
 
@@ -178,11 +184,11 @@ describe Thor do
 
     describe "for a specific task" do
       it "provides full help info when talking about a specific task" do
-        capture(:stdout) { MyScript.help(shell, "foo") }.must == <<END
+        capture(:stdout) { MyScript.help(shell, :task => "foo") }.must == <<END
 Usage:
-  foo BAR
+  thor my_script:foo BAR
 
-Method options:
+Options:
   [--force]  # Force to do some fooing
 
 do some fooing
@@ -193,24 +199,20 @@ END
 
       it "raises an error if the task can't be found" do
         lambda {
-          MyScript.help(shell, "unknown")
+          MyScript.help(shell, :task => "unknown")
         }.must raise_error(Thor::Error, "task 'unknown' could not be found in namespace 'my_script'")
       end
     end
 
     describe "options" do
-      it "shows the namespace if required" do
-        capture(:stdout){ MyScript.help(shell, nil, :namespace => true) }.must =~ /my_script:foo BAR/
-      end
-
       it "does not show superclass tasks if required" do
-        capture(:stdout){ MyScript.help(shell, nil, :short => true) }.must_not =~ /help/
+        capture(:stdout){ MyScript.help(shell, :short => true) }.must_not =~ /help/
       end
     end
 
     describe "instance method" do
       it "calls the class method" do
-        stub(MyScript).help(mock.instance_of(Thor::Base.shell), nil, :namespace => nil)
+        stub(MyScript).help(mock.instance_of(Thor::Base.shell), :task => nil)
         MyScript.start(["help"])
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
-  version: 0.12.0
+  version: 0.12.2
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 -02:00
+date: 2010-01-01 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -88,30 +88,65 @@ signing_key:
 specification_version: 3
 summary: A scripting framework that replaces rake, sake and rubigen
 test_files: 
-- spec/rake_compat_spec.rb
+- spec/actions/create_file_spec.rb
 - spec/actions/directory_spec.rb
 - spec/actions/empty_directory_spec.rb
-- spec/actions/create_file_spec.rb
-- spec/actions/inject_into_file_spec.rb
 - spec/actions/file_manipulation_spec.rb
-- spec/shell_spec.rb
-- spec/invocation_spec.rb
-- spec/base_spec.rb
-- spec/task_spec.rb
-- spec/spec_helper.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/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/group_spec.rb
+- spec/shell_spec.rb
+- spec/spec_helper.rb
+- spec/task_spec.rb
 - spec/thor_spec.rb
+- spec/util_spec.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/doc/config.rb
 - spec/fixtures/bundle/execute.rb
-- spec/util_spec.rb
+- spec/fixtures/bundle/main.thor
+- spec/fixtures/doc/%file_name%.rb.tt
+- spec/fixtures/doc/config.rb
+- spec/fixtures/doc/README
+- spec/fixtures/group.thor
+- spec/fixtures/invoke.thor
+- 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/parser/arguments_spec.rb
+- spec/rake_compat_spec.rb
 - spec/runner_spec.rb
-- spec/core_ext/ordered_hash_spec.rb
-- spec/core_ext/hash_with_indifferent_access_spec.rb
+- spec/shell/basic_spec.rb
+- spec/shell/color_spec.rb
+- spec/shell_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/task_spec.rb
+- spec/thor_spec.rb
+- spec/util_spec.rb