methadone 1.9.5 → 2.0.0

data/test/{test_exit_now.rb → unit/test_exit_now.rb}

@@ -16,8 +16,8 @@ class TestExitNow < BaseTest
     }
     Then {
       exception = assert_raises(Methadone::Error,&@code)
-      exception.exit_code.should == @exit_code
-      exception.message.should == @message
+      exception.exit_code.should be == @exit_code
+      exception.message.should be == @message
     }
   end
 
@@ -30,8 +30,8 @@ class TestExitNow < BaseTest
     }
     Then {
       exception = assert_raises(Methadone::Error,&@code)
-      exception.exit_code.should == 1
-      exception.message.should == @message
+      exception.exit_code.should be == 1
+      exception.message.should be == @message
     }
   end
 end 

data/test/{test_main.rb → unit/test_main.rb}

@@ -66,7 +66,7 @@ class TestMain < BaseTest
     }
     When run_go_safely
     Then {
-      @params.should == %w(one two three)
+      @params.should be == %w(one two three)
     }
   end
 
@@ -94,7 +94,7 @@ class TestMain < BaseTest
     }
     When run_go_safely
     Then {
-      @params.should == ['one','two',nil]
+      @params.should be == ['one','two',nil]
     }
   end
 
@@ -248,7 +248,7 @@ class TestMain < BaseTest
 
     Then {
       @switch.should be true
-      @flag.should == 'value'
+      @flag.should be == 'value'
     }
   end
 
@@ -345,18 +345,18 @@ class TestMain < BaseTest
       @switch[0].should be true
       @some_other[0].should be true
       @other[0].should_not be true
-      @flag[0].should == 'value'
-      @f[0].should == 'value'
-      @with_dashes[0].should == 'BAR'
+      @flag[0].should be == 'value'
+      @f[0].should be == 'value'
+      @with_dashes[0].should be == 'BAR'
 
       @switch[1].should be true
       @some_other[1].should be nil # ** this is set manually
       @other[1].should_not be true
-      @flag[1].should == 'value'
-      @f[1].should == 'value'
-      @with_dashes[1].should == 'BAR'
+      @flag[1].should be == 'value'
+      @f[1].should be == 'value'
+      @with_dashes[1].should be == 'BAR'
 
-      opts.to_s.should match /Some documentation string/
+      opts.to_s.should match(/Some documentation string/)
     }
   end
 
@@ -366,7 +366,7 @@ class TestMain < BaseTest
     }
 
     Then {
-      opts.banner.should_not match /\[options\]/
+      opts.banner.should_not match(/\[options\]/)
     }
   end
 
@@ -377,7 +377,7 @@ class TestMain < BaseTest
     }
 
     Then {
-      opts.banner.should match /\[options\]/
+      opts.banner.should match(/\[options\]/)
     }
 
   end
@@ -395,10 +395,10 @@ class TestMain < BaseTest
     }
     When run_go_safely
     Then {
-      opts.banner.should match /db_name user \[password\]$/
-      opts.to_s.should match /#{@db_name_desc}/
-      opts.to_s.should match /#{@user_desc}/
-      opts.to_s.should match /#{@password_desc}/
+      opts.banner.should match(/db_name user \[password\]$/)
+      opts.to_s.should match(/#{@db_name_desc}/)
+      opts.to_s.should match(/#{@user_desc}/)
+      opts.to_s.should match(/#{@password_desc}/)
     }
   end
 
@@ -412,7 +412,7 @@ class TestMain < BaseTest
     }
 
     Then {
-      opts.banner.should match /db_name user tables...$/
+      opts.banner.should match(/db_name user tables...$/)
     }
   end
 
@@ -426,7 +426,7 @@ class TestMain < BaseTest
     }
 
     Then {
-      opts.banner.should match /db_name user \[tables...\]$/
+      opts.banner.should match(/db_name user \[tables...\]$/)
     }
   end
 
@@ -437,7 +437,7 @@ class TestMain < BaseTest
 
     }
     Then {
-      opts.banner.should match /^An app of total awesome$/
+      opts.banner.should match(/^An app of total awesome$/)
     }
   end
 
