thor 0.18.1 → 0.19.0

data/spec/actions/create_link_spec.rb

@@ -1,22 +1,23 @@
-require 'helper'
-require 'thor/actions'
-require 'tempfile'
+require "helper"
+require "thor/actions"
+require "tempfile"
 
 describe Thor::Actions::CreateLink do
   before do
-    @hardlink_to = File.join(Dir.tmpdir, 'linkdest.rb')
+    @silence = false
+    @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')
+  def create_link(destination = nil, config = {}, options = {})
+    @base = MyCounter.new([1, 2], options, :destination_root => destination_root)
+    allow(@base).to receive(:file_name).and_return("rdoc")
 
     @tempfile = Tempfile.new("config.rb")
 
     @action = Thor::Actions::CreateLink.new(@base, destination, @tempfile.path,
-                                            { :verbose => !@silence }.merge(config))
+                                            {:verbose => !@silence}.merge(config))
   end
 
   def invoke!
@@ -36,30 +37,30 @@ describe Thor::Actions::CreateLink do
       create_link("doc/config.rb", :symbolic => true)
       invoke!
       destination_path = File.join(destination_root, "doc/config.rb")
-      expect(File.exists?(destination_path)).to be_true
-      expect(File.symlink?(destination_path)).to be_true
+      expect(File.exist?(destination_path)).to be true
+      expect(File.symlink?(destination_path)).to be true
     end
 
     it "creates a hard link for :symbolic => false" do
       create_link(@hardlink_to, :symbolic => false)
       invoke!
       destination_path = @hardlink_to
-      expect(File.exists?(destination_path)).to be_true
-      expect(File.symlink?(destination_path)).to be_false
+      expect(File.exist?(destination_path)).to be true
+      expect(File.symlink?(destination_path)).to 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")
-      expect(File.exists?(destination_path)).to be_true
-      expect(File.symlink?(destination_path)).to be_true
+      expect(File.exist?(destination_path)).to be true
+      expect(File.symlink?(destination_path)).to be true
     end
 
     it "does not create a link if pretending" do
       create_link("doc/config.rb", {}, :pretend => true)
       invoke!
-      expect(File.exists?(File.join(destination_root, "doc/config.rb"))).to be_false
+      expect(File.exist?(File.join(destination_root, "doc/config.rb"))).to be false
     end
 
     it "shows created status to the user" do
@@ -77,9 +78,9 @@ describe Thor::Actions::CreateLink do
   describe "#identical?" do
     it "returns true if the destination link exists and is identical" do
       create_link("doc/config.rb")
-      expect(@action.identical?).to be_false
+      expect(@action.identical?).to be false
       invoke!
-      expect(@action.identical?).to be_true
+      expect(@action.identical?).to be true
     end
   end
 
@@ -89,7 +90,7 @@ describe Thor::Actions::CreateLink do
       invoke!
       File.delete(@tempfile.path)
       revoke!
-      expect(File.symlink?(@action.destination)).to be_false
+      expect(File.symlink?(@action.destination)).to be false
     end
   end
 end

data/spec/actions/directory_spec.rb

@@ -1,48 +1,48 @@
-require 'helper'
-require 'thor/actions'
+require "helper"
+require "thor/actions"
 
 describe Thor::Actions::Directory do
   before do
     ::FileUtils.rm_rf(destination_root)
-    invoker.stub!(:file_name).and_return("rdoc")
+    allow(invoker).to receive(:file_name).and_return("rdoc")
   end
 
   def invoker
-    @invoker ||= WhinyGenerator.new([1,2], {}, { :destination_root => destination_root })
+    @invoker ||= WhinyGenerator.new([1, 2], {}, :destination_root => destination_root)
   end
 
   def revoker
-    @revoker ||= WhinyGenerator.new([1,2], {}, { :destination_root => destination_root, :behavior => :revoke })
+    @revoker ||= WhinyGenerator.new([1, 2], {}, :destination_root => destination_root, :behavior => :revoke)
   end
 
   def invoke!(*args, &block)
-    capture(:stdout){ invoker.directory(*args, &block) }
+    capture(:stdout) { invoker.directory(*args, &block) }
   end
 
   def revoke!(*args, &block)
-    capture(:stdout){ revoker.directory(*args, &block) }
+    capture(:stdout) { revoker.directory(*args, &block) }
   end
 
   def exists_and_identical?(source_path, destination_path)
