dev_commands 0.0.41 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddb5e7dbeac67f1bff9a6f4025e85497c9a001d3
-  data.tar.gz: 4a1887451dcf5ad54eee8d5c0b592d8127567673
+  metadata.gz: 6b611814d3d0fd7323179bf1a3f0280d60a13099
+  data.tar.gz: 949e91336bd6fb6481716f8c1d6fa490d10162d1
 SHA512:
-  metadata.gz: baaf2c25cae9277a5c558d3809ff4117a518008cafa0a72479f7ed68f03e2da2a3943aa2aa41b3bd9a414edeb81b6fef6e2f619feb892b3b8c6748e5be8d383f
-  data.tar.gz: 3a139999d22aaf6ec49ad4705ac29889f2e63d29ff001300d5c4bb0b0160f1668dbea64b913ccdfdd844db8831bd726f546ffe3151e84f78d573e8ceaa191757
+  metadata.gz: b0da1876adb0693a5d7cf0ac17bfa5c3a107fdba5e4d360cf53fb87beb0698cefaf295fd77e2852e27b16cbe583909e87888b2dd80c8d860b7ff6dcd684109a1
+  data.tar.gz: 13e503c95cad72a4648ee7fba49596e6265b3af3fefa01fcbb98c1e2e97f9b65ca3392de8bdb9e85c5d9481a20536cafa8293c3827d1165c9a62eb90270e6ff2

data/lib/array.rb

@@ -1,14 +1,9 @@
 class Array
-    def execute value=nil
+    def execute
       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/build.rb

@@ -1,22 +1,28 @@
 require_relative('msbuild.rb')
-
+require_relative('gemspec.rb')
 class Build < Array
 	def update
-		Dir.glob('*.gemspec'){|gemspec|
-    		add "gem build #{gemspec}"
-    	}
-    	Dir.glob('**/*.sln'){|sln_file|
-    		vs_version=MSBuild.get_vs_version(sln_file)
-			if(MSBuild.has_version?(vs_version))
-				MSBuild.get_configurations(sln_file).each{ |configuration|
-	      			MSBuild.get_platforms(sln_file).each{|platform|
-		    			#Console.debug "configuration='#{configuration}', platform='#{platform}'"
-	        			self.add "\"#{MSBuild.get_version(vs_version)}\" \"#{sln_file}\" /nologo /p:Configuration=#{configuration} /p:Platform=\"#{platform}\""
-	      			}
-	    		}
-            else
-                "puts version #{vs_version} not found for MsBuild"
-			end
-    	}
+
+		changed = true
+		changed = Git.has_changes? if(File.exists?('.git') && defined?(Git))
+		changed = Svn.has_changes? if(File.exists?('.svn') && defined?(Svn))
+        if(changed)
+			Dir.glob('*.gemspec'){|gemspec|
+	    		add "gem build #{gemspec}" if !File.exist?(Gemspec.gemfile gemspec)
+	    	}
+	    	Dir.glob('*.sln'){|sln_file|
+	    		vs_version=MSBuild.get_vs_version(sln_file)
+				if(MSBuild.has_version?(vs_version))
+					MSBuild.get_configurations(sln_file).each{ |configuration|
+		      			MSBuild.get_platforms(sln_file).each{|platform|
+			    			#Console.debug "configuration='#{configuration}', platform='#{platform}'"
+		        			self.add "\"#{MSBuild.get_version(vs_version)}\" \"#{sln_file}\" /nologo /p:Configuration=#{configuration} /p:Platform=\"#{platform}\""
+		      			}
+		    		}
+	            else
+	                "puts version #{vs_version} not found for MsBuild"
+				end
+	    	}
+	    end
 	end
 end

data/lib/command.rb

@@ -3,9 +3,26 @@ require_relative('./array.rb')
 require_relative('./hash.rb')
 require_relative('./timer.rb')
 
