thor 0.17.0 → 0.18.0

data/spec/parser/arguments_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'helper'
 require 'thor/parser'
 
 describe Thor::Arguments do

data/spec/parser/option_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'helper'
 require 'thor/parser'
 
 describe Thor::Option do

data/spec/parser/options_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'helper'
 require 'thor/parser'
 
 describe Thor::Options do
@@ -223,6 +223,11 @@ describe Thor::Options do
         expect(remaining).to eq(["--bar", "--verbose"])
       end
 
+      it "retains -- after it has stopped parsing" do
+        expect(parse(%w[--bar -- whatever])).to eq({})
+        expect(remaining).to eq(["--bar", "--", "whatever"])
+      end
+
       it "still accepts options that are given before non-options" do
         expect(parse(%w[--verbose foo])).to eq({"verbose" => true})
         expect(remaining).to eq(["foo"])

data/spec/rake_compat_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'helper'
 require 'thor/rake_compat'
 require 'rake/tasklib'
 

data/spec/register_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'helper'
 
 class BoringVendorProvidedCLI < Thor
   desc "boring", "do boring stuff"
@@ -20,7 +20,7 @@ class ExcitingPluginCLI < Thor
 end
 
 class SuperSecretPlugin < Thor
-  default_task :squirrel
+  default_command :squirrel
 
   desc "squirrel", "All of secret squirrel's secrets"
   def squirrel
@@ -60,7 +60,7 @@ class PluginWithDefault < Thor
     puts msg
   end
 
-  default_task :say
+  default_command :say
 end
 
 class PluginWithDefaultMultipleArguments < Thor
@@ -69,17 +69,17 @@ class PluginWithDefaultMultipleArguments < Thor
     puts args
   end
 
-  default_task :say
+  default_command :say
 end
 
-class PluginWithDefaultTaskAndDeclaredArgument < Thor
+class PluginWithDefaultcommandAndDeclaredArgument < Thor
   desc "say MSG [MSG]", "print multiple messages"
   argument :msg
   def say
     puts msg
   end
 
-  default_task :say
+  default_command :say
 end
 
 BoringVendorProvidedCLI.register(
@@ -120,7 +120,7 @@ BoringVendorProvidedCLI.register(
   'subcommands ftw')
 
 BoringVendorProvidedCLI.register(
-  PluginWithDefaultTaskAndDeclaredArgument,
+  PluginWithDefaultcommandAndDeclaredArgument,
   'say_argument',
   'say message',
   'subcommands ftw')
@@ -136,18 +136,18 @@ describe ".register-ing a Thor subclass" do
     expect(help_output).to include('do exciting things')
   end
 
-  it "invokes the default task correctly" do
+  it "invokes the default command correctly" do
     output = capture(:stdout) { BoringVendorProvidedCLI.start(%w[say hello]) }
     expect(output).to include("hello")
   end
 
-  it "invokes the default task correctly with multiple args" do
+  it "invokes the default command correctly with multiple args" do
     output = capture(:stdout) { BoringVendorProvidedCLI.start(%w[say_multiple hello adam]) }
     expect(output).to include("hello")
     expect(output).to include("adam")
   end
 
-  it "invokes the default task correctly with a declared argument" do
+  it "invokes the default command correctly with a declared argument" do
     output = capture(:stdout) { BoringVendorProvidedCLI.start(%w[say_argument hello]) }
     expect(output).to include("hello")
   end
@@ -185,12 +185,12 @@ describe ".register-ing a Thor::Group subclass" do
 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
+  it "is compatible with both 1.8 and 1.9 syntax w/o command options" do
     group_output = capture(:stdout) { BoringVendorProvidedCLI.start(%w[zoo]) }
     expect(group_output).to match(/zebra/)
   end
 
-  it "is compatible with both 1.8 and 1.9 syntax w/task options" do
+  it "is compatible with both 1.8 and 1.9 syntax w/command options" do
     group_output = capture(:stdout) { BoringVendorProvidedCLI.start(%w[zoo -w lion]) }
     expect(group_output).to match(/lion/)
   end

data/spec/runner_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
+require 'helper'
 require 'thor/runner'
 
 describe Thor::Runner do
@@ -14,13 +14,13 @@ describe Thor::Runner do
 
   describe "#help" do
     it "shows information about Thor::Runner itself" do
-      expect(capture(:stdout) { Thor::Runner.start(["help"]) }).to match(/List the available thor tasks/)
+      expect(capture(:stdout) { Thor::Runner.start(["help"]) }).to match(/List the available thor commands/)
     end
 
-    it "shows information about an specific Thor::Runner task" do
+    it "shows information about a specific Thor::Runner command" do
       content = capture(:stdout) { Thor::Runner.start(["help", "list"]) }
-      expect(content).to match(/List the available thor tasks/)
-      expect(content).not_to match(/help \[TASK\]/)
+      expect(content).to match(/List the available thor commands/)
+      expect(content).not_to match(/help \[COMMAND\]/)
     end
 
     it "shows information about a specific Thor class" do
@@ -28,10 +28,10 @@ describe Thor::Runner do
       expect(content).to match(/zoo\s+# zoo around/m)
     end
 
-    it "shows information about an specific task from an specific Thor class" do
+    it "shows information about an specific command from an specific Thor class" do
       content = capture(:stdout) { Thor::Runner.start(["help", "my_script:zoo"]) }
       expect(content).to match(/zoo around/)
-      expect(content).not_to match(/help \[TASK\]/)
+      expect(content).not_to match(/help \[COMMAND\]/)
     end
 
     it "shows information about a specific Thor group class" do
@@ -39,63 +39,63 @@ describe Thor::Runner do
       expect(content).to match(/my_counter N/)
     end
 
-    it "raises error if a class/task cannot be found" do
+    it "raises error if a class/command cannot be found" do
       content = capture(:stderr){ Thor::Runner.start(["help", "unknown"]) }
-      expect(content.strip).to eq('Could not find task "unknown" in "default" namespace.')
+      expect(content.strip).to eq('Could not find command "unknown" in "default" namespace.')
     end
 
-    it "raises error if a class/task cannot be found for a setup without thorfiles" do
+    it "raises error if a class/command 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"]) }
-        expect(content.strip).to eq('Could not find task "unknown".')
+        expect(content.strip).to eq('Could not find command "unknown".')
       end
     end
   end
 
   describe "#start" do
