beaker 1.12.1 → 1.12.2

data/lib/beaker/options/command_line_parser.rb

@@ -198,6 +198,9 @@ module Beaker
             @cmd_options[:log_level] =  bool ? 'debug' : 'info'
           end
 
+          opts.on '--package-proxy URL', 'Set proxy url for package managers (yum and apt)' do |value|
+            @cmd_options[:package_proxy] = value
+          end
         end
 
       end

data/lib/beaker/options/parser.rb

@@ -119,6 +119,44 @@ module Beaker
         git_opts
       end
 
+      #Add the 'default' role to the host determined to be the default.  If a host already has the role default then
+      #do nothing.  If more than a single host has the role 'default', raise error.
+      #Default host determined to be 1) the only host in a single host configuration, 2) the host with the role 'master'
+      #defined.
+      #@param [Hash] hosts A hash of hosts, each identified by a String name.  Each named host will have an Array of roles
+      def set_default_host!(hosts)
+        default = []
+        master = []
+        default_host_name = nil
+
+        #look through the hosts and find any hosts with role 'default' and any hosts with role 'master'
+        hosts.each_key do |name|
+          host = hosts[name]
+          if host[:roles].include?('default')
+            default << name
+          elsif host[:roles].include?('master')
+            master << name
+          end
+        end
+
+        if not default.empty?
+          #we already have a default set, do nothing
+          if default.length > 1
+            parser_error "Only one host may have the role 'default', default roles assigned to #{default}"
+          end
+        else
+          #no default set, let's make one
+          if not master.empty? and master.length == 1
+            default_host_name = master[0]
+          elsif hosts.length == 1
+            default_host_name = hosts[0].keys[0]
+          end
+          if default_host_name
+            hosts[default_host_name][:roles] << 'default'
+          end
+        end
+      end
+
       #Constructor for Parser
       #
       def initialize
@@ -205,6 +243,7 @@ module Beaker
       #  - that one and only one master is defined per set of hosts
       #  - that solaris/windows/aix hosts are agent only for PE tests OR
       #  - that windows/aix host are agent only if type is not 'pe'
+      #  - sets the default host based upon machine definitions
       #
       #@raise [ArgumentError] Raise if argument/options values are invalid
       def normalize_args
@@ -303,6 +342,9 @@ module Beaker
           end
         end
 
+        #set the default role
+        set_default_host!(@options[:HOSTS])
+
       end
 
       private

data/lib/beaker/options/presets.rb

@@ -42,7 +42,8 @@ module Beaker
                                       ENV['q_verify_packages'] || 'y',
                                     :q_puppetdb_password =>
                                       ENV['q_puppetdb_password'] || '~!@#$%^*-/ aZ',
-                                  }
+                                  },
+          :package_proxy        => ENV['BEAKER_PACKAGE_PROXY']
         }.delete_if {|key, value| value.nil? or value.empty? })
       end
 
@@ -73,6 +74,7 @@ module Beaker
           :fail_mode           => 'slow',
           :timesync            => false,
           :repo_proxy          => false,
+          :package_proxy       => false,
           :add_el_extras       => false,
           :add_master_entry    => false,
           :consoleport         => 443,

data/lib/beaker/shared.rb

@@ -1,9 +1,5 @@
-[ 'repetition', 'error_handler', 'host_role_parser', 'timed' ].each do |file|
-  begin
-    require "beaker/shared/#{file}"
-  rescue LoadError
-    require File.expand_path(File.join(File.dirname(__FILE__), 'shared', file))
-  end
+[ 'repetition', 'error_handler', 'host_role_parser', 'timed' ].each do |lib|
+  require "beaker/shared/#{lib}"
 end
 module Beaker
   module Shared

data/lib/beaker/test_case.rb

@@ -1,9 +1,5 @@
-%w( host answers dsl ).each do |lib|
-  begin
-    require "beaker/#{lib}"
-  rescue LoadError
-    require File.expand_path(File.join(File.dirname(__FILE__), lib))
-  end
+[ 'host', 'answers', 'dsl' ].each do |lib|
+  require "beaker/#{lib}"
 end
 
 require 'tempfile'

