dev_commands 0.0.39 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7474a5054ce8e1846be673781d0418af177fbe82
-  data.tar.gz: c05e5655ac9b8bf7c1f5b6fffda3007e517659ba
+  metadata.gz: 6b0ae71e6301b33d4c845fea6ce37380f17c8a52
+  data.tar.gz: 542e659e0926fa75fddbcde08f0d7da7fcd7e019
 SHA512:
-  metadata.gz: 463a0a95113d8d2a41bb244457c5493f340169842d003778005a48efa7dc8efd5b26fd347e07667704259522ff25428f4eec13946de643da14e7cfe166bcffa1
-  data.tar.gz: 22dea8db2b587cbeb0659de3f2401f7f515d4dd9c9e84d552cc4a6a74eadaaac5c420ef8e6e0f25f59163117e7bb996481ad68c2696da9859c0a4b283e509684
+  metadata.gz: 7bc5e4fac606037686c6cfc7e8bf49058ad64f2e73d37f2bb0bcd07f7211d2e7eaf0a1a9dda205d5e08ae1452f72045c15affc94648bbea293169079930282ee
+  data.tar.gz: 4c6f3584e5347f6ddd92c601a3e84445a18269549f46114f5b0b216d57da2ae833a51cf8a5e22384172fd27b7c53a618db2ae74a81b958ae73318c9edf883491

data/lib/array.rb

@@ -1,9 +1,14 @@
 class Array
-    def execute
+    def execute value=nil
       i=0
       while i < self.length
         self[i]=Command.new(self[i]) if(self[i].is_a?(String))
         self[i]=Command.new(self[i]) if(self[i].is_a?(Hash) && !self[i].is_a?(Command))
+
+        if(!value.nil? && value.is_a?(Hash))
+          value.each{|k,v|self[i][k]=v}
+        end
+
         self[i].execute if(self[i].is_a?(Command))
         i=i+1
       end

data/lib/command.rb

@@ -35,7 +35,11 @@ class Command < Hash
     (self.has_key?(:quiet) && self[:quiet])
   end
 
-	def execute
+	def execute value=nil
+
+    if(!value.nil? && value.is_a?(Hash))
+      value.each{|k,v|self[k]=v}
+    end
 		pwd=Dir.pwd
 		Dir.chdir(self[:directory]) if(self.has_key?(:directory) && File.exists?(self[:directory]))
 		self[:directory] = pwd if(self[:directory].length==0)

data/lib/hash.rb

@@ -1,5 +1,5 @@
 class Hash
-	def execute
+	def execute value=nil
 	  self.each{|k,v|
       v.update if v.respond_to?(:update)
       if(v.is_a?(Array) && v.length==0)
@@ -7,7 +7,7 @@ class Hash
       else
         #puts "executing #{k}"
 
-	  	  v.execute if v.respond_to?(:execute)
+	  	  v.execute(value) if v.respond_to?(:execute)
       end
 	  }
     end

data/spec/command_spec.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 
 describe Command do
   it "should be able to execute ruby --version command" do
-    cmd=Command.new("ruby --version")
+    cmd=Command.new({ :input => 'ruby --version', :quiet => true})
     # Timeout
     expect(cmd[:timeout]).to eq(0)
     cmd[:timeout]=3000
@@ -58,7 +58,7 @@ describe Command do
   end
 
   it "should be able to write to/load from JSON" do
-    cmd=Command.new("ruby --version")
+    cmd=Command.new({ :input => 'ruby --version', :quiet => true})
     expect(cmd[:timeout]).to eq(0)
     expect(cmd[:input]).to eq("ruby --version")
     cmd2=Command.new(JSON.parse(cmd.to_json))
@@ -80,16 +80,36 @@ describe Command do
         f.puts " puts 'rake_test'"
         f.puts "end" 
     }
-    cmd=Command.new("rake")
+    cmd=Command.new({ :input => 'rake', :quiet => true})
     cmd[:directory]=dir
     cmd.execute
     FileUtils.rm_r("#{File.dirname(__FILE__)}/tmp")
     expect(cmd[:output].include?('rake_test')).to eq(true)
   end
 
+  it "should fail when calling rake produces an error" do
+    dir="#{File.dirname(__FILE__)}/tmp/rake_error_test"
+    FileUtils.mkdir_p(dir) if(!File.exists?(dir))
+    File.open("#{dir}/rakefile.rb","w") { |f| 
+        f.puts "task :default do"
+        f.puts " raise 'rake_test'"
+        f.puts "end" 
+    }
+    cmd=Command.new({ :input => 'rake', :ignore_failure => true, :quiet => true})
+    cmd[:directory]=dir
+    cmd.execute({:quiet => true})
+    FileUtils.rm_r("#{File.dirname(__FILE__)}/tmp")
+    expect(cmd[:exit_code]).not_to eq(0)
+
+    cmd=Command.new({ :input => 'rake bogus', :ignore_failure => true, :quiet => true})
+    cmd[:directory]=dir
+    cmd.execute
+    expect(cmd[:exit_code]).not_to eq(0)
+  end
+
   it "should be able to execute an array of commands" do
     help=['git --help','rake --help','ruby --help']
-    help.execute
+    help.execute({:quiet => true})
     File.open('help.html','w'){|f|f.write(help.to_html)}
   end
 
@@ -97,11 +117,11 @@ describe Command do
     commands=Hash.new
     commands[:help]=['git --help','rake --help','ruby --help']
     commands[:version]=['git --version','rake --version','ruby --version']
-    commands.execute
+    commands.execute({:quiet => true})
     File.open('commands.html','w'){|f|f.write(commands.to_html)}
   end
 
-  it "hsould be able to get the output" do
+  it "should be able to get the output" do
     expect(Command.output('git --version').include?('git version')).to eq(true)
     expect(Command.output('bogus --version').include?('bogus version')).to eq(false)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev_commands
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
 platform: ruby
 authors:
 - Lou Parslow