thor 0.12.2 → 0.12.3

data/spec/shell/basic_spec.rb

@@ -17,81 +17,81 @@ describe Thor::Shell::Basic do
 
   describe "#ask" do
     it "prints a message to the user and gets the response" do
-      mock($stdout).print("Should I overwrite it? ")
-      mock($stdin).gets{ "Sure" }
+      $stdout.should_receive(:print).with("Should I overwrite it? ")
+      $stdin.should_receive(:gets).and_return('Sure')
       shell.ask("Should I overwrite it?").must == "Sure"
     end
   end
 
   describe "#yes?" do
     it "asks the user and returns true if the user replies yes" do
-      mock($stdout).print("Should I overwrite it? ")
-      mock($stdin).gets{ "y" }
+      $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
 
-      mock($stdout).print("Should I overwrite it? ")
-      mock($stdin).gets{ "n" }
+      $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
     end
   end
 
   describe "#no?" do
     it "asks the user and returns true if the user replies no" do
-      mock($stdout).print("Should I overwrite it? ")
-      mock($stdin).gets{ "n" }
+      $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
 
-      mock($stdout).print("Should I overwrite it? ")
-      mock($stdin).gets{ "Yes" }
+      $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
     end
   end
 
   describe "#say" do
     it "prints a message to the user" do
-      mock($stdout).puts("Running...")
+      $stdout.should_receive(:puts).with("Running...")
       shell.say("Running...")
     end
 
     it "prints a message to the user without new line if it ends with a whitespace" do
-      mock($stdout).print("Running... ")
+      $stdout.should_receive(:print).with("Running... ")
       shell.say("Running... ")
     end
 
     it "prints a message to the user without new line" do
-      mock($stdout).print("Running...")
+      $stdout.should_receive(:print).with("Running...")
       shell.say("Running...", nil, false)
     end
   end
 
   describe "#say_status" do
     it "prints a message to the user with status" do
-      mock($stdout).puts("      create  ~/.thor/task.thor")
+      $stdout.should_receive(:puts).with("      create  ~/.thor/task.thor")
       shell.say_status(:create, "~/.thor/task.thor")
     end
 
     it "always use new line" do
-      mock($stdout).puts("      create  ")
+      $stdout.should_receive(:puts).with("      create  ")
       shell.say_status(:create, "")
     end
 
     it "does not print a message if base is set to quiet" do
       base = MyCounter.new [1,2]
-      mock(base).options { Hash.new(:quiet => true) }
+      base.should_receive(:options).and_return(:quiet => true)
 
-      dont_allow($stdout).puts
+      $stdout.should_not_receive(:puts)
       shell.base = base
       shell.say_status(:created, "~/.thor/task.thor")
     end
 
     it "does not print a message if log status is set to false" do
-      dont_allow($stdout).puts
+      $stdout.should_not_receive(:puts)
       shell.say_status(:created, "~/.thor/task.thor", false)
     end
 
     it "uses padding to set messages left margin" do
       shell.padding = 2
-      mock($stdout).puts("      create      ~/.thor/task.thor")
+      $stdout.should_receive(:puts).with("      create      ~/.thor/task.thor")
       shell.say_status(:create, "~/.thor/task.thor")
     end
   end
@@ -123,7 +123,7 @@ TABLE
     end
 
     it "uses maximum terminal width" do
-      mock(shell).terminal_width { 20 }
+      shell.should_receive(:terminal_width).and_return(20)
       content = capture(:stdout){ shell.print_table(@table, :ident => 2, :truncate => true) }
       content.must == <<-TABLE
   abc  #123  firs...
@@ -135,41 +135,41 @@ TABLE
 
   describe "#file_collision" do
     it "shows a menu with options" do
-      mock($stdout).print('Overwrite foo? (enter "h" for help) [Ynaqh] ')
-      mock($stdin).gets{ 'n' }
+      $stdout.should_receive(:print).with('Overwrite foo? (enter "h" for help) [Ynaqh] ')
+      $stdin.should_receive(:gets).and_return('n')
       shell.file_collision('foo')
     end
 
     it "returns true if the user choose default option" do
