thor 0.14.3 → 0.14.4

data/lib/thor/actions.rb

@@ -158,13 +158,23 @@ class Thor
     #
     def inside(dir='', config={}, &block)
       verbose = config.fetch(:verbose, false)
+      pretend = options[:pretend]
 
       say_status :inside, dir, verbose
       shell.padding += 1 if verbose
       @destination_stack.push File.expand_path(dir, destination_root)
 
-      FileUtils.mkdir_p(destination_root) unless File.exist?(destination_root)
-      FileUtils.cd(destination_root) { block.arity == 1 ? yield(destination_root) : yield }
+      # If the directory doesnt exist and we're not pretending
+      if !File.exist?(destination_root) && !pretend
+        FileUtils.mkdir_p(destination_root)
+      end
+      
+      if pretend
+        # In pretend mode, just yield down to the block
+        block.arity == 1 ? yield(destination_root) : yield
+      else
+        FileUtils.cd(destination_root) { block.arity == 1 ? yield(destination_root) : yield }
+      end
 
       @destination_stack.pop
       shell.padding -= 1 if verbose

data/lib/thor/actions/directory.rb

@@ -70,7 +70,7 @@ class Thor
           lookup = config[:recursive] ? File.join(source, '**') : source
           lookup = File.join(lookup, '{*,.[a-z]*}')
 
-          Dir[lookup].each do |file_source|
+          Dir[lookup].sort.each do |file_source|
             next if File.directory?(file_source)
             file_destination = File.join(given_destination, file_source.gsub(source, '.'))
             file_destination.gsub!('/./', '/')

data/lib/thor/actions/file_manipulation.rb

@@ -51,7 +51,7 @@ class Thor
       config = args.last.is_a?(Hash) ? args.pop : {}
       destination = args.first
 
-      source = File.expand_path(find_in_source_paths(source.to_s)) unless source =~ /^http\:\/\//
+      source = File.expand_path(find_in_source_paths(source.to_s)) unless source =~ /^https?\:\/\//
       render = open(source) {|input| input.binmode.read }
 
       destination ||= if block_given?

data/lib/thor/base.rb

@@ -392,6 +392,22 @@ class Thor
         exit(1) if exit_on_failure?
       end
 
+      # Allows to use private methods from parent in child classes as tasks.
+      #
+      # ==== Paremeters
+      #   names<Array>:: Method names to be used as tasks
+      #
+      # ==== Examples
+      #
+      #   public_task :foo
+      #   public_task :foo, :bar, :baz
+      #
+      def public_task(*names)
+        names.each do |name|
+          class_eval "def #{name}(*); super end"
+        end
+      end
+
       def handle_no_task_error(task) #:nodoc:
         if $thor_runner
           raise UndefinedTaskError, "Could not find task #{task.inspect} in #{namespace.inspect} namespace."

data/lib/thor/shell/basic.rb

@@ -11,6 +11,21 @@ class Thor
         @base, @padding = nil, 0
       end
 
+      # Mute everything that's inside given block
+      #
+      def mute
+        @mute = true
+        yield
+      ensure
+        @mute = false
+      end
+
+      # Check if base is muted
+      #
+      def mute?
+        @mute
+      end
+
       # Sets the output padding, not allowing less than zero values.
       #
       def padding=(value)
@@ -229,7 +244,7 @@ HELP
         end
 
         def quiet? #:nodoc:
-          base && base.options[:quiet]
+          mute? || (base && base.options[:quiet])
         end
 
         # This code was copied from Rake, available under MIT-LICENSE

data/lib/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.14.3".freeze
+  VERSION = "0.14.4".freeze
 end

data/spec/actions/directory_spec.rb

@@ -39,6 +39,11 @@ describe Thor::Actions::Directory do
         invoke! "unknown"
       }.must raise_error(Thor::Error, /Could not find "unknown" in any of your source paths/)
     end
+    
+    it "should not create a directory in pretend mode" do
+      invoke! "doc", "ghost", :pretend => true
+      File.exists?("ghost").must be_false
+    end
 
     it "copies the whole directory recursively to the default destination" do
       invoke! "doc"

data/spec/actions/empty_directory_spec.rb

@@ -62,6 +62,13 @@ describe Thor::Actions::EmptyDirectory do
       invoke!.must == "      create  doc\n"
     end
 
+    it "does not create a directory if pretending" do
+      base.inside("foo", :pretend => true) do
+        empty_directory("ghost")
+      end
+      File.exists?(File.join(base.destination_root, "ghost")).must be_false
+    end
+
     describe "when directory exists" do
       it "shows exist status" do
         empty_directory("doc")

data/spec/actions/file_manipulation_spec.rb

@@ -114,6 +114,15 @@ describe Thor::Actions do
       end
       FakeWeb.clean_registry
     end
+
+    it "accepts https remote sources" do
+      body = "__start__\nHTTPSFILE\n__end__\n"
+      FakeWeb.register_uri(:get, 'https://example.com/file.txt', :body => body)
+      action :get, 'https://example.com/file.txt' do |content|
+        content.must == body
+      end
+      FakeWeb.clean_registry
+    end
   end
 
   describe "#template" do

data/spec/actions_spec.rb

@@ -140,6 +140,13 @@ describe Thor::Actions do
         File.exists?(file).must be_true
       end
     end
+    
+    describe "when pretending" do
+      it "no directories should be created" do
+        runner.inside("bar", :pretend => true) {}
+        File.exists?("bar").must be_false
+      end
+    end
 
     describe "when verbose" do
       it "logs status" do

data/spec/fixtures/group.thor

@@ -93,3 +93,22 @@ class TaskConflict < Thor::Group
     puts "group"
   end
 end
+
+class ParentGroup < Thor::Group
+private
+  def foo
+    "foo"
+  end
+
+  def baz(name = 'baz')
+    name
+  end
+end
+
+class ChildGroup < ParentGroup
+  def bar
+    "bar"
+  end
+
+  public_task :foo, :baz
+end

data/spec/group_spec.rb

@@ -1,6 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Thor::Group do
+  describe "task" do
+    it "allows to use private methods from parent class as tasks" do
+      ChildGroup.start.must == ["bar", "foo", "baz"]
+      ChildGroup.new.baz("bar").must == "bar"
+    end
+  end
+
   describe "#start" do
     it "invokes all the tasks under the Thor group" do
       MyCounter.start(["1", "2", "--third", "3"]).must == [ 1, 2, 3 ]

data/spec/shell/basic_spec.rb

@@ -75,6 +75,15 @@ describe Thor::Shell::Basic do
       shell.say_status(:create, "")
     end
 
+    it "does not print a message if base is muted" do
+      shell.should_receive(:mute?).and_return(true)
+      $stdout.should_not_receive(:puts)
+
+      shell.mute do
+        shell.say_status(:created, "~/.thor/task.thor")
+      end
+    end
+
     it "does not print a message if base is set to quiet" do
       base = MyCounter.new [1,2]
       base.should_receive(:options).and_return(:quiet => true)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 14
-  - 3
-  version: 0.14.3
+  - 4
+  version: 0.14.4
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +02:00
+date: 2010-11-04 00:00:00 -02:00
 default_executable: 
 dependencies: []