thor 0.14.6 → 0.15.0

data/spec/actions_spec.rb

@@ -82,6 +82,10 @@ describe Thor::Actions do
         end
       end
 
+      it "creates proper relative paths for absolute file location" do
+        runner.relative_to_original_destination_root('/test/file').should == "/test/file"
+      end
+
       describe "#source_paths_for_search" do
         it "add source_root to source_paths_for_search" do
           MyCounter.source_paths_for_search.should include(File.expand_path("fixtures", File.dirname(__FILE__)))

data/spec/base_spec.rb

@@ -227,10 +227,15 @@ describe Thor::Base do
   end
 
   describe "#start" do
-    it "raises an error instead of rescueing if --debug is given" do
-      lambda {
-        MyScript.start ["what", "--debug"]
-      }.should raise_error(Thor::UndefinedTaskError, 'Could not find task "what" in "my_script" namespace.')
+    it "raises an error instead of rescueing if THOR_DEBUG=1 is given" do
+      begin
+        ENV["THOR_DEBUG"] = 1
+        lambda {
+          MyScript.start ["what", "--debug"]
+        }.should raise_error(Thor::UndefinedTaskError, 'Could not find task "what" in "my_script" namespace.')
+      rescue
+        ENV["THOR_DEBUG"] = nil
+      end
     end
 
     it "does not steal args" do
@@ -247,7 +252,7 @@ describe Thor::Base do
 
     it "checks unknown options except specified" do
       capture(:stderr) {
-        MyScript.start(["with_optional", "NAME", "--omg", "--invalid"]).should == ["NAME", {}]
+        MyScript.start(["with_optional", "NAME", "--omg", "--invalid"]).should == ["NAME", {}, ["--omg", "--invalid"]]
       }.strip.should be_empty
     end
   end

data/spec/exit_condition_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'thor/base'
+
+describe "Exit conditions" do
+  it "should exit 0, not bubble up EPIPE, if EPIPE is raised" do
+    epiped = false
+
+    task = Class.new(Thor) do
+      desc "my_action", "testing EPIPE"
+      define_method :my_action do
+        epiped = true
+        raise Errno::EPIPE
+      end
+    end
+
+    lambda { task.start(["my_action"]) }.should raise_error(SystemExit)
+    epiped.should == true
+  end
+end

data/spec/fixtures/script.thor

@@ -10,6 +10,8 @@ class MyScript < Thor
 
   map "-T" => :animal, ["-f", "--foo"] => :foo
 
+  map "animal_prison" => "zoo"
+
   desc "zoo", "zoo around"
   def zoo
     true
@@ -26,11 +28,15 @@ class MyScript < Thor
     [type]
   end
 
+  map "hid" => "hidden"
+
   desc "hidden TYPE", "this is hidden", :hide => true
   def hidden(type)
     [type]
   end
 
+  map "fu" => "zoo"
+
   desc "foo BAR", <<END
 do some fooing
   This is more info!
@@ -77,8 +83,8 @@ END
   method_option :lazy_array,   :type => :array,   :lazy_default => %w[eat at joes]
   method_option :lazy_hash,    :type => :hash,    :lazy_default => {'swedish' => 'meatballs'}
   desc "with_optional NAME", "invoke with optional name"
-  def with_optional(name=nil)
-    [ name, options ]
+  def with_optional(name=nil, *args)
+    [ name, options, args ]
   end
 
   class AnotherScript < Thor

data/spec/group_spec.rb

@@ -32,7 +32,7 @@ describe Thor::Group do
     end
 
     it "raises an error when a Thor group task expects arguments" do
-      lambda { WhinyGenerator.start }.should raise_error(ArgumentError, /Are you sure it has arity equals to 0\?/)
+      lambda { WhinyGenerator.start }.should raise_error(ArgumentError, /thor wrong_arity takes 1 argument, but it should not/)
     end
 
     it "invokes help message if any of the shortcuts is given" do
@@ -175,4 +175,42 @@ describe Thor::Group do
       end
     end
   end