data/lib/beaker/test_suite.rb

@@ -1,12 +1,8 @@
 # -*- coding: utf-8 -*-
 require 'rexml/document'
 require 'fileutils'
-%w(test_case logger).each do |lib|
-  begin
-    require "beaker/#{lib}"
-  rescue LoadError
-    require File.expand_path(File.join(File.dirname(__FILE__), lib))
-  end
+[ 'test_case', 'logger' ].each do |lib|
+  require "beaker/#{lib}"
 end
 
 module Beaker

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.12.1'
+    STRING = '1.12.2'
   end
 end

data/spec/beaker/dsl/helpers_spec.rb

@@ -16,7 +16,7 @@ describe ClassMixedWithDSLHelpers do
   let( :host ) { double.as_null_object }
   let( :result ) { Beaker::Result.new( host, command ) }
 
-  let( :master ) { make_host( 'master',   :roles => %w( master agent )    ) }
+  let( :master ) { make_host( 'master',   :roles => %w( master agent default)    ) }
   let( :agent )  { make_host( 'agent',    :roles => %w( agent )           ) }
   let( :custom ) { make_host( 'custom',   :roles => %w( custom agent )    ) }
   let( :dash )   { make_host( 'console',  :roles => %w( dashboard agent ) ) }
@@ -557,6 +557,33 @@ describe ClassMixedWithDSLHelpers do
     end
   end
 
+  describe 'version_is_less' do
+
+    it 'reports 3.0.0-160-gac44cfb is not less than 3.0.0' do
+      expect( subject.version_is_less( '3.0.0-160-gac44cfb', '3.0.0' ) ).to be === false
+    end
+
+    it 'reports 3.0.0-160-gac44cfb is not less than 2.8.2' do
+      expect( subject.version_is_less( '3.0.0-160-gac44cfb', '2.8.2' ) ).to be === false
+    end
+
+    it 'reports 3.0.0 is less than 3.0.0-160-gac44cfb' do
+      expect( subject.version_is_less( '3.0.0', '3.0.0-160-gac44cfb' ) ).to be === true
+    end
+
+    it 'reports 2.8.2 is less than 3.0.0-160-gac44cfb' do
+      expect( subject.version_is_less( '2.8.2', '3.0.0-160-gac44cfb' ) ).to be === true
+    end
+
+    it 'reports 2.8 is less than 3.0.0-160-gac44cfb' do
+      expect( subject.version_is_less( '2.8', '3.0.0-160-gac44cfb' ) ).to be === true
+    end
+
+    it 'reports 2.8 is less than 2.9' do
+      expect( subject.version_is_less( '2.8', '2.9' ) ).to be === true
+    end
+  end
+
   describe "#stop_agent_on" do
     let( :result_fail ) { Beaker::Result.new( [], "" ) }
     let( :result_pass ) { Beaker::Result.new( [], "" ) }

data/spec/beaker/dsl/install_utils_spec.rb

@@ -101,33 +101,6 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
-  describe 'version_is_less' do
-
-    it 'reports 3.0.0-160-gac44cfb is not less than 3.0.0' do
-      expect( subject.version_is_less( '3.0.0-160-gac44cfb', '3.0.0' ) ).to be === false
-    end
-
-    it 'reports 3.0.0-160-gac44cfb is not less than 2.8.2' do
-      expect( subject.version_is_less( '3.0.0-160-gac44cfb', '2.8.2' ) ).to be === false
-    end
-
-    it 'reports 3.0.0 is less than 3.0.0-160-gac44cfb' do
-      expect( subject.version_is_less( '3.0.0', '3.0.0-160-gac44cfb' ) ).to be === true
-    end
-
-    it 'reports 2.8.2 is less than 3.0.0-160-gac44cfb' do
-      expect( subject.version_is_less( '2.8.2', '3.0.0-160-gac44cfb' ) ).to be === true
-    end
-
-    it 'reports 2.8 is less than 3.0.0-160-gac44cfb' do
-      expect( subject.version_is_less( '2.8', '3.0.0-160-gac44cfb' ) ).to be === true
-    end
-
-    it 'reports 2.8 is less than 2.9' do
-      expect( subject.version_is_less( '2.8', '2.9' ) ).to be === true
-    end
-  end
-
   describe 'installer_cmd' do
 
     it 'generates a windows PE install command for a windows host' do
@@ -243,18 +216,20 @@ describe ClassMixedWithDSLInstallUtils do
 
       subject.should_not_receive(:scp_to)
       subject.should_not_receive(:on)
+      subject.stub(:version_is_less).with('3.2.0', '3.2.0').and_return(false)
       subject.fetch_puppet( [unixhost], {} )
     end
   end
 
   describe 'do_install' do
-    it 'can preform a simple installation' do
+    it 'can perform a simple installation' do
       subject.stub( :on ).and_return( Beaker::Result.new( {}, '' ) )
       subject.stub( :fetch_puppet ).and_return( true )
       subject.stub( :create_remote_file ).and_return( true )
       subject.stub( :sign_certificate_for ).and_return( true )
       subject.stub( :stop_agent_on ).and_return( true )
       subject.stub( :sleep_until_puppetdb_started ).and_return( true )
+      subject.stub( :version_is_less ).with('3.0', '3.0').and_return( false )
       subject.stub( :wait_for_host_in_dashboard ).and_return( true )
       subject.stub( :puppet_agent ).and_return do |arg|
         "puppet agent #{arg}"
@@ -402,6 +377,7 @@ describe ClassMixedWithDSLInstallUtils do
       the_hosts = [ hosts[0].dup, hosts[1].dup, hosts[2].dup ]
       subject.stub( :hosts ).and_return( the_hosts )
       subject.stub( :options ).and_return( {} )
+      subject.stub( :version_is_less ).with('2.8', '3.0').and_return( true )
       version = version_win = '2.8'
       path = "/path/to/upgradepkg"
       subject.should_receive( :do_install ).with( the_hosts, { :type => :upgrade } )
@@ -417,6 +393,7 @@ describe ClassMixedWithDSLInstallUtils do
       the_hosts = [ hosts[0].dup, hosts[1].dup, hosts[2].dup ]
       subject.stub( :hosts ).and_return( the_hosts )
       subject.stub( :options ).and_return( {} )
+      subject.stub( :version_is_less ).with('3.1', '3.0').and_return( false )
       version = version_win = '3.1'
       path = "/path/to/upgradepkg"
       subject.should_receive( :do_install ).with( the_hosts, { :type => :upgrade } )
@@ -432,6 +409,7 @@ describe ClassMixedWithDSLInstallUtils do
       the_hosts = [ hosts[0].dup, hosts[1].dup, hosts[2].dup ]
       subject.stub( :hosts ).and_return( the_hosts )
       subject.stub( :options ).and_return( {} )
+      subject.stub( :version_is_less ).with('2.8', '3.0').and_return( true )
       version = version_win = '2.8'
       path = "/path/to/upgradepkg"
       subject.should_receive( :do_install ).with( the_hosts, { :type => :upgrade } )

data/spec/beaker/dsl/roles_spec.rb

@@ -39,19 +39,9 @@ describe ClassMixedWithDSLRoles do
     end
     it 'raises an error if there is more than one master' do
       @hosts = [ master, monolith ]
-      subject.should_receive( :hosts ).exactly( 5 ).times.and_return( hosts )
+      subject.should_receive( :hosts ).exactly( 1 ).times.and_return( hosts )
       expect { subject.master }.to raise_error Beaker::DSL::FailTest
     end
-    it 'and raises an error if there is no master and no default' do
-      @hosts = [ agent1, agent2, custom ]
-      subject.should_receive( :hosts ).exactly( 4 ).times.and_return( hosts )
-      expect { subject.master }.to raise_error Beaker::DSL::FailTest
-    end
-    it 'returns the default when there is no master' do
-      @hosts = [ agent1 ]
-      subject.should_receive( :hosts ).exactly( 3 ).times.and_return( hosts )
-      expect( subject.master ).to be == agent1 
-    end
   end
   describe '#dashboard' do
     it 'returns the dashboard if there is one' do
