boxgrinder-core 0.0.21 → 0.0.22

data/CHANGELOG

@@ -1,4 +1,8 @@
 
+v0.0.22
+
+* [BGBUILD-44] ExecHelper should raise exception if execution fails
+
 v0.0.21
 
 * Return nil if key is not found in OpenHash

data/Rakefile

@@ -6,4 +6,5 @@ Echoe.new("boxgrinder-core") do |p|
   p.summary     = "Core files for BoxGrinder."
   p.url         = "http://www.jboss.org/stormgrind/projects/boxgrinder.html"
   p.email       = "info@boxgrinder.org"
-end
+  p.runtime_dependencies = ['open4 >=1.0.0']
+end

data/boxgrinder-core.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-core}
-  s.version = "0.0.21"
+  s.version = "0.0.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2010-08-08}
+  s.date = %q{2010-08-23}
   s.description = %q{Core files for BoxGrinder.}
   s.email = %q{info@boxgrinder.org}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/defaults.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/helpers/queue-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/validators/appliance-config-validator.rb", "lib/boxgrinder-core/validators/errors.rb", "lib/openhash/openhash.rb"]
@@ -23,8 +23,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<open4>, [">= 1.0.0"])
     else
+      s.add_dependency(%q<open4>, [">= 1.0.0"])
     end
   else
+    s.add_dependency(%q<open4>, [">= 1.0.0"])
   end
 end

data/lib/boxgrinder-core/helpers/exec-helper.rb

@@ -19,7 +19,8 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'logger'
-require 'open3'
+require 'rubygems'
+require 'open4'
 
 module BoxGrinder
   class ExecHelper
@@ -32,28 +33,40 @@ module BoxGrinder
 
       output = ""
 
-      Open3.popen3( command ) do |stdin, stdout, stderr|
-        threads = []
+      begin
+        status = Open4::popen4( command ) do |pid, stdin, stdout, stderr|
+          threads = []
 
-        threads << Thread.new(stdout) do |input_str|
-          input_str.each do |l|
-            output << l
-            @log.debug l.chomp.strip
+          threads << Thread.new(stdout) do |input_str|
+            input_str.each do |l|
+              l.chomp!
+              l.strip!
+
+              output << "\n#{l}"
+              @log.debug l
+            end
           end
-        end
-        
-        threads << Thread.new(stderr) do |input_str|
-          input_str.each do |l|
-            output << l
-            @log.debug l.chomp.strip
+
+          threads << Thread.new(stderr) do |input_str|
+            input_str.each do |l|
+              l.chomp!
+              l.strip!
+
+              output << "\n#{l}"
+              @log.debug l
+            end
           end
+          threads.each{|t|t.join}
         end
-        threads.each{|t|t.join}
-      end
 
-      raise "An error occurred executing command: '#{command}'" if $?.to_i != 0
+        raise "process exited with wrong exit status: #{status.exitstatus}" if status.exitstatus != 0
 
-      output
+        return output.strip
+      rescue => e
+        @log.error e.backtrace.join($/)
+        @log.error "An error occurred while executing command: '#{command}', #{e.message}"
+        raise "An error occurred while executing command: '#{command}', #{e.message}"
+      end
     end
   end
-end
+end

data/spec/Rakefile

@@ -3,7 +3,8 @@ require 'spec/rake/spectask'
 
 desc "Run all examples"
 Spec::Rake::SpecTask.new('examples') do |t|
-  t.spec_files = FileList['../**/spec/**/*-spec.rb']
+  t.spec_files = FileList['**/*-spec.rb']
   t.rcov = true
+  t.spec_opts = ['--colour', '--format', 'nested']
   t.rcov_opts = ['--exclude', 'spec']
 end

data/spec/helpers/exec-helper-spec.rb

@@ -2,5 +2,40 @@ require 'boxgrinder-core/helpers/exec-helper'
 
 module BoxGrinder
   describe ExecHelper do
+    before(:each) do
+      @helper = ExecHelper.new( :log => Logger.new('/dev/null') )
+    end
+
+    it "should fail when command doesn't exists" do
+      Open4.should_receive( :popen4 ).with('thisdoesntexists').and_raise('abc')
+
+      proc { @helper.execute("thisdoesntexists") }.should raise_error("An error occurred while executing command: 'thisdoesntexists', abc")
+    end
+
+    it "should fail when command exit status != 0" do
+      open4 = mock(Open4)
+      open4.stub!(:exitstatus).and_return(1)
+
+      Open4.should_receive( :popen4 ).with('abc').and_return(open4)
+
+      proc { @helper.execute("abc") }.should raise_error("An error occurred while executing command: 'abc', process exited with wrong exit status: 1")
+    end
+
+    it "should execute the command" do
+      open4 = mock(Open4)
+      open4.stub!(:exitstatus).and_return(0)
+
+      Open4.should_receive( :popen4 ).with('abc').and_return(open4)
+
+      proc { @helper.execute("abc") }.should_not raise_error
+    end
+
+    it "should execute the command and return output" do
+      @helper.execute("ls rspec/ls | wc -l").should == "2"
+    end
+
+    it "should execute the command and return multi line output" do
+      @helper.execute("ls -1 rspec/ls").should == "one\ntwo"
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 21
-  version: 0.0.21
+  - 22
+  version: 0.0.22
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -14,10 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 +02:00
+date: 2010-08-23 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: open4
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id001
 description: Core files for BoxGrinder.
 email: info@boxgrinder.org
 executables: []