beaker-puppet 1.29.0 → 3.0.0

data/spec/beaker-puppet/helpers/tk_helpers_spec.rb

@@ -10,41 +10,39 @@ class ClassMixedWithDSLHelpers
   def logger
     RSpec::Mocks::Double.new('logger').as_null_object
   end
-
 end
 
 describe ClassMixedWithDSLHelpers do
-  let( :opts )   { Beaker::Options::Presets.env_vars }
-  let( :command ){ 'ls' }
-  let( :host )   { double.as_null_object }
-  let( :result ) { Beaker::Result.new( host, command ) }
-
-  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 ) ) }
-  let( :db )     { make_host( 'db',       :roles => %w( database agent )  ) }
-  let( :hosts )  { [ master, agent, dash, db, custom ] }
+  let(:opts) { Beaker::Options::Presets.env_vars }
+  let(:command) { 'ls' }
+  let(:host)   { double.as_null_object }
+  let(:result) { Beaker::Result.new(host, command) }
 
+  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]) }
+  let(:db)     { make_host('db',       roles: %w[database agent]) }
+  let(:hosts)  { [master, agent, dash, db, custom] }
 
   describe 'modify_tk_config' do
     let(:host) { double.as_null_object }
-    let(:config_file_path) { 'existing-file-path'}
-    let(:invalid_config_file_path) { 'nonexisting-file-path'}
-    let(:options_hash) { {:key => 'value'} }
+    let(:config_file_path) { 'existing-file-path' }
+    let(:invalid_config_file_path) { 'nonexisting-file-path' }
+    let(:options_hash) { { key: 'value' } }
     let(:replace) { true }
 
     shared_examples 'modify-tk-config-without-error' do
       it 'dumps to the SUT config file path' do
-        allow( JSON ).to receive(:pretty_generate)
-        allow( subject ).to receive(:create_remote_file).with(host, config_file_path, anything())
+        allow(JSON).to receive(:pretty_generate)
+        allow(subject).to receive(:create_remote_file).with(host, config_file_path, anything)
         subject.modify_tk_config(host, config_file_path, options_hash, replace)
       end
     end
 
     before do
-      allow( host ).to receive(:file_exist?).with(invalid_config_file_path).and_return(false)
-      allow( host ).to receive(:file_exist?).with(config_file_path).and_return(true)
+      allow(host).to receive(:file_exist?).with(invalid_config_file_path).and_return(false)
+      allow(host).to receive(:file_exist?).with(config_file_path).and_return(true)
     end
 
     describe 'if file does not exist on SUT' do
@@ -62,23 +60,21 @@ describe ClassMixedWithDSLHelpers do
     end
 
     describe 'given a non-empty options hash' do
-
       describe 'given a false value to its `replace` parameter' do
         let(:replace) { false }
         before do
-          expect( subject ).to receive(:read_tk_config_string).with(anything())
+          expect(subject).to receive(:read_tk_config_string).with(anything)
         end
         include_examples('modify-tk-config-without-error')
       end
 
       describe 'given a true value to its `replace` parameter' do
         before do
-          expect( JSON ).to receive(:pretty_generate)
-          expect( subject ).to receive(:create_remote_file).with(host, config_file_path, anything())
+          expect(JSON).to receive(:pretty_generate)
+          expect(subject).to receive(:create_remote_file).with(host, config_file_path, anything)
         end
         include_examples('modify-tk-config-without-error')
       end
     end
   end
-
 end

