thor 0.14.6 → 0.15.0

data/lib/thor/shell/color.rb

@@ -50,10 +50,46 @@ class Thor
       # on Highline implementation and it automatically appends CLEAR to the end
       # of the returned String.
       #
-      def set_color(string, color, bold=false)
-        color = self.class.const_get(color.to_s.upcase) if color.is_a?(Symbol)
-        bold  = bold ? BOLD : ""
-        "#{bold}#{color}#{string}#{CLEAR}"
+      # Pass foreground, background and bold options to this method as
+      # symbols.
+      #
+      # Example:
+      #
+      #   set_color "Hi!", :red, :on_white, :bold
+      #
+      # The available colors are:
+      #
+      #   :bold
+      #   :black
+      #   :red
+      #   :green
+      #   :yellow
+      #   :blue
+      #   :magenta
+      #   :cyan
+      #   :white
+      #   :on_black
+      #   :on_red
+      #   :on_green
+      #   :on_yellow
+      #   :on_blue
+      #   :on_magenta
+      #   :on_cyan
+      #   :on_white
+      def set_color(string, *colors)
+        if colors.all? { |color| color.is_a?(Symbol) || color.is_a?(String) }
+          ansi_colors = colors.map { |color| lookup_color(color) }
+          "#{ansi_colors.join}#{string}#{CLEAR}"
+        else
+          # The old API was `set_color(color, bold=boolean)`. We
+          # continue to support the old API because you should never
+          # break old APIs unnecessarily :P
+          foreground, bold = colors
+          foreground = self.class.const_get(foreground.to_s.upcase) if foreground.is_a?(Symbol)
+
+          bold       = bold ? BOLD : ""
+          "#{bold}#{foreground}#{string}#{CLEAR}"
+        end
       end
 
       protected

data/lib/thor/shell/html.rb

@@ -7,56 +7,58 @@ class Thor
     #
     class HTML < Basic
       # The start of an HTML bold sequence.
-      BOLD       = "<strong>"
-      # The end of an HTML bold sequence.
-      END_BOLD   = "</strong>"
-
-      # Embed in a String to clear previous color selection.
-      CLEAR      = "</span>"
+      BOLD       = "font-weight: bold"
 
       # Set the terminal's foreground HTML color to black.
-      BLACK      = '<span style="color: black;">'
+      BLACK      = 'color: black'
       # Set the terminal's foreground HTML color to red.
-      RED        = '<span style="color: red;">'
+      RED        = 'color: red'
       # Set the terminal's foreground HTML color to green.
-      GREEN      = '<span style="color: green;">'
+      GREEN      = 'color: green'
       # Set the terminal's foreground HTML color to yellow.
-      YELLOW     = '<span style="color: yellow;">'
+      YELLOW     = 'color: yellow'
       # Set the terminal's foreground HTML color to blue.
-      BLUE       = '<span style="color: blue;">'
+      BLUE       = 'color: blue'
       # Set the terminal's foreground HTML color to magenta.
-      MAGENTA    = '<span style="color: magenta;">'
+      MAGENTA    = 'color: magenta'
       # Set the terminal's foreground HTML color to cyan.
-      CYAN       = '<span style="color: cyan;">'
+      CYAN       = 'color: cyan'
       # Set the terminal's foreground HTML color to white.
-      WHITE      = '<span style="color: white;">'
+      WHITE      = 'color: white'
 
       # Set the terminal's background HTML color to black.
-      ON_BLACK   = '<span style="background-color: black">'
+      ON_BLACK   = 'background-color: black'
       # Set the terminal's background HTML color to red.
-      ON_RED     = '<span style="background-color: red">'
+      ON_RED     = 'background-color: red'
       # Set the terminal's background HTML color to green.
-      ON_GREEN   = '<span style="background-color: green">'
+      ON_GREEN   = 'background-color: green'
       # Set the terminal's background HTML color to yellow.
-      ON_YELLOW  = '<span style="background-color: yellow">'
+      ON_YELLOW  = 'background-color: yellow'
       # Set the terminal's background HTML color to blue.
-      ON_BLUE    = '<span style="background-color: blue">'
+      ON_BLUE    = 'background-color: blue'
       # Set the terminal's background HTML color to magenta.
-      ON_MAGENTA = '<span style="background-color: magenta">'
+      ON_MAGENTA = 'background-color: magenta'
       # Set the terminal's background HTML color to cyan.
-      ON_CYAN    = '<span style="background-color: cyan">'
+      ON_CYAN    = 'background-color: cyan'
       # Set the terminal's background HTML color to white.
-      ON_WHITE   = '<span style="background-color: white">'
+      ON_WHITE   = 'background-color: white'
 
       # Set color by using a string or one of the defined constants. If a third
       # option is set to true, it also adds bold to the string. This is based
       # on Highline implementation and it automatically appends CLEAR to the end
       # of the returned String.
       #