+
+  describe "edge-cases" do
+    it "can handle boolean options followed by arguments" do
+      klass = Class.new(Thor::Group) do
+        desc "say hi to name"
+        argument :name, :type => :string
+        class_option :loud, :type => :boolean
+
+        def hi
+          name.upcase! if options[:loud]
+          "Hi #{name}"
+        end
+      end
+
+      klass.start(["jose"]).should == ["Hi jose"]
+      klass.start(["jose", "--loud"]).should == ["Hi JOSE"]
+      klass.start(["--loud", "jose"]).should == ["Hi JOSE"]
+    end
+
+    it "provides extra args as `args`" do
+      klass = Class.new(Thor::Group) do
+        desc "say hi to name"
+        argument :name, :type => :string
+        class_option :loud, :type => :boolean
+
+        def hi
+          name.upcase! if options[:loud]
+          out = "Hi #{name}"
+          out << ": " << args.join(", ") unless args.empty?
+          out
+        end
+      end
+
+      klass.start(["jose"]).should == ["Hi jose"]
+      klass.start(["jose", "--loud"]).should == ["Hi JOSE"]
+      klass.start(["--loud", "jose"]).should == ["Hi JOSE"]
+    end
+  end
 end

data/spec/parser/arguments_spec.rb

@@ -26,6 +26,7 @@ describe Thor::Arguments do
       create :string => nil, :hash => nil
       parse("product", "title:string", "age:integer")["string"].should == "product"
       parse("product", "title:string", "age:integer")["hash"].should == { "title" => "string", "age" => "integer"}
+      parse("product", "url:http://www.amazon.com/gp/product/123")["hash"].should == { "url" => "http://www.amazon.com/gp/product/123" }
     end
 
     it "accepts arrays" do

data/spec/parser/options_spec.rb

@@ -121,13 +121,13 @@ describe Thor::Options do
       check_unknown!
     end
 
-    it "excepts underscores in commandline args hash for boolean" do
+    it "accepts underscores in commandline args hash for boolean" do
       create :foo_bar => :boolean
       parse("--foo_bar")["foo_bar"].should == true
       parse("--no_foo_bar")["foo_bar"].should == false
     end
 
-    it "excepts underscores in commandline args hash for strings" do
+    it "accepts underscores in commandline args hash for strings" do
       create :foo_bar => :string, :baz_foo => :string
       parse("--foo_bar", "baz")["foo_bar"].should == "baz"
       parse("--baz_foo", "foo bar")["baz_foo"].should == "foo bar"
@@ -229,6 +229,10 @@ describe Thor::Options do
         parse("--foo", "--bar")["foo"].should == true
       end
 
+      it "uses the default value if no switch is given" do
+        parse("")["foo"].should == false
+      end
+
       it "accepts --opt=value assignment" do
         parse("--foo=true")["foo"].should == true
         parse("--foo=false")["foo"].should == false
@@ -258,6 +262,12 @@ describe Thor::Options do
         parse("--no-foo-bar")["foo_bar"].should == false
         parse("--skip-foo-bar")["foo_bar"].should == false
       end
+
+      it "doesn't eat the next part of the param" do
+        create :foo => :boolean
+        parse("--foo", "bar").should == {"foo" => true}
+        @opt.remaining.should == ["bar"]
+      end
     end
 
     describe "with :hash type" do

data/spec/rake_compat_spec.rb

@@ -2,20 +2,24 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'thor/rake_compat'
 require 'rake/tasklib'
 
+$main = self
+
 class RakeTask < Rake::TaskLib
   def initialize
     define
   end
 
   def define
-    desc "Say it's cool"
-    task :cool do
-      puts "COOL"
-    end
+    $main.instance_eval do
+      desc "Say it's cool"
+      task :cool do
+        puts "COOL"
+      end
 
-    namespace :hiper_mega do
-      task :super do
-        puts "HIPER MEGA SUPER"
+      namespace :hiper_mega do
+        task :super do
+          puts "HIPER MEGA SUPER"
+        end
       end
     end
   end

data/spec/register_spec.rb

@@ -40,6 +40,19 @@ class GroupPlugin < Thor::Group
   end
 end
 
+class ClassOptionGroupPlugin < Thor::Group
+  class_option :who,
+    :type => :string,
+    :aliases => "-w",
+    :default => "zebra"
+end
+
+class CompatibleWith19Plugin < ClassOptionGroupPlugin
+  desc "animal"
+  def animal
+    p options[:who]
+  end
+end
 
 BoringVendorProvidedCLI.register(
   ExcitingPluginCLI,
@@ -60,6 +73,12 @@ BoringVendorProvidedCLI.register(
   "Do a bunch of things in a row",
   "purple monkey dishwasher")
 
+BoringVendorProvidedCLI.register(
+  CompatibleWith19Plugin,
+  'zoo',
+  "zoo [-w animal]",
+  "Shows a provided animal or just zebra")
+
 describe ".register-ing a Thor subclass" do
   it "registers the plugin as a subcommand" do
     fireworks_output = capture(:stdout) { BoringVendorProvidedCLI.start(%w[exciting fireworks]) }
@@ -71,6 +90,18 @@ describe ".register-ing a Thor subclass" do
     help_output.should include('do exciting things')
   end
 
+  context "when $thor_runner is false" do
+    it "includes the plugin's subcommand name in subcommand's help" do
+      begin
+        $thor_runner = false
+        help_output = capture(:stdout) { BoringVendorProvidedCLI.start(%w[exciting]) }
+        help_output.should include('thor exciting_plugin_c_l_i fireworks')
+      ensure
+        $thor_runner = true
+      end
+    end
+  end
+
   context "when hidden" do
     it "omits the hidden plugin's usage from the help" do
       help_output = capture(:stdout) { BoringVendorProvidedCLI.start(%w[help]) }
@@ -90,3 +121,15 @@ describe ".register-ing a Thor::Group subclass" do
     group_output.should == "part one\npart two\n"
   end
 end
+
+describe "1.8 and 1.9 syntax compatibility" do
+  it "is compatible with both 1.8 and 1.9 syntax w/o task options" do
+    group_output = capture(:stdout) { BoringVendorProvidedCLI.start(%w[zoo]) }
+    group_output.should match /zebra/
+  end
+
+  it "is compatible with both 1.8 and 1.9 syntax w/task options" do
+    group_output = capture(:stdout) { BoringVendorProvidedCLI.start(%w[zoo -w lion]) }
+    group_output.should match /lion/
+  end
+end

data/spec/runner_spec.rb

@@ -2,6 +2,16 @@ require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
 require 'thor/runner'
 
 describe Thor::Runner do
+  def when_no_thorfiles_exist
+    old_dir = Dir.pwd
+    Dir.chdir '..'
+    delete = Thor::Base.subclasses.select {|e| e.namespace == 'default' }
+    delete.each {|e| Thor::Base.subclasses.delete e }
+    yield
+    Thor::Base.subclasses.concat delete
+    Dir.chdir old_dir
+  end
+
   describe "#help" do
     it "shows information about Thor::Runner itself" do
       capture(:stdout){ Thor::Runner.start(["help"]) }.should =~ /List the available thor tasks/
@@ -33,6 +43,14 @@ describe Thor::Runner do
       content = capture(:stderr){ Thor::Runner.start(["help", "unknown"]) }
       content.strip.should == 'Could not find task "unknown" in "default" namespace.'
     end
+
+    it "raises error if a class/task cannot be found for a setup without thorfiles" do
+      when_no_thorfiles_exist do
+        Thor::Runner.should_receive :exit
+        content = capture(:stderr){ Thor::Runner.start(["help", "unknown"]) }
+        content.strip.should == 'Could not find task "unknown".'
+      end
+    end
   end
 
   describe "#start" do
@@ -72,6 +90,15 @@ describe Thor::Runner do
       content.strip.should == 'Could not find task "unknown" in "default" namespace.'
     end
 
+    it "raises an error if class/task can't be found in a setup without thorfiles" do
+      when_no_thorfiles_exist do
+        ARGV.replace ["unknown"]
+        Thor::Runner.should_receive :exit
+        content = capture(:stderr){ Thor::Runner.start }
+        content.strip.should == 'Could not find task "unknown".'
+      end
+    end
+
     it "does not swallow NoMethodErrors that occur inside the called method" do
       ARGV.replace ["my_script:call_unexistent_method"]
       lambda { Thor::Runner.start }.should raise_error(NoMethodError)
@@ -79,13 +106,13 @@ describe Thor::Runner do
 
     it "does not swallow Thor::Group InvocationError" do
       ARGV.replace ["whiny_generator"]
-      lambda { Thor::Runner.start }.should raise_error(ArgumentError, /Are you sure it has arity equals to 0\?/)
+      lambda { Thor::Runner.start }.should raise_error(ArgumentError, /thor wrong_arity takes 1 argument, but it should not/)
     end
 
     it "does not swallow Thor InvocationError" do
       ARGV.replace ["my_script:animal"]
       content = capture(:stderr) { Thor::Runner.start }
-      content.strip.should == '"animal" was called incorrectly. Call as "thor my_script:animal TYPE".'
+      content.strip.should == 'thor animal requires at least 1 argument: "thor my_script:animal TYPE".'
     end
   end
 
@@ -197,7 +224,11 @@ describe Thor::Runner do
 
       it "updates existing thor files" do
         path = File.join(Thor::Util.thor_root, @original_yaml["random"][:filename])
-        File.should_receive(:delete).with(path)
+        if File.directory? path
+          FileUtils.should_receive(:rm_rf).with(path)
+        else
+          File.should_receive(:delete).with(path)
+        end
         silence(:stdout) { Thor::Runner.start(["update", "random"]) }
       end
 

data/spec/shell/basic_spec.rb

@@ -21,6 +21,19 @@ describe Thor::Shell::Basic do
       $stdin.should_receive(:gets).and_return('Sure')
       shell.ask("Should I overwrite it?").should == "Sure"
     end
+
+    it "prints a message to the user with the available options and determines the correctness of the answer" do
+      $stdout.should_receive(:print).with('What\'s your favorite Neopolitan flavor? ["strawberry", "chocolate", "vanilla"] ')
+      $stdin.should_receive(:gets).and_return('chocolate')
+      shell.ask("What's your favorite Neopolitan flavor?", :limited_to => ["strawberry", "chocolate", "vanilla"]).should == "chocolate"
+    end
+
+    it "prints a message to the user with the available options and reasks the question after an incorrect repsonse" do
+      $stdout.should_receive(:print).with('What\'s your favorite Neopolitan flavor? ["strawberry", "chocolate", "vanilla"] ').twice
+      $stdout.should_receive(:puts).with('Your response must be one of: ["strawberry", "chocolate", "vanilla"]. Please try again.')
+      $stdin.should_receive(:gets).and_return('moose tracks', 'chocolate')
+      shell.ask("What's your favorite Neopolitan flavor?", :limited_to => ["strawberry", "chocolate", "vanilla"]).should == "chocolate"
+    end
   end
 
   describe "#yes?" do
@@ -122,8 +135,8 @@ xyz  #786  last three
 TABLE
     end
 
-    it "prints a table with identation" do
-      content = capture(:stdout){ shell.print_table(@table, :ident => 2) }
+    it "prints a table with indentation" do
+      content = capture(:stdout){ shell.print_table(@table, :indent => 2) }
       content.should == <<-TABLE
   abc  #123  first three
        #0    empty
@@ -133,7 +146,7 @@ TABLE
 
     it "uses maximum terminal width" do
       shell.should_receive(:terminal_width).and_return(20)
-      content = capture(:stdout){ shell.print_table(@table, :ident => 2, :truncate => true) }
+      content = capture(:stdout){ shell.print_table(@table, :indent => 2, :truncate => true) }
       content.should == <<-TABLE
   abc  #123  firs...
        #0    empty
@@ -147,6 +160,40 @@ TABLE
 abc         #123  first three
             #0    empty
 xyz         #786  last three
+TABLE
+    end
+
+    it "prints tables with implicit columns" do
+      2.times { @table.first.pop }
+      content = capture(:stdout){ shell.print_table(@table) }
+      content.should == <<-TABLE
+abc  
+     #0    empty
+xyz  #786  last three
+TABLE
+    end
+
+    it "prints a table with small numbers, and right-aligns them" do
+      table = [
+        ["Name", "Number", "Color"],
+        ["Erik", 1, "green"]
+      ]
+      content = capture(:stdout){ shell.print_table(table) }
+      content.should == <<-TABLE
+Name  Number  Color
+Erik       1  green
+TABLE
+    end
+
+    it "prints a table with big numbers" do
+      table = [
+        ["Name", "Number", "Color"],
+        ["Erik", 1234567890123, "green"]
+      ]
+      content = capture(:stdout){ shell.print_table(table) }
+      content.should == <<-TABLE
+Name  Number         Color
+Erik  1234567890123  green
 TABLE
     end
   end