-    %w(config.rb README).each do |file|
+    %w[config.rb README].each do |file|
       source      = File.join(source_root, source_path, file)
       destination = File.join(destination_root, destination_path, file)
 
-      expect(File.exists?(destination)).to be_true
-      expect(FileUtils.identical?(source, destination)).to be_true
+      expect(File.exist?(destination)).to be true
+      expect(FileUtils.identical?(source, destination)).to be true
     end
   end
 
   describe "#invoke!" do
     it "raises an error if the source does not exist" do
-      expect {
+      expect do
         invoke! "unknown"
-      }.to raise_error(Thor::Error, /Could not find "unknown" in any of your source paths/)
+      end.to raise_error(Thor::Error, /Could not find "unknown" in any of your source paths/)
     end
 
     it "does not create a directory in pretend mode" do
       invoke! "doc", "ghost", :pretend => true
-      expect(File.exists?("ghost")).to be_false
+      expect(File.exist?("ghost")).to be false
     end
 
     it "copies the whole directory recursively to the default destination" do
@@ -59,25 +59,25 @@ describe Thor::Actions::Directory do
       invoke! ".", "commands", :recursive => false
 
       file = File.join(destination_root, "commands", "group.thor")
-      expect(File.exists?(file)).to be_true
+      expect(File.exist?(file)).to be true
 
       file = File.join(destination_root, "commands", "doc")
-      expect(File.exists?(file)).to be_false
+      expect(File.exist?(file)).to be false
 
       file = File.join(destination_root, "commands", "doc", "README")
-      expect(File.exists?(file)).to be_false
+      expect(File.exist?(file)).to be false
     end
 
     it "ignores files within excluding/ directories when exclude_pattern is provided" do
       invoke! "doc", "docs", :exclude_pattern => /excluding\//
       file = File.join(destination_root, "docs", "excluding", "rdoc.rb")
-      expect(File.exists?(file)).to be_false
+      expect(File.exist?(file)).to be false
     end
 
-    it "copies and evalutes files within excluding/ directory when no exclude_pattern is present" do
+    it "copies and evaluates files within excluding/ directory when no exclude_pattern is present" do
       invoke! "doc", "docs"
       file = File.join(destination_root, "docs", "excluding", "rdoc.rb")
-      expect(File.exists?(file)).to be_true
+      expect(File.exist?(file)).to be true
       expect(File.read(file)).to eq("BAR = BAR\n")
     end
 
@@ -91,11 +91,11 @@ describe Thor::Actions::Directory do
     it "copies and evaluates templates" do
       invoke! "doc", "docs"
       file = File.join(destination_root, "docs", "rdoc.rb")
-      expect(File.exists?(file)).to be_true
+      expect(File.exist?(file)).to be true
       expect(File.read(file)).to eq("FOO = FOO\n")
     end
 
-    it "copies directories and preserved file mode" do
+    it "copies directories and preserves file mode" do
       invoke! "preserve", "preserved", :mode => :preserve
       original = File.join(source_root, "preserve", "script.sh")
       copy = File.join(destination_root, "preserved", "script.sh")
@@ -105,20 +105,20 @@ describe Thor::Actions::Directory do
     it "copies directories" do
       invoke! "doc", "docs"
       file = File.join(destination_root, "docs", "components")
-      expect(File.exists?(file)).to be_true
-      expect(File.directory?(file)).to be_true
+      expect(File.exist?(file)).to be true
+      expect(File.directory?(file)).to be true
     end
 
     it "does not copy .empty_directory files" do
       invoke! "doc", "docs"
       file = File.join(destination_root, "docs", "components", ".empty_directory")
-      expect(File.exists?(file)).to be_false
+      expect(File.exist?(file)).to be false
     end
 
     it "copies directories even if they are empty" do
       invoke! "doc/components", "docs/components"
       file = File.join(destination_root, "docs", "components")
-      expect(File.exists?(file)).to be_true
+      expect(File.exist?(file)).to be true
     end
 
     it "does not copy empty directories twice" do
@@ -139,7 +139,7 @@ describe Thor::Actions::Directory do
       invoke!("doc") do |content|
         checked ||= !!(content =~ /FOO/)
       end
-      expect(checked).to be_true
+      expect(checked).to be true
     end
 
     it "works with glob characters in the path" do
