shellshot 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/shellshot.rb

@@ -17,6 +17,7 @@ module Shellshot
     def exec(command, options = {})
 
       self.options = options
+      timeout = options[:timeout] || DEFAULT_TIMEOUT
 
       prepare_pipes
       self.pid = fork do
@@ -26,10 +27,10 @@ module Shellshot
       end
 
       begin
-        wait_for(options[:timeout] || DEFAULT_TIMEOUT)
+        wait_for(timeout)
       rescue Timeout::Error => e
         terminate_child_process
-        raise
+        raise Timeout::Error, "execution of #{command} exceeded #{timeout} seconds"
       end
 
       true

data/shellshot.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{shellshot}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Petyo Ivanov"]
-  s.date = %q{2010-01-06}
+  s.date = %q{2010-02-25}
   s.description = %q{
       A small library dealing with the obscurities of shell commands, piping and timeouts.
       Most of the stuff comes from bad experience in http://beanstalkapp.com.
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/underlog/shellshot}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{ruby proxy handling the complexities of system invocations}
   s.test_files = [
     "spec/shellshot_spec.rb",
@@ -59,3 +59,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<SystemTimer>, [">= 0"])
   end
 end
+

data/spec/shellshot_spec.rb

@@ -24,7 +24,7 @@ describe Shellshot do
   end
 
   it "should cancel execution on time if timeout provided" do
-    lambda { Shellshot.exec %q[ruby -e 'sleep 10000'], :timeout => 1 }.should raise_error(Timeout::Error)
+    lambda { Shellshot.exec %q[ruby -e 'sleep 10000'], :timeout => 1 }.should raise_error(Timeout::Error, "execution of ruby -e 'sleep 10000' exceeded 1 seconds")
   end
 
   it "should raise error if command returned something else." do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: shellshot
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Petyo Ivanov
@@ -9,29 +14,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 +02:00
+date: 2010-02-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: SystemTimer
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: "\n      A small library dealing with the obscurities of shell commands, piping and timeouts.\n      Most of the stuff comes from bad experience in http://beanstalkapp.com.\n    "
 email: underlog@gmail.com
 executables: []
@@ -67,18 +76,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ruby proxy handling the complexities of system invocations