thor 0.11.7 → 0.12.0

data/CHANGELOG.rdoc

@@ -2,7 +2,12 @@
 
 * Improve spec coverage for Thor::Runner
 
-== 0.11.x, released 2009-07-01
+== 0.12, released 2009-11-06
+
+* [#7] Do not force white color on status
+* [#8] Yield a block with the filename on directory
+
+== 0.11, released 2009-07-01
 
 * Added a rake compatibility layer. It allows you to use spec and rdoc tasks on
   Thor classes.

data/Thorfile

@@ -1,4 +1,6 @@
-require 'rubygems'
+# enconding: utf-8
+
+require File.join(File.dirname(__FILE__), "lib", "thor", "version")
 require 'thor/rake_compat'
 require 'spec/rake/spectask'
 require 'rdoc/task'
@@ -10,11 +12,13 @@ class Default < Thor
   include Thor::RakeCompat
 
   Spec::Rake::SpecTask.new(:spec) do |t|
+    t.libs << 'lib'
     t.spec_opts = ['--options', "spec/spec.opts"]
     t.spec_files = FileList['spec/**/*_spec.rb']
   end
 
   Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.libs << 'lib'
     t.spec_opts = ['--options', "spec/spec.opts"]
     t.spec_files = FileList['spec/**/*_spec.rb']
     t.rcov = true
@@ -34,6 +38,7 @@ class Default < Thor
     require 'jeweler'
     Jeweler::Tasks.new do |s|
       s.name = GEM_NAME
+      s.version = Thor::VERSION
       s.rubyforge_project = "textmate"
       s.platform = Gem::Platform::RUBY
       s.summary = "A scripting framework that replaces rake, sake and rubigen"
@@ -51,7 +56,7 @@ class Default < Thor
       s.test_files.exclude 'spec/sandbox/**/*'
     end
 
-    Jeweler::RubyforgeTasks.new
+    Jeweler::GemcutterTasks.new
   rescue LoadError
     puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
   end

data/bin/rake2thor

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
 require 'ruby2ruby'
 require 'parse_tree'
 if Ruby2Ruby::VERSION >= "1.2.0"

data/bin/thor

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- mode: ruby -*-
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'thor')
+require 'thor'
 require 'thor/runner'
 
 Thor::Runner.start

data/lib/thor/actions/create_file.rb

@@ -60,6 +60,7 @@ class Thor
           FileUtils.mkdir_p(File.dirname(destination))
           File.open(destination, 'w'){ |f| f.write render }
         end
+        given_destination
       end
 
       protected

data/lib/thor/actions/directory.rb

@@ -40,15 +40,16 @@ class Thor
     #   directory "doc"
     #   directory "doc", "docs", :recursive => false
     #
-    def directory(source, destination=nil, config={})
-      action Directory.new(self, source, destination || source, config)
+    def directory(source, destination=nil, config={}, &block)
+      action Directory.new(self, source, destination || source, config, &block)
     end
 
     class Directory < EmptyDirectory #:nodoc:
       attr_reader :source
 
-      def initialize(base, source, destination=nil, config={})
+      def initialize(base, source, destination=nil, config={}, &block)
         @source = File.expand_path(base.find_in_source_paths(source.to_s))
+        @block  = block
         super(base, destination, { :recursive => true }.merge(config))
       end
 
@@ -70,14 +71,19 @@ class Thor
           Dir[lookup].each do |file_source|
             next if File.directory?(file_source)
             file_destination = File.join(given_destination, file_source.gsub(source, '.'))
+            file_destination.gsub!('/./', '/')
 
             case file_source
               when /\.empty_directory$/
-                base.empty_directory(File.dirname(file_destination), config)
+                dirname = File.dirname(file_destination).gsub(/\/\.$/, '')
+                next if dirname == given_destination
+                base.empty_directory(dirname, config)
               when /\.tt$/
-                base.template(file_source, file_destination[0..-4], config)
+                destination = base.template(file_source, file_destination[0..-4], config)
+                @block.call(destination) if @block
               else
-                base.copy_file(file_source, file_destination, config)
+                destination = base.copy_file(file_source, file_destination, config)
+                @block.call(destination) if @block
             end
           end
         end

data/lib/thor/actions/empty_directory.rb

@@ -55,6 +55,7 @@ class Thor
       def revoke!
         say_status :remove, :red
         ::FileUtils.rm_rf(destination) if !pretend? && exists?
+        given_destination
       end
 
       protected

data/lib/thor/group.rb

@@ -74,7 +74,7 @@ class Thor::Group
     #
     def invoke(*names, &block)
       options = names.last.is_a?(Hash) ? names.pop : {}
-      verbose = options.fetch(:verbose, :white)
+      verbose = options.fetch(:verbose, true)
 
       names.each do |name|
         invocations[name] = false

data/lib/thor/rake_compat.rb

@@ -22,7 +22,8 @@ class Thor
 
     def self.included(base)
       # Hack. Make rakefile point to invoker, so rdoc task is generated properly.
-      Rake.application.instance_variable_set(:@rakefile, caller[0].match(/(.*):\d+/)[1])
+      rakefile = File.basename(caller[0].match(/(.*):\d+/)[1])
+      Rake.application.instance_variable_set(:@rakefile, rakefile)
       self.rake_classes << base
     end
   end

data/lib/thor/runner.rb

@@ -215,7 +215,7 @@ class Thor::Runner < Thor #:nodoc:
     # 5. c:\ <-- no Thorfiles found!
     #
     def thorfiles(relevant_to=nil, skip_lookup=false)
-      # Deal with deprecated thor when :namespaces: is available as constants
+      # TODO Remove this dealing with deprecated thor when :namespaces: is available as constants
       save_yaml(thor_yaml) if Thor::Util.convert_constants_to_namespaces(thor_yaml)
 
       thorfiles = []

data/lib/thor/shell.rb

@@ -1,11 +1,17 @@
+require 'rbconfig'
 require 'thor/shell/color'
 
 class Thor
   module Base
-    # Returns the shell used in all Thor classes. Default to color one.
+    # Returns the shell used in all Thor classes. If you are in a Unix platform
+    # it will use a colored log, otherwise it will use a basic one without color.
     #
     def self.shell
-      @shell ||= Thor::Shell::Color
+      @shell ||= if Config::CONFIG['host_os'] =~ /mswin|mingw/
+        Thor::Shell::Basic
+      else
+        Thor::Shell::Color
+      end
     end
 
     # Sets the shell used in all Thor classes.

data/lib/thor/util.rb

@@ -209,7 +209,7 @@ class Thor
     # Returns the root where thor files are located, dependending on the OS.
     #
     def self.thor_root
-      File.join(user_home, ".thor")
+      File.join(user_home, ".thor").gsub(/\\/, '/')
     end
 
     # Returns the files in the thor root. On Windows thor_root will be something
@@ -220,7 +220,7 @@ class Thor
     # If we don't #gsub the \ character, Dir.glob will fail.
     #
     def self.thor_root_glob
-      files = Dir["#{thor_root.gsub(/\\/, '/')}/*"]
+      files = Dir["#{thor_root}/*"]
 
       files.map! do |file|
         File.directory?(file) ? File.join(file, "main.thor") : file

data/lib/thor/version.rb

@@ -0,0 +1,3 @@
+class Thor
+  VERSION = "0.12.0".freeze
+end

data/lib/thor.rb

@@ -1,4 +1,3 @@
-$:.unshift File.expand_path(File.dirname(__FILE__))
 require 'thor/base'
 require 'thor/group'
 require 'thor/actions'

data/spec/actions/create_file_spec.rb

@@ -50,9 +50,9 @@ describe Thor::Actions::CreateFile do
       invoke!.must be_empty
     end
 
-    it "returns the destination" do
+    it "returns the given destination" do
       capture(:stdout) do
-        create_file("doc/config.rb").invoke!.must == File.join(destination_root, "doc/config.rb")
+        create_file("doc/config.rb").invoke!.must == "doc/config.rb"
       end
     end
 

data/spec/actions/directory_spec.rb

@@ -96,6 +96,11 @@ describe Thor::Actions::Directory do
       File.exists?(file).must be_true
     end
 
+    it "does not copy empty directories twice" do
+      content = invoke!("doc/components", "docs/components")
+      content.must_not =~ /exist/
+    end
+
     it "logs status" do
       content = invoke!("doc")
       content.must =~ /create  doc\/README/
@@ -103,6 +108,13 @@ describe Thor::Actions::Directory do
       content.must =~ /create  doc\/rdoc\.rb/
       content.must =~ /create  doc\/components/
     end
+
+    it "yields a block" do
+      invoke!("doc") do |f|
+        %(doc/README doc/config.rb doc/rdoc.rb).must include(f)
+        %(doc/components/).must_not include(f)
+      end
+    end
   end
 
   describe "#revoke!" do

data/spec/rake_compat_spec.rb

@@ -27,6 +27,10 @@ class ThorTask < Thor
 end
 
 describe Thor::RakeCompat do
+  it "sets the rakefile application" do
+    ["rake_compat_spec.rb", "Thorfile"].must include(Rake.application.rakefile)
+  end
+
   it "adds rake tasks to thor classes too" do
     task = ThorTask.tasks["cool"]
     task.must be

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 $TESTING=true
 
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require 'thor'
 require 'stringio'
+
 require 'rubygems'
 require 'rr'
 require 'diff/lcs' # You need diff/lcs installed to run specs (but not to run Thor).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
-  version: 0.11.7
+  version: 0.12.0
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-22 00:00:00 -03:00
+date: 2009-11-09 00:00:00 -02:00
 default_executable: 
 dependencies: []
 
@@ -26,13 +26,11 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 - Thorfile
-- VERSION
 files: 
 - CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
 - Thorfile
-- VERSION
 - bin/rake2thor
 - bin/thor
 - lib/thor.rb
@@ -60,6 +58,7 @@ files:
 - lib/thor/shell/color.rb
 - lib/thor/task.rb
 - lib/thor/util.rb
+- lib/thor/version.rb
 has_rdoc: true
 homepage: http://yehudakatz.com
 licenses: []

data/VERSION

@@ -1 +0,0 @@
-0.11.7