thor 0.16.0 → 0.17.0

data/spec/actions/empty_directory_spec.rb

@@ -11,11 +11,11 @@ describe Thor::Actions::EmptyDirectory do
   end
 
   def invoke!
-    capture(:stdout){ @action.invoke! }
+    capture(:stdout) { @action.invoke! }
   end
 
   def revoke!
-    capture(:stdout){ @action.revoke! }
+    capture(:stdout) { @action.revoke! }
   end
 
   def base
@@ -24,12 +24,12 @@ describe Thor::Actions::EmptyDirectory do
 
   describe "#destination" do
     it "returns the full destination with the destination_root" do
-      empty_directory('doc').destination.should == 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
-        empty_directory('contents').destination.should == File.join(destination_root, 'doc', 'contents')
+        expect(empty_directory('contents').destination).to eq(File.join(destination_root, 'doc', 'contents'))
       end
     end
   end
@@ -37,7 +37,7 @@ describe Thor::Actions::EmptyDirectory do
   describe "#relative_destination" do
     it "returns the relative destination to the original destination root" do
       base.inside('doc') do
-        empty_directory('contents').relative_destination.should == 'doc/contents'
+        expect(empty_directory('contents').relative_destination).to eq('doc/contents')
       end
     end
   end
@@ -45,7 +45,7 @@ describe Thor::Actions::EmptyDirectory do
   describe "#given_destination" do
     it "returns the destination supplied by the user" do
       base.inside('doc') do
-        empty_directory('contents').given_destination.should == 'contents'
+        expect(empty_directory('contents').given_destination).to eq('contents')
       end
     end
   end
@@ -54,26 +54,26 @@ describe Thor::Actions::EmptyDirectory do
     it "copies the file to the specified destination" do
       empty_directory("doc")
       invoke!
-      File.exists?(File.join(destination_root, "doc")).should be_true
+      expect(File.exists?(File.join(destination_root, "doc"))).to be_true
     end
 
     it "shows created status to the user" do
       empty_directory("doc")
-      invoke!.should == "      create  doc\n"
+      expect(invoke!).to eq("      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")).should be_false
+      expect(File.exists?(File.join(base.destination_root, "ghost"))).to be_false
     end
 
     describe "when directory exists" do
       it "shows exist status" do
         empty_directory("doc")
         invoke!
-        invoke!.should == "       exist  doc\n"
+        expect(invoke!).to eq("       exist  doc\n")
       end
     end
   end
@@ -83,16 +83,16 @@ describe Thor::Actions::EmptyDirectory do
       empty_directory("doc")
       invoke!
       revoke!
-      File.exists?(@action.destination).should be_false
+      expect(File.exists?(@action.destination)).to be_false
     end
   end
 
   describe "#exists?" do
     it "returns true if the destination file exists" do
       empty_directory("doc")
-      @action.exists?.should be_false
+      expect(@action.exists?).to be_false
       invoke!
-      @action.exists?.should be_true
+      expect(@action.exists?).to be_true
     end
   end
 
@@ -104,15 +104,15 @@ describe Thor::Actions::EmptyDirectory do
       end
 
       it "accepts and executes a 'legal' %\w+% encoded instruction" do
-        @action.send(:convert_encoded_instructions, "%file_name%.txt").should == "expected.txt"
+        expect(@action.send(:convert_encoded_instructions, "%file_name%.txt")).to eq("expected.txt")
       end
 
       it "ignores an 'illegal' %\w+% encoded instruction" do
-        @action.send(:convert_encoded_instructions, "%some_name%.txt").should == "%some_name%.txt"
+        expect(@action.send(:convert_encoded_instructions, "%some_name%.txt")).to eq("%some_name%.txt")
       end
 
       it "ignores incorrectly encoded instruction" do
-        @action.send(:convert_encoded_instructions, "%some.name%.txt").should == "%some.name%.txt"
+        expect(@action.send(:convert_encoded_instructions, "%some.name%.txt")).to eq("%some.name%.txt")
       end
 
       it "raises an error if the instruction refers to a private method" do

