onceover 3.13.0 → 3.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b767447cfe2fa9bb00e8b3ebb2a97c574ca4729181543d18e6e2d2e097cc16d1
-  data.tar.gz: ee8987789479439ff9e4c4e79a57ca62f5c8b4d9103a106588f14ce553fd8dc3
+  metadata.gz: 1f8920ed5a1afa3942e0012f21ec49ef5fb6596cec5c57bca55a11da1b393324
+  data.tar.gz: b8d27d282ed8d35d989a56598959f8371763e013f60eee9a27671c204cc71f89
 SHA512:
-  metadata.gz: af4bda7ab741bcbbb0a73ed560db3a9eade8311ec3f7f9d98d0bef91e166c05429a4b8f1f73add1d949027fdbd0cbfdd5be7b17ffadf1cc92a220064adf7e07f
-  data.tar.gz: dd7f40a2ba1717c01e989bcd9b5a51d89f3dd334cb5a75ba5b8df9c6af21f4f91e4bb0c9a92fd1a566ae959677f01eeaa407433c63581d5d45362c85e3d81d5c
+  metadata.gz: d93ef0787d387a1b35ff0234bc29b7daf62a1a410eaa8576309bd249f6881f6b5250c62b5923dcf60268b9d3aaeca6ef6ed2debd2120e60cf302e109d362314a
+  data.tar.gz: b99f5e7d3ca96c1c6b0db3c98d0ce88355c307dbb919cfa1f02544e21535720eafda4c578ba0fbff5621c38ce66456c39d5da2b63dd1c19e0650016e290fa349

data/Gemfile

@@ -4,6 +4,9 @@ gemspec
 
 gem 'pry-coolline', '> 0.0', '< 1.0.0'
 
+# Cri 2.15.6 broke r10k and they can't be used together
+gem 'cri', '<= 2.15.5'
+
 if ENV['PUPPET_VERSION']
   gem 'puppet', ENV['PUPPET_VERSION']
 end

data/lib/onceover/controlrepo.rb

@@ -399,7 +399,6 @@ class Onceover
     end
 
     def config
-      # Parse the file
       logger.debug "Reading #{@environment_conf}"
       env_conf = File.read(@environment_conf)
       env_conf = env_conf.split("\n")
@@ -410,7 +409,9 @@ class Onceover
       # Map the lines into a hash
       environment_config = {}
       env_conf.each do |line|
-        environment_config.merge!(Hash[*line.split('=').map { |s| s.strip}])
+        if matches = line.match(/^(\S+)\s*=(.*)$/)
+          environment_config[matches[1]] = matches[2].strip
+        end
       end
 
       # Finally, split the modulepath values and return
@@ -419,7 +420,8 @@ class Onceover
       rescue
         raise "modulepath was not found in environment.conf, don't know where to look for roles & profiles"
       end
-      return environment_config
+      
+      environment_config
     end
 
     def r10k_config_file

data/onceover.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "onceover"
-  s.version     = "3.13.0"
+  s.version     = "3.13.1"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'r10k', '>=2.1.0'
   s.add_runtime_dependency 'puppet', '>=3.4.0'
   s.add_runtime_dependency 'git'
-  s.add_runtime_dependency 'cri', '>= 2.6'
+  s.add_runtime_dependency 'cri', '>= 2.6', '<= 2.15.5'
   s.add_runtime_dependency 'colored', '~> 1.2'
   s.add_runtime_dependency 'logging', '>= 2.0.0'
   s.add_runtime_dependency 'deep_merge', '>= 1.0.0'

data/spec/fixtures/controlrepos/basic/environment.conf

@@ -1,2 +1,7 @@
 modulepath          = site:modules:$basemodulepath
-config_version      = 'scripts/config_version.sh $environmentpath $environment'
+
+# Comments!    
+
+value_with_equals = 'foo=bar'
+
+config_version      = 'scripts/config_version.sh $environmentpath $environment'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.13.0
+  version: 3.13.1
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -157,6 +157,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.6'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.15.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -164,6 +167,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.6'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.15.5
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement