beaker 1.0.1.pre → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODg5ZjNlOGYzYmRlZWViOTc4OWQzYjViYmEzZTdkMDNmZDYzODUxZA==
+    MTM0OWZkNGIzNmYyNDhhMjI4Zjk1ODE4M2I5OGZiMTIyMTJlYmJlNg==
   data.tar.gz: !binary |-
-    Mjg2YmJhNDE1OTdlMWE4OTg1YTVkOGVhNTYzMjg1ZGNlYzlmYzdhOQ==
+    MGM1MWNkMDNiMWE1ZWNiNTMzNjE2MTg1MDNjYWRjNzRiMDQ2ZmRjZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmIwNzlmODFjYjNhMjNkNDU4NTZkOTY1MDdjMTUxODM3YTEyZmMxZGFhNmNj
-    ZjgwYTNkYjU3MzQ5Yjk2NTY5OWYxYThmZDZlNjk5Mjg4NWIwYjcyY2E1OGI2
-    YWY3NTVjYzU5YzEzZTIyOWJmNjZmNTFjOGQ1NjJkODQ2OTU5YWY=
+    NWVkM2ExMzE4MjQzOWQ3MDViZThkMjUzNmFhOWRlMmQ0MTljNzNmY2JlMTkw
+    MWQ2NjQxNGUyMmUwYmZiNGQ0MzhmYTdjMzA1ODg2ZGQ4OThiOGVmOTMwZGEx
+    ZjAyM2E2NjhiODJhZDYyOTI1MjMxMzc0NjhlYjNkYWMxYmRiNmQ=
   data.tar.gz: !binary |-
-    ZGFjYzQ0NWRiYzViYjNkNDRlY2JiM2RjM2U2ZDM1MjBmNTYzYzliYTJhMDFk
-    Y2U5ODlkMmUyYjRmZjc3MDU5NzAxMTc3YmFhZGEwZmFmYWY2MGQxMjRlZTIx
-    M2RhZDdlYThiMmU3MzI5MzVkODBhYWIzMTMxM2IzOWM1YTExYTk=
+    OGJlNjgxYzk0ZmE1NTQ0MjIxZDVkMDhiMmRlN2ExMTc1ZGYwZDVmODU4MThk
+    MTA4MjRkNzFlYjIzNzhmMjhlMTNhMmExMzAxYWFjYzg0NWJkZmI5YmJiZTY3
+    YjMxYmI3ZWVkOTM2ZjY3Y2JjYmU4ODViYTJmODA2NGVhZTkxZDY=

data/beaker.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "beaker"
-  s.version     = '1.0.1.pre'
+  s.version     = '1.0.1'
   s.authors     = ["Puppetlabs"]
   s.email       = ["delivery@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker"

data/lib/beaker/answers.rb

@@ -1,4 +1,4 @@
-[ 'version30', 'version28', 'version20' ].each do |file|
+[ 'version32', 'version30', 'version28', 'version20' ].each do |file|
   begin
     require "beaker/answers/#{file}"
   rescue LoadError
@@ -25,7 +25,11 @@ module Beaker
     def self.answers(version, hosts, master_certname, options)
 
       case version
-      when /\A3\.[[:digit:]]/ # All 3.x so far have the same answers
+      when /\A3\.2/
+        Version32.answers(hosts, master_certname, options)
+      when /\A3\.1/
+        Version30.answers(hosts, master_certname, options)
+      when /\A3\.0/
         Version30.answers(hosts, master_certname, options)
       when /\A2\.8/
         Version28.answers(hosts, master_certname, options)

data/lib/beaker/answers/version32.rb

@@ -0,0 +1,20 @@
+require 'beaker/answers/version30'
+
+module Beaker
+  module Answers
+    module Version32
+      def self.answers(hosts, master_certname, options)
+        dashboard = only_host_with_role(hosts, 'dashboard')
+        master = only_host_with_role(hosts, 'master')
+
+        the_answers = Version30.answers(hosts, master_certname, options)
+        if dashboard != master
+          # in 3.2, dashboard needs the master certname
+          the_answers[dashboard.name][:q_puppetmaster_certname] = master_certname
+        end
+
+        return the_answers
+      end
+    end
+  end
+end

data/spec/beaker/answers_spec.rb

@@ -8,6 +8,12 @@ module Beaker
                           basic_hosts }
     let( :master_certname ) { 'master_certname' }
 
+    it 'generates 3.2 answers for 3.2 hosts' do
+      @ver = '3.2'
+      Beaker::Answers::Version32.should_receive( :answers ).with( hosts, master_certname, {}).once
+      subject.answers( @ver, hosts, master_certname, {} )
+    end
+
     it 'generates 3.0 answers for 3.1 hosts' do
       @ver = '3.1'
       Beaker::Answers::Version30.should_receive( :answers ).with( hosts, master_certname, {} ).once
@@ -39,6 +45,22 @@ module Beaker
   end
 
   module Answers
+    describe Version32 do
+      let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }
+      let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
+                      basic_hosts[1]['roles'] = ['dashboard', 'agent']
+                      basic_hosts[2]['roles'] = ['database', 'agent']
+                      basic_hosts }
+      let( :master_certname ) { 'master_certname' }
+
+      # The only difference between 3.2 and 3.0 is the addition of the
+      # master certname to the dashboard answers
+      it 'should add q_puppetmaster_certname to the dashboard answers' do
+        @ver = '3.2'
+        expect( subject.answers( hosts, master_certname, {} )['vm2']).to include :q_puppetmaster_certname
+      end
+    end
+
     describe Version30 do
       let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
       let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.0.1.pre
+  version: 1.0.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -272,6 +272,7 @@ files:
 - lib/beaker/answers/version20.rb
 - lib/beaker/answers/version28.rb
 - lib/beaker/answers/version30.rb
+- lib/beaker/answers/version32.rb
 - lib/beaker/cli.rb
 - lib/beaker/command.rb
 - lib/beaker/command_factory.rb
@@ -401,9 +402,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.6