@@ -90,23 +80,18 @@ describe ClassMixedWithDSLRoles do
   describe '#default' do
     it 'returns the default host when one is specified' do
       @hosts = [ db, agent1, agent2, default, master]
-      subject.should_receive( :hosts ).exactly( 3 ).times.and_return( hosts )
+      subject.should_receive( :hosts ).exactly( 1  ).times.and_return( hosts )
       expect( subject.default ).to be == default
     end
-    it 'returns the master if no default host is set' do
-      @hosts = [ db, agent1, agent2, master]
-      subject.should_receive( :hosts ).exactly( 4 ).times.and_return( hosts )
-      expect( subject.default ).to be == master
-    end
-    it 'returns the only host when only a single host is defined' do
-      @hosts = [ agent1 ]
-      subject.should_receive( :hosts ).exactly( 2 ).times.and_return( hosts )
-      expect( subject.default ).to be == agent1
+    it 'raises an error if there is more than one default' do
+      @hosts = [ db, monolith, default, default ]
+      subject.should_receive( :hosts ).and_return( hosts )
+      expect { subject.database }.to raise_error Beaker::DSL::FailTest
     end
-    it 'raises an error when there is no default (no default, no master, no single host)'  do
-      @hosts = [ agent1, agent2 ]
-      subject.should_receive( :hosts ).exactly( 3 ).times.and_return( hosts )
-      expect{ subject.default }.to raise_error Beaker::DSL::FailTest
+    it 'and raises an error if there is no default' do
+      @hosts = [ agent1, agent2, custom ]
+      subject.should_receive( :hosts ).and_return( hosts )
+      expect { subject.database }.to raise_error Beaker::DSL::FailTest
     end
   end
 end

data/spec/beaker/dsl/wrappers_spec.rb

@@ -23,14 +23,6 @@ describe ClassMixedWithDSLWrappers do
     end
   end
 
-  describe '#razor' do
-    it 'should split out the options and pass "razor" as first arg to Command' do
-      Beaker::Command.should_receive( :new ).
-        with('razor', [ '-p' ], opts)
-      subject.razor( '-p' )
-    end
-  end
-
   describe '#puppet' do
     it 'should split out the options and pass "puppet <blank>" to Command' do
       merged_opts = {}

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -418,4 +418,30 @@ describe Beaker do
 
   end
 
+  context "package_proxy" do
+
+    subject { dummy_class.new }
+    proxyurl = "http://192.168.2.100:3128"
+
+    it "can set proxy config on a debian/ubuntu host" do
+      host = make_host('name', { :platform => 'ubuntu' } )
+
+      Beaker::Command.should_receive( :new ).with( "echo 'Acquire::http::Proxy \"#{proxyurl}/\";' >> /etc/apt/apt.conf.d/10proxy" ).once
+      host.should_receive( :exec ).once
+
+      subject.package_proxy(host, options.merge( {'package_proxy' => proxyurl}) )
+    end
+
+    it "can set proxy config on a redhat/centos host" do
+      host = make_host('name', { :platform => 'centos' } )
+
+      Beaker::Command.should_receive( :new ).with( "echo 'proxy=#{proxyurl}/' >> /etc/yum.conf" ).once
+      host.should_receive( :exec ).once
+
+      subject.package_proxy(host, options.merge( {'package_proxy' => proxyurl}) )
+
+    end
+
+  end
+
 end

data/spec/beaker/options/command_line_parser_spec.rb

@@ -6,14 +6,14 @@ module Beaker
 
       let(:parser) {Beaker::Options::CommandLineParser.new}
       let(:test_opts) {["-h", "vcloud.cfg", "--debug", "--tests", "test.rb", "--help"]}
