release_manager 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c365f59f90bdaede02a31dfe60018215087da2a6f8dc6af0fb0652d72e7dcbaf
-  data.tar.gz: f613cd28e465bb6d9d0ec8803ae9a0ecc9e819b1970a09aaa59a0ba2034b9a46
+  metadata.gz: 4711f3474a2ef018068f10268dd3a89bab7da246713b800a0912901fc9b0a70c
+  data.tar.gz: 1f6ef1c783a37a09fa646f855fee88e36e058e9eef43f35101f68ee412606902
 SHA512:
-  metadata.gz: f90dc6f458bba87bd9a68cee0386cfb5aa27cfb39b3cc75c2a7b028156df9a59e025d34bb9a6216116465253fd84e5673a1c012fc8aed329799eca7ed3c138e5
-  data.tar.gz: a0b2e769b5da06a13db6f6481606e49f531ea04516434d9dc4fc82685f073685f9b540f9a6b3e091bdf760ad906edfeacf93b6b49e94878addd09f914c6d9153
+  metadata.gz: cc5ea77eb51f6753db50284ae1419f822908c5f1d7a02d2a0306211c50af2c33105b9d7d80b51d084e88a5f23ff98f212a156522e0fbbc60307605c92f6245f7
+  data.tar.gz: 5819cb50e9bd8c0c49d8b180e07577a9a1ca4b3fc7c614089e69ce57454ead371e822cf88b6d5c18fd68e86536157017179d33dd70e141a38bb9583b4101dfe5

data/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Release Manager
+## 0.9.3
+* Fixes gh-17 - Hiera 5 environment layer support
 
 ## 0.9.2
  * Removed slice_when in order to support older rubies.

data/Gemfile

@@ -1,4 +1,6 @@
-source ENV['GEM_SOURCE'] ||'https://rubygems.org'
+# frozen_string_literal: true
+
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 # Specify your gem's dependencies in release_manager.gemspec
 gem 'gitlab'
 gem 'rugged', '~> 0.26'
@@ -9,7 +11,9 @@ group :test do
   gem 'rubocop'
   gem 'rake'
   gem 'rspec'
-  gem 'bundler'
+  gem 'bundler', '~> 2.1'
   # when docker compiles this it cannot find release manager until we mount the volume
-  gem 'release_manager', path: '.' if File.exists?(File.join('release_manager.gemspec'))
+  if File.exist?(File.join('release_manager.gemspec'))
+    gem 'release_manager', path: '.'
+  end
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    release_manager (0.9.2)
+    release_manager (0.9.3)
       gitlab (~> 4.2.0)
       highline (~> 1.7)
       rugged (~> 0.26)
@@ -9,58 +9,66 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.3.0)
-    coderay (1.1.2)
+    ast (2.4.1)
+    coderay (1.1.3)
     diff-lcs (1.3)
     gitlab (4.2.0)
       httparty
       terminal-table
-    highline (1.7.8)
-    httparty (0.15.6)
+    highline (1.7.10)
+    httparty (0.18.1)
+      mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    method_source (0.9.0)
+    method_source (1.0.0)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.0512)
     multi_xml (0.6.0)
-    parallel (1.12.0)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    powerpack (0.1.1)
-    pry (0.11.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rainbow (2.2.2)
-      rake
-    rake (12.3.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    parallel (1.19.1)
+    parser (2.7.1.3)
+      ast (~> 2.4.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.51.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rubocop (0.85.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    rugged (0.26.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
+    ruby-progressbar (1.10.1)
+    rugged (0.99.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
+  bundler (~> 2.1)
   gitlab
   highline (~> 1.7)
   pry
@@ -71,4 +79,4 @@ DEPENDENCIES
   rugged (~> 0.26)
 
 BUNDLED WITH
-   1.16.2
+   2.1.4

data/lib/release_manager/control_mod.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 class ControlMod
   attr_reader :name, :metadata, :repo
   attr_accessor :version
 
   def initialize(name, args)
     @name = name
-    @metadata = args.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+    @metadata = args.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v; }
   end
 
   def repo
@@ -25,22 +27,28 @@ class ControlMod
 
   def to_s
     name_line = "mod '#{name}',"
-    data = metadata.map { |k, v| ":#{k} => '#{v}'" }.join(",\n\  ")
+    data = metadata.map do |k, v|
+      v == :control_branch ? ":#{k} => #{v.inspect}" : ":#{k} => '#{v}'"
+    end.join(",\n\  ")
     "#{name_line}\n  #{data}"
   end
 
   def bump_patch_version
     return unless metadata[:tag]
+
     pieces = metadata[:tag].split('.')
     raise "invalid semver structure #{metadata[:tag]}" if pieces.count != 3
+
     pieces[2] = pieces[2].next
     pin_version(pieces.join('.'))
   end
 
   def bump_minor_version
     return unless metadata[:tag]
+
     pieces = metadata[:tag].split('.')
     raise "invalid semver structure #{metadata[:tag]}" if pieces.count != 3
+
     pieces[2] = '0'
     pieces[1] = pieces[1].next
     pin_version(pieces.join('.'))
@@ -48,8 +56,10 @@ class ControlMod
 
   def bump_major_version
     return unless metadata[:tag]
+
     pieces = metadata[:tag].split('.')
     raise "invalid semver structure #{metadata[:tag]}" if pieces.count != 3
+
     pieces[2] = '0'
     pieces[1] = '0'
     pieces[0] = pieces[0].next
@@ -79,5 +89,4 @@ class ControlMod
   def pin_url(src)
     metadata[:git] = src
   end
-
 end

data/lib/release_manager/version.rb

@@ -1,3 +1,3 @@
 module ReleaseManager
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/release_manager.gemspec

@@ -1,39 +1,40 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'release_manager/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "release_manager"
+  spec.name          = 'release_manager'
   spec.version       = ReleaseManager::VERSION
-  spec.authors       = ["Corey Osman"]
-  spec.email         = ["corey@nwops.io"]
+  spec.authors       = ['Corey Osman']
+  spec.email         = ['corey@nwops.io']
 
-  spec.summary       = %q{Release tools for puppet code}
-  spec.description   = %q{Release management tools for releasing modules and r10k control repos}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.summary       = 'Release tools for puppet code'
+  spec.description   = 'Release management tools for releasing modules and r10k control repos'
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    #spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
+    # spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+      'public gem pushes.'
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  spec.add_runtime_dependency "gitlab", "~> 4.2.0"
-  spec.add_runtime_dependency "rugged", "~> 0.26"
-  spec.add_runtime_dependency "highline", '~> 1.7'
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.require_paths = ['lib']
+  spec.add_runtime_dependency 'gitlab', '~> 4.2.0'
+  spec.add_runtime_dependency 'rugged', '~> 0.26'
+  spec.add_runtime_dependency 'highline', '~> 1.7'
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: release_manager
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -199,8 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Release tools for puppet code