@@ -450,7 +450,7 @@ class TestMain < BaseTest
     }
 
     Then {
-      opts.banner.should == 'FOOBAR'
+      opts.banner.should be == 'FOOBAR'
     }
   end
 
@@ -491,7 +491,7 @@ class TestMain < BaseTest
     }
 
     Then {
-      opts.banner.should match /^v0.0.1/m
+      opts.banner.should match(/^v0.0.1/m)
     }
   end
 
@@ -503,7 +503,7 @@ class TestMain < BaseTest
     }
     Then run_go_safely
     And {
-      opts.to_s.should match /Show help\/version info/m
+      opts.to_s.should match(/Show help\/version info/m)
     }
   end
 
@@ -516,7 +516,7 @@ class TestMain < BaseTest
     }
     Then run_go_safely
     And {
-      opts.to_s.should match /#{@version_message}/
+      opts.to_s.should match(/#{@version_message}/)
     }
   end
 
@@ -530,7 +530,7 @@ class TestMain < BaseTest
       @help_string = opts.to_s
     }
     When {
-      @help_string.should match /\(default: bar\)/
+      @help_string.should match(/\(default: bar\)/)
     }
 
   end
@@ -545,7 +545,7 @@ class TestMain < BaseTest
       @help_string = opts.to_s
     }
     When {
-      @help_string.should match /\(default: bar\)/
+      @help_string.should match(/\(default: bar\)/)
     }
   end
 
@@ -556,7 +556,7 @@ class TestMain < BaseTest
       @help_string = opts.to_s
     }
     Then {
-      @help_string.should match /Default values can be placed in the APP_OPTS environment variable/
+      @help_string.should match(/Default values can be placed in the APP_OPTS environment variable/)
     }
   end
 
@@ -573,9 +573,9 @@ class TestMain < BaseTest
     }
     Then {
       assert_exits(0,'',&@code)
-      @switch.should == true
-      @flag.should == @flag_value
-      @args.should == [@some_arg]
+      @switch.should be == true
+      @flag.should be == @flag_value
+      @args.should be == [@some_arg]
     }
   end
 
@@ -591,8 +591,8 @@ class TestMain < BaseTest
     }
     Then {
       assert_exits(0,'',&@code)
-      @switch.should == true
-      @flag.should == @flag_value
+      @switch.should be == true
+      @flag.should be == @flag_value
     }
   end
 
@@ -607,8 +607,8 @@ class TestMain < BaseTest
     }
     Then {
       assert_exits(0,'',&@code)
-      @switch.should == true
-      @flag.should == @flag_value
+      @switch.should be == true
+      @flag.should be == @flag_value
     }
   end
 
@@ -624,8 +624,8 @@ class TestMain < BaseTest
     }
     Then {
       assert_exits(0,'',&@code)
-      @switch.should == true
-      @flag.should == @flag_value
+      @switch.should be == true
+      @flag.should be == @flag_value
     }
   end
 
@@ -646,8 +646,8 @@ class TestMain < BaseTest
     }
     Then {
       assert_exits(0,&@code)
-      @switch.should == true
-      @flag.should == @flag_value
+      @switch.should be == true
+      @flag.should be == @flag_value
     }
 
   end
@@ -670,8 +670,8 @@ class TestMain < BaseTest
     }
     Then {
       assert_exits(0,&@code)
-      @switch.should == true
-      @flag.should == @flag_value
+      @switch.should be == true
+      @flag.should be == @flag_value
     }
 
   end
@@ -682,15 +682,15 @@ class TestMain < BaseTest
     And {
       @flag_value = any_string
       rc_file = File.join(ENV['HOME'],'.my_app.rc')
-      raise "Something's wrong, expection rc file not to exist" if File.exists?(rc_file)
+      raise "Something's wrong, expection rc file not to exist" if File.exist?(rc_file)
     }
     When {
       @code = lambda { go! }
     }
     Then {
       assert_exits(0,&@code)
-      @switch.should == nil
-      @flag.should == nil
+      @switch.should be == nil
+      @flag.should be == nil
     }
   end
 
