beaker 2.6.0 → 2.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjk0OGJjNzMzZmM2NTA1OWFlMDRlNzI3YmM0MTI5MjUxZGQwNTU5MA==
+    YzZhNGFhMzQyMzkyNjUwODVjNmQ1NmZiNGRmNGRkMTZhZjEyOGE5NA==
   data.tar.gz: !binary |-
-    Mjk2ZDUyY2JkY2MzZTc2Yjg2YTcwYWNkN2RjZThjMmVjZWY0ZGU0Zg==
+    NGQ0ZDIwOTRiNDBkMGE2ZDI3OWMyM2FlMmY0MGMxNGQzYjVjMWZjZA==
 SHA512:
   metadata.gz: !binary |-
-    MTAwMDc2MTllMzg1NTU5ODQ0ODUxY2U3N2I5NGRiMTA3MGE3ZDQ4ZDFlMTQ1
-    Y2JmNTY0N2MxNmI0ZjUzYjE2ZDhkNTdhYWNmZDIxOWViMWYxNWNiZDlkN2Qx
-    YWQxMjVlNGZjZDA0OGEwODZjYmY0NjM3YjAwYzI2MDUyYTI4NWU=
+    MTE4NjJjYjY4YTYyNDJkYmU4MzFjNTgzNGM3ODZlZTJmMjMxNjEyNzkyNzBi
+    YzU3ZjQ5YTU3NTA2NTg1Mjc5ZDM4OTNiMWNkZDcwY2JkODJlMmI1NGI5MmU2
+    YmVhNGVlNDgzYzRiOWVlNDY0OTIyOWQ1ODcxYmI3YjBkYmM2ZTg=
   data.tar.gz: !binary |-
-    MjZmZWZkYjYyMTkzN2Y1MmJiNmJiNjYxMDQ5ZWZjZTljNjFmNDU3N2M3MmIy
-    NGE4ZDAzYWNlZmIwNWVlMDQ4ODEzN2EyYTI5ZTEwOGU1N2NkMzRlNzk3ZjRj
-    YmE0YzU4NDAxMDFhNzM4ZjY2YTVlZWYyNjExMmMxYzU2MDg2YWE=
+    OTc4YzgyZDNhMjA5MDkxM2ZhOTdkNTA0MmRiMjJlZWI2NzY1YjAxMDE2ZmQz
+    YjkyODY3ZDQxZGMwZDg2ZDllYjBlODM0ZTQ2ZTUxMjNlMWE4NzUyYTg0ZWRh
+    ZWQ3NmViZmNjNDg4N2Y2MWMxNzQ2MmM5YjQ5MTEyODcyZjJlNjI=

data/CONTRIBUTING.md

