rscm 0.5.0 → 0.5.1

data/CHANGES

@@ -1,5 +1,10 @@
 = RSCM Changelog
 
+== 0.5.1
+Bugfix release.
+
+* Fixed a bug causing bad commands in conjunction with a block not to fail. They now fail correctly.
+
 == 0.5.0
 This release improves command line and logging, as well as improved support for slurping all historic revisions incrementally (to save memory). The latter will be improved in upcoming versions.
 

data/README

@@ -1,4 +1,4 @@
-= RSCM - Ruby Source Control Management (0.4.5)
+= RSCM - Ruby Source Control Management (0.5.1)
 
 RSCM is to SCM what DBI/JDBC/ODBC are to databases - an SCM-independent API for accessing different SCMs. The high level features are roughly:
 

data/lib/rscm/command_line.rb

@@ -66,12 +66,11 @@ module RSCM
       options[:stdout] = File.expand_path(options[:stdout]) if options[:stdout]
       options[:stderr] = File.expand_path(options[:stderr]) if options[:stderr]
 
-      commands = cmd.split("&&").collect{|c| c.strip}
       if options[:dir].nil?
-        e(cmd, commands, options, &proc)
+        e(cmd, options, &proc)
       else
         Dir.chdir(options[:dir]) do
-          e(cmd, commands, options, &proc)
+          e(cmd, options, &proc)
         end
       end
     end
@@ -79,7 +78,8 @@ module RSCM
 
   private
 
-    def e(cmd, commands, options, &proc)
+    def full_cmd(cmd, options, &proc)
+      commands = cmd.split("&&").collect{|c| c.strip}
       stdout_opt = options[:stdout] ? ">> #{options[:stdout]}" : ""
       stderr_opt = options[:stderr] ? "2>> #{options[:stderr]}" : ""
       capture_info_command = (block_given? && options[:stdout])? "echo [output captured and therefore not logged] >> #{options[:stdout]} && " : ""
@@ -92,34 +92,42 @@ module RSCM
 
         stdout_prompt_command + capture_info_command + stderr_prompt_command + redirected_command
       end.join(" && ")
+    end
+    module_function :full_cmd
+
+    def verify_exit_code(cmd, full_cmd, options)
+      if($?.exitstatus != options[:exitstatus])
+        error_message = "#{options[:stderr]} doesn't exist"
+        if options[:stderr] && File.exist?(options[:stderr])
+          File.open(options[:stderr]) do |errio|
+            begin
+              errio.seek(-1200, IO::SEEK_END)
+            rescue Errno::EINVAL
+              # ignore - it just means we didn't have 400 bytes.
+            end
+            error_message = errio.read
+          end
+        end
+        raise ExecutionError.new(cmd, full_cmd, options[:dir] || Dir.pwd, $?.exitstatus, error_message)
+      end
+    end
+    module_function :verify_exit_code
+
+    def e(cmd, options, &proc)
+      full_cmd = full_cmd(cmd, options, &proc)
 
       options[:env].each{|k,v| ENV[k]=v}
       begin
         STDOUT.puts "#{RSCM::Platform.prompt} #{cmd}" if options[:stdout].nil?
         IO.popen(full_cmd, options[:mode]) do |io|
           if(block_given?)
-            return(proc.call(io))
+            proc.call(io)
           else
             io.each_line do |line|
               STDOUT.puts line if options[:stdout].nil?
             end
           end
         end
-
-        if($?.exitstatus != options[:exitstatus])
-          error_message = "#{options[:stderr]} doesn't exist"
-          if options[:stderr] && File.exist?(options[:stderr])
-            File.open(options[:stderr]) do |errio|
-              begin
-                errio.seek(-1200, IO::SEEK_END)
-              rescue Errno::EINVAL
-                # ignore - it just means we didn't have 400 bytes.
-              end
-              error_message = errio.read
-            end
-          end
-          raise ExecutionError.new(cmd, full_cmd, options[:dir] || Dir.pwd, $?.exitstatus, error_message)
-        end
       rescue Errno::ENOENT => e
         unless options[:stderr].nil?
           File.open(options[:stderr], "a") {|io| io.write(e.message)}
@@ -128,6 +136,8 @@ module RSCM
           STDERR.puts e.backtrace.join("\n")
         end
         raise ExecutionError.new(cmd, full_cmd, options[:dir] || Dir.pwd, nil, e.message)
+      ensure
+        verify_exit_code(cmd, full_cmd, options)
       end
     end
     module_function :e

data/lib/rscm/version.rb

@@ -2,7 +2,7 @@ module RSCM
   module VERSION
     MAJOR = 0
     MINOR = 5
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
 

data/test/rscm/command_line_test.rb

@@ -3,7 +3,7 @@ require 'rscm/command_line'
 
 module RSCM
 
-  class DifftoolTest < Test::Unit::TestCase
+  class CommandLineTest < Test::Unit::TestCase
     def setup_dir(prefix)
       @dir = RSCM.new_temp_dir(prefix)
       @stdout = "#{@dir}/stdout"
@@ -39,5 +39,30 @@ module RSCM
       assert_equal("#{@prompt} echo hello", File.open(@stderr).read.strip)
     end
     
+    def test_should_raise_on_bad_command
+      setup_dir(method_name)
+      assert_raise(CommandLine::ExecutionError) do
+        CommandLine.execute("xaswedf", {:dir => @dir, :stdout => @stdout, :stderr => @stderr})
+      end
+    end
+
+    def test_should_raise_on_bad_command_with_block
+      setup_dir(method_name)
+      assert_raise(CommandLine::ExecutionError) do
+        CommandLine.execute("xaswedf", {:dir => @dir, :stdout => @stdout, :stderr => @stderr}) do |io|
+          io.each_line do |line|
+          end
+        end
+      end
+    end
+
+    def test_should_return_block_result
+      setup_dir(method_name)
+      result = CommandLine.execute("echo hello", {:dir => @dir, :stdout => @stdout, :stderr => @stderr}) do |io|
+        io.read
+      end
+      assert_equal "hello", result.strip
+    end
+
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rscm
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2006-05-18 00:00:00 -05:00
+  version: 0.5.1
+date: 2006-05-19 00:00:00 -05:00
 summary: RSCM - Ruby Source Control Management
 require_paths: 
 - lib
@@ -43,9 +43,9 @@ files:
 - lib/rscm/path_converter.rb
 - lib/rscm/platform.rb
 - lib/rscm/revision.rb
-- lib/rscm/revisions.rb
 - lib/rscm/revision_file.rb
 - lib/rscm/revision_poller.rb
+- lib/rscm/revisions.rb
 - lib/rscm/scm
 - lib/rscm/tempdir.rb
 - lib/rscm/time_ext.rb
@@ -77,10 +77,10 @@ files:
 - test/rscm/mockit_test.rb
 - test/rscm/parser_test.rb
 - test/rscm/path_converter_test.rb
-- test/rscm/revisions_test.rb
 - test/rscm/revision_file_test.rb
 - test/rscm/revision_poller_test.rb
 - test/rscm/revision_test.rb
+- test/rscm/revisions_test.rb
 - test/rscm/scm
 - test/rscm/test_helper.rb
 - test/rscm/compatibility/config.yml