r10k 2.6.6 → 2.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c37b475095ce21d823096d20d2e44f57842fda88
-  data.tar.gz: b1f1a320a079d235b672ab467883616fa550e42a
+  metadata.gz: 6dfe2e3855040213486ec3ac3bf7bf6a9ea18b84
+  data.tar.gz: 139a09c327d96882971c78c6547aef55cce41ac4
 SHA512:
-  metadata.gz: 5c3017e68a3c1a8f6f22d914d372421c57b834a98f5734e14b4d1fbb0da02be4ec928fc36a15a75c2a6db9709460f43ac6d42624a8ab308a5d0f8a3a89e5f7b5
-  data.tar.gz: 6c3070d06402a786fdf1f854b0c824cd5e5c9c3ac6a1dc5429609c44c98622f684141e19656043ab43e8298f4f3ec7bb0add0f99a1844f4414d4d1e895eb1957
+  metadata.gz: 45038a55ecf4b3488e7ede4a027eb707ec63d50707c02bfdff703c305bbdad955875a9484f89082ef31f30f5cde27c24937bba92d8bca8e56610a1729c9e01f9
+  data.tar.gz: d2a82738b8a8d1f8b266c0f56b1a5b48bd0b3440fb336133b7795c260e049c838e4617967471f5a20892cbe5c010049c65dc26e6cacf3229d7f0678d0a320d26

data/.travis.yml

@@ -6,7 +6,7 @@ notifications:
   email: false
 sudo: false
 jdk:
-  - oraclejdk8
+  - openjdk8
 before_install: gem install bundler -v '< 2' --no-document
 matrix:
   include:

data/lib/r10k/action/deploy/environment.rb

@@ -125,11 +125,24 @@ module R10K
         end
 
         def write_environment_info!(environment, started_at, success)
+          module_deploys = []
+          begin
+            environment.puppetfile.modules.each do |mod|
+              name = mod.name
+              version = mod.version
+              sha = mod.repo.head rescue nil
+              module_deploys.push({:name => name, :version => version, :sha => sha})
+            end
+          rescue
+            logger.debug("Unable to get environment module deploy data for .r10k-deploy.json at #{environment.path}")
+          end
+
           File.open("#{environment.path}/.r10k-deploy.json", 'w') do |f|
             deploy_info = environment.info.merge({
               :started_at => started_at,
               :finished_at => Time.new,
               :deploy_success => success,
+              :module_deploys => module_deploys,
             })
 
             f.puts(JSON.pretty_generate(deploy_info))

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '2.6.6'
+  VERSION = '2.6.7'
 end

data/r10k.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
 
   s.add_development_dependency 'yard', '~> 0.9.11'
-  s.add_development_dependency 'minitar', '~> 0.6.1'
+  s.add_development_dependency 'minitar', '~> 0.9.0'
 
   s.files        = %x[git ls-files].split($/)
   s.require_path = 'lib'

data/spec/unit/action/deploy/environment_spec.rb

@@ -127,4 +127,63 @@ describe R10K::Action::Deploy::Environment do
       end
     end
   end