@@ -153,17 +153,17 @@ describe Thor::Actions::Directory do
       invoke! "doc"
       revoke! "doc"
 
-      expect(File.exists?(File.join(destination_root, "doc", "README"))).to be_false
-      expect(File.exists?(File.join(destination_root, "doc", "config.rb"))).to be_false
-      expect(File.exists?(File.join(destination_root, "doc", "components"))).to be_false
+      expect(File.exist?(File.join(destination_root, "doc", "README"))).to be false
+      expect(File.exist?(File.join(destination_root, "doc", "config.rb"))).to be false
+      expect(File.exist?(File.join(destination_root, "doc", "components"))).to be false
     end
 
     it "works with glob characters in the path" do
       invoke! "app{1}"
-      expect(File.exists?(File.join(destination_root, "app{1}", "README"))).to be_true
+      expect(File.exist?(File.join(destination_root, "app{1}", "README"))).to be true
 
       revoke! "app{1}"
-      expect(File.exists?(File.join(destination_root, "app{1}", "README"))).to be_false
+      expect(File.exist?(File.join(destination_root, "app{1}", "README"))).to be false
     end
   end
 end

data/spec/actions/empty_directory_spec.rb

@@ -1,12 +1,12 @@
-require 'helper'
-require 'thor/actions'
+require "helper"
+require "thor/actions"
 
 describe Thor::Actions::EmptyDirectory do
   before do
     ::FileUtils.rm_rf(destination_root)
   end
 
-  def empty_directory(destination, options={})
+  def empty_directory(destination, options = {})
     @action = Thor::Actions::EmptyDirectory.new(base, destination)
   end
 
@@ -19,33 +19,33 @@ describe Thor::Actions::EmptyDirectory do
   end
 
   def base
-    @base ||= MyCounter.new([1,2], {}, { :destination_root => destination_root })
+    @base ||= MyCounter.new([1, 2], {}, :destination_root => destination_root)
   end
 
   describe "#destination" do
     it "returns the full destination with the destination_root" do
-      expect(empty_directory('doc').destination).to eq(File.join(destination_root, 'doc'))
+      expect(empty_directory("doc").destination).to eq(File.join(destination_root, "doc"))
     end
 
     it "takes relative root into account" do
-      base.inside('doc') do
-        expect(empty_directory('contents').destination).to eq(File.join(destination_root, 'doc', 'contents'))
+      base.inside("doc") do
+        expect(empty_directory("contents").destination).to eq(File.join(destination_root, "doc", "contents"))
       end
     end
   end
 
   describe "#relative_destination" do
     it "returns the relative destination to the original destination root" do
-      base.inside('doc') do
-        expect(empty_directory('contents').relative_destination).to eq('doc/contents')
+      base.inside("doc") do
+        expect(empty_directory("contents").relative_destination).to eq("doc/contents")
       end
     end
   end
 
   describe "#given_destination" do
     it "returns the destination supplied by the user" do
-      base.inside('doc') do
-        expect(empty_directory('contents').given_destination).to eq('contents')
+      base.inside("doc") do
+        expect(empty_directory("contents").given_destination).to eq("contents")
       end
     end
   end
@@ -54,7 +54,7 @@ describe Thor::Actions::EmptyDirectory do
     it "copies the file to the specified destination" do
       empty_directory("doc")
       invoke!
-      expect(File.exists?(File.join(destination_root, "doc"))).to be_true
+      expect(File.exist?(File.join(destination_root, "doc"))).to be true
     end
 
     it "shows created status to the user" do
@@ -66,7 +66,7 @@ describe Thor::Actions::EmptyDirectory do
       base.inside("foo", :pretend => true) do
         empty_directory("ghost")
       end
-      expect(File.exists?(File.join(base.destination_root, "ghost"))).to be_false
+      expect(File.exist?(File.join(base.destination_root, "ghost"))).to be false
     end
 
     describe "when directory exists" do
@@ -83,16 +83,16 @@ describe Thor::Actions::EmptyDirectory do
       empty_directory("doc")
       invoke!
       revoke!
-      expect(File.exists?(@action.destination)).to be_false
+      expect(File.exist?(@action.destination)).to be false
     end
   end
 
   describe "#exists?" do
     it "returns true if the destination file exists" do
       empty_directory("doc")
-      expect(@action.exists?).to be_false
+      expect(@action.exists?).to be false
       invoke!
