thor 0.13.4 → 0.13.5

data/README.rdoc

@@ -270,7 +270,7 @@ argument for our generator to run.
 
 The <tt>create_lib_file</tt> uses an ERB template. This is what it looks like:
 
-    class <%= name.camelize %>
+    class <%= name.capitalize %>
     end
 
 The arguments that you set in your generator will automatically be passed in

data/lib/thor/actions.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'uri'
 require 'thor/core_ext/file_binary_read'
 
 Dir[File.join(File.dirname(__FILE__), "actions", "*.rb")].each do |action|
@@ -115,7 +116,7 @@ class Thor
       @source_paths ||= self.class.source_paths_for_search
     end
 
-    # Receives a file or directory and search for it in the source paths. 
+    # Receives a file or directory and search for it in the source paths.
     #
     def find_in_source_paths(file)
       relative_root = relative_to_original_destination_root(destination_root, false)
@@ -129,7 +130,7 @@ class Thor
         raise Error, "You don't have any source path defined for class #{self.class.name}. To fix this, " <<
                      "you can define a source_root in your class."
       else
-        raise Error, "Could not find #{file.inspect} in source paths."
+        raise Error, "Could not find #{file.inspect} in source paths: \n#{source_paths.join("\n")}"
       end
     end
 
@@ -180,7 +181,14 @@ class Thor
 
       say_status :apply, path, verbose
       shell.padding += 1 if verbose
-      instance_eval(open(path).read)
+
+      if URI(path).is_a?(URI::HTTP)
+        contents = open(path, "Accept" => "application/x-thor-template") {|io| io.read }
+      else
+        contents = open(path) {|io| io.read }
+      end
+
+      instance_eval(contents, path)
       shell.padding -= 1 if verbose
     end
 
@@ -223,7 +231,7 @@ class Thor
       run command, config.merge(:with => Thor::Util.ruby_command)
     end
 
-    # Run a thor command. A hash of options can be given and it's converted to 
+    # Run a thor command. A hash of options can be given and it's converted to
     # switches.
     #
     # ==== Parameters

data/lib/thor/actions/file_manipulation.rb

@@ -48,7 +48,7 @@ class Thor
     #
     def get(source, destination=nil, config={}, &block)
       source = File.expand_path(find_in_source_paths(source.to_s)) unless source =~ /^http\:\/\//
-      render = open(source).binmode.read
+      render = open(source) {|input| input.binmode.read }
 
       destination ||= if block_given?
         block.arity == 1 ? block.call(render) : block.call

data/lib/thor/invocation.rb

@@ -11,7 +11,7 @@ class Thor
       def prepare_for_invocation(key, name) #:nodoc:
         case name
           when Symbol, String
-            Thor::Util.find_class_and_task_by_namespace(name.to_s)
+            Thor::Util.find_class_and_task_by_namespace(name.to_s, !key)
           else
             name
         end

data/lib/thor/runner.rb

@@ -16,7 +16,7 @@ class Thor::Runner < Thor #:nodoc:
   def help(meth=nil)
     if meth && !self.respond_to?(meth)
       initialize_thorfiles(meth)
-      klass, task = Thor::Util.find_class_and_task_by_namespace!(meth)
+      klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
       klass.start(["-h", task].compact, :shell => self.shell)
     else
       super
@@ -29,7 +29,7 @@ class Thor::Runner < Thor #:nodoc:
   def method_missing(meth, *args)
     meth = meth.to_s
     initialize_thorfiles(meth)
-    klass, task = Thor::Util.find_class_and_task_by_namespace!(meth)
+    klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
     args.unshift(task) if task
     klass.start(args, :shell => self.shell)
   end
@@ -44,10 +44,10 @@ class Thor::Runner < Thor #:nodoc:
     begin
       if File.directory?(File.expand_path(name))
         base, package = File.join(name, "main.thor"), :directory
-        contents      = open(base).read
+        contents      = open(base) {|input| input.read }
       else
         base, package = name, :file
-        contents      = open(name).read
+        contents      = open(name) {|input| input.read }
       end
     rescue OpenURI::HTTPError
       raise Error, "Error opening URI '#{name}'"

data/lib/thor/util.rb

@@ -128,25 +128,19 @@ class Thor
     # ==== Parameters
     # namespace<String>
     #
-    def self.find_class_and_task_by_namespace(namespace)
-      if namespace.include?(?:)
+    def self.find_class_and_task_by_namespace(namespace, fallback = true)
+      if namespace.include?(?:) # look for a namespaced task
         pieces = namespace.split(":")
         task   = pieces.pop
         klass  = Thor::Util.find_by_namespace(pieces.join(":"))
       end
-
-      unless klass
+      unless klass # look for a Thor::Group with the right name
         klass, task = Thor::Util.find_by_namespace(namespace), nil
       end
-
-      return klass, task
-    end
-
-    # The same as namespace_to_thor_class_and_task!, but raises an error if a klass
-    # could not be found.
-    def self.find_class_and_task_by_namespace!(namespace)
-      klass, task = find_class_and_task_by_namespace(namespace)
-      raise Error, "Could not find namespace or task #{namespace.inspect}." unless klass
+      if !klass && fallback # try a task in the default namespace
+        task = namespace
+        klass = Thor::Util.find_by_namespace('')
+      end
       return klass, task
     end
 

data/lib/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.13.4".freeze
+  VERSION = "0.13.5".freeze
 end

data/spec/actions_spec.rb

@@ -195,7 +195,7 @@ describe Thor::Actions do
       @template.instance_eval "def read; self; end" # Make the string respond to read
 
       @file = "http://gist.github.com/103208.txt"
-      runner.should_receive(:open).and_return(@template)
+      runner.should_receive(:open).with(@file, "Accept" => "application/x-thor-template").and_return(@template)
     end
 
     it "opens a file and executes its content in the instance binding" do

data/spec/fixtures/group.thor

@@ -20,7 +20,7 @@ class MyCounter < Thor::Group
 
   desc <<-FOO
 Description:
-  This generator run three tasks: one, two and three.
+  This generator runs three tasks: one, two and three.
 FOO
 
   def one
@@ -81,3 +81,10 @@ class WhinyGenerator < Thor::Group
   def wrong_arity(required)
   end
 end
+
+class TaskConflict < Thor::Group
+  desc "A group with the same name as a default task"
+  def group
+    puts "group"
+  end
+end

data/spec/fixtures/script.thor

@@ -127,9 +127,14 @@ module Scripts
 
   class MyDefaults < Thor
     namespace :default
-    desc "test", "prints 'test'"
-    def test
-      puts "test"
+    desc "cow", "prints 'moo'"
+    def cow
+      puts "moo"
+    end
+
+    desc "task_conflict", "only gets called when prepended with a colon"
+    def task_conflict
+      puts "task"
     end
   end
 

data/spec/group_spec.rb

@@ -36,11 +36,11 @@ describe Thor::Group do
 
   describe "#desc" do
     it "sets the description for a given class" do
-      MyCounter.desc.must == "Description:\n  This generator run three tasks: one, two and three.\n"
+      MyCounter.desc.must == "Description:\n  This generator runs three tasks: one, two and three.\n"
     end
 
     it "can be inherited" do
-      BrokenCounter.desc.must == "Description:\n  This generator run three tasks: one, two and three.\n"
+      BrokenCounter.desc.must == "Description:\n  This generator runs three tasks: one, two and three.\n"
     end
 
     it "can be nil" do
@@ -59,7 +59,7 @@ describe Thor::Group do
 
     it "shows description" do
       @content.must =~ /Description:/
-      @content.must =~ /This generator run three tasks: one, two and three./
+      @content.must =~ /This generator runs three tasks: one, two and three./
     end
 
     it "shows options information" do

data/spec/runner_spec.rb

@@ -30,9 +30,8 @@ describe Thor::Runner do
     end
 
     it "raises error if a class/task cannot be found" do
-      Thor::Runner.should_receive(:exit).with(1)
       content = capture(:stderr){ Thor::Runner.start(["help", "unknown"]) }
-      content.strip.must == 'Could not find namespace or task "unknown".'
+      content.strip.must == 'Could not find task "unknown" in "default" namespace.'
     end
   end
 
@@ -68,10 +67,9 @@ describe Thor::Runner do
     end
 
     it "raises an error if class/task can't be found" do
-      Thor::Runner.should_receive(:exit).with(1)
       ARGV.replace ["unknown"]
       content = capture(:stderr){ Thor::Runner.start }
-      content.strip.must == 'Could not find namespace or task "unknown".'
+      content.strip.must == 'Could not find task "unknown" in "default" namespace.'
     end
 
     it "does not swallow NoMethodErrors that occur inside the called method" do
@@ -145,12 +143,22 @@ 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 =~ /^thor :test\s+# prints 'test'/m
+        capture(:stdout) { Thor::Runner.start }.must =~ /^thor :cow\s+# prints 'moo'/m
       end
 
       it "runs tasks with an empty namespace from the default namespace" do
-        ARGV.replace [":test"]
-        capture(:stdout) { Thor::Runner.start }.must == "test\n"
+        ARGV.replace [":task_conflict"]
+        capture(:stdout) { Thor::Runner.start }.must == "task\n"
+      end
+
+      it "runs groups even when there is a task with the same name" do
+        ARGV.replace ["task_conflict"]
+        capture(:stdout) { Thor::Runner.start }.must == "group\n"
+      end
+
+      it "runs tasks with no colon in the default namespace" do
+        ARGV.replace ["cow"]
+        capture(:stdout) { Thor::Runner.start }.must == "moo\n"
       end
     end
 

data/spec/util_spec.rb

@@ -100,18 +100,14 @@ describe Thor::Util do
       Thor::Util.find_class_and_task_by_namespace("thor:help").must == [Thor, "help"]
     end
 
-    it "fallbacks in the namespace:task look up even if a full namespace does not match" do
+    it "falls back in the namespace:task look up even if a full namespace does not match" do
       Thor.const_set(:Help, Module.new)
       Thor::Util.find_class_and_task_by_namespace("thor:help").must == [Thor, "help"]
       Thor.send :remove_const, :Help
     end
 
-    describe 'errors' do
-      it "raises an error if the Thor class or task can't be found" do
-        lambda {
-          Thor::Util.find_class_and_task_by_namespace!("foobar")
-        }.must raise_error(Thor::Error, 'Could not find namespace or task "foobar".')
-      end
+    it "falls back on the default namespace class if nothing else matches" do
+      Thor::Util.find_class_and_task_by_namespace("test").must == [Scripts::MyDefaults, "test"]
     end
   end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
-  version: 0.13.4
+  prerelease: false
+  segments: 
+  - 0
+  - 13
+  - 5
+  version: 0.13.5
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 +01:00
+date: 2010-04-29 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -73,18 +78,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: textmate
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A scripting framework that replaces rake, sake and rubigen