-BUFFER_SIZE=1024 if(!defined?(BUFFER_SIZE))
-            
-          
+# = Command
+#
+# execution of system commands
+#
+# = Keys
+#
+# - :input The input of the commands.
+# - :timeout The timeout in seconds.
+#          a value of zero is to infinite timeout.
+#          defaults to zero
+# - :directory The working directory for the command.
+#             defaults to the current directory
+# - :exit_code The exit code of the command
+# - :output The output contains the stdout output of the command
+# - :error The error contains stderr output of the command
+# - :machine The name of the machine the command executed on
+# - :user The user name
+# - :start_time
+# - :end_time
+#
 class Command < Hash
 	def initialize command
 
@@ -31,23 +48,12 @@ class Command < Hash
         end
 	end
 
-  def quiet?
-    (self.has_key?(:quiet) && self[:quiet])
-  end
-
-	def execute value=nil
-
-    if(!value.nil? && value.is_a?(Hash))
-      value.each{|k,v|self[k]=v}
-    end
+	def execute
+		puts "#{self[:input]}" if(!self.has_key?(:quiet) || !self[:quiet])
 		pwd=Dir.pwd
 		Dir.chdir(self[:directory]) if(self.has_key?(:directory) && File.exists?(self[:directory]))
 		self[:directory] = pwd if(self[:directory].length==0)
-    if(self[:timeout] > 0)
-      puts "#{self[:input]} (#{self[:directory]}) timeout #{self[:timeout].to_s}" if(!quiet?)
-    else
-		  puts "#{self[:input]} (#{self[:directory]})" if(!quiet?)
-    end
+		
 		self[:machine] = Command.machine
 		self[:user] = Command.user
 
@@ -67,27 +73,10 @@ class Command < Hash
 		  self[:end_time] = Time.now
 		else
 			begin
-        if(self[:timeout] <= 0)
-          self[:output],self[:error],status= Open3.capture3(self[:input])
-          self[:exit_code]=status.to_i
-  			  self[:elapsed] = timer.elapsed_str
-  			  self[:end_time] = Time.now
-        else
-          require_relative 'timeout.rb'
-          #puts run_with_timeout(self[:input], self[:timeout], 1).to_s
-          #self[:output] = run_with_timeout(self[:input], self[:timeout], 1)
-          result=run_with_timeout(self[:input], self[:timeout], 1)
-          self[:output]=result[0]
-          self[:exit_code]=result[1]
-
-          self[:elapsed] = timer.elapsed_str
-          self[:end_time] = Time.now
-          
-          if(timer.elapsed >= self[:timeout])
-            self[:exit_code]=1 
-            self[:error] = self[:error] + "timed out"
-          end
-        end
+        self[:output],self[:error],status= Open3.capture3(self[:input])
+        self[:exit_code]=status.to_i
+			  self[:elapsed] = timer.elapsed_str
+			  self[:end_time] = Time.now
 			rescue Exception => e
 			  self[:elapsed] = timer.elapsed_str
 			  self[:end_time] = Time.now
@@ -99,10 +88,13 @@ class Command < Hash
         Dir.chdir(pwd) if pwd != Dir.pwd
 
         if(self[:exit_code] != 0)
-          if(!quiet?)
+          if(!self.has_key?(:quiet) || !self[:quiet])
+        	  puts ' '
         	  puts "exit_code=#{self[:exit_code]}"
+        	  puts ' '
         	  puts self[:output]
         	  puts self[:error]
+        	  puts ' '
           end
         	if(!self.has_key?(:ignore_failure) || !self[:ignore_failure])
         		raise "#{self[:input]} failed" 

data/lib/hash.rb

@@ -1,5 +1,5 @@
 class Hash
-	def execute value=nil
+	def execute
 	  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(value) if v.respond_to?(:execute)
+	  	  v.execute 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({ :input => 'ruby --version', :quiet => true})
+    cmd=Command.new("ruby --version")
     # 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({ :input => 'ruby --version', :quiet => true})
+    cmd=Command.new("ruby --version")
     expect(cmd[:timeout]).to eq(0)
     expect(cmd[:input]).to eq("ruby --version")
     cmd2=Command.new(JSON.parse(cmd.to_json))