-    it "invokes a task from Thor::Runner" do
+    it "invokes a command from Thor::Runner" do
       ARGV.replace ["list"]
       expect(capture(:stdout) { Thor::Runner.start }).to match(/my_counter N/)
     end
 
-    it "invokes a task from a specific Thor class" do
+    it "invokes a command from a specific Thor class" do
       ARGV.replace ["my_script:zoo"]
       expect(Thor::Runner.start).to be_true
     end
 
-    it "invokes the default task from a specific Thor class if none is specified" do
+    it "invokes the default command from a specific Thor class if none is specified" do
       ARGV.replace ["my_script"]
-      expect(Thor::Runner.start).to eq("default task")
+      expect(Thor::Runner.start).to eq("default command")
     end
 
-    it "forwads arguments to the invoked task" do
+    it "forwads arguments to the invoked command" do
       ARGV.replace ["my_script:animal", "horse"]
       expect(Thor::Runner.start).to eq(["horse"])
     end
 
-    it "invokes tasks through shortcuts" do
+    it "invokes commands through shortcuts" do
       ARGV.replace ["my_script", "-T", "horse"]
       expect(Thor::Runner.start).to eq(["horse"])
     end
 
     it "invokes a Thor::Group" do
       ARGV.replace ["my_counter", "1", "2", "--third", "3"]
-      expect(Thor::Runner.start).to eq([1, 2, 3])
+      expect(Thor::Runner.start).to eq([1, 2, 3, nil, nil, nil])
     end
 
-    it "raises an error if class/task can't be found" do
+    it "raises an error if class/command can't be found" do
       ARGV.replace ["unknown"]
       content = capture(:stderr){ Thor::Runner.start }
-      expect(content.strip).to eq('Could not find task "unknown" in "default" namespace.')
+      expect(content.strip).to eq('Could not find command "unknown" in "default" namespace.')
     end
 
-    it "raises an error if class/task can't be found in a setup without thorfiles" do
+    it "raises an error if class/command 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 }
-        expect(content.strip).to eq('Could not find task "unknown".')
+        expect(content.strip).to eq('Could not find command "unknown".')
       end
     end
 