-      stub($stdout).print
-      mock($stdin).gets{ '' }
+      $stdout.stub!(:print)
+      $stdin.should_receive(:gets).and_return('')
       shell.file_collision('foo').must be_true
     end
 
     it "returns false if the user choose no" do
-      stub($stdout).print
-      mock($stdin).gets{ 'n' }
+      $stdout.stub!(:print)
+      $stdin.should_receive(:gets).and_return('n')
       shell.file_collision('foo').must be_false
     end
 
     it "returns true if the user choose yes" do
-      stub($stdout).print
-      mock($stdin).gets{ 'y' }
+      $stdout.stub!(:print)
+      $stdin.should_receive(:gets).and_return('y')
       shell.file_collision('foo').must be_true
     end
 
     it "shows help usage if the user choose help" do
-      stub($stdout).print
-      mock($stdin).gets{ 'h' }
-      mock($stdin).gets{ 'n' }
+      $stdout.stub!(:print)
+      $stdin.should_receive(:gets).and_return('h')
+      $stdin.should_receive(:gets).and_return('n')
       help = capture(:stdout){ shell.file_collision('foo') }
       help.must =~ /h \- help, show this help/
     end
 
     it "quits if the user choose quit" do
-      stub($stdout).print
-      mock($stdout).puts('Aborting...')
-      mock($stdin).gets{ 'q' }
+      $stdout.stub!(:print)
+      $stdout.should_receive(:puts).with('Aborting...')
+      $stdin.should_receive(:gets).and_return('q')
 
       lambda {
         shell.file_collision('foo')
@@ -177,27 +177,27 @@ TABLE
     end
 
     it "always returns true if the user choose always" do
-      mock($stdout).print('Overwrite foo? (enter "h" for help) [Ynaqh] ')
-      mock($stdin).gets{ 'a' }
+      $stdout.should_receive(:print).with('Overwrite foo? (enter "h" for help) [Ynaqh] ')
+      $stdin.should_receive(:gets).and_return('a')
 
       shell.file_collision('foo').must be_true
 
-      dont_allow($stdout).print
+      $stdout.should_not_receive(:print)
       shell.file_collision('foo').must be_true
     end
 
     describe "when a block is given" do
       it "displays diff options to the user" do
-        mock($stdout).print('Overwrite foo? (enter "h" for help) [Ynaqdh] ')
-        mock($stdin).gets{ 's' }
+        $stdout.should_receive(:print).with('Overwrite foo? (enter "h" for help) [Ynaqdh] ')
+        $stdin.should_receive(:gets).and_return('s')
         shell.file_collision('foo'){ }
       end
 
       it "invokes the diff command" do
-        stub($stdout).print
-        mock($stdin).gets{ 'd' }
-        mock($stdin).gets{ 'n' }
-        mock(shell).system(/diff -u/)
+        $stdout.stub!(:print)
+        $stdin.should_receive(:gets).and_return('d')
+        $stdin.should_receive(:gets).and_return('n')
+        shell.should_receive(:system).with(/diff -u/)
         capture(:stdout){ shell.file_collision('foo'){ } }
       end
     end

data/spec/shell/color_spec.rb

@@ -7,19 +7,19 @@ describe Thor::Shell::Color do
 
   describe "#say" do
     it "set the color if specified" do
-      mock($stdout).puts("\e[32mWow! Now we have colors!\e[0m")
+      $stdout.should_receive(:puts).with("\e[32mWow! Now we have colors!\e[0m")
       shell.say "Wow! Now we have colors!", :green
     end
 
     it "does not use a new line even with colors" do
-      mock($stdout).print("\e[32mWow! Now we have colors! \e[0m")
+      $stdout.should_receive(:print).with("\e[32mWow! Now we have colors! \e[0m")
       shell.say "Wow! Now we have colors! ", :green
     end
   end
 
   describe "#say_status" do
     it "uses color to say status" do
-      mock($stdout).puts("\e[1m\e[31m    conflict\e[0m  README")
+      $stdout.should_receive(:puts).with("\e[1m\e[31m    conflict\e[0m  README")
       shell.say_status :conflict, "README", :red
     end
   end
@@ -27,9 +27,9 @@ describe Thor::Shell::Color do
   describe "#file_collision" do
     describe "when a block is given" do
       it "invokes the diff command" do
-        stub($stdout).print
-        mock($stdin).gets{ 'd' }
-        mock($stdin).gets{ 'n' }
+        $stdout.stub!(:print)
+        $stdin.should_receive(:gets).and_return('d')
+        $stdin.should_receive(:gets).and_return('n')
 
         output = capture(:stdout){ shell.file_collision('spec/fixtures/doc/README'){ "README\nEND\n" } }
         output.must =~ /\e\[31m\- __start__\e\[0m/

data/spec/spec_helper.rb

@@ -5,9 +5,11 @@ require 'thor'
 require 'stringio'
 
 require 'rubygems'
-require 'rr'
+require 'rdoc'
 require 'diff/lcs' # You need diff/lcs installed to run specs (but not to run Thor).
 
+$thor_runner = true
+
 # Load fixtures
 load File.join(File.dirname(__FILE__), "fixtures", "task.thor")
 load File.join(File.dirname(__FILE__), "fixtures", "group.thor")
@@ -25,8 +27,6 @@ Kernel.module_eval do
 end
 
 Spec::Runner.configure do |config|
-  config.mock_with :rr
-
   def capture(stream)
     begin
       stream = stream.to_s
@@ -48,5 +48,5 @@ Spec::Runner.configure do |config|
     File.join(File.dirname(__FILE__), 'sandbox')
   end
 
-  alias silence capture
+  alias :silence :capture
 end

data/spec/task_spec.rb

@@ -11,20 +11,20 @@ describe Thor::Task do
 
   describe "#formatted_usage" do
     it "includes namespace within usage" do
-      stub(Object).namespace{ "foo" }
-      stub(Object).arguments{ [] }
+      Object.stub!(:namespace).and_return("foo")
+      Object.stub!(:arguments).and_return([])
       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{ [] }
+      Object.stub!(:namespace).and_return("default:foo")
+      Object.stub!(:arguments).and_return([])
       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) ] }
