thor 0.14.0 → 0.14.1

data/README.md

@@ -160,6 +160,8 @@ The output is "1 2 3", which means that the three task was invoked only once.
 You can even invoke tasks from another class, so be sure to check the
 [documentation](http://rdoc.info/rdoc/wycats/thor/blob/f939a3e8a854616784cac1dcff04ef4f3ee5f7ff/Thor.html).
 
+Notice invocations do not share the same object. I.e, Thor will instantiate Counter once to invoke the task one, then, it instantiates another to invoke the task two and another for task three. This happens to allow options and arguments to parsed again. For example, if two and three have different options and both of them were given to the command line, calling invoke makes them be parsed each time and used accordingly by each task.
+
 ## Thor::Group
 
 Thor has a special class called Thor::Group.  The main difference to Thor class

data/Thorfile

@@ -10,7 +10,7 @@ rescue LoadError
 end
 
 GEM_NAME = 'thor'
-EXTRA_RDOC_FILES = ["README.md", "LICENSE", "CHANGELOG.rdoc", "VERSION", "Thorfile"]
+EXTRA_RDOC_FILES = ["README.md", "LICENSE", "CHANGELOG.rdoc", "Thorfile"]
 
 class Default < Thor
   include Thor::RakeCompat
@@ -59,6 +59,7 @@ class Default < Thor
       s.executables = %w( thor rake2thor )
       s.files = s.extra_rdoc_files + Dir.glob("{bin,lib}/**/*")
       s.test_files.include 'spec/**/*'
+      s.test_files.include 'spec/fixtures/doc/components/.empty_directory'
       s.test_files.exclude 'spec/sandbox/**/*'
     end
 

data/lib/thor.rb

@@ -200,7 +200,7 @@ class Thor
         else
           @check_unknown_options.delete(key)
         end
-      end 
+      end
       @check_unknown_options
     end
 
@@ -252,7 +252,7 @@ class Thor
       # the namespace should be displayed as arguments.
       #
       def banner(task, namespace = nil, subcommand = false)
-        "#{$0} #{task.formatted_usage(self, $thor_runner, subcommand)}"
+        "#{basename} #{task.formatted_usage(self, $thor_runner, subcommand)}"
       end
 
       def baseclass #:nodoc:

data/lib/thor/actions/directory.rb

@@ -21,7 +21,7 @@ class Thor
     #   directory "doc"
     #
     # It will create a doc directory in the destination with the following
-    # files (assuming that the app_name is "blog"):
+    # files (assuming that the `app_name` method returns the value "blog"):
     #
     #   doc/
     #     components/

data/lib/thor/base.rb

@@ -531,6 +531,13 @@ class Thor
           false
         end
 
+        #
+        # The basename of the program invoking the thor class.
+        #
+        def basename
+          File.basename($0).split(' ').first
+        end
+
         # SIGNATURE: Sets the baseclass. This is where the superclass lookup
         # finishes.
         def baseclass #:nodoc:

data/lib/thor/group.rb

@@ -6,7 +6,7 @@ require 'thor/base'
 # tasks.
 class Thor::Group
   class << self
-    # The descrition for this Thor::Group. If none is provided, but a source root
+    # The description for this Thor::Group. If none is provided, but a source root
     # exists, tries to find the USAGE one folder above it, otherwise searches
     # in the superclass.
     #
@@ -114,7 +114,7 @@ class Thor::Group
 
       names.each do |name|
         unless class_options.key?(name)
-          raise ArgumentError, "You have to define the option #{name.inspect} " << 
+          raise ArgumentError, "You have to define the option #{name.inspect} " <<
                                "before setting invoke_from_option."
         end
 
@@ -230,7 +230,7 @@ class Thor::Group
       # The banner for this class. You can customize it if you are invoking the
       # thor class by another ways which is not the Thor::Runner.
       def banner
-        "#{$0} #{self_task.formatted_usage(self, false)}"
+        "#{basename} #{self_task.formatted_usage(self, false)}"
       end
 
       # Represents the whole class as a task.

data/lib/thor/parser/options.rb

@@ -134,7 +134,15 @@ class Thor
       #
       def parse_boolean(switch)
         if current_is_value?
-          ["true", "TRUE", "t", "T", true].include?(shift)
+          if ["true", "TRUE", "t", "T", true].include?(peek)
+            shift
+            true
+          elsif ["false", "FALSE", "f", "F", false].include?(peek)
+            shift
+            false
+          else
+            true
+          end
         else
           @switches.key?(switch) || !no_or_skip?(switch)
         end

data/lib/thor/shell.rb

@@ -8,7 +8,7 @@ class Thor
     def self.shell
       @shell ||= if ENV['THOR_SHELL'] && ENV['THOR_SHELL'].size > 0
         Thor::Shell.const_get(ENV['THOR_SHELL'])
-      elsif Config::CONFIG['host_os'] =~ /mswin|mingw/
+      elsif RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
         Thor::Shell::Basic
       else
         Thor::Shell::Color

data/lib/thor/shell/basic.rb

@@ -69,7 +69,7 @@ class Thor
       # "yes".
       #
       def yes?(statement, color=nil)
-        ask(statement, color) =~ is?(:yes)
+        !!(ask(statement, color) =~ is?(:yes))
       end
 
       # Make a question the to user and returns true if the user replies "n" or

data/lib/thor/shell/html.rb

@@ -58,7 +58,7 @@ class Thor
         bold, end_bold = bold ? [BOLD, END_BOLD] : ['', '']
         "#{bold}#{color}#{string}#{CLEAR}#{end_bold}"
       end
-      
+
       # Ask something to the user and receives a response.
       #
       # ==== Example

data/lib/thor/util.rb

@@ -216,8 +216,8 @@ class Thor
     #
     def self.ruby_command
       @ruby_command ||= begin
-        ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
-        ruby << Config::CONFIG['EXEEXT']
+        ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+        ruby << RbConfig::CONFIG['EXEEXT']
 
         # escape string in case path to ruby executable contain spaces.
         ruby.sub!(/.*\s.*/m, '"\&"')

data/lib/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.14.0".freeze
+  VERSION = "0.14.1".freeze
 end

data/spec/actions/directory_spec.rb

@@ -84,7 +84,7 @@ describe Thor::Actions::Directory do
       File.directory?(file).must be_true
     end
 
-    it "does not copy .empty_diretories files" do
+    it "does not copy .empty_directory files" do
       invoke! "doc", "docs"
       file = File.join(destination_root, "docs", "components", ".empty_directory")
       File.exists?(file).must be_false

data/spec/base_spec.rb

@@ -74,7 +74,7 @@ describe Thor::Base do
       MyCounter.start(["1", "2", "--third", "3"])[2].must == 3
     end
 
-    it "does not create an acessor for it" do
+    it "does not create an accessor for it" do
       BrokenCounter.start(["1", "2", "--third", "3"])[3].must be_false
     end
   end

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
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: false
   segments: 
   - 0
   - 14
-  - 0
-  version: 0.14.0
+  - 1
+  version: 0.14.1
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 +02:00
+date: 2010-09-17 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -104,6 +104,7 @@ files:
 - 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: []
@@ -176,3 +177,4 @@ test_files:
 - spec/fixtures/script.thor
 - spec/fixtures/task.thor
 - spec/spec.opts
+- spec/fixtures/doc/components/.empty_directory