-      def set_color(string, color, bold=false)
-        color = self.class.const_get(color.to_s.upcase) if color.is_a?(Symbol)
-        bold, end_bold = bold ? [BOLD, END_BOLD] : ['', '']
-        "#{bold}#{color}#{string}#{CLEAR}#{end_bold}"
+      def set_color(string, *colors)
+        if colors.all? { |color| color.is_a?(Symbol) || color.is_a?(String) }
+          html_colors = colors.map { |color| lookup_color(color) }
+          "<span style=\"#{html_colors.join("; ")};\">#{string}</span>"
+        else
+          color, bold = colors
+          html_color = self.class.const_get(color.to_s.upcase) if color.is_a?(Symbol)
+          styles = [html_color]
+          styles << BOLD if bold
+          "<span style=\"#{styles.join("; ")};\">#{string}</span>"
+        end
       end
 
       # Ask something to the user and receives a response.

data/lib/thor/task.rb

@@ -18,11 +18,21 @@ class Thor
     # By default, a task invokes a method in the thor class. You can change this
     # implementation to create custom tasks.
     def run(instance, args=[])
-      public_method?(instance) ?
-        instance.send(name, *args) : instance.class.handle_no_task_error(name)
+      arity = nil
+
+      if private_method?(instance)
+        instance.class.handle_no_task_error(name)
+      elsif public_method?(instance)
+        arity = instance.method(name).arity
+        instance.send(name, *args)
+      elsif local_method?(instance, :method_missing)
+        instance.send(:method_missing, name.to_sym, *args)
+      else
+        instance.class.handle_no_task_error(name)
+      end
     rescue ArgumentError => e
       handle_argument_error?(instance, e, caller) ?
-        instance.class.handle_argument_error(self, e) : (raise e)
+        instance.class.handle_argument_error(self, e, arity) : (raise e)
     rescue NoMethodError => e
       handle_no_method_error?(instance, e, caller) ?
         instance.class.handle_no_task_error(name) : (raise e)
@@ -34,8 +44,8 @@ class Thor
       if namespace
         namespace = klass.namespace
         formatted = "#{namespace.gsub(/^(default)/,'')}:"
-        formatted.sub!(/.$/, ' ') if subcommand
       end
+      formatted = "#{klass.namespace.split(':').last} " if subcommand
 
       formatted ||= ""
 
@@ -65,14 +75,22 @@ class Thor
       @required_options ||= options.map{ |_, o| o.usage if o.required? }.compact.sort.join(" ")
     end
 
-    # Given a target, checks if this class name is not a private/protected method.
+    # Given a target, checks if this class name is a public method.
     def public_method?(instance) #:nodoc:
-      collection = instance.private_methods + instance.protected_methods
-      (collection & [name.to_s, name.to_sym]).empty?
+      !(instance.public_methods & [name.to_s, name.to_sym]).empty?
+    end
+
+    def private_method?(instance)
+      !(instance.private_methods & [name.to_s, name.to_sym]).empty?
+    end
+
+    def local_method?(instance, name)
+      methods = instance.public_methods(false) + instance.private_methods(false) + instance.protected_methods(false)
+      !(methods & [name.to_s, name.to_sym]).empty?
     end
 
     def sans_backtrace(backtrace, caller) #:nodoc:
-      saned  = backtrace.reject { |frame| frame =~ FILE_REGEXP }
+      saned  = backtrace.reject { |frame| frame =~ FILE_REGEXP || (frame =~ /\.java:/ && RUBY_PLATFORM =~ /java/) }
       saned -= caller
     end
 

data/lib/thor/util.rb

@@ -8,11 +8,11 @@ class Thor
   #
   # 1) Methods to convert thor namespaces to constants and vice-versa.
   #
-  #   Thor::Utils.namespace_from_thor_class(Foo::Bar::Baz) #=> "foo:bar:baz"
+  #   Thor::Util.namespace_from_thor_class(Foo::Bar::Baz) #=> "foo:bar:baz"
   #
   # 2) Loading thor files and sandboxing:
   #
-  #   Thor::Utils.load_thorfile("~/.thor/foo")
+  #   Thor::Util.load_thorfile("~/.thor/foo")
   #
   module Util
 
@@ -153,11 +153,11 @@ class Thor
       begin
         Thor::Sandbox.class_eval(content, path)
       rescue Exception => e
-        $stderr.puts "WARNING: unable to load thorfile #{path.inspect}: #{e.message}"
+        $stderr.puts("WARNING: unable to load thorfile #{path.inspect}: #{e.message}")
         if debug
