beaker-rspec 2.0.0 → 2.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2M0Mzc5ZjhlN2JjZTY3NGI5ZGMwZGUyN2UxM2UyNjA1ZTliMGE2Zg==
+    YzRmYjczM2IwYmUyMjI3NWI2ZGMwYjhmNzk3N2VkOGFjODg5NDRjZQ==
   data.tar.gz: !binary |-
-    NGMyZmU0NzhkNzY0Y2VhNzgzMDE1NWJiMjRhMzIyZDFkNDQ1ZGFhNA==
-!binary "U0hBNTEy":
+    MWI2MDRiYWYzNjUyZGI0NTc5Nzk4YWIxOWFlM2FhNTk4MmQwZDFlYQ==
+SHA512:
   metadata.gz: !binary |-
-    MGFhNGM3ZDFlZjE5OTEyM2RkZGEyZGVmZDg2YzBkZGI5M2M1YjVjYmVhZDll
-    YWQzNWEwODcyMjVkN2IyYzFiODE0MTU2MDA5NWEzZTk4NDhiMzgzZjVlMjAx
-    YTNmZjVmOTRkNGY4NGE2MTA4YjczMDhhMGYwMTY0ZTM5NWUwODg=
+    ZDAwNGNiYjgwZjJlN2I0ZWM3ZjkxNWVjM2JhNmQ2NTk1ZTg1ZmFkOTE1MzNh
+    ODQ4ZGRkYzEzMTkwNWE2MDliZWZiMDgyMThlNWJiNmYwMzk2ZDAwMDY0MzZj
+    ZDU3MjQzZDIwOGRjZTBhMjRkMDg0ZTkzNDBkZThkYWQ4ZGFlZTM=
   data.tar.gz: !binary |-
-    ZjBkNWFlNzgwYTI5OGNjNjA4NWQ1YTNjNWZmNWVlNTJiMDQ4MzliNmI4N2Qz
-    MzkwMjdjYTg2MWVmOTMxZGY2OTVlM2E3NjQ3MGNlMzRjMzEwM2Q0YmYzODdj
-    YTY4ZGJiNWYwNTI3NzFkYjVhOTUxMGQ4MGU3Mzk0NTk3ZWZlNmU=
+    MmFiZTU0ZWFkNWE4MzYxZTVkMTM3NjUwMDcwODMxOGI5MzY4ZjZmZGQ1ZjY5
+    MzlhNmViZjU5YmFiNGU3Y2EwM2YyYjJkZTg0NDU0NTE2YjE2MDdjMDdkYzJk
+    MTAzMmU3YjExM2JiZjI2Yjk0NDkyODQxNWMzZTg1M2M1NmYxMGI=

data/beaker-rspec.gemspec

@@ -6,12 +6,12 @@ less_than_one_nine = ruby_conf['MAJOR'].to_i == 1 && ruby_conf['MINOR'].to_i < 9
 
 Gem::Specification.new do |s|
   s.name        = "beaker-rspec"