-      let(:full_opts) {["--hosts", "host.cfg", "--options", "opts_file", "--type", "pe", "--helper", "path_to_helper", "--load-path", "load_path", "--tests", "test1.rb,test2.rb,test3.rb", "--pre-suite", "pre_suite.rb", "--post-suite", "post_suite.rb", "--no-provision", "--preserve-hosts", "always", "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath", "-m", "module", "-q", "--no-xml", "--dry-run", "--no-ntp", "--repo-proxy", "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast", "--no-color", "--version", "--log-level", "info"]}
+      let(:full_opts) {["--hosts", "host.cfg", "--options", "opts_file", "--type", "pe", "--helper", "path_to_helper", "--load-path", "load_path", "--tests", "test1.rb,test2.rb,test3.rb", "--pre-suite", "pre_suite.rb", "--post-suite", "post_suite.rb", "--no-provision", "--preserve-hosts", "always", "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath", "-m", "module", "-q", "--no-xml", "--dry-run", "--no-ntp", "--repo-proxy", "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast", "--no-color", "--version", "--log-level", "info", "--package-proxy", "http://192.168.100.1:3128"]}
 
       it "can correctly read command line input" do
         expect(parser.parse(test_opts)).to be === {:hosts_file=>"vcloud.cfg", :log_level=>"debug", :tests=>"test.rb", :help=>true}
       end
 
       it "supports all our command line options" do
-        expect(parser.parse(full_opts)).to be === {:hosts_file=>"anotherfile.cfg", :options_file=>"opts_file", :type=>"pe", :helper=>"path_to_helper", :load_path=>"load_path", :tests=>"test1.rb,test2.rb,test3.rb", :pre_suite=>"pre_suite.rb", :post_suite=>"post_suite.rb", :provision=>false, :preserve_hosts=>"always", :root_keys=>true, :keyfile=>"../.ssh/id_rsa", :install=>"gitrepopath", :modules=>"module", :quiet=>true, :xml=>false, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true, :fail_mode=>"fast", :color=>false, :version=>true, :log_level=>"info"}
+        expect(parser.parse(full_opts)).to be === {:hosts_file=>"anotherfile.cfg", :options_file=>"opts_file", :type=>"pe", :helper=>"path_to_helper", :load_path=>"load_path", :tests=>"test1.rb,test2.rb,test3.rb", :pre_suite=>"pre_suite.rb", :post_suite=>"post_suite.rb", :provision=>false, :preserve_hosts=>"always", :root_keys=>true, :keyfile=>"../.ssh/id_rsa", :install=>"gitrepopath", :modules=>"module", :quiet=>true, :xml=>false, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true, :fail_mode=>"fast", :color=>false, :version=>true, :log_level=>"info", :package_proxy => "http://192.168.100.1:3128"}
       end
 
       it "can produce a usage description" do

data/spec/beaker/options/parser_spec.rb

@@ -163,7 +163,7 @@ module Beaker
         end
 
         it "ensures that fail-mode is one of fast/slow" do
-          args = ["-h", hosts_path, "--log-level", "debug", "--fail-mode", "nope"] 
+          args = ["-h", hosts_path, "--log-level", "debug", "--fail-mode", "nope"]
           expect{parser.parse_args(args)}.to raise_error(ArgumentError)
         end
 
@@ -173,6 +173,40 @@ module Beaker
         end
       end
 