@@ -66,12 +66,6 @@ describe Command do
     expect(cmd2[:input]).to eq("ruby --version")
   end
 
-  it "should be able to timeout" do
-    cmd=Command.new({ :input => 'ftp', :timeout => 0.5, :ignore_failure => true, :quiet => true})
-    cmd.execute
-    expect(cmd[:exit_code]).not_to eq(0)
-  end
-
   it "should be able to execute rake command in specific directory" do
     dir="#{File.dirname(__FILE__)}/tmp/rake_test"
     FileUtils.mkdir_p(dir) if(!File.exists?(dir))
@@ -80,41 +74,16 @@ describe Command do
         f.puts " puts 'rake_test'"
         f.puts "end" 
     }
-    cmd=Command.new({ :input => 'rake', :quiet => true, :timeout => 2 })
+    cmd=Command.new("rake")
     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)
-
-    cmd=Command.new({ :input => 'rake bogus', :timeout => 3, :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({:quiet => true})
+    help.execute
     File.open('help.html','w'){|f|f.write(help.to_html)}
   end
 
@@ -122,11 +91,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({:quiet => true})
+    commands.execute
     File.open('commands.html','w'){|f|f.write(commands.to_html)}
   end
 
-  it "should be able to get the output" do
+  it "hsould 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,133 +1,79 @@
 --- !ruby/object:Gem::Specification
 name: dev_commands
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 description: execution of system commands
 email: lou.parslow@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
 - lib/add.rb
 - lib/analyze.rb
 - lib/array.rb
@@ -151,7 +97,6 @@ files:
 - lib/setup.rb
 - lib/test.rb
 - lib/text.rb
-- lib/timeout.rb
 - lib/timer.rb
 - lib/update.rb
 - lib/upgrade.rb
@@ -162,8 +107,6 @@ files:
 - spec/sln-vs12-example/rakefile.rb
 - spec/sln-vs9-example/rakefile.rb
 - spec/text_spec.rb
-- LICENSE
-- README.md
 homepage: http://github.com/lou-parslow/dev_commands.gem
 licenses:
 - Apache 2.0
@@ -174,17 +117,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: gem to execute system commands

data/lib/timeout.rb

@@ -1,54 +0,0 @@
-############################################################################
-# The following code is based on code originally copied from 
-# https://gist.github.com/lpar/1032297
-# Gist title: lpar/timeout.rb
-############################################################################
-# Runs a specified shell command in a separate thread.
-# If it exceeds the given timeout in seconds, kills it.
-# Returns any output produced by the command (stdout or stderr) as a String.
-# Uses Kernel.select to wait up to the tick length (in seconds) between 
-# checks on the command's status
-#
-# If you've got a cleaner way of doing this, I'd be interested to see it.
-# If you think you can do it with Ruby's Timeout module, think again.
-def run_with_timeout(command, timeout, tick)
-  output = ''
-  exit_code=1
-  begin
-    # Start task in another thread, which spawns a process
-    stdin, stderrout, thread = Open3.popen2e(command)
-    # Get the pid of the spawned process
-    pid = thread[:pid]
-    start = Time.now
-
-    while (Time.now - start) < timeout and thread.alive?
-      # Wait up to `tick` seconds for output/error data
-      Kernel.select([stderrout], nil, nil, tick)
-      # Try to read the data
-      begin
-        output << stderrout.read_nonblock(BUFFER_SIZE)
-      rescue IO::WaitReadable
-        # A read would block, so loop around for another select
-      rescue EOFError
-        # Command has completed, not really an error...
-        break
-      end
-    end
-
-    # Give Ruby time to clean up the other thread
-    sleep 1
-
-    if thread.alive?
-      # We need to kill the process, because killing the thread leaves
-      # the process alive but detached, annoyingly enough.
-      Process.kill("TERM", pid)
-    else
-      exit_code=thread.value
-    end
-
-      ensure
-    stdin.close if stdin
-    stderrout.close if stderrout
-  end
-  return [output,exit_code]
-end