-  s.version     = '2.0.0'
+  s.version     = '2.0.1'
   s.authors     = ["Puppetlabs"]
   s.email       = ["sqa@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker-rspec"
   s.summary     = %q{RSpec bindings for beaker}
-  s.description = %q{RSpec bindings for beaker}
+  s.description = %q{RSpec bindings for beaker, see https://github.com/puppetlabs/beaker}
   s.license     = 'Apache2'
 
 
@@ -21,10 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Testing dependencies
-  s.add_development_dependency 'rspec', '2.13.0'
   s.add_development_dependency 'fakefs', '0.4'
-  s.add_development_dependency 'specinfra'
-  s.add_development_dependency 'serverspec'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov' unless less_than_one_nine
 
@@ -34,6 +31,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'thin'
 
   # Run time dependencies
-  s.add_runtime_dependency 'beaker'
-  s.add_runtime_dependency 'rspec'
+  s.add_runtime_dependency 'beaker', '~> 1.3'
+  s.add_runtime_dependency 'rspec', '~> 2.14'
+  s.add_runtime_dependency 'serverspec', '~> 0.14'
+  s.add_runtime_dependency 'specinfra', '~> 0.3'
 end

data/lib/beaker-rspec/beaker_shim.rb

@@ -18,14 +18,14 @@ module BeakerRSpec
     # Accessor for options hash
     # @return Hash options
     def options
-      @options
+      RSpec.configuration.options
     end
 
     # Provision the hosts to run tests on.
     # Assumes #setup has already been called.
     #
     def provision
-      @network_manager = Beaker::NetworkManager.new(@options, @logger)
+      @network_manager = Beaker::NetworkManager.new(options, @logger)
       RSpec.configuration.hosts = @network_manager.provision
     end
 
@@ -39,12 +39,13 @@ module BeakerRSpec
     # @param [Array<String>] args The argument array of options for configuring Beaker
     # See 'beaker --help' for full list of supported command line options
     def setup(args = [])
-      @options_parser = Beaker::Options::Parser.new
-      @options = @options_parser.parse_args(args)
-      @options[:debug] = true
-      @logger = Beaker::Logger.new(@options)
-      @options[:logger] = @logger
+      options_parser = Beaker::Options::Parser.new
+      options = options_parser.parse_args(args)
+      options[:debug] = true
+      @logger = Beaker::Logger.new(options)
+      options[:logger] = @logger
       RSpec.configuration.hosts = []
+      RSpec.configuration.options = options
     end
 
     # Accessor for hosts object

data/lib/beaker-rspec/spec_helper.rb

@@ -8,6 +8,8 @@ RSpec.configure do |c|
 
   # Define persistant hosts setting
   c.add_setting :hosts, :default => []
+  # Define persistant options setting
+  c.add_setting :options, :default => {}
 
   # Defined target nodeset
   nodeset = ENV['RS_SET'] || 'default'
@@ -15,9 +17,11 @@ RSpec.configure do |c|
 
   preserve = ENV['RS_DESTROY'] == 'no' ? '--preserve-hosts' : ''
   fresh_nodes = ENV['RS_PROVISION'] == 'no' ? '--no-provision' : ''
+  keyfile = ENV['RS_KEYFILE'] ? ['--keyfile', ENV['RS_KEYFILE']] : []
+  debug = ENV['RS_DEBUG'] ? ['--log-level', 'debug'] : []
 
   # Configure all nodes in nodeset
-  c.setup([preserve, fresh_nodes, '--type','git','--hosts', nodesetfile])
+  c.setup([preserve, fresh_nodes, '--hosts', nodesetfile, keyfile, debug].flatten)
   c.provision
   c.validate
 

data/sample.cfg

@@ -11,6 +11,7 @@ HOSTS:
     box_url: http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210.box
     ip: 192.168.20.20
     distmoduledir: .
+    pe_dir: http://enterprise.delivery.puppetlabs.net/3.1/ci-ready/
   ubuntu-10-04-4-x64-agent:
     roles:
       - agent
@@ -20,6 +21,8 @@ HOSTS:
     box_url: http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210.box
     ip: 192.168.21.21
     distmoduledir: .
+    pe_dir: http://enterprise.delivery.puppetlabs.net/3.1/ci-ready/
 CONFIG:
   nfs_server: none
   consoleport: 443
+  type: git

data/spec/acceptance/example_spec.rb

@@ -8,10 +8,15 @@ describe "ignore" do
     end
   end
 
+  example "access options hash" do
+    install_pe
+  end
+
   hosts.each do |node|
     describe service('ssh'), :node => node do
       it { should be_running }
       it { should be_enabled }
     end
   end
+
 end

data/spec/spec_helper.rb

@@ -1,3 +1,3 @@
-ENV['RS_SETFILE'] = 'sample.cfg'
+ENV['RS_SETFILE'] ||= 'sample.cfg'
 
 require "beaker-rspec"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: beaker-rspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: specinfra
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -53,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: serverspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -109,62 +95,62 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: markdown
+  name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '2.14'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: beaker
+  name: serverspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: specinfra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-description: RSpec bindings for beaker
+        version: '0.3'
+description: RSpec bindings for beaker, see https://github.com/puppetlabs/beaker
 email:
 - sqa@puppetlabs.com
 executables: []
@@ -203,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: RSpec bindings for beaker