data/spec/actions/file_manipulation_spec.rb

@@ -8,15 +8,15 @@ describe Thor::Actions do
   end
 
   def action(*args, &block)
-    capture(:stdout){ runner.send(*args, &block) }
+    capture(:stdout) { runner.send(*args, &block) }
   end
 
   def exists_and_identical?(source, destination)
    destination = File.join(destination_root, destination)
-   File.exists?(destination).should be_true
+   expect(File.exists?(destination)).to be_true
 
    source = File.join(source_root, source)
-   FileUtils.should be_identical(source, destination)
+   expect(FileUtils).to be_identical(source, destination)
   end
 
   def file
@@ -41,12 +41,12 @@ describe Thor::Actions do
 
     it "logs status" do
       FileUtils.should_receive(:chmod_R).with(0755, file)
-      action(:chmod, "foo", 0755).should == "       chmod  foo\n"
+      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)
-      action(:chmod, "foo", 0755, :verbose => false).should be_empty
+      expect(action(:chmod, "foo", 0755, :verbose => false)).to be_empty
     end
   end
 
@@ -68,15 +68,22 @@ describe Thor::Actions do
       exists_and_identical?("doc/README", "doc/README")
     end
 
+    it "copies file from source to default destination and preserves file mode" do
+      action :copy_file, "preserve/script.sh", :mode => :preserve
+      original = File.join(source_root, "preserve/script.sh")
+      copy = File.join(destination_root, "preserve/script.sh")
+      expect(File.stat(original).mode).to eq(File.stat(copy).mode)
+    end
+
     it "logs status" do
-      action(:copy_file, "task.thor").should == "      create  task.thor\n"
+      expect(action(:copy_file, "task.thor")).to eq("      create  task.thor\n")
     end
 
     it "accepts a block to change output" do
       action :copy_file, "task.thor" do |content|
         "OMG" + content
       end
-      File.read(File.join(destination_root, "task.thor")).should =~ /^OMG/
+      expect(File.read(File.join(destination_root, "task.thor"))).to match(/^OMG/)
     end
   end
 
@@ -99,7 +106,7 @@ describe Thor::Actions do
     end
 
     it "logs status" do
-      action(:link_file, "task.thor").should == "      create  task.thor\n"
+      expect(action(:link_file, "task.thor")).to eq("      create  task.thor\n")
     end
   end
 
@@ -121,19 +128,19 @@ describe Thor::Actions do
 
     it "yields file content to a block" do
       action :get, "doc/README" do |content|
-        content.should == "__start__\nREADME\n__end__\n"
+        expect(content).to eq("__start__\nREADME\n__end__\n")
       end
     end
 
     it "logs status" do
-      action(:get, "doc/README", "docs/README").should == "      create  docs/README\n"
+      expect(action(:get, "doc/README", "docs/README")).to eq("      create  docs/README\n")
     end
 
     it "accepts http remote sources" do
       body = "__start__\nHTTPFILE\n__end__\n"
       FakeWeb.register_uri(:get, 'http://example.com/file.txt', :body => body)
-      action :get, 'http://example.com/file.txt' do |content|
-        content.should == body
+      action :get, "http://example.com/file.txt" do |content|
+        expect(content).to eq(body)
       end
       FakeWeb.clean_registry
     end
@@ -141,8 +148,8 @@ 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)
-      action :get, 'https://example.com/file.txt' do |content|
-        content.should == body
+      action :get, "https://example.com/file.txt" do |content|
+        expect(content).to eq(body)
       end
       FakeWeb.clean_registry
     end
@@ -153,7 +160,7 @@ describe Thor::Actions do
       action :template, "doc/block_helper.rb"
 
       file = File.join(destination_root, "doc/block_helper.rb")
-      File.read(file).should == "Hello world!"
+      expect(File.read(file)).to eq("Hello world!")
     end
 
     it "evaluates the template given as source" do