@@ -708,8 +708,8 @@ class TestMain < BaseTest
     }
     Then {
       assert_exits(0,&@code)
-      @switch.should == true
-      @flag.should == @flag_value
+      @switch.should be == true
+      @flag.should be == @flag_value
     }
 
   end
@@ -728,8 +728,8 @@ class TestMain < BaseTest
     }
     Then {
       assert_exits(0,&@code)
-      @switch.should == true
-      @flag.should == @flag_value
+      @switch.should be == true
+      @flag.should be == @flag_value
     }
   end
 
@@ -758,8 +758,8 @@ class TestMain < BaseTest
       main {}
     }
     Then {
-      opts.banner.should match /^An app of total awesome$/
-      opts.to_s.should match /--switch/
+      opts.banner.should match(/^An app of total awesome$/)
+      opts.to_s.should match(/--switch/)
     }
   end
 

data/test/{test_sh.rb → unit/test_sh.rb}

@@ -54,7 +54,7 @@ class TestSH < BaseTest
         end
       }
       Then {
-        @stdout_received.should == test_command_stdout
+        @stdout_received.should be == test_command_stdout
         assert_successful_command_execution(@exit_code,@logger,@command,test_command_stdout)
       }
     end
@@ -71,7 +71,7 @@ class TestSH < BaseTest
         end
       }
       Then {
-        @block_called.should == true
+        @block_called.should be == true
         assert_successful_command_execution(@exit_code,@logger,@command,test_command_stdout)
       }
     end
@@ -87,7 +87,7 @@ class TestSH < BaseTest
         @exit_code = self.send(method,@command,&@lambda)
       }
       Then {
-        @block_called.should == true
+        @block_called.should be == true
         assert_successful_command_execution(@exit_code,@logger,@command,test_command_stdout)
       }
     end
@@ -107,8 +107,8 @@ class TestSH < BaseTest
         end
       }
       Then {
-        @stdout_received.should == test_command_stdout
-        @stderr_received.length.should == 0
+        @stdout_received.should be == test_command_stdout
+        @stderr_received.length.should be == 0
         assert_successful_command_execution(@exit_code,@logger,@command,test_command_stdout)
       }
     end
@@ -130,9 +130,9 @@ class TestSH < BaseTest
         end
       }
       Then {
-        @stdout_received.should == test_command_stdout
-        @stderr_received.length.should == 0
-        @exitstatus_received.should == 0
+        @stdout_received.should be == test_command_stdout
+        @stderr_received.length.should be == 0
+        @exitstatus_received.should be == 0
         assert_successful_command_execution(@exit_code,@logger,@command,test_command_stdout)
       }
     end
@@ -150,7 +150,7 @@ class TestSH < BaseTest
       end
     }
     Then {
-      @exit_code.should == 1
+      @exit_code.should be == 1
       assert_logger_output_for_failure(@logger,@command,test_command_stdout,test_command_stderr)
     }
   end
@@ -167,7 +167,7 @@ class TestSH < BaseTest
       end
     }
     Then {
-      @exit_code.should == 1
+      @exit_code.should be == 1
       assert_logger_output_for_failure(@logger,@command,test_command_stdout,test_command_stderr)
     }
   end
@@ -188,12 +188,12 @@ class TestSH < BaseTest
           end
         }
         Then {
-          @exit_code.should == 1
-          @block_called.should == true
-          @exitstatus_received.should == 1
-          @logger.debugs[0].should == "Executing '#{test_command}foo'"
-          @logger.debugs[1].should == "stdout output of '#{test_command}foo': #{test_command_stdout}"
-          @logger.warns[0].should == "stderr output of '#{test_command}foo': #{test_command_stderr}"
+          @exit_code.should be == 1
+          @block_called.should be == true
+          @exitstatus_received.should be == 1
+          @logger.debugs[0].should be == "Executing '#{test_command}foo'"
+          @logger.debugs[1].should be == "stdout output of '#{test_command}foo': #{test_command_stdout}"
+          @logger.warns[0].should be == "stderr output of '#{test_command}foo': #{test_command_stderr}"
         }
       end
     end