-      expect(@action.exists?).to be_true
+      expect(@action.exists?).to be true
     end
   end
 
@@ -100,7 +100,7 @@ describe Thor::Actions::EmptyDirectory do
     describe "#convert_encoded_instructions" do
       before do
         empty_directory("test_dir")
-        @action.base.stub!(:file_name).and_return("expected")
+        allow(@action.base).to receive(:file_name).and_return("expected")
       end
 
       it "accepts and executes a 'legal' %\w+% encoded instruction" do
@@ -109,10 +109,10 @@ describe Thor::Actions::EmptyDirectory do
 
       it "accepts and executes a private %\w+% encoded instruction" do
         @action.base.extend Module.new {
-          private
           def private_file_name
             "expected"
           end
+          private :private_file_name
         }
         expect(@action.send(:convert_encoded_instructions, "%private_file_name%.txt")).to eq("expected.txt")
       end

data/spec/actions/file_manipulation_spec.rb

@@ -1,10 +1,10 @@
-require 'helper'
+require "helper"
 
 class Application; end
 
 describe Thor::Actions do
-  def runner(options={})
-    @runner ||= MyCounter.new([1], options, { :destination_root => destination_root })
+  def runner(options = {})
+    @runner ||= MyCounter.new([1], options, :destination_root => destination_root)
   end
 
   def action(*args, &block)
@@ -12,11 +12,11 @@ describe Thor::Actions do
   end
 
   def exists_and_identical?(source, destination)
-   destination = File.join(destination_root, destination)
-   expect(File.exists?(destination)).to be_true
+    destination = File.join(destination_root, destination)
+    expect(File.exist?(destination)).to be true
 
-   source = File.join(source_root, source)
-   expect(FileUtils).to be_identical(source, destination)
+    source = File.join(source_root, source)
+    expect(FileUtils).to be_identical(source, destination)
   end
 
   def file
@@ -29,23 +29,23 @@ describe Thor::Actions do
 
   describe "#chmod" do
     it "executes the command given" do
-      FileUtils.should_receive(:chmod_R).with(0755, file)
+      expect(FileUtils).to receive(:chmod_R).with(0755, file) # rubocop:disable SymbolName
       action :chmod, "foo", 0755
     end
 
-    it "does not execute the command if pretending given" do
-      FileUtils.should_not_receive(:chmod_R)
+    it "does not execute the command if pretending" do
+      expect(FileUtils).not_to receive(:chmod_R) # rubocop:disable SymbolName
       runner(:pretend => true)
       action :chmod, "foo", 0755
     end
 
     it "logs status" do
-      FileUtils.should_receive(:chmod_R).with(0755, file)
+      expect(FileUtils).to receive(:chmod_R).with(0755, file) # rubocop:disable SymbolName
       expect(action(:chmod, "foo", 0755)).to eq("       chmod  foo\n")
     end
 
     it "does not log status if required" do
-      FileUtils.should_receive(:chmod_R).with(0755, file)
+      expect(FileUtils).to receive(:chmod_R).with(0755, file) # rubocop:disable SymbolName
       expect(action(:chmod, "foo", 0755, :verbose => false)).to be_empty
     end
   end
@@ -122,7 +122,7 @@ describe Thor::Actions do
     end
 
     it "allows the destination to be set as a block result" do
-      action(:get, "doc/README"){ |c| "docs/README" }
+      action(:get, "doc/README") { |c| "docs/README" }
       exists_and_identical?("doc/README", "docs/README")
     end
 
@@ -138,7 +138,7 @@ describe Thor::Actions do
 
     it "accepts http remote sources" do
       body = "__start__\nHTTPFILE\n__end__\n"
-      FakeWeb.register_uri(:get, 'http://example.com/file.txt', :body => body)
+      FakeWeb.register_uri(:get, "http://example.com/file.txt", :body => body)
       action :get, "http://example.com/file.txt" do |content|
         expect(content).to eq(body)
       end
@@ -147,7 +147,7 @@ describe Thor::Actions do
 
     it "accepts https remote sources" do
       body = "__start__\nHTTPSFILE\n__end__\n"
-      FakeWeb.register_uri(:get, 'https://example.com/file.txt', :body => body)
+      FakeWeb.register_uri(:get, "https://example.com/file.txt", :body => body)
       action :get, "https://example.com/file.txt" do |content|
         expect(content).to eq(body)
       end