+      context "set_default_host!" do
+
+        let(:roles) { @roles || [ [ "master", "agent", "database"], ["agent"]] }
+        let(:node1) { { :node1 => { :roles => roles[0]}} }
+        let(:node2) { { :node2 => { :roles => roles[1]}} }
+        let(:hosts) { node1.merge(node2) }
+
+        it "does nothing if the default host is already set" do
+          @roles = [ ["master"], ["agent", "default"] ]
+          parser.set_default_host!(hosts)
+          expect( hosts[:node1][:roles].include?('default') ).to be === false
+          expect( hosts[:node2][:roles].include?('default') ).to be === true
+        end
+
+        it "makes the master default" do
+          @roles = [ ["master"], ["agent"] ]
+          parser.set_default_host!(hosts)
+          expect( hosts[:node1][:roles].include?('default') ).to be === true
+          expect( hosts[:node2][:roles].include?('default') ).to be === false
+        end
+
+        it "makes a single node default" do
+          @roles = [ ["master", "database", "dashboard", "agent"] ]
+          parser.set_default_host!(node1)
+          expect( hosts[:node1][:roles].include?('default') ).to be === true
+        end
+
+        it "raises an error if two nodes are defined as default" do
+          @roles = [ ["master", "default"], ["default"] ]
+          expect{ parser.set_default_host!(hosts) }.to raise_error(ArgumentError)
+        end
+
+      end
+
       describe "normalize_args" do
         let(:hosts) do
           {

metadata

@@ -1,317 +1,215 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: beaker
-version: !ruby/object:Gem::Version
-  version: 1.12.1
+version: !ruby/object:Gem::Version 
+  version: 1.12.2
 platform: ruby
-authors:
+authors: 
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-06-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.14.0
+      - !ruby/object:Gem::Version 
+        version: "4.0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.14.0
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.4'
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: fakefs
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: "0.4"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 10.1.0
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: pry
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.1.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        version: 0.9.12.6
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: yard
-  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: markdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id007 
+      - ">="
+      - !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
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: thin
-  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
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id007
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
+      - !ruby/object:Gem::Version 
+        version: "1.8"
   type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: net-scp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+      - !ruby/object:Gem::Version 
+        version: "2.6"
   type: :runtime
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: net-scp
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: inifile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        version: "1.1"
   type: :runtime
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: inifile
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rbvmomi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.1
+      - !ruby/object:Gem::Version 
+        version: "2.0"
   type: :runtime
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: rbvmomi
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 1.8.1
-- !ruby/object:Gem::Dependency
-  name: blimpy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
   type: :runtime
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: blimpy
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: fission
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
+      - !ruby/object:Gem::Version 
+        version: "0.6"
   type: :runtime
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: fission
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: google-api-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.1
+      - !ruby/object:Gem::Version 
+        version: "0.4"
   type: :runtime
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: google-api-client
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.38'
   type: :runtime
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: aws-sdk
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.38'
-- !ruby/object:Gem::Dependency
-  name: docker-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        version: "1.38"
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.10
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.10
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.25'
+      - !ruby/object:Gem::Version 
+        version: 1.5.10
   type: :runtime
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: mime-types
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.25'
-- !ruby/object:Gem::Dependency
-  name: unf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
+      - !ruby/object:Gem::Version 
+        version: "1.25"
   type: :runtime
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: unf
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
+      - !ruby/object:Gem::Version 
+        version: "0.1"
+  type: :runtime
+  version_requirements: *id020
 description: Puppetlabs accceptance testing harness
-email:
+email: 
 - delivery@puppetlabs.com
-executables:
+executables: 
 - beaker
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .simplecov
@@ -414,7 +312,6 @@ files:
 - spec/beaker/hypervisor/docker_spec.rb
 - spec/beaker/hypervisor/ec2_helper_spec.rb
 - spec/beaker/hypervisor/fusion_spec.rb
-- spec/beaker/hypervisor/google_compute.rb
 - spec/beaker/hypervisor/hypervisor_spec.rb
 - spec/beaker/hypervisor/solaris_spec.rb
 - spec/beaker/hypervisor/vagrant_spec.rb
@@ -451,30 +348,29 @@ files:
 - spec/mocks.rb
 - spec/spec_helper.rb
 homepage: https://github.com/puppetlabs/beaker
-licenses:
+licenses: 
 - Apache2
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+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'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id007
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id007
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Let's test Puppet!
-test_files:
+test_files: 
 - spec/beaker/answers_spec.rb
 - spec/beaker/cli_spec.rb
 - spec/beaker/command_spec.rb
@@ -494,7 +390,6 @@ test_files:
 - spec/beaker/hypervisor/docker_spec.rb
 - spec/beaker/hypervisor/ec2_helper_spec.rb
 - spec/beaker/hypervisor/fusion_spec.rb
-- spec/beaker/hypervisor/google_compute.rb
 - spec/beaker/hypervisor/hypervisor_spec.rb
 - spec/beaker/hypervisor/solaris_spec.rb
 - spec/beaker/hypervisor/vagrant_spec.rb