@@ -161,38 +168,38 @@ describe Thor::Actions do
       action :template, "doc/config.rb"
 
       file = File.join(destination_root, "doc/config.rb")
-      File.read(file).should == "class Config; end\n"
+      expect(File.read(file)).to eq("class Config; end\n")
     end
 
     it "copies the template to the specified destination" do
       action :template, "doc/config.rb", "doc/configuration.rb"
       file = File.join(destination_root, "doc/configuration.rb")
-      File.exists?(file).should be_true
+      expect(File.exists?(file)).to be_true
     end
 
     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")
-      File.exists?(file).should be_true
+      expect(File.exists?(file)).to be_true
     end
 
     it "logs status" do
-      capture(:stdout){ runner.template("doc/config.rb") }.should == "      create  doc/config.rb\n"
+      expect(capture(:stdout) { runner.template("doc/config.rb") }).to eq("      create  doc/config.rb\n")
     end
 
     it "accepts a block to change output" do
       action :template, "doc/config.rb" do |content|
         "OMG" + content
       end
-      File.read(File.join(destination_root, "doc/config.rb")).should =~ /^OMG/
+      expect(File.read(File.join(destination_root, "doc/config.rb"))).to match(/^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
+      expect(File.exists?(file)).to be_true
     end
   end
 
@@ -208,84 +215,84 @@ describe Thor::Actions do
     describe "#remove_file" do
       it "removes the file given" do
         action :remove_file, "doc/README"
-        File.exists?(file).should be_false
+        expect(File.exists?(file)).to be_false
       end
 
       it "removes directories too" do
         action :remove_dir, "doc"
-        File.exists?(File.join(destination_root, "doc")).should be_false
+        expect(File.exists?(File.join(destination_root, "doc"))).to be_false
       end
 
       it "does not remove if pretending" do
         runner(:pretend => true)
         action :remove_file, "doc/README"
-        File.exists?(file).should be_true
+        expect(File.exists?(file)).to be_true
       end
 
       it "logs status" do
-        action(:remove_file, "doc/README").should == "      remove  doc/README\n"
+        expect(action(:remove_file, "doc/README")).to eq("      remove  doc/README\n")
       end
 
       it "does not log status if required" do
-        action(:remove_file, "doc/README", :verbose => false).should be_empty
+        expect(action(:remove_file, "doc/README", :verbose => false)).to be_empty
       end
     end
 
     describe "#gsub_file" do
       it "replaces the content in the file" do
         action :gsub_file, "doc/README", "__start__", "START"
-        File.binread(file).should == "START\nREADME\n__end__\n"
+        expect(File.binread(file)).to eq("START\nREADME\n__end__\n")
       end
 
       it "does not replace if pretending" do
         runner(:pretend => true)
         action :gsub_file, "doc/README", "__start__", "START"
-        File.binread(file).should == "__start__\nREADME\n__end__\n"
+        expect(File.binread(file)).to eq("__start__\nREADME\n__end__\n")
       end
 
       it "accepts a block" do
         action(:gsub_file, "doc/README", "__start__"){ |match| match.gsub('__', '').upcase  }
-        File.binread(file).should == "START\nREADME\n__end__\n"
+        expect(File.binread(file)).to eq("START\nREADME\n__end__\n")
       end
 
       it "logs status" do
-        action(:gsub_file, "doc/README", "__start__", "START").should == "        gsub  doc/README\n"
+        expect(action(:gsub_file, "doc/README", "__start__", "START")).to eq("        gsub  doc/README\n")
       end
 
       it "does not log status if required" do
-        action(:gsub_file, file, "__", :verbose => false){ |match| match * 2 }.should be_empty
+        expect(action(:gsub_file, file, "__", :verbose => false){ |match| match * 2 }).to be_empty
       end
     end
 
     describe "#append_to_file" do
       it "appends content to the file" do
         action :append_to_file, "doc/README", "END\n"
-        File.binread(file).should == "__start__\nREADME\n__end__\nEND\n"
+        expect(File.binread(file)).to eq("__start__\nREADME\n__end__\nEND\n")
       end
 
       it "accepts a block" do
         action(:append_to_file, "doc/README"){ "END\n" }
-        File.binread(file).should == "__start__\nREADME\n__end__\nEND\n"
+        expect(File.binread(file)).to eq("__start__\nREADME\n__end__\nEND\n")
       end
 
       it "logs status" do
-        action(:append_to_file, "doc/README", "END").should == "      append  doc/README\n"
+        expect(action(:append_to_file, "doc/README", "END")).to eq("      append  doc/README\n")
       end
     end
 
     describe "#prepend_to_file" do
       it "prepends content to the file" do
         action :prepend_to_file, "doc/README", "START\n"
-        File.binread(file).should == "START\n__start__\nREADME\n__end__\n"
+        expect(File.binread(file)).to eq("START\n__start__\nREADME\n__end__\n")
       end
 
       it "accepts a block" do
         action(:prepend_to_file, "doc/README"){ "START\n" }
-        File.binread(file).should == "START\n__start__\nREADME\n__end__\n"
+        expect(File.binread(file)).to eq("START\n__start__\nREADME\n__end__\n")
       end
 
       it "logs status" do
-        action(:prepend_to_file, "doc/README", "START").should == "     prepend  doc/README\n"
+        expect(action(:prepend_to_file, "doc/README", "START")).to eq("     prepend  doc/README\n")
       end
     end
 
@@ -296,21 +303,21 @@ describe Thor::Actions do
 
       it "appends content to a class" do
         action :inject_into_class, "application.rb", Application, "  filter_parameters :password\n"
-        File.binread(file).should == "class Application < Base\n  filter_parameters :password\nend\n"
+        expect(File.binread(file)).to eq("class Application < Base\n  filter_parameters :password\nend\n")
       end
 
       it "accepts a block" do
         action(:inject_into_class, "application.rb", Application){ "  filter_parameters :password\n" }
-        File.binread(file).should == "class Application < Base\n  filter_parameters :password\nend\n"
+        expect(File.binread(file)).to eq("class Application < Base\n  filter_parameters :password\nend\n")
       end
 
       it "logs status" do
-        action(:inject_into_class, "application.rb", Application, "  filter_parameters :password\n").should == "      insert  application.rb\n"
+        expect(action(:inject_into_class, "application.rb", Application, "  filter_parameters :password\n")).to eq("      insert  application.rb\n")
       end
 
       it "does not append if class name does not match" do
         action :inject_into_class, "application.rb", "App", "  filter_parameters :password\n"
-        File.binread(file).should == "class Application < Base\nend\n"
+        expect(File.binread(file)).to eq("class Application < Base\nend\n")
       end
     end
   end
@@ -324,46 +331,51 @@ describe Thor::Actions do
       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__/
+    unmodified_comments_file = /__start__\n # greenblue\n#\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__/
+        expect(File.binread(file)).to match(/__start__\n greenblue\n#\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__/
+        expect(File.binread(file)).to match(/__start__\n greenblue\n#\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__/
+        expect(File.binread(file)).to match(/__start__\n # greenblue\n#\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
+        expect(File.binread(file)).to match(unmodified_comments_file)
+      end
+
+      it "does not uncomment the wrong line when uncommenting lines preceded by blank commented line" do
+        action :uncomment_lines, "doc/COMMENTER", "yellow"
+        expect(File.binread(file)).to match(/__start__\n # greenblue\n#\nyellowblue\nyellowred\n #greenred\norange\n    purple\n  ind#igo\n  # ind#igo\n__end__/)
       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__/
+        expect(File.binread(file)).to match(/__start__\n # greenblue\n#\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__/
+        expect(File.binread(file)).to match(/__start__\n # greenblue\n#\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__/
+        expect(File.binread(file)).to match(/__start__\n # greenblue\n#\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
+        expect(File.binread(file)).to match(unmodified_comments_file)
       end
     end
   end