-          $stderr.puts *e.backtrace
+          $stderr.puts(*e.backtrace)
         else
-          $stderr.puts e.backtrace.first
+          $stderr.puts(e.backtrace.first)
         end
       end
     end
@@ -184,7 +184,7 @@ class Thor
       end
     end
 
-    # Returns the root where thor files are located, dependending on the OS.
+    # Returns the root where thor files are located, depending on the OS.
     #
     def self.thor_root
       File.join(user_home, ".thor").gsub(/\\/, '/')
@@ -216,9 +216,28 @@ class Thor
     #
     def self.ruby_command
       @ruby_command ||= begin
-        ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+        ruby_name = RbConfig::CONFIG['ruby_install_name']
+        ruby = File.join(RbConfig::CONFIG['bindir'], ruby_name)
         ruby << RbConfig::CONFIG['EXEEXT']
 
+        # avoid using different name than ruby (on platforms supporting links)
+        if ruby_name != 'ruby' && File.respond_to?(:readlink)
+          begin
+            alternate_ruby = File.join(RbConfig::CONFIG['bindir'], 'ruby')
+            alternate_ruby << RbConfig::CONFIG['EXEEXT']
+  
+            # ruby is a symlink
+            if File.symlink? alternate_ruby
+              linked_ruby = File.readlink alternate_ruby
+  
+              # symlink points to 'ruby_install_name'
+              ruby = alternate_ruby if linked_ruby == ruby_name || linked_ruby == ruby
+            end
+          rescue NotImplementedError
+            # just ignore on windows
+          end
+        end
+
         # escape string in case path to ruby executable contain spaces.
         ruby.sub!(/.*\s.*/m, '"\&"')
         ruby

data/lib/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.14.6".freeze
+  VERSION = "0.15.0"
 end

data/spec/actions/create_link_spec.rb

@@ -0,0 +1,81 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'thor/actions'
+require 'tempfile'
+
+describe Thor::Actions::CreateLink do
+  before(:each) do
+    @hardlink_to = File.join(Dir.tmpdir, 'linkdest.rb')
+    ::FileUtils.rm_rf(destination_root)
+    ::FileUtils.rm_rf(@hardlink_to)
+  end
+
+  def create_link(destination=nil, config={}, options={})
+    @base = MyCounter.new([1,2], options, { :destination_root => destination_root })
+    @base.stub!(:file_name).and_return('rdoc')
+
+    @tempfile = Tempfile.new("config.rb")
+
+    @action = Thor::Actions::CreateLink.new(@base, destination, @tempfile.path,
+                                            { :verbose => !@silence }.merge(config))
+  end
+
+  def invoke!
+    capture(:stdout){ @action.invoke! }
+  end
+
+  def silence!
+    @silence = true
+  end
+
+  describe "#invoke!" do
+    it "creates a symbolic link for :symbolic => true" do
+      create_link("doc/config.rb", :symbolic => true)
+      invoke!
+      destination_path = File.join(destination_root, "doc/config.rb")
+      File.exists?(destination_path).should be_true
+      File.symlink?(destination_path).should be_true
+    end
+
+    it "creates a hard link for :symbolic => false" do
+      create_link(@hardlink_to, :symbolic => false)
+      invoke!
+      destination_path = @hardlink_to
+      File.exists?(destination_path).should be_true
+      File.symlink?(destination_path).should be_false
+    end
+
+    it "creates a symbolic link by default" do
+      create_link("doc/config.rb")
+      invoke!
+      destination_path = File.join(destination_root, "doc/config.rb")
+      File.exists?(destination_path).should be_true
+      File.symlink?(destination_path).should be_true
+    end
+
+    it "does not create a link if pretending" do
+      create_link("doc/config.rb", {}, :pretend => true)
+      invoke!
+      File.exists?(File.join(destination_root, "doc/config.rb")).should be_false
+    end
+
+    it "shows created status to the user" do
+      create_link("doc/config.rb")
+      invoke!.should == "      create  doc/config.rb\n"
+    end
+
+    it "does not show any information if log status is false" do
+      silence!
+      create_link("doc/config.rb")
+      invoke!.should be_empty
+    end
+  end
+
+  describe "#identical?" do
+    it "returns true if the destination link exists and is identical" do
+      create_link("doc/config.rb")
+      @action.identical?.should be_false
+      invoke!
+      @action.identical?.should be_true
+    end
+  end
+end

data/spec/actions/empty_directory_spec.rb

@@ -95,4 +95,36 @@ describe Thor::Actions::EmptyDirectory do
       @action.exists?.should be_true
     end
   end