@@ -8,8 +8,7 @@
   * Clearly describe the issue including steps to reproduce when it is a bug.
   * File in the appropriate location:
     * Using your [Jira account](http://tickets.puppetlabs.com)
-      * Beaker bugs are submitted in the `QENG` project with the `Beaker` component.
-    * As a [GitHub issue](https://github.com/puppetlabs/beaker/issues?direction=desc&sort=updated&state=open)
+      * Beaker bugs are submitted in the [BKR project](https://tickets.puppetlabs.com/issues/?jql=project%20%3D%20BKR)
 * Fork the [Beaker repository on GitHub](https://github.com/puppetlabs/beaker)
 
 ## Making Changes
@@ -19,10 +18,10 @@
   * To quickly create a topic branch based on master use `git checkout -b my_contribution master`. Please avoid working directly on the `master` branch.
 * Make commits of logical units.
 * Check for unnecessary whitespace with `git diff --check` before committing.
-* Make sure your commit messages are in the proper format. 
+* Make sure your commit messages are in the proper format.
 
 ````
-    (QENG-1234 OR gh-1234) Make the example in CONTRIBUTING imperative and concrete
+    (BKR-1234) Make the example in CONTRIBUTING imperative and concrete
 
     Without this patch applied the example commit message in the CONTRIBUTING
     document is not a concrete example.  This is a problem because the
@@ -39,7 +38,7 @@
   * Beaker uses RSpec 3.1.0+, and you should **NOT USE** deprecated `should`/`stub` methods - **USE** `expect`/`allow`.  Use of deprecated RSpec methods will result in your patch being rejected.  See a nice blog post from 2013 on [RSpec's new message expectation syntax](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/).
 * Make sure that you have added documentation using [Yard](http://yardoc.org/), new methods/classes without apporpriate documentation will be rejected.
 * Run the tests to assure nothing else was accidentally broken, using `rake test`
-  * **Bonus**: if possible ensure that `rake test` runs without failures for additional Ruby versions (1.9, 1.8, 2.0). Beaker supports Ruby 1.8+, and breakage of support for older/newer rubies will cause a patch to be rejected.
+  * **Bonus**: if possible ensure that `rake test` runs without failures for additional Ruby versions (1.9, 2.0, etc). Beaker supports Ruby 1.9+, and breakage of support for older/newer rubies will cause a patch to be rejected.
 * During the time that you are working on your patch the master Beaker branch may have changed - you'll want to [rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) before you submit your PR with `git rebase master`.  A successful rebase ensures that your patch will cleanly merge into Beaker.
 * Submitted patches will be smoke tested through a series of acceptance level tests that ensures basic Beaker functionality - the results of these tests will be evaluated by a Beaker team member.  Failures associated with the submitted patch will result in the patch being rejected.
 
@@ -47,7 +46,7 @@
 
 ### Maintenance
 
-For changes of a trivial nature, it is not always necessary to create a new ticket in Jira or GitHub. In this case, it is appropriate to start the first line of a commit with `(MAINT)` instead of a ticket/issue number. 
+For changes of a trivial nature, it is not always necessary to create a new ticket in Jira. In this case, it is appropriate to start the first line of a commit with `(MAINT)` instead of a ticket/issue number. 
 
 ````
     (MAINT) Fix whitespace 
@@ -74,16 +73,15 @@ To prepare for a new gem release of Beaker (after the version has been bumped) t
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request to [Beaker](https://github.com/puppetlabs/beaker)
 * Update your ticket
-  * Update your [Jira](http://tickets.puppetlabs.com) ticket to mark that you have submitted code and are ready for it to be reviewed (Status: Ready for Review).
+  * Update your [Jira](https://tickets.puppetlabs.com/issues/?jql=project%20%3D%20BKR) ticket to mark that you have submitted code and are ready for it to be considered for merge (Status: Ready for Merge).
     * Include a link to the pull request in the ticket.
-  * Update your [GitHub issue](https://github.com/puppetlabs/beaker/issues?direction=desc&sort=updated&state=open)
-    * Include a link to the pull request in the issue.
 * PRs are reviewed as time permits.  
 
 # Additional Resources
 
 * [More information on contributing](http://links.puppetlabs.com/contribute-to-puppet)
 * [Bug tracker (Jira)](http://tickets.puppetlabs.com)
+* [BKR Jira Project](https://tickets.puppetlabs.com/issues/?jql=project%20%3D%20BKR)
 * [Contributor License Agreement](http://links.puppetlabs.com/cla)
 * [General GitHub documentation](http://help.github.com/)
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 gemspec

data/README.md

@@ -21,5 +21,5 @@ See [LICENSE](LICENSE) file.
 
 #Support
 
-Please log tickets and issues at our [Beaker Issue Tracker](https://github.com/puppetlabs/beaker/issues).  In addition there is an active #puppet-dev channel on Freenode.
+Please log tickets and issues at our [Beaker Issue Tracker](https://tickets.puppetlabs.com/issues/?jql=project%20%3D%20BKR).  In addition there is an active #puppet-dev channel on Freenode.
 

data/lib/beaker/answers.rb

@@ -20,7 +20,7 @@ module Beaker
       when /\A3\.99/
         return Version40.new(version, hosts, options)
       when /\A3\.8/
-        return Version34.new(version, hosts, options)
+        return Version38.new(version, hosts, options)
       when /\A3\.7/
         return Version34.new(version, hosts, options)
       when /\A3\.4/

data/lib/beaker/answers/version38.rb

@@ -0,0 +1,26 @@
+require 'beaker/answers/version34'
+
+module Beaker
+  # This class provides answer file information for PE version 4.0
+  #
+  # @api private
+  class Version38 < Version34
+    def generate_answers
+      masterless = @options[:masterless]
+      return super if masterless
+
+      the_answers = super
+
+      # add new answers
+      exit_for_nc_migrate = answer_for(@options, :q_exit_for_nc_migrate, 'n')
+      enable_future_parser = answer_for(@options, :q_enable_future_parser, 'n')
+
+      the_answers.map do |key, value|
+        the_answers[key][:q_exit_for_nc_migrate] = exit_for_nc_migrate
+        the_answers[key][:q_enable_future_parser] = enable_future_parser
+      end
+
+      return the_answers
+    end
+  end
+end

data/lib/beaker/answers/version40.rb

@@ -1,10 +1,10 @@
-require 'beaker/answers/version34'
+require 'beaker/answers/version38'
 
 module Beaker
   # This class provides answer file information for PE version 4.0
   #
   # @api private
-  class Version40 < Version34
+  class Version40 < Version38
     def generate_answers
       masterless = @options[:masterless]
       return super if masterless

data/lib/beaker/host/windows.rb

@@ -29,6 +29,7 @@ module Windows
         'sitemoduledir' => 'C:/usr/share/puppet/modules',
         #let's just add both potential bin dirs to the path
         'puppetbindir'  => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet Enterprise/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet Enterprise/bin',
+        'privatebindir' => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet Enterprise/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet Enterprise/sys/ruby/bin',
         'pathseparator' => ';',
       })
     end
@@ -47,8 +48,9 @@ module Windows
         'sitemoduledir'     => 'C:/usr/share/puppet/modules',
         'hieralibdir'       => '`cygpath -w /opt/puppet-git-repos/hiera/lib`',
         'hierapuppetlibdir' => '`cygpath -w /opt/puppet-git-repos/hiera-puppet/lib`',
-        #let's just add both potential bin dirs to the path, include ruby too for `gem`, `ruby`, etc
-        'puppetbindir'      => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
+        #let's just add both potential bin dirs to the path
+        'puppetbindir'      => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin',
+        'privatebindir'     => '/usr/bin',
         'hierabindir'       => '/opt/puppet-git-repos/hiera/bin',
         'pathseparator'     => ';',
       })

data/lib/beaker/host_prebuilt_steps.rb

@@ -453,7 +453,7 @@ module Beaker
     def construct_env host, opts
       env = additive_hash_merge(host[:host_env], opts[:host_env])
 
-      #Add PATH and RUBYLIB
+      #Add PATH
 
       #prepend any PATH already set for this host
 
@@ -464,16 +464,12 @@ module Beaker
       #run the paths through echo to see if they have any subcommands that need processing
       env['PATH'].map! { |val| echo_on_host(host, val) }
 
-      #prepend any RUBYLIB already set for this host
-      env['RUBYLIB'] =  (%w(hieralibdir hierapuppetlibdir pluginlibpath puppetlibdir facterlibdir) << env['RUBYLIB']).compact.reject(&:empty?)
-      #get the RUBYLIB defaults
-      env['RUBYLIB'].map! { |val| host[val] }
-      env['RUBYLIB'] = env['RUBYLIB'].compact.reject(&:empty?)
-      #run the paths through echo to see if they have any subcommands that need processing
-      env['RUBYLIB'].map! { |val| echo_on_host(host, val) }
-
       env.each_key do |key|
-        env[key] = env[key].join(host['pathseparator'])
+        separator = host['pathseparator']
+        if key == 'PATH' && host.is_cygwin?
+          separator = ':'
+        end
+        env[key] = env[key].join(separator)
       end
       env
     end
@@ -525,7 +521,6 @@ module Beaker
           host.exec(Command.new("chmod 0600 #{Pathname.new(host[:ssh_env_file]).dirname}"))
           host.exec(Command.new("touch #{host[:ssh_env_file]}"))
           #add the constructed env vars to this host
-          host.add_env_var('RUBYLIB', '$RUBYLIB')
           host.add_env_var('PATH', '$PATH')
         end
         #add the env var set to this test host

data/lib/beaker/options/presets.rb

@@ -190,6 +190,8 @@ module Beaker
                                      :q_rbac_database_name                          => 'pe-rbac',
                                      :q_rbac_database_password                      => '~!@#$%^*-/ aZ',
                                      :q_install_update_server                       => 'y',
+                                     :q_exit_for_nc_migrate                         => 'n',
+                                     :q_enable_future_parser                        => 'n',
           },
           :dot_fog                => File.join(ENV['HOME'], '.fog'),
           :ec2_yaml               => 'config/image_templates/ec2.yaml',

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.6.0'
+    STRING = '2.7.0'
   end
 end

data/spec/beaker/answers_spec.rb

@@ -19,6 +19,11 @@ module Beaker
       expect( answers ).to be_a_kind_of Version40
     end
 
+    it 'generates 3.8 answers for 3.8 hosts' do
+      @ver = '3.8'
+      expect( answers ).to be_a_kind_of Version38
+    end
+
     it 'generates 3.4 answers for 3.4 hosts' do
       @ver = '3.4'
       expect( answers ).to be_a_kind_of Version34
@@ -163,6 +168,40 @@ module Beaker
 
   end
 
+  describe Version38 do
+    let( :options )     { Beaker::Options::Presets.new.presets }
+    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( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
+    let( :upgrade_answers )     { Beaker::Answers.create(@ver, hosts, options.merge( {:type => :upgrade}) ) }
+
+    before :each do
+      @ver = '3.8'
+      @answers = answers.answers
+    end
+
+    it 'adds :q_enable_future_parser to all hosts, default to "n"' do
+      hosts.each do |host|
+        expect( host[:answers][:q_enable_future_parser] ).to be == 'n'
+      end
+    end
+
+    it 'adds :q_exit_for_nc_migrate to all hosts, default to "n"' do
+      hosts.each do |host|
+        expect( host[:answers][:q_exit_for_nc_migrate] ).to be == 'n'
+      end
+    end
+
+    it 'should add answers to the host objects' do
+      hosts.each do |host|
+        expect( host[:answers] ).to be === @answers[host.name]
+      end
+    end
+  end
+
   describe Version40 do
     let( :options )     { Beaker::Options::Presets.new.presets }
     let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -514,7 +514,6 @@ describe Beaker do
       expect( Beaker::Command ).to receive( :new ).with( "chmod 0600 #{Pathname.new(host[:ssh_env_file]).dirname}" ).once
       expect( Beaker::Command ).to receive( :new ).with( "touch #{host[:ssh_env_file]}" ).once
       expect( Beaker::Command ).to receive( :new ).with( "cat #{host[:ssh_env_file]}" ).once
-      expect( host ).to receive( :add_env_var ).with( 'RUBYLIB', '$RUBYLIB' ).once
       expect( host ).to receive( :add_env_var ).with( 'PATH', '$PATH' ).once
       opts.each_pair do |key, value|
         expect( host ).to receive( :add_env_var ).with( key, value ).once

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -405,6 +405,7 @@ files:
 - lib/beaker/answers/version30.rb
 - lib/beaker/answers/version32.rb
 - lib/beaker/answers/version34.rb
+- lib/beaker/answers/version38.rb
 - lib/beaker/answers/version40.rb
 - lib/beaker/cli.rb
 - lib/beaker/command.rb