+      Object.stub!(:namespace).and_return("foo")
+      Object.stub!(:arguments).and_return([ Thor::Argument.new(:bar, nil, true, :string) ])
       task(:foo => :required).formatted_usage(Object).must == "foo:can_has BAR --foo=FOO"
     end
   end
@@ -54,15 +54,17 @@ describe Thor::Task do
 
   describe "#run" do
     it "runs a task by calling a method in the given instance" do
-      mock = mock!.send("can_has", 1, 2, 3).subject
+      mock = mock()
+      mock.should_receive(:send).with("can_has", 1, 2, 3)
       task.run(mock, [1, 2, 3])
     end
 
     it "raises an error if the method to be invoked is private" do
-      mock = mock!.private_methods{ [ 'can_has' ] }.subject
+      mock = mock()
+      mock.should_receive(:private_methods).and_return(['can_has'])
       lambda {
         task.run(mock)
-      }.must raise_error(Thor::UndefinedTaskError, "the 'can_has' task of Object is private")
+      }.must raise_error(Thor::UndefinedTaskError, "the 'can_has' task of Spec::Mocks::Mock is private")
     end
   end
 end

data/spec/thor_spec.rb

@@ -156,9 +156,9 @@ describe Thor do
       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\.\.\.$/
+        @shell.should_receive(:terminal_width).and_return(80)
+        content = capture(:stdout){ MyScript.help(shell) }
+        content.must =~ /aaa\.\.\.$/
       end
 
       it "provides description for tasks from classes in the same namespace" do
@@ -184,7 +184,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.help(shell, :task => "foo") }.must == <<END
+        capture(:stdout) { MyScript.task_help(shell, "foo") }.must == <<END
 Usage:
   thor my_script:foo BAR
 
@@ -199,21 +199,18 @@ END
 
       it "raises an error if the task can't be found" do
         lambda {
-          MyScript.help(shell, :task => "unknown")
+          MyScript.task_help(shell, "unknown")
         }.must raise_error(Thor::Error, "task 'unknown' could not be found in namespace 'my_script'")
       end
     end
 
-    describe "options" do
-      it "does not show superclass tasks if required" do
-        capture(:stdout){ MyScript.help(shell, :short => true) }.must_not =~ /help/
+    describe "instance method" do
+      it "calls the class method" do
+        capture(:stdout){ MyScript.start(["help"]) }.must =~ /Tasks:/
       end