data/spec/beaker-puppet/install_utils/ezbake_utils_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-EZBAKE_CONFIG_EXAMPLE= {
-  :project => 'puppetserver',
-  :real_name => 'puppetserver',
-  :user => 'puppet',
-  :group => 'puppet',
-  :uberjar_name => 'puppetserver-release.jar',
-  :config_files => [],
-  :terminus_info => {},
-  :debian => { :additional_dependencies => ["puppet (= 3.6.1-puppetlabs1)"], },
-  :redhat => { :additional_dependencies => ["puppet = 3.6.1"], },
-  :java_args => '-Xmx192m',
+EZBAKE_CONFIG_EXAMPLE = {
+  project: 'puppetserver',
+  real_name: 'puppetserver',
+  user: 'puppet',
+  group: 'puppet',
+  uberjar_name: 'puppetserver-release.jar',
+  config_files: [],
+  terminus_info: {},
+  debian: { additional_dependencies: ['puppet (= 3.6.1-puppetlabs1)'] },
+  redhat: { additional_dependencies: ['puppet = 3.6.1'] },
+  java_args: '-Xmx192m',
 }
 
 class ClassMixedWithEZBakeUtils
@@ -34,9 +34,9 @@ module Beaker::DSL::EZBakeUtils::EZBake
 end
 
 describe ClassMixedWithEZBakeUtils do
-  let( :opts ) { Beaker::Options::Presets.env_vars }
-  let( :host ) { double.as_null_object }
-  let( :local_commands ) { Beaker::DSL::EZBakeUtils::LOCAL_COMMANDS_REQUIRED }
+  let(:opts) { Beaker::Options::Presets.env_vars }
+  let(:host) { double.as_null_object }
+  let(:local_commands) { Beaker::DSL::EZBakeUtils::LOCAL_COMMANDS_REQUIRED }
 
   describe '#install_from_ezbake' do
     let(:platform) { Beaker::Platform.new('el-7-i386') }
@@ -48,11 +48,11 @@ describe ClassMixedWithEZBakeUtils do
       allow(subject).to receive(:ezbake_tools_available?) { true }
     end
 
-    it "when ran with an el-7 machine runs correct installsh command" do
-      expect(subject).to receive(:install_ezbake_tarball_on_host).
-                          ordered
-      expect(subject).
-        to receive(:ezbake_installsh).with(host, "service")
+    it 'when ran with an el-7 machine runs correct installsh command' do
+      expect(subject).to receive(:install_ezbake_tarball_on_host)
+        .ordered
+      expect(subject)
+        .to receive(:ezbake_installsh).with(host, 'service')
       subject.install_from_ezbake host
     end
   end
@@ -67,12 +67,12 @@ describe ClassMixedWithEZBakeUtils do
       allow(subject).to receive(:ezbake_tools_available?) { true }
     end
 
-    it "when ran with an el-7 machine runs correct installsh command" do
+    it 'when ran with an el-7 machine runs correct installsh command' do
       expect(subject).to receive(:ezbake_validate_support).with(host).ordered
-      expect(subject).to receive(:install_ezbake_tarball_on_host).
-                          with(host).ordered
-      expect(subject).
-        to receive(:ezbake_installsh).with(host, "termini")
+      expect(subject).to receive(:install_ezbake_tarball_on_host)
+        .with(host).ordered
+      expect(subject)
+        .to receive(:ezbake_installsh).with(host, 'termini')
       subject.install_termini_from_ezbake host
     end
   end
@@ -96,27 +96,27 @@ describe ClassMixedWithEZBakeUtils do
       end
 
       it 'should throw exception' do
-        expect {
+        expect do
           subject.ezbake_validate_support host
-        }.to raise_error(RuntimeError,
-                         "No support for aix within ezbake_utils ...")
+        end.to raise_error(RuntimeError,
+                           'No support for aix within ezbake_utils ...')
       end
     end
   end
 
   def install_ezbake_tarball_on_host_common_expects
-    result = object_double(Beaker::Result.new(host, "foo"), :exit_code => 1)
-    expect(subject).to receive(:on).
-                        with(kind_of(Beaker::Host), /test -d/,
-                             anything()).ordered { result }
-    expect(Dir).to receive(:chdir).and_yield()
+    result = object_double(Beaker::Result.new(host, 'foo'), exit_code: 1)
+    expect(subject).to receive(:on)
+      .with(kind_of(Beaker::Host), /test -d/,
+            anything).ordered { result }
+    expect(Dir).to receive(:chdir).and_yield
     expect(subject).to receive(:ezbake_local_cmd).with(/rake package:tar/).ordered
-    expect(subject).to receive(:scp_to).
-                        with(kind_of(Beaker::Host), anything(), anything()).ordered
-    expect(subject).to receive(:on).
-                        with(kind_of(Beaker::Host), /tar -xzf/).ordered
-    expect(subject).to receive(:on).
-                        with(kind_of(Beaker::Host), /test -d/).ordered
+    expect(subject).to receive(:scp_to)
+      .with(kind_of(Beaker::Host), anything, anything).ordered
+    expect(subject).to receive(:on)
+      .with(kind_of(Beaker::Host), /tar -xzf/).ordered
+    expect(subject).to receive(:on)
+      .with(kind_of(Beaker::Host), /test -d/).ordered
   end
 
   describe '#install_ezbake_tarball_on_host' do
@@ -147,32 +147,29 @@ describe ClassMixedWithEZBakeUtils do
       allow(subject).to receive(:system) { true }
     end
 
-    describe "checks for local successful commands" do
-
-      it "and succeeds if all commands return successfully" do
+    describe 'checks for local successful commands' do
+      it 'and succeeds if all commands return successfully' do
         local_commands.each do |software_name, command, additional_error_messages|
           expect(subject).to receive(:system).with(/#{command}/)
         end
         subject.ezbake_tools_available?
       end
 
-      it "and raises an exception if a command returns failure" do
+      it 'and raises an exception if a command returns failure' do
         allow(subject).to receive(:system) { false }
         local_commands.each do |software_name, command, additional_error_messages|
           expect(subject).to receive(:system).with(/#{command}/)
           break # just need first element
         end
-        expect{
+        expect do
           subject.ezbake_tools_available?
-        }.to raise_error(RuntimeError, /Must have .* installed on development system./)
+        end.to raise_error(RuntimeError, /Must have .* installed on development system./)
       end
-
     end
-
   end
 
   describe '#ezbake_config' do
-    it "returns a map with ezbake configuration parameters" do
+    it 'returns a map with ezbake configuration parameters' do
       subject.initialize_ezbake_config
       config = subject.ezbake_config
       expect(config).to include(EZBAKE_CONFIG_EXAMPLE)
@@ -185,17 +182,15 @@ describe ClassMixedWithEZBakeUtils do
       subject.wipe_out_ezbake_config
     end
 
-    it "initializes EZBakeUtils.config" do
-      allow(Dir).to receive(:chdir).and_yield()
-
-      expect(subject).to receive(:ezbake_local_cmd).
-                          with(/^lein.*install/, :throw_on_failure =>
-                                                 true).ordered
-      expect(subject).to receive(:ezbake_local_cmd).
-                          with(/^lein.*with-profile ezbake ezbake stage/, :throw_on_failure =>
-                                                 true).ordered
-      expect(subject).to receive(:ezbake_local_cmd).with("rake package:bootstrap").ordered
-      expect(subject).to receive(:load) { }.ordered
+    it 'initializes EZBakeUtils.config' do
+      allow(Dir).to receive(:chdir).and_yield
+
+      expect(subject).to receive(:ezbake_local_cmd)
+        .with(/^lein.*install/, throw_on_failure: true).ordered
+      expect(subject).to receive(:ezbake_local_cmd)
+        .with(/^lein.*with-profile ezbake ezbake stage/, throw_on_failure: true).ordered
+      expect(subject).to receive(:ezbake_local_cmd).with('rake package:bootstrap').ordered
+      expect(subject).to receive(:load) {}.ordered
       expect(subject).to receive(:`).ordered
 
       config = subject.ezbake_config
@@ -210,39 +205,41 @@ describe ClassMixedWithEZBakeUtils do
 
   describe '#ezbake_local_cmd' do
     it 'should execute system on the command specified' do
-      expect(subject).to receive(:system).with("my command") { true }
-      subject.ezbake_local_cmd("my command")
+      expect(subject).to receive(:system).with('my command') { true }
+      subject.ezbake_local_cmd('my command')
     end
 
     it 'with :throw_on_failure should throw exeception when failed' do
-      expect(subject).to receive(:system).with("my failure") { false }
-      expect {
-        subject.ezbake_local_cmd("my failure", :throw_on_failure => true)
-      }.to raise_error(RuntimeError, "Command failure my failure")
+      expect(subject).to receive(:system).with('my failure') { false }
+      expect do
+        subject.ezbake_local_cmd('my failure', throw_on_failure: true)
+      end.to raise_error(RuntimeError, 'Command failure my failure')
     end
 
     it 'without :throw_on_failure should just fail and return false' do
-      expect(subject).to receive(:system).with("my failure") { false }
-      expect(subject.ezbake_local_cmd("my failure")).to eq(false)
+      expect(subject).to receive(:system).with('my failure') { false }
+      expect(subject.ezbake_local_cmd('my failure')).to eq(false)
     end
   end
 
   describe '#ezbake_install_name' do
     it 'should return the installation name from example configuration' do
-      expect(subject).to receive(:ezbake_config) {{
-        :package_version => '1.1.1',
-        :project => 'myproject',
-      }}
-      expect(subject.ezbake_install_name).to eq "myproject-1.1.1"
+      expect(subject).to receive(:ezbake_config) {
+                           {
+                             package_version: '1.1.1',
+                             project: 'myproject',
+                           }
+                         }
+      expect(subject.ezbake_install_name).to eq 'myproject-1.1.1'
     end
   end
 
   describe '#ezbake_install_dir' do
     it 'should return the full path from ezbake_install_name' do
       expect(subject).to receive(:ezbake_install_name) {
-        "mynewproject-2.3.4"
+        'mynewproject-2.3.4'
       }
-      expect(subject.ezbake_install_dir).to eq "/root/mynewproject-2.3.4"
+      expect(subject.ezbake_install_dir).to eq '/root/mynewproject-2.3.4'
     end
   end
 
@@ -250,30 +247,29 @@ describe ClassMixedWithEZBakeUtils do
     it 'run on command correctly when invoked' do
       expect(subject).to receive(:on).with(host,
                                            /install.sh my_task/)
-      subject.ezbake_installsh host, "my_task"
+      subject.ezbake_installsh host, 'my_task'
     end
   end
 
   describe '#conditionally_clone' do
     it 'when repo exists, just do fetch and checkout' do
-      expect(subject).to receive(:ezbake_local_cmd).
-        with(/git status/) { true }
-      expect(subject).to receive(:ezbake_local_cmd).
-        with(/git fetch origin/)
-      expect(subject).to receive(:ezbake_local_cmd).
-        with(/git checkout/)
-      subject.conditionally_clone("my_url", "my_local_path")
+      expect(subject).to receive(:ezbake_local_cmd)
+        .with(/git status/) { true }
+      expect(subject).to receive(:ezbake_local_cmd)
+        .with(/git fetch origin/)
+      expect(subject).to receive(:ezbake_local_cmd)
+        .with(/git checkout/)
+      subject.conditionally_clone('my_url', 'my_local_path')
     end
 
     it 'when repo does not exist, do clone and checkout' do
-      expect(subject).to receive(:ezbake_local_cmd).
-                          with(/git status/) { false }
-      expect(subject).to receive(:ezbake_local_cmd).
-                          with(/git clone/)
-      expect(subject).to receive(:ezbake_local_cmd).
-                          with(/git checkout/)
-      subject.conditionally_clone("my_url", "my_local_path")
+      expect(subject).to receive(:ezbake_local_cmd)
+        .with(/git status/) { false }
+      expect(subject).to receive(:ezbake_local_cmd)
+        .with(/git clone/)
+      expect(subject).to receive(:ezbake_local_cmd)
+        .with(/git checkout/)
+      subject.conditionally_clone('my_url', 'my_local_path')
     end
   end
-
-end
+end