+
+  describe "write_environment_info!" do
+
+    class Fake_Environment
+      attr_accessor :path
+      attr_accessor :puppetfile
+      attr_accessor :info
+
+      def initialize(path, info)
+        @path = path
+        @info = info
+        @puppetfile = R10K::Puppetfile.new
+      end
+    end
+
+    let(:mock_stateful_repo_1) { instance_double("R10K::Git::StatefulRepository", :head => "123456") }
+    let(:mock_stateful_repo_2) { instance_double("R10K::Git::StatefulRepository", :head => "654321") }
+    let(:mock_git_module_1) { instance_double("R10K::Module::Git", :name => "my_cool_module", :version => "1.0", :repo => mock_stateful_repo_1) }
+    let(:mock_git_module_2) { instance_double("R10K::Module::Git", :name => "my_lame_module", :version => "0.0.1", :repo => mock_stateful_repo_2) }
+    let(:mock_forge_module_1) { double(:name => "their_shiny_module", :version => "2.0.0") }
+    let(:mock_puppetfile) { instance_double("R10K::Puppetfile", :modules => [mock_git_module_1, mock_git_module_2, mock_forge_module_1]) }
+
+    before(:all) do
+      @tmp_path = "./tmp-r10k-test-dir/"
+      Dir.mkdir(@tmp_path) unless File.exists?(@tmp_path)
+    end
+
+    after(:all) do
+      File.delete("#{@tmp_path}/.r10k-deploy.json")
+      Dir.delete(@tmp_path)
+    end
+
+    it "writes the .r10k-deploy file correctly" do
+      allow(R10K::Puppetfile).to receive(:new).and_return(mock_puppetfile)
+      allow(mock_forge_module_1).to receive(:repo).and_raise(NoMethodError)
+
+      fake_env = Fake_Environment.new(@tmp_path, {:name => "my_cool_environment", :signature => "pablo picasso"})
+      subject.send(:write_environment_info!, fake_env, "2019-01-01 23:23:22 +0000", true)
+
+      file_contents = File.read("#{@tmp_path}/.r10k-deploy.json")
+      r10k_deploy = JSON.parse(file_contents)
+
+      expect(r10k_deploy['name']).to eq("my_cool_environment")
+      expect(r10k_deploy['signature']).to eq("pablo picasso")
+      expect(r10k_deploy['started_at']).to eq("2019-01-01 23:23:22 +0000")
+      expect(r10k_deploy['deploy_success']).to eq(true)
+      expect(r10k_deploy['module_deploys'].length).to eq(3)
+      expect(r10k_deploy['module_deploys'][0]['name']).to eq("my_cool_module")
+      expect(r10k_deploy['module_deploys'][0]['version']).to eq("1.0")
+      expect(r10k_deploy['module_deploys'][0]['sha']).to eq("123456")
+      expect(r10k_deploy['module_deploys'][1]['name']).to eq("my_lame_module")
+      expect(r10k_deploy['module_deploys'][1]['version']).to eq("0.0.1")
+      expect(r10k_deploy['module_deploys'][1]['sha']).to eq("654321")
+      expect(r10k_deploy['module_deploys'][2]['name']).to eq("their_shiny_module")
+      expect(r10k_deploy['module_deploys'][2]['version']).to eq("2.0.0")
+      expect(r10k_deploy['module_deploys'][2]['sha']).to eq(nil)
+
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.6.7
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.9.0
 description: |2
       R10K provides a general purpose toolset for deploying Puppet environments and modules.
       It implements the Puppetfile format and provides a native implementation of Puppet
@@ -220,7 +220,6 @@ files:
 - integration/tests/Puppetfile/HTTP_PROXY_affects_git_source.rb
 - integration/tests/README.mkd
 - integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb
-- integration/tests/basic_functionality/negative/attempt_to_install_peonly_module_without_license.rb
 - integration/tests/basic_functionality/negative/neg_deploy_with_invalid_r10k_yaml.rb
 - integration/tests/basic_functionality/negative/neg_deploy_with_missing_r10k_yaml.rb
 - integration/tests/basic_functionality/negative/neg_invalid_git_provider.rb

data/integration/tests/basic_functionality/negative/attempt_to_install_peonly_module_without_license.rb

@@ -1,71 +0,0 @@
-require 'git_utils'
-require 'r10k_utils'
-require 'master_manipulator'
-test_name 'RK-158 - C92361 - Attempt to install a PE-only module with no license file'
-
-#Init
-env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
-r10k_fqp = get_r10k_fqp(master)
-master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
-
-git_repo_path = '/git_repos'
-git_repo_name = 'environments'
-git_control_remote = File.join(git_repo_path, "#{git_repo_name}.git")
-git_environments_path = '/root/environments'
-last_commit = git_last_commit(master, git_environments_path)
-git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
-
-r10k_config_path = get_r10k_config_file_path(master)
-r10k_config_bak_path = "#{r10k_config_path}.bak"
-
-#In-line files
-r10k_conf = <<-CONF
-cachedir: '/var/cache/r10k'
-git:
-  provider: '#{git_provider}'
-sources:
-  control:
-    basedir: "#{env_path}"
-    remote: "#{git_control_remote}"
-CONF
-
-#Manifest
-site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
-site_pp = create_site_pp(master_certname, '  include peonly')
-
-# Verification
-error_message_regex = /You must have a valid Puppet Enterprise® license on this node in order to download ztr-peonly/
-
-#Teardown
-teardown do
-  step 'Restore Original "r10k" Config'
-  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
-
-  step 'cleanup r10k'
-  clean_up_r10k(master, last_commit, git_environments_path)
-end
-
-#Setup
-step 'Stub the forge'
-stub_forge_on(master)
-
-step 'Backup a Valid "r10k" Config'
-on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
-
-step 'Update the "r10k" Config'
-create_remote_file(master, r10k_config_path, r10k_conf)
-
-step 'Inject New "site.pp" to the "production" Environment'
-inject_site_pp(master, site_pp_path, site_pp)
-
-step 'Copy Puppetfile to "production" Environment Git Repo'
-create_remote_file(master, "#{git_environments_path}/Puppetfile", 'mod "ztr-peonly"')
-
-step 'Push Changes'
-git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_path)
-
-#Test
-step 'Deploy "production" Environment via r10k'
-on(master, "#{r10k_fqp} deploy environment -p", :acceptable_exit_codes => [0,1]) do |result|
-  assert_match(error_message_regex, result.stderr, 'Expected error message was not observed!')
-end