@@ -172,23 +172,33 @@ describe Thor::Actions do
     end
 
     it "copies the template to the specified destination" do
+      runner.instance_variable_set("@klass", "Config")
       action :template, "doc/config.rb", "doc/configuration.rb"
       file = File.join(destination_root, "doc/configuration.rb")
-      expect(File.exists?(file)).to be_true
+      expect(File.exist?(file)).to be true
     end
 
-    it "converts enconded instructions" do
-      runner.should_receive(:file_name).and_return("rdoc")
+    it "converts encoded instructions" do
+      expect(runner).to receive(:file_name).and_return("rdoc")
       action :template, "doc/%file_name%.rb.tt"
       file = File.join(destination_root, "doc/rdoc.rb")
-      expect(File.exists?(file)).to be_true
+      expect(File.exist?(file)).to be true
+    end
+
+    it "accepts filename without .tt for template method" do
+      expect(runner).to receive(:file_name).and_return("rdoc")
+      action :template, "doc/%file_name%.rb"
+      file = File.join(destination_root, "doc/rdoc.rb")
+      expect(File.exist?(file)).to be true
     end
 
     it "logs status" do
+      runner.instance_variable_set("@klass", "Config")
       expect(capture(:stdout) { runner.template("doc/config.rb") }).to eq("      create  doc/config.rb\n")
     end
 
     it "accepts a block to change output" do
+      runner.instance_variable_set("@klass", "Config")
       action :template, "doc/config.rb" do |content|
         "OMG" + content
       end
@@ -199,7 +209,7 @@ describe Thor::Actions do
       action :template, "doc/config.yaml.tt"
 
       file = File.join(destination_root, "doc/config.yaml")
-      expect(File.exists?(file)).to be_true
+      expect(File.exist?(file)).to be true
     end
   end
 
@@ -215,18 +225,18 @@ describe Thor::Actions do
     describe "#remove_file" do
       it "removes the file given" do
         action :remove_file, "doc/README"
-        expect(File.exists?(file)).to be_false
+        expect(File.exist?(file)).to be false
       end
 
       it "removes directories too" do
         action :remove_dir, "doc"
-        expect(File.exists?(File.join(destination_root, "doc"))).to be_false
+        expect(File.exist?(File.join(destination_root, "doc"))).to be false
       end
 
       it "does not remove if pretending" do
         runner(:pretend => true)
         action :remove_file, "doc/README"
-        expect(File.exists?(file)).to be_true
+        expect(File.exist?(file)).to be true
       end
 
       it "logs status" do
@@ -251,7 +261,7 @@ describe Thor::Actions do
       end
 
       it "accepts a block" do
-        action(:gsub_file, "doc/README", "__start__"){ |match| match.gsub('__', '').upcase  }
+        action(:gsub_file, "doc/README", "__start__") { |match| match.gsub("__", "").upcase  }
         expect(File.binread(file)).to eq("START\nREADME\n__end__\n")
       end
 
@@ -260,7 +270,7 @@ describe Thor::Actions do
       end
 
       it "does not log status if required" do
-        expect(action(:gsub_file, file, "__", :verbose => false){ |match| match * 2 }).to be_empty
+        expect(action(:gsub_file, file, "__", :verbose => false) { |match| match * 2 }).to be_empty
       end
     end
 
@@ -271,7 +281,7 @@ describe Thor::Actions do
       end
 
       it "accepts a block" do
-        action(:append_to_file, "doc/README"){ "END\n" }
+        action(:append_to_file, "doc/README") { "END\n" }
         expect(File.binread(file)).to eq("__start__\nREADME\n__end__\nEND\n")
       end
 
@@ -287,7 +297,7 @@ describe Thor::Actions do
       end
 
       it "accepts a block" do
-        action(:prepend_to_file, "doc/README"){ "START\n" }
+        action(:prepend_to_file, "doc/README") { "START\n" }
         expect(File.binread(file)).to eq("START\n__start__\nREADME\n__end__\n")
       end
 
@@ -307,7 +317,7 @@ describe Thor::Actions do
       end
 
       it "accepts a block" do
-        action(:inject_into_class, "application.rb", Application){ "  filter_parameters :password\n" }
+        action(:inject_into_class, "application.rb", Application) { "  filter_parameters :password\n" }
         expect(File.binread(file)).to eq("class Application < Base\n  filter_parameters :password\nend\n")
       end