@@ -208,7 +208,7 @@ class TestSH < BaseTest
       @exit_code = sh @command
     }
     Then {
-      @exit_code.should == 1
+      @exit_code.should be == 1
       assert_logger_output_for_failure(@logger,@command,test_command_stdout,test_command_stderr)
     }
   end
@@ -222,8 +222,8 @@ class TestSH < BaseTest
       @exit_code = sh @command
     }
     Then {
-      @exit_code.should == 127 # consistent with what bash does
-      @logger.errors[0].should match /^Error running '#{@command}': .+$/
+      @exit_code.should be == 127 # consistent with what bash does
+      @logger.errors[0].should match(/^Error running '#{@command}': .+$/)
     }
   end
 
@@ -237,7 +237,7 @@ class TestSH < BaseTest
     }
     Then {
       exception = assert_raises(Methadone::FailedCommandError,&@code)
-      exception.command.should == @command
+      exception.command.should be == @command
       assert_logger_output_for_failure(@logger,@command,test_command_stdout,test_command_stderr)
     }
   end
@@ -253,8 +253,8 @@ class TestSH < BaseTest
     }
     Then {
       exception = assert_raises(Methadone::FailedCommandError,&@code)
-      exception.command.should == @command
-      exception.message.should == @custom_error_message
+      exception.command.should be == @command
+      exception.message.should be == @custom_error_message
       assert_logger_output_for_failure(@logger,@command,test_command_stdout,test_command_stderr)
     }
   end
@@ -289,7 +289,7 @@ class TestSH < BaseTest
       @code = lambda { @test_app.sh @command }
     }
     Then {
-      exception = assert_raises(StandardError,&@code)
+      assert_raises(StandardError,&@code)
     }
   end
 
@@ -339,8 +339,8 @@ class TestSH < BaseTest
       @results = @app.sh(@command)
     }
     Then {
-      @app.strategy.command.should == @command
-      @results.should == @exit_code
+      @app.strategy.command.should be == @command
+      @results.should be == @exit_code
     }
   end
 
@@ -353,8 +353,8 @@ class TestSH < BaseTest
       @results = @app.sh(@command)
     }
     Then {
-      @app.strategy.command.should == @command
-      @results.should == 0
+      @app.strategy.command.should be == @command
+      @results.should be == 0
     }
   end
 
@@ -367,25 +367,25 @@ class TestSH < BaseTest
       @results = @app.sh(@command)
     }
     Then {
-      @app.strategy.command.should == @command
-      @results.should == 1
+      @app.strategy.command.should be == @command
+      @results.should be == 1
     }
   end
 
 private
 
   def assert_successful_command_execution(exit_code,logger,command,stdout)
-    exit_code.should == 0
-    logger.debugs[0].should == "Executing '#{command}'"
-    logger.debugs[1].should == "stdout output of '#{command}': #{stdout}"
-    logger.warns.length.should == 0
+    exit_code.should be == 0
+    logger.debugs[0].should be == "Executing '#{command}'"
+    logger.debugs[1].should be == "stdout output of '#{command}': #{stdout}"
+    logger.warns.length.should be == 0
   end
 
   def assert_logger_output_for_failure(logger,command,stdout,stderr)
-    logger.debugs[0].should == "Executing '#{command}'"
-    logger.infos[0].should == "stdout output of '#{command}': #{stdout}"
-    logger.warns[0].should == "stderr output of '#{command}': #{stderr}"
-    logger.warns[1].should == "Error running '#{command}'"
+    logger.debugs[0].should be == "Executing '#{command}'"
+    logger.infos[0].should be == "stdout output of '#{command}': #{stdout}"
+    logger.warns[0].should be == "stderr output of '#{command}': #{stderr}"
+    logger.warns[1].should be == "Error running '#{command}'"
   end
 
   def use_capturing_logger