+
+  context "protected methods" do
+    describe "#convert_encoded_instructions" do
+      before :each do
+        empty_directory("test_dir")
+        @action.base.stub!(:file_name).and_return("expected")
+      end
+
+      it "accepts and executes a 'legal' %\w+% encoded instruction" do
+        @action.send(:convert_encoded_instructions, "%file_name%.txt").should == "expected.txt"
+      end
+
+      it "ignores an 'illegal' %\w+% encoded instruction" do
+        @action.send(:convert_encoded_instructions, "%some_name%.txt").should == "%some_name%.txt"
+      end
+
+      it "ignores incorrectly encoded instruction" do
+        @action.send(:convert_encoded_instructions, "%some.name%.txt").should == "%some.name%.txt"
+      end
+
+      it "raises an error if the instruction refers to a private method" do
+        module PrivExt
+          private
+          def private_file_name
+            "something_hidden"
+          end
+        end
+        @action.base.extend(PrivExt)
+        expect { @action.send(:convert_encoded_instructions, "%private_file_name%.txt") }.to raise_error Thor::PrivateMethodEncodedError
+      end
+    end
+  end
 end

data/spec/actions/file_manipulation_spec.rb

@@ -173,7 +173,7 @@ describe Thor::Actions do
     it "converts enconded instructions" do
       runner.should_receive(:file_name).and_return("rdoc")
       action :template, "doc/%file_name%.rb.tt"
-      file = File.join(destination_root, "doc/rdoc.rb.tt")
+      file = File.join(destination_root, "doc/rdoc.rb")
       File.exists?(file).should be_true
     end
 
@@ -187,6 +187,13 @@ describe Thor::Actions do
       end
       File.read(File.join(destination_root, "doc/config.rb")).should =~ /^OMG/
     end
+
+    it "guesses the destination name when given only a source" do
+      action :template, "doc/config.yaml.tt"
+
+      file = File.join(destination_root, "doc/config.yaml")
+      File.exists?(file).should be_true
+    end
   end
 
   describe "when changing existent files" do
@@ -307,4 +314,57 @@ describe Thor::Actions do
       end
     end
   end
+
+  describe "when adjusting comments" do
+    before(:each) do
+      ::FileUtils.cp_r(source_root, destination_root)
+    end
+
+    def file
+      File.join(destination_root, "doc", "COMMENTER")
+    end
+
+    unmodified_comments_file = /__start__\n # greenblue\n# yellowblue\n#yellowred\n #greenred\norange\n    purple\n  ind#igo\n  # ind#igo\n__end__/
+
+    describe "#uncomment_lines" do
+      it "uncomments all matching lines in the file" do
+        action :uncomment_lines, "doc/COMMENTER", "green"
+        File.binread(file).should =~ /__start__\n greenblue\n# yellowblue\n#yellowred\n greenred\norange\n    purple\n  ind#igo\n  # ind#igo\n__end__/
+
+        action :uncomment_lines, "doc/COMMENTER", "red"
+        File.binread(file).should =~ /__start__\n greenblue\n# yellowblue\nyellowred\n greenred\norange\n    purple\n  ind#igo\n  # ind#igo\n__end__/
+      end
+
+      it "correctly uncomments lines with hashes in them" do
+        action :uncomment_lines, "doc/COMMENTER", "ind#igo"
+        File.binread(file).should =~ /__start__\n # greenblue\n# yellowblue\n#yellowred\n #greenred\norange\n    purple\n  ind#igo\n  ind#igo\n__end__/
+      end
+
+      it "does not modify already uncommented lines in the file" do
+        action :uncomment_lines, "doc/COMMENTER", "orange"
+        action :uncomment_lines, "doc/COMMENTER", "purple"
+        File.binread(file).should =~ unmodified_comments_file
+      end
+    end
+
+    describe "#comment_lines" do
+      it "comments lines which are not commented" do
+        action :comment_lines, "doc/COMMENTER", "orange"
+        File.binread(file).should =~ /__start__\n # greenblue\n# yellowblue\n#yellowred\n #greenred\n# orange\n    purple\n  ind#igo\n  # ind#igo\n__end__/
+
+        action :comment_lines, "doc/COMMENTER", "purple"
+        File.binread(file).should =~ /__start__\n # greenblue\n# yellowblue\n#yellowred\n #greenred\n# orange\n    # purple\n  ind#igo\n  # ind#igo\n__end__/
+      end
+
+      it "correctly comments lines with hashes in them" do
+        action :comment_lines, "doc/COMMENTER", "ind#igo"
+        File.binread(file).should =~ /__start__\n # greenblue\n# yellowblue\n#yellowred\n #greenred\norange\n    purple\n  # ind#igo\n  # ind#igo\n__end__/
+      end
+
+      it "does not modify already commented lines" do
+        action :comment_lines, "doc/COMMENTER", "green"
+        File.binread(file).should =~ unmodified_comments_file
+      end
+    end
+  end
 end