dev_commands 0.0.53 → 0.0.54

data/lib/command.rb

@@ -99,7 +99,7 @@ class Command < Hash
             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[:directory],self[:input], self[:timeout], 1)
+            result=run_with_timeout(self[:directory],self[:input], self[:timeout], 2)
             self[:output]=result[0]
             self[:exit_code]=result[1]
 

data/lib/internet.rb

@@ -1,15 +1,22 @@
 require 'open-uri'
-
+#require 'net/http'
+require 'timeout'
 class Internet
 
-	@@available=nil
+	@@available=true
 
 	def self.available?
 		return @@available if !@@available.nil?
 
 		begin
-			@@available = true if open('http://www.google.com')
-		rescue
+			index=open('http://www.google.com').read 
+			if index.include?('<Title>Google')
+				@@available = true
+			else
+				puts "open('http://www.google.com') returned false"
+			end
+		rescue Exception => e
+			puts "open('http://www.google.com') raised an exception: #{e.to_s}"
 			@@available = false
 		end
 		@@available

data/lib/timeout.rb

@@ -44,11 +44,38 @@ def run_with_timeout(directory,command, timeout, tick)
       Process.kill("TERM", pid)
     else
       exit_code=thread.value
+      sleep 1
     end
 
-      ensure
+  ensure
     stdin.close if stdin
     stderrout.close if stderrout
   end
   return [output,exit_code]
-end
+end
+
+require 'timeout'
+def run_with_timeout2(directory,command,timeout)
+  # stdout, stderr pipes
+  rout, wout = IO.pipe
+  rerr, werr = IO.pipe
+  output=''
+  error=''
+  exit_code=1
+  pid = Process.spawn(command, :chdir => directory, :out => wout, :err => werr)
+  begin
+    Timeout.timeout(timeout) do
+      exit_code = Process.wait2(pid)
+      output = rout.readlines.join("\n")
+      error = rerr.readlines.join("\n")
+    end
+  rescue
+    Proces.kill('TERM',pid)
+    output = output + 'timeout occurred.'
+  ensure
+    rout.close
+    rerr.close
+  end
+  [output,exit_code]
+end
+

data/spec/command_spec.rb

@@ -93,6 +93,24 @@ describe Command do
     FileUtils.rm_r(dir)
   end
 
+  it "should be able to rake" do
+    dir="#{File.dirname(__FILE__)}/tmp/rake_timeout_test"
+    FileUtils.mkdir_p(dir) if(!File.exists?(dir))
+    File.open("#{dir}/rakefile.rb","w") { |f| 
+        f.puts "task :default do"
+        f.puts " puts 'rake_test'"
+        f.puts "end" 
+    }
+    Dir.chdir(dir) do
+        #rake = Command.new({ :input => 'rake', :timeout => 300, :ignore_failure => true })
+        #rake.execute
+
+        #expect(rake[:exit_code]).to eq(0)
+        #expect(rake.summary.include?('rake')).to eq(true)
+        #expect(rake[:output].include?('rake_test')).to eq(true)
+    end
+  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))
@@ -120,7 +138,7 @@ describe Command do
     expect(cmd[:exit_code]).not_to eq(0)
 
     begin
-        FileUtils.rm_r("#{dir}")
+        #FileUtils.rm_r("#{dir}")
     rescue
     end
   end

data/spec/internet_spec.rb

@@ -0,0 +1,9 @@
+require_relative '../lib/internet.rb'
+require 'rake'
+describe Internet do
+	it "should be able to detect internet availability" do
+		expect(Internet.available?).to eq(true)
+		
+
+	end
+end

data/spec/tmp/rake_error_test/rakefile.rb

@@ -0,0 +1,3 @@
+task :default do
+ raise 'rake_test'
+end

data/spec/tmp/rake_timeout_test/rakefile.rb

@@ -0,0 +1,3 @@
+task :default do
+ puts 'rake_test'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev_commands
 version: !ruby/object:Gem::Version
-  version: 0.0.53
+  version: 0.0.54
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -105,16 +105,19 @@ files:
 - lib/test.rb
 - lib/text.rb
 - lib/timeout.rb
-- lib/Timer.rb
+- lib/timer.rb
 - lib/update.rb
 - lib/upgrade.rb
 - spec/commands_spec.rb
 - spec/command_spec.rb
 - spec/gem-example/rakefile.rb
+- spec/internet_spec.rb
 - spec/publish_spec.rb
 - spec/sln-vs12-example/rakefile.rb
 - spec/sln-vs9-example/rakefile.rb
 - spec/text_spec.rb
+- spec/tmp/rake_error_test/rakefile.rb
+- spec/tmp/rake_timeout_test/rakefile.rb
 - LICENSE
 - README.md
 homepage: http://github.com/lou-parslow/dev_commands.gem
@@ -138,8 +141,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.28
 signing_key: 
 specification_version: 3
 summary: gem to execute system commands
 test_files: []
+has_rdoc: