beaker 1.3.2 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2M3OTY2ZTdlMDEyYzA1YWIyMmUwN2VlMzlkYzdlNzI5MzQzNjQ1YQ==
+    ZmRmOTdmNmVlZDNkMjFiMGIyNTAzZTRjYjRiMDRmYWU5Mjk3NDZmMw==
   data.tar.gz: !binary |-
-    OGQ4MTNjYWJlNDExMGI0ODliMDY1OGJkOGI0YTY0NjQzOWY2MTQ4ZQ==
+    NjY1MWEyOGQyMzdjNDZjM2Q0YWNmMzY0N2U3ZTE4ZGQ4NThmMWExNw==
 SHA512:
   metadata.gz: !binary |-
-    NDJmNTcwMjFjYzhjNDM4MzQ5OTY1OTdhYWNkN2IzYTI2NjIzZjZmNjEzZjky
-    ODM3YjVjMWM5ZmFmY2RhNWIyZGQxZjI4OTY4YzJmZDk1OTM3NzVjY2Q5Mjhl
-    MzYwMTlmZjkyZTQxYWNjYzQyNWUzNTQwNGY1Yjc2YjNjNTFlMWY=
+    MTk5MWY3N2NjNWI5ZDMwNjZiMzM4YWRlNmUwMDczYTY3ZTFhNDc1MzViYzEz
+    NjZkZDBkZjczMWEwZWNjOTEyN2E1ZTk1N2YxNDFlMzhlOWVjMzE4ZjhmOTVj
+    OTlkODM2Y2Y0NWViYjA4ZWE3YzA0M2RhYzExZGRiOTI0MDZjMzQ=
   data.tar.gz: !binary |-
-    OTA4MDAxMjhhNTY0OTYzZjRjZjViYTNiNjlhOTZkOTUxMDZmM2YxNGVkYzYy
-    NTg2NDA2MTM4OWUzNTRjZWI1NjBlMTFiNWI3YjQyNzM2MzcwN2YwMDc1Mzg5
-    YTkwNGI1ODQ0ODMyMTdiYzY1N2ZkZWZiNzdiNzIzMmE0MTA5NjA=
+    NWRlNmUxNzM0Y2E3MDYwNmNjODZhYzk1YzQ1NDdjMTA2NWQ5ZTdjMjAzODVj
+    ZjdlYzg4NjI5MDFjMTU2MjRjYTNkZWNhZDVkZWIzNDc1MmRhZGQwMDVlZmIx
+    OGY1OTdkZDdhZTk2OWJlOGNiZTM0MGIyMzViZTVhMzg4NTFhZTM=

data/lib/beaker/dsl/helpers.rb

@@ -659,6 +659,11 @@ module Beaker
       #                         if `puppet --apply` indicates that there were
       #                         changes or failures during its execution.
       #
+      # @option opts [Boolean]  :expect_changes (false) This option enables
+      #                         detailed exit codes and causes a test failure
+      #                         if `puppet --apply` indicates that there were
+      #                         no resource changes during its execution.
+      #
       # @option opts [Boolean]  :expect_failures (false) This option enables
       #                         detailed exit codes and causes a test failure
       #                         if `puppet --apply` indicates there were no
@@ -679,8 +684,8 @@ module Beaker
         # "... an exit code of '2' means there were changes, an exit code of
         # '4' means there were failures during the transaction, and an exit
         # code of '6' means there were both changes and failures."
-        if [opts[:catch_changes],opts[:catch_failures],opts[:expect_failures]].select{|x|x}.length > 1
-          raise(ArgumentError, "Cannot specify more than one of `catch_failures`, `catch_changes`, or `expect_failures` for a single manifest")
+        if [opts[:catch_changes],opts[:catch_failures],opts[:expect_failures],opts[:expect_changes]].select{|x|x}.length > 1
+          raise(ArgumentError, "Cannot specify more than one of `catch_failures`, `catch_changes`, `expect_failures`, or `expect_changes` for a single manifest")
         end
         if opts[:catch_changes]
           args << '--detailed-exitcodes'
@@ -697,6 +702,11 @@ module Beaker
 
           # We're after failures specifically so allow exit codes 1, 4, and 6 only.
           on_options[:acceptable_exit_codes] |= [1, 4, 6]
+        elsif opts[:expect_changes]
+          args << '--detailed-exitcodes'
+
+          # We're after changes specifically so allow exit code 2 only.
+          on_options[:acceptable_exit_codes] |= [2]
         else
           # Either use the provided acceptable_exit_codes or default to [0]
           on_options[:acceptable_exit_codes] |= [0]

data/lib/beaker/dsl/install_utils.rb

@@ -141,12 +141,14 @@ module Beaker
       #      on host, "#{installer_cmd(host, options)} -a #{host['working_dir']}/answers"
       # @api private
       def installer_cmd(host, options)
+        version = options[:pe_ver] || host['pe_ver']
         if host['platform'] =~ /windows/
           version = options[:pe_ver_win] || host['pe_ver']
           "cd #{host['working_dir']} && msiexec.exe /qn /i puppet-enterprise-#{version}.msi"
-        elsif host['roles'].include? 'frictionless'
-          version = options[:pe_ver] || host['pe_ver']
-          "cd #{host['working_dir']} && curl -kO https://#{master}:8140/packages/#{version}/#{host['platform']}.bash && bash #{host['platform']}.bash"
+        # Frictionless install didn't exist pre-3.2.0, so in that case we fall
+        # through and do a regular install.
+        elsif host['roles'].include? 'frictionless' and ! version_is_less(version, '3.2.0')
+          "cd #{host['working_dir']} && curl -kO https://#{master}:8140/packages/#{version}/install.bash && bash install.bash"
         else
           "cd #{host['working_dir']}/#{host['dist']} && ./#{options[:installer]} -a #{host['working_dir']}/answers"
         end
@@ -184,7 +186,7 @@ module Beaker
       def fetch_puppet(hosts, options)
         hosts.each do |host|
           # We install Puppet from the master for frictionless installs, so we don't need to *fetch* anything
-          next if host['roles'].include? 'frictionless'
+          next if host['roles'].include? 'frictionless' and ! version_is_less(options[:pe_ver] || host['pe_ver'], '3.2.0')
 
           windows = host['platform'] =~ /windows/
           path = options[:pe_dir] || host['pe_dir']
@@ -279,7 +281,8 @@ module Beaker
             on host, "#{installer_cmd(host, options)} PUPPET_MASTER_SERVER=#{master} PUPPET_AGENT_CERTNAME=#{host}"
           else
             # We only need answers if we're using the classic installer
-            if ! host['roles'].include? 'frictionless'
+            version = options[:pe_ver] || host['pe_ver']
+            if (! host['roles'].include? 'frictionless') || version_is_less(version, '3.2.0')
               answers = Beaker::Answers.answers(options[:pe_ver] || host['pe_ver'], hosts, master_certname, options)
               create_remote_file host, "#{host['working_dir']}/answers", Beaker::Answers.answer_string(host, answers)
             end
@@ -383,6 +386,41 @@ module Beaker
         special_nodes + real_agents
       end
 
+      #Install POSS based upon host configuration and options
+      # @example
+      #  install_puppet
+      #
+      # @note This will attempt to add a repository for apt.puppetlabs.com on
+      #       Debian or Ubuntu machines, or yum.puppetlabs.com on EL or Fedora
+      #       machines, then install the package 'puppet'
+      #
+      # @api dsl
+      # @return nil
+      def install_puppet
+        hosts.each do |host|
+          if host['platform'] =~ /el-(5|6)/
+            relver = $1
+            on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-#{relver}.noarch.rpm"
+            on host, 'yum install -y puppet'
+          elsif host['platform'] =~ /fedora-(\d+)/
+            relver = $1
+            on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-fedora-#{relver}.noarch.rpm"
+            on host, 'yum install -y puppet'
+          elsif host['platform'] =~ /(ubuntu|debian)/
+            if ! host.check_for_package 'curl'
+              on host, 'apt-get install -y curl'
+            end
+            on host, 'curl -O http://apt.puppetlabs.com/puppetlabs-release-$(lsb_release -c -s).deb'
+            on host, 'dpkg -i puppetlabs-release-$(lsb_release -c -s).deb'
+            on host, 'apt-get -y -f -m update'
+            on host, 'apt-get install -y puppet'
+          else
+            raise "install_puppet() called for unsupported platform '#{host['platform']}' on '#{host.name}'"
+          end
+        end
+        nil
+      end
+
       #Install PE based upon host configuration and options
       # @example 
       #  install_pe

data/lib/beaker/host.rb

@@ -1,5 +1,6 @@
 require 'socket'
 require 'timeout'
+require 'benchmark'
 
 %w(command ssh_connection).each do |lib|
   begin
@@ -131,6 +132,14 @@ module Beaker
       @options.is_pe?
     end
 
+    def log_prefix
+      if @defaults['vmhostname']
+        "#{self} (#{@name})"
+      else
+        self.to_s
+      end
+    end
+
     def connection
       @connection ||= SshConnection.connect( reachable_name,
                                              self['user'],
@@ -149,11 +158,7 @@ module Beaker
       if options[:silent]
         output_callback = nil
       else
-        if @defaults['vmhostname']
-          @logger.debug "\n#{self} (#{@name}) $ #{cmdline}"
-        else
-          @logger.debug "\n#{self} $ #{cmdline}"
-        end
+        @logger.debug "\n#{log_prefix} $ #{cmdline}"
         output_callback = logger.method(:host_output)
       end
 
@@ -161,7 +166,12 @@ module Beaker
         # is this returning a result object?
         # the options should come at the end of the method signature (rubyism)
         # and they shouldn't be ssh specific
-        result = connection.execute(cmdline, options, output_callback)
+        result = nil
+
+        seconds = Benchmark.realtime {
+          result = connection.execute(cmdline, options, output_callback)
+        }
+        @logger.debug "\n#{log_prefix} executed in %0.2f seconds" % seconds
 
         unless options[:silent]
           # What?
@@ -180,7 +190,6 @@ module Beaker
     end
 
     def do_scp_to source, target, options
-
       @logger.debug "localhost $ scp #{source} #{@name}:#{target} #{options.to_s}"
       result = connection.scp_to(source, target, options, $dry_run)
       return result

data/lib/beaker/options/command_line_parser.rb

@@ -28,7 +28,7 @@ module Beaker
           end
 
           opts.on '--type TYPE',
-                  'one of git or pe', 
+                  'one of git, foss, or pe',
                   'used to determine underlying path structure of puppet install',
                   '(default pe)' do |type|
             @cmd_options[:type] = type

data/lib/beaker/options/parser.rb

@@ -234,8 +234,8 @@ module Beaker
         end 
  
         #check for valid type
-        if @options[:type] !~ /(pe)|(git)/
-          parser_error "--type must be one of pe or git, not '#{@options[:type]}'"
+        if @options[:type] !~ /(pe)|(git)|(foss)/
+          parser_error "--type must be one of pe, git, or foss, not '#{@options[:type]}'"
         end
 
         #check for valid fail mode

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.3.2'
+    STRING = '1.4.0'
   end
 end

data/spec/beaker/dsl/helpers_spec.rb

@@ -359,6 +359,25 @@ describe ClassMixedWithDSLHelpers do
         :catch_changes => true
       )
     end
+    it 'enforces a 2 exit code through :expect_changes' do
+      subject.should_receive( :create_remote_file ).and_return( true )
+      subject.should_receive( :puppet ).
+        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', /apply_manifest.\d+.pp/ ).
+        and_return( 'puppet_command' )
+
+      subject.should_receive( :on ).with(
+        'my_host',
+        'puppet_command',
+        :acceptable_exit_codes => [2]
+      )
+
+      subject.apply_manifest_on(
+        'my_host',
+        'class { "boo": }',
+        :trace         => true,
+        :expect_changes => true
+      )
+    end
     it 'enforces exit codes through :expect_failures' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).

data/spec/beaker/dsl/install_utils_spec.rb

@@ -197,8 +197,9 @@ describe ClassMixedWithDSLInstallUtils do
 
     end
 
-    it "does nothing for a frictionless agent" do
+    it "does nothing for a frictionless agent for PE >= 3.2.0" do
       unixhost['roles'] << 'frictionless'
+      unixhost['pe_ver'] = '3.2.0'
 
       subject.should_not_receive(:scp_to)
       subject.should_not_receive(:on)
@@ -257,6 +258,68 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  describe '#install_puppet' do
+    let(:hosts) do
+      make_hosts({:platform => platform })
+    end
+
+    before do
+      subject.stub(:hosts).and_return(hosts)
+      subject.stub(:on).and_return(Beaker::Result.new({},''))
+    end
+    context 'on el-6' do
+      let(:platform) { "el-6-i386" }
+      it 'installs' do
+        expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-el-6\.noarch\.rpm/)
+        expect(subject).to receive(:on).with(hosts[0], 'yum install -y puppet')
+        subject.install_puppet
+      end
+    end
+    context 'on el-5' do
+      let(:platform) { "el-5-i386" }
+      it 'installs' do
+        expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-el-5\.noarch\.rpm/)
+        expect(subject).to receive(:on).with(hosts[0], 'yum install -y puppet')
+        subject.install_puppet
+      end
+    end
+    context 'on fedora' do
+      let(:platform) { "fedora-18-x86_84" }
+      it 'installs' do
+        expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-fedora-18\.noarch\.rpm/)
+        expect(subject).to receive(:on).with(hosts[0], 'yum install -y puppet')
+        subject.install_puppet
+      end
+    end
+    context 'on debian' do
+      let(:platform) { "debian-7-amd64" }
+      it 'installs' do
+        expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-\$\(lsb_release -c -s\)\.deb/)
+        expect(subject).to receive(:on).with(hosts[0], 'dpkg -i puppetlabs-release-$(lsb_release -c -s).deb')
+        expect(subject).to receive(:on).with(hosts[0], 'apt-get -y -f -m update')
+        expect(subject).to receive(:on).with(hosts[0], 'apt-get install -y puppet')
+        subject.install_puppet
+      end
+    end
+    context 'on ubuntu' do
+      let(:platform) { "ubuntu-12.04-amd64" }
+      it 'installs' do
+        expect(subject).to receive(:on).with(hosts[0], /puppetlabs-release-\$\(lsb_release -c -s\)\.deb/)
+        expect(subject).to receive(:on).with(hosts[0], 'dpkg -i puppetlabs-release-$(lsb_release -c -s).deb')
+        expect(subject).to receive(:on).with(hosts[0], 'apt-get -y -f -m update')
+        expect(subject).to receive(:on).with(hosts[0], 'apt-get install -y puppet')
+        subject.install_puppet
+      end
+    end
+    context 'on solaris' do
+      let(:platform) { 'solaris-11-x86_64' }
+      it 'raises an error' do
+        expect(subject).to_not receive(:on)
+        expect { subject.install_puppet }.to raise_error(/unsupported platform/)
+      end
+    end
+  end
+
   describe 'install_pe' do
 
     it 'calls do_install with sorted hosts' do

data/spec/beaker/host_spec.rb

@@ -112,6 +112,14 @@ module Beaker
       it 'receives a result object from the connection#execute'
       it "returns the result object"
 
+      it 'logs the amount of time spent executing the command' do
+        result.exit_code = 0
+
+        expect(host.logger).to receive(:debug).with(/host executed in \d\.\d{2} seconds/)
+
+        host.exec(command,{})
+      end
+
       context "controls the result objects logging" do
         it "and passes a test if the exit_code doesn't match the default :acceptable_exit_codes of 0" do
           result.exit_code = 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Puppetlabs