beaker-module_install_helper 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69a2c6ed3022d19e60e1d0384af079f91e88ca41
-  data.tar.gz: a735093e505f4b2bd462068f0bc51d1b2758f516
+  metadata.gz: 8842d6e64dfcbb76640dd4b108b9bb4b4fbb05e3
+  data.tar.gz: 8e8f8f4b8c02d126ee573897a010733771da65dd
 SHA512:
-  metadata.gz: 9b1776180ebfaa84699217d459e6edb6da441ab2521b53c6095767d944577f2e07432ea536cc83403e8bfa404b981e8a3112c80b7a58fe38bd8f9ff11a7f7dc7
-  data.tar.gz: 25239feb1592cdee1a638ca2fec9c463d6590c913e0ecdacd8c391942466e7b8bcaaff43569408ade407fb6af396ba761cbe46e1289705f86f6fadcd0460d0bd
+  metadata.gz: 8f7dd4d97c7d19fa656cda404ba7777aad1f34a4f2bd942b6b37462c0367b670f52cd2c9acefae34c1f3b4941b0cec3dda6a7da61a921584fcc94efbbc118e5d
+  data.tar.gz: a410e06926548aa30c40b4e5a35ca3bbe00ae1e4205573053a854661ec67a5432bd48aa57e19a9cdb5ccb233de636013249d1f96785865296adc5de5a368a887

data/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.1.6]
+### Fixed
+- (BKR-1254) Update for Unix::Host does not allow each
+- Rubocop failures
+
 ## [0.1.5]
 ### Fixed
 - Documentation language updates