-    end
 
-    describe "instance method" do
       it "calls the class method" do
-        stub(MyScript).help(mock.instance_of(Thor::Base.shell), :task => nil)
-        MyScript.start(["help"])
+        capture(:stdout){ MyScript.start(["help", "foo"]) }.must =~ /Usage:/
       end
     end
   end

data/spec/util_spec.rb

@@ -129,7 +129,7 @@ describe Thor::Util do
 
   describe "#user_home" do
     before(:each) do
-      stub(ENV)[]
+      ENV.stub!(:[])
       Thor::Util.clear_user_home!
     end
 
@@ -138,7 +138,7 @@ describe Thor::Util do
     end
 
     it "returns the *unix system path if file cannot be expanded and separator does not exist" do
-      stub(File).expand_path("~"){ raise }
+      File.should_receive(:expand_path).with("~").and_raise(RuntimeError)
       previous_value = File::ALT_SEPARATOR
       capture(:stderr){ File.const_set(:ALT_SEPARATOR, false) }
       Thor::Util.user_home.must == "/"
@@ -146,7 +146,7 @@ describe Thor::Util do
     end
 
     it "returns the windows system path if file cannot be expanded and a separator exists" do
-      stub(File).expand_path("~"){ raise }
+      File.should_receive(:expand_path).with("~").and_raise(RuntimeError)
       previous_value = File::ALT_SEPARATOR
       capture(:stderr){ File.const_set(:ALT_SEPARATOR, true) }
       Thor::Util.user_home.must == "C:/"
@@ -154,43 +154,19 @@ describe Thor::Util do
     end
 
     it "returns HOME/.thor if set" do
-      stub(ENV)["HOME"].returns{ "/home/user/" }
+      ENV.stub!(:[]).with("HOME").and_return("/home/user/")
       Thor::Util.user_home.must == "/home/user/"
     end
 
     it "returns path with HOMEDRIVE and HOMEPATH if set" do
-      stub(ENV)["HOMEDRIVE"].returns{ "D:/" }
-      stub(ENV)["HOMEPATH"].returns{ "Documents and Settings/James" }
+      ENV.stub!(:[]).with("HOMEDRIVE").and_return("D:/")
+      ENV.stub!(:[]).with("HOMEPATH").and_return("Documents and Settings/James")
       Thor::Util.user_home.must == "D:/Documents and Settings/James"
     end
 
     it "returns APPDATA/.thor if set" do
-      stub(ENV)["APPDATA"].returns{ "/home/user/" }
+      ENV.stub!(:[]).with("APPDATA").and_return("/home/user/")
       Thor::Util.user_home.must == "/home/user/"
     end
   end
-
-  describe "#convert_constants_to_namespaces" do
-    before(:each) do
-      @hash = {
-        :git => {
-          :constants => [Object, "Thor::Sandbox::Package", Thor::CoreExt::OrderedHash]
-        }
-      }
-    end
-
-    it "converts constants in the hash to namespaces" do
-      Thor::Util.convert_constants_to_namespaces(@hash)
-      @hash[:git][:namespaces].must == [ "object", "package", "thor:core_ext:ordered_hash" ]
-    end
-
-    it "returns true if the hash changed" do
-      Thor::Util.convert_constants_to_namespaces(@hash).must be_true
-    end
-
-    it "does not add namespaces to the hash if namespaces were already added" do
-      Thor::Util.convert_constants_to_namespaces(@hash)
-      Thor::Util.convert_constants_to_namespaces(@hash).must be_false
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-01 00:00:00 +01:00
+date: 2010-01-18 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -41,6 +41,7 @@ files:
 - lib/thor/actions/file_manipulation.rb
 - lib/thor/actions/inject_into_file.rb
 - lib/thor/base.rb
+- lib/thor/core_ext/file_binary_read.rb
 - lib/thor/core_ext/hash_with_indifferent_access.rb
 - lib/thor/core_ext/ordered_hash.rb
 - lib/thor/error.rb
@@ -115,38 +116,11 @@ test_files:
 - 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/bundle/execute.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/rake_compat_spec.rb
-- spec/runner_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