@@ -112,13 +112,13 @@ describe Thor::Runner do
     it "does not swallow Thor InvocationError" do
       ARGV.replace ["my_script:animal"]
       content = capture(:stderr) { Thor::Runner.start }
-      expect(content.strip).to eq('thor animal requires at least 1 argument: "thor my_script:animal TYPE".')
+      expect(content.strip).to eq(%Q'ERROR: thor animal was called with no arguments\nUsage: "thor my_script:animal TYPE".')
     end
   end
 
-  describe "tasks" do
+  describe "commands" do
     before do
-      @location = "#{File.dirname(__FILE__)}/fixtures/task.thor"
+      @location = "#{File.dirname(__FILE__)}/fixtures/command.thor"
       @original_yaml = {
         "random" => {
           :location  => @location,
@@ -136,7 +136,7 @@ describe Thor::Runner do
     end
 
     describe "list" do
-      it "gives a list of the available tasks" do
+      it "gives a list of the available commands" do
         ARGV.replace ["list"]
         content = capture(:stdout) { Thor::Runner.start }
         expect(content).to match(/amazing:describe NAME\s+# say that someone is amazing/m)
@@ -147,7 +147,7 @@ describe Thor::Runner do
         expect(capture(:stdout) { Thor::Runner.start }).to match(/my_counter N/)
       end
 
-      it "can filter a list of the available tasks by --group" do
+      it "can filter a list of the available commands by --group" do
         ARGV.replace ["list", "--group", "standard"]
         expect(capture(:stdout) { Thor::Runner.start }).to match(/amazing:describe NAME/)
         ARGV.replace []
@@ -156,34 +156,34 @@ describe Thor::Runner do
         expect(capture(:stdout) { Thor::Runner.start }).to match(/my_script:animal TYPE/)
       end
 
-      it "can skip all filters to show all tasks using --all" do
+      it "can skip all filters to show all commands using --all" do
         ARGV.replace ["list", "--all"]
         content = capture(:stdout) { Thor::Runner.start }
         expect(content).to match(/amazing:describe NAME/)
         expect(content).to match(/my_script:animal TYPE/)
       end
 
-      it "doesn't list superclass tasks in the subclass" do
+      it "doesn't list superclass commands in the subclass" do
         ARGV.replace ["list"]
         expect(capture(:stdout) { Thor::Runner.start }).not_to match(/amazing:help/)
       end
 
-      it "presents tasks in the default namespace with an empty namespace" do
+      it "presents commands in the default namespace with an empty namespace" do
         ARGV.replace ["list"]
         expect(capture(:stdout) { Thor::Runner.start }).to match(/^thor :cow\s+# prints 'moo'/m)
       end
 
-      it "runs tasks with an empty namespace from the default namespace" do
-        ARGV.replace [":task_conflict"]
-        expect(capture(:stdout) { Thor::Runner.start }).to eq("task\n")
+      it "runs commands with an empty namespace from the default namespace" do
+        ARGV.replace [":command_conflict"]
+        expect(capture(:stdout) { Thor::Runner.start }).to eq("command\n")
       end
 
-      it "runs groups even when there is a task with the same name" do
-        ARGV.replace ["task_conflict"]
+      it "runs groups even when there is a command with the same name" do
+        ARGV.replace ["command_conflict"]
         expect(capture(:stdout) { Thor::Runner.start }).to eq("group\n")
       end
 
-      it "runs tasks with no colon in the default namespace" do
+      it "runs commands with no colon in the default namespace" do
         ARGV.replace ["cow"]
         expect(capture(:stdout) { Thor::Runner.start }).to eq("moo\n")
       end

data/spec/shell/basic_spec.rb

@@ -1,6 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+# coding: UTF-8
+require 'helper'
 
 describe Thor::Shell::Basic do
   def shell
@@ -93,8 +92,8 @@ describe Thor::Shell::Basic do
 
   describe "#say_status" do
     it "prints a message to the user with status" do
-      $stdout.should_receive(:puts).with("      create  ~/.thor/task.thor")
-      shell.say_status(:create, "~/.thor/task.thor")
+      $stdout.should_receive(:puts).with("      create  ~/.thor/command.thor")
+      shell.say_status(:create, "~/.thor/command.thor")
     end
 
     it "always use new line" do
@@ -107,7 +106,7 @@ describe Thor::Shell::Basic do
       $stdout.should_not_receive(:puts)
 
       shell.mute do
-        shell.say_status(:created, "~/.thor/task.thor")
+        shell.say_status(:created, "~/.thor/command.thor")
       end
     end
 
@@ -117,18 +116,18 @@ describe Thor::Shell::Basic do
 
       $stdout.should_not_receive(:puts)
       shell.base = base
-      shell.say_status(:created, "~/.thor/task.thor")
+      shell.say_status(:created, "~/.thor/command.thor")
     end
 
     it "does not print a message if log status is set to false" do
       $stdout.should_not_receive(:puts)
-      shell.say_status(:created, "~/.thor/task.thor", false)
+      shell.say_status(:created, "~/.thor/command.thor", false)
     end
 
     it "uses padding to set messages left margin" do
       shell.padding = 2
-      $stdout.should_receive(:puts).with("      create      ~/.thor/task.thor")
-      shell.say_status(:create, "~/.thor/task.thor")
+      $stdout.should_receive(:puts).with("      create      ~/.thor/command.thor")
+      shell.say_status(:create, "~/.thor/command.thor")
     end
   end
 

data/spec/shell/color_spec.rb

@@ -1,12 +1,16 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'helper'
 
 describe Thor::Shell::Color do
   def shell
     @shell ||= Thor::Shell::Color.new
   end
 
+  before do
+    StringIO.any_instance.stub(:tty?).and_return(true)
+  end
+
   describe "#say" do
-    it "set the color if specified" do
+    it "set the color if specified and tty?" do
       out = capture(:stdout) do
         shell.say "Wow! Now we have colors!", :green
       end
@@ -14,6 +18,15 @@ describe Thor::Shell::Color do
       expect(out.chomp).to eq("\e[32mWow! Now we have colors!\e[0m")
     end
 
+    it "does not set the color if output is not a tty" do
+      out = capture(:stdout) do
+        $stdout.should_receive(:tty?).and_return(false)
+        shell.say "Wow! Now we have colors!", :green
+      end
+
+      expect(out.chomp).to eq("Wow! Now we have colors!")
+    end
+
     it "does not use a new line even with colors" do
       out = capture(:stdout) do
         shell.say "Wow! Now we have colors! ", :green
@@ -68,6 +81,7 @@ describe Thor::Shell::Color do
     describe "when a block is given" do
       it "invokes the diff command" do
         $stdout.stub!(:print)
+        $stdout.stub!(:tty?).and_return(true)
         $stdin.should_receive(:gets).and_return('d')
         $stdin.should_receive(:gets).and_return('n')
 

data/spec/shell/html_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'helper'
 
 describe Thor::Shell::HTML do
   def shell

data/spec/shell_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'helper'
 
 describe Thor::Shell do
   def shell

data/spec/subcommand_spec.rb

@@ -0,0 +1,30 @@
+require 'helper'
+
+describe Thor do
+
+  describe "#subcommand" do
+
+    it "maps a given subcommand to another Thor subclass" do
+      barn_help = capture(:stdout) { Scripts::MyDefaults.start(%w[barn]) }
+      expect(barn_help).to include("barn help [COMMAND]  # Describe subcommands or one specific subcommand")
+    end
+
+    it "passes commands to subcommand classes" do
+      expect(capture(:stdout) { Scripts::MyDefaults.start(%w[barn open]) }.strip).to eq("Open sesame!")
+    end
+
+    it "passes arguments to subcommand classes" do
+      expect(capture(:stdout) { Scripts::MyDefaults.start(%w[barn open shotgun]) }.strip).to eq("That's going to leave a mark.")
+    end
+
+    it "ignores unknown options (the subcommand class will handle them)" do
+      expect(capture(:stdout) { Scripts::MyDefaults.start(%w[barn paint blue --coats 4])}.strip).to eq("4 coats of blue paint")
+    end
+
+    it "passes parsed options to subcommands" do
+      output = capture(:stdout) { TestSubcommands::Parent.start(%w[sub print_opt --opt output]) }
+      expect(output).to eq("output")
+    end
+  end
+
+end