@@ -12,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 
 [Unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/0.1.5...HEAD
+[0.1.6]: https://github.com/olivierlacan/keep-a-changelog/compare/0.1.5...0.1.6
 [0.1.5]: https://github.com/olivierlacan/keep-a-changelog/compare/0.1.4...0.1.5
 [0.1.4]: https://github.com/olivierlacan/keep-a-changelog/compare/0.1.3...0.1.4
 [0.1.3]: https://github.com/olivierlacan/keep-a-changelog/compare/0.1.2...0.1.3

data/beaker-module_install_helper.gemspec

@@ -1,11 +1,9 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'beaker-module_install_helper'
-  spec.version       = '0.1.5'
+  spec.version       = '0.1.6'
   spec.authors       = ['Puppet']
   spec.email         = ['wilson@puppet.com']
 
@@ -16,7 +14,7 @@ Gem::Specification.new do |spec|
                        'module under test and its dependencies on the system ' \
                        'under test'
   spec.homepage      = 'https://github.com/puppetlabs/beaker-module_install_helper'
-  spec.license       = 'Apache-2'
+  spec.license       = 'Apache-2.0'
 
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -29,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
 
   # Run time dependencies
-  spec.add_runtime_dependency 'beaker', '>= 2.0'
+  spec.add_runtime_dependency 'beaker', '~> 2.0'
 end

data/lib/beaker/module_install_helper.rb

@@ -29,6 +29,7 @@ module Beaker::ModuleInstallHelper
   # specified host(s) from the dependencies list in metadata.json
   def install_module_dependencies_on(hsts, deps = nil)
     hsts = [hsts] if hsts.is_a?(Hash)
+    hsts = [hsts] unless hsts.respond_to?(:each)
     deps = deps.nil? ? module_dependencies_from_metadata : deps
 
     fh = ENV['BEAKER_FORGE_HOST']

data/spec/unit/beaker/module_install_helper_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe Beaker::ModuleInstallHelper do
-  context 'hosts_to_install_module_on' do
-    context 'on split master/agent setup' do
+  describe 'hosts_to_install_module_on' do
+    context 'with a split master/agent setup' do
       let(:hosts) do
         [
           { 'roles' => %w[master database dashboard classifier] },
@@ -15,7 +15,7 @@ describe Beaker::ModuleInstallHelper do
       end
     end
 
-    context 'on split agent only setup' do
+    context 'with a split agent only setup' do
       let(:hosts) { [{ 'roles' => ['agent'] }] }
 
       it 'returns a node with master role' do
@@ -24,7 +24,7 @@ describe Beaker::ModuleInstallHelper do
     end
   end
 
-  context 'module_name_from_metadata' do
+  describe 'module_name_from_metadata' do
     let(:module_metadata) { { 'name' => 'puppetlabs-vcsrepo' } }
 
     it 'Removes author from name' do
@@ -33,7 +33,7 @@ describe Beaker::ModuleInstallHelper do
     end
   end
 
-  context 'module_metadata' do
+  describe 'module_metadata' do
     before do
       $module_source_dir = '/a/b/c/d'
       allow(File).to receive(:exist?)
@@ -44,12 +44,12 @@ describe Beaker::ModuleInstallHelper do
         .and_return('{"name": "puppetlabs-vcsrepo"}')
     end
 
-    it 'Returns hash with correct data' do
+    it 'returns hash with correct data' do
       expect(module_metadata['name']).to eq('puppetlabs-vcsrepo')
     end
   end
 
-  context 'get_module_source_directory' do
+  describe 'get_module_source_directory' do
     let(:call_stack) { ['/a/b/c/d/e/f/g/spec_helper_acceptance.rb'] }
     let(:call_stack_no_metadata) { ['/test/test/test/spec_helper_acceptance.rb'] }
 
@@ -67,7 +67,7 @@ describe Beaker::ModuleInstallHelper do
     end
   end
 
-  context 'install_module_on' do
+  describe 'install_module_on' do
     let(:module_source_dir) { '/a/b/c/d' }
     let(:host) { { 'roles' => %w[master database dashboard classifier] } }
 
@@ -92,7 +92,7 @@ describe Beaker::ModuleInstallHelper do
     end
   end
 
-  context 'module_version_matching_requirement' do
+  describe 'module_version_matching_requirement' do
     context 'with simple version requirement, no upper bound' do
       it 'return latest matching version' do
         res = module_version_from_requirement('puppetlabs-ntp', '= 6.0.0')
@@ -109,14 +109,14 @@ describe Beaker::ModuleInstallHelper do
     end
   end
 
-  context 'module_dependencies_from_metadata' do
+  describe 'module_dependencies_from_metadata' do
     before do
       allow_any_instance_of(described_class)
         .to receive(:module_metadata)
         .and_return(input_metadata)
     end
 
-    context 'multiple dependencies with versions' do
+    context 'with multiple dependencies with versions' do
       let(:input_metadata) do
         {
           'name' => 'puppetlabs-vcsrepo',
@@ -145,7 +145,7 @@ describe Beaker::ModuleInstallHelper do
       end
     end
 
-    context 'multiple dependencies without versions' do
+    context 'with multiple dependencies without versions' do
       let(:input_metadata) do
         {
           'name' => 'puppetlabs-vcsrepo',
@@ -169,7 +169,7 @@ describe Beaker::ModuleInstallHelper do
       end
     end
 
-    context 'empty dependencies' do
+    context 'with empty dependencies' do
       let(:input_metadata) do
         {
           'name' => 'puppetlabs-vcsrepo',
@@ -184,7 +184,7 @@ describe Beaker::ModuleInstallHelper do
       end
     end
 
-    context 'no dependencies' do
+    context 'with no dependencies' do
       let(:input_metadata) { { 'name' => 'puppetlabs-vcsrepo' } }
       let(:desired) { [] }
 
@@ -195,7 +195,7 @@ describe Beaker::ModuleInstallHelper do
     end
   end
 
-  context 'version_requirements_from_string' do
+  describe 'version_requirements_from_string' do
     context 'with simple version requirement containing lower bound' do
       let(:lower_bound) { '>= 2.0.0' }
 
@@ -217,7 +217,7 @@ describe Beaker::ModuleInstallHelper do
     end
   end
 
-  context 'forge_host' do
+  describe 'forge_host' do
     context 'without env variables specified' do
       it 'returns production forge host' do
         allow(ENV).to receive(:[]).with('BEAKER_FORGE_HOST').and_return(nil)
@@ -235,7 +235,7 @@ describe Beaker::ModuleInstallHelper do
     end
   end
 
-  context 'forge_api' do
+  describe 'forge_api' do
     context 'without env variables specified' do
       it 'returns production forge api' do
         allow(ENV).to receive(:[]).with('BEAKER_FORGE_HOST').and_return(nil)
@@ -255,7 +255,7 @@ describe Beaker::ModuleInstallHelper do
     end
   end
 
-  context 'install_module_dependencies_on' do
+  describe 'install_module_dependencies_on' do
     before do
       allow_any_instance_of(described_class)
         .to receive(:module_metadata)
@@ -279,14 +279,12 @@ describe Beaker::ModuleInstallHelper do
         }
       end
 
-      before do
+      it 'installs the modules' do
         expect_any_instance_of(Beaker::DSL::InstallUtils::ModuleUtils)
           .to receive(:install_puppet_module_via_pmt_on)
           .with(a_host, dependency)
           .exactly(1)
-      end
 
-      it 'installs the modules' do
         install_module_dependencies_on(a_host)
       end
     end
@@ -305,7 +303,7 @@ describe Beaker::ModuleInstallHelper do
       let(:dependency1) { { module_name: 'puppetlabs-concat' } }
       let(:dependency2) { { module_name: 'puppetlabs-stdlib' } }
 
-      before do
+      it 'installs both modules' do # rubocop:disable RSpec/ExampleLength,RSpec/MultipleExpectations
         expect_any_instance_of(Beaker::DSL::InstallUtils::ModuleUtils)
           .to receive(:install_puppet_module_via_pmt_on)
           .with(a_host, dependency1)
@@ -315,28 +313,24 @@ describe Beaker::ModuleInstallHelper do
           .to receive(:install_puppet_module_via_pmt_on)
           .with(a_host, dependency2)
           .exactly(1)
-      end
 
-      it 'installs both modules' do
         install_module_dependencies_on(a_host)
       end
     end
   end
 
-  context 'install_module_from_forge_on' do
+  describe 'install_module_from_forge_on' do
     let(:a_host) { { name: 'a_host' } }
     let(:dependency) { { module_name: 'puppetlabs-stdlib', version: '4.14.0' } }
     let(:input_module_name) { 'puppetlabs/stdlib' }
     let(:input_module_version_requirement) { '>= 4.13.1 <= 4.14.0' }
 
-    before do
+    it 'installs the module' do
       expect_any_instance_of(Beaker::DSL::InstallUtils::ModuleUtils)
         .to receive(:install_puppet_module_via_pmt_on)
         .with(a_host, dependency)
         .exactly(1)
-    end
 
-    it 'installs the module' do
       install_module_from_forge_on(a_host, input_module_name, input_module_version_requirement)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-module_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -28,14 +28,14 @@ dependencies:
   name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: A helper gem for use in a Puppet Modules spec_helper_acceptance.rb file
@@ -62,7 +62,7 @@ files:
 - spec/unit/beaker/module_install_helper_spec.rb
 homepage: https://github.com/puppetlabs/beaker-module_install_helper
 licenses:
-- Apache-2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A helper gem for use in a Puppet Modules spec_helper_acceptance.rb file