rspec-system 2.1.0 → 2.1.1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+2.1.1
+=====
+
+This bug fix only adds lsb_* facts to the prefabs for: centos-64 and fedora-18
+
+-------------------------------
+
 2.1.0
 =====
 

data/lib/rspec-system.rb

@@ -3,6 +3,7 @@ require 'rspec'
 # Root module namespace for +rspec-system+
 module RSpecSystem; end
 
+require 'rspec-system/exception'
 require 'rspec-system/util'
 require 'rspec-system/log'
 require 'rspec-system/helper'

data/lib/rspec-system/exception.rb

@@ -0,0 +1,9 @@
+require 'rspec-system'
+
+module RSpecSystem::Exception
+  # Parent for all RSpecSystem exceptions
+  class Error < StandardError; end
+
+  # General timeout error
+  class TimeoutError < Error; end
+end

data/lib/rspec-system/helper.rb

@@ -1,6 +1,7 @@
 require 'rspec-system'
 require 'rspec-system/result'
 require 'rspec-system/internal_helpers'
+require 'timeout'
 
 module RSpecSystem
   # This class represents an abstract 'helper' object.
@@ -74,6 +75,7 @@ module RSpecSystem
       opts = {
         :node => opts[:n] || dn,
         :n => opts[:node] || dn,
+        :timeout => opts[:timeout] || 0,
         :lazy => lazy,
       }.merge(opts)
 
@@ -109,7 +111,14 @@ module RSpecSystem
     # @api private
     def result_data
       return rd unless rd.nil?
-      @rd = RSpecSystem::Result.new(execute)
+
+      begin
+        Timeout::timeout(opts[:timeout]) do
+          @rd = RSpecSystem::Result.new(execute)
+        end
+      rescue Timeout::Error => e
+        raise RSpecSystem::Exception::TimeoutError, e.message
+      end
     end
 
     # Refresh the data, re-running the action associated with this helper.

data/lib/rspec-system/helpers.rb

@@ -79,6 +79,8 @@ module RSpecSystem::Helpers
   #     default in your YAML file, otherwise if there is only one node it uses
   #     that) specifies node to execute command on.
   #   @option options [RSpecSystem::Node] :n alias for :node
+  #   @option options [Fixnum] :timeout seconds of time to allow before timing
+  #     out. Defaults to 0 (not timeout).
   # @overload shell(command)
   #   @param command [String] command to execute
   # @yield [result] yields result when called as a block
@@ -136,6 +138,8 @@ module RSpecSystem::Helpers
   # @option options [RSpecSystem::Node] :source_node ('') Reserved
   #   for future use. Patches welcome.
   # @option options [RSpecSystem::Node] :s alias for source_node
+  # @option options [Fixnum] :timeout seconds of time to allow before timing
+  #   out. Defaults to 0 (no timeout).
   # @yield [result] yields result when called as a block
   # @yieldparam result [RSpecSystem::Helpers::Rcp] result of rcp
   # @return [RSpecSystem::Helpers::Rcp] result of rcp

data/resources/prefabs.yml

@@ -80,6 +80,11 @@
     kernelversion: "2.6.32"
     operatingsystemrelease: "6.4"
     osfamily: RedHat
+    lsbmajdistrelease: "6"
+    lsbdistcodename: Final
+    lsbdistdescription: "CentOS release 6.4 (Final)"
+    lsbdistid: CentOS
+    lsbdistrelease: "6.4"
     kernel: Linux
     rubyversion: "1.8.7"
   provider_specifics:
@@ -99,6 +104,9 @@
     kernelrelease: 3.6.10-4.fc18.x86_64
     kernelversion: 3.6.10
     operatingsystemrelease: "18"
+    lsbdistid: Fedora
+    lsbmajdistrelease: "18"
+    lsbdistrelease: "18"
     osfamily: RedHat
     rubyversion: 1.9.3
   provider_specifics:

data/rspec-system.gemspec

@@ -2,9 +2,9 @@
 Gem::Specification.new do |s|
   # Metadata
   s.name        = "rspec-system"
-  s.version     = "2.1.0"
+  s.version     = "2.1.1"
   s.authors     = ["Ken Barber"]
-  s.email       = ["ken@bob.sh"]
+  s.email       = ["info@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/rspec-system"
   s.summary     = "System testing with rspec"
 

data/spec/system/shell_spec.rb

@@ -121,6 +121,20 @@ describe "shell:" do
       end
     end
   end
+
+  describe 'timeouts' do
+    it 'should throw exception if the command times out' do
+      expect { shell(:c => 'sleep 2', :timeout => 1) }.to raise_error(RSpecSystem::Exception::TimeoutError, 'execution expired')
+    end
+
+    it 'should complete fine if command completed within timeout' do
+      shell(:c => 'sleep 1', :timeout => 5) do |r|
+        r.stdout.should == ''
+        r.stderr.should == ''
+        r.exit_code.should == 0
+      end
+    end
+  end
 end
 
 # Test as a top-level subject

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-system
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -125,7 +125,7 @@ dependencies:
         version: 1.5.9
 description: 
 email:
-- ken@bob.sh
+- info@puppetlabs.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -149,6 +149,7 @@ files:
 - examples/spec/system/test2_spec.rb
 - examples/spec/system/test3_spec.rb
 - lib/rspec-system.rb
+- lib/rspec-system/exception.rb
 - lib/rspec-system/formatter.rb
 - lib/rspec-system/helper.rb
 - lib/rspec-system/helpers.rb