r10k 2.0.0 → 2.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTUyZGI3NDlmOTVkZTNjMjhkMThmNjNiMGQ1NzlkMjg4YzAzZTZlMA==
+    ZTFjN2Q4ODIzMTI4MDAzZjc3MzI4MzA0ZDJlMzhmMDI0ODIyMDFiMQ==
   data.tar.gz: !binary |-
-    NzFhY2VkNWU1M2JhMzI1ZmFmZTQ1YzIyNTRjZjA5YzliMDY2MTRhZQ==
+    YWZhNDNlN2RmMmFhNjRhMTNlNTJmZGExZDdkMmVjYjA3YTRkY2ZjMw==
 SHA512:
   metadata.gz: !binary |-
-    MDUxZjBkYmQxOWNhOTBhMDgyNWY0NWIzYzZhOGNjODM4YWJiMzEzMDQ5OWE1
-    YTViZGUxOWU4YTllMzZkMDY2NWViZTE4MzMzNDY5YzIwYzMyZjczNDNlOTJh
-    MWUyZjM0OWM5NWRmNWIzZDJjZWU5ZDAzYjdhYWVmMDRlYTIxNjA=
+    ZGVjY2M1MDg2NTQ1NTRiZDViY2VmMTQxYTBjNDk4ZDM2NmNmY2YyODcyMWI0
+    NjMzYzcwNzQ5NzhlMTEwY2ZlOTNkYjUzYThiNGNhY2NhMzAxNzk2MzA3M2E1
+    YjYyMWJhZjJkMjZiZmIzOWI0MjVmZWE0MzI2M2ZkOGYxYWY3MmU=
   data.tar.gz: !binary |-
-    MTIwMjc2Njg2NzBhNTQ3NDVhYmRiOWY5ZmNlYjY1Y2NlYWYzNjI2ZjRjMWUz
-    NDg0YWU5ODUwNTY4Y2YxNjRjY2Q3N2IyNThiOWEyNzQ2NzU1NWYzMTZhMzNj
-    N2Q2NzVmMDhlYTMzZGU0NGI2NDUzNjhiNWQzMmI0NWNkMjk5YWQ=
+    NjZjYzFkNTkyYWY0MmIwMWQzODI4NzE5YmM5YmZjYWY4NTVjZmUzZWYxMGE2
+    MWE2YzViZWVhNDc1NmMxYWQzYzE5OTExMTQ4MTBiYjdjMTQ3ZWY3ZWM3YTMz
+    NTg1OTgzYjE2Mzc4MzFiZGNhZDJhNjkzY2I2M2FkYjNlNWQxMmY=

data/CHANGELOG.mkd

@@ -1,6 +1,37 @@
 CHANGELOG
 =========
 
+2.0.1
+-----
+
+2015/06/09
+
+This release fixes a couple of issues and defects found in 2.0.0.
+
+### Thanks
+
+Thanks to Tim Meusel (https://github.com/bastelfreak) and ktreese
+(https://github.com/ktreese) for reporting GH-443 and GH-447.
+
+### User notes
+
+(RK-117), (GH-443), (GH-447) Add minitar as runtime dependency
+
+Minitar is a hard runtime dependency of r10k as part of the new Forge module
+implementation, but was only added as a development dependency which means that
+r10k could be installed without all of the required runtime dependencies. This
+oversight has been corrected; r10k will now pull in minitar at installation
+time.
+
+(RK-118) Readd '/etc/r10k.yaml' to config search path
+
+The '/etc/r10k.yaml' config path was deprecated in r10k 1.5.0, but this
+deprecation was only a soft deprecation and was easy to miss. While 2.0.0 is a
+backwards incompatible release it was too aggressive to remove this entirely, so
+'/etc/r10k.yaml' will continue to be respected/read in r10k 2.x. If this file is
+present and used then a deprecation notice will be logged. Apologies for the
+churn on this!
+
 2.0.0
 -----
 

data/doc/dynamic-environments/configuration.mkd

@@ -21,12 +21,13 @@ locations for a configuration file.
 
   * `{current working directory}/r10k.yaml`
   * `/etc/puppetlabs/r10k/r10k.yaml` (1.5.0 and later)
-  * `/etc/r10k.yaml` (removed in 2.0.0, deprecated in 1.5.0)
+  * `/etc/r10k.yaml` (deprecated in 1.5.0)
 
-As of 2.0.0, r10k will no longer search for a configuration file at
-`/etc/r10k.yaml`. In 1.5.0 r10k added `/etc/puppetlabs/r10k/r10k.yaml` to the
-configuration search path. The old location, `/etc/r10k.yaml` was deprecated
-at that time.
+In 1.5.0 r10k added `/etc/puppetlabs/r10k/r10k.yaml` to the configuration search
+path. The old location, `/etc/r10k.yaml` has been deprecated in favor of the new
+location. If both `/etc/puppetlabs/r10k/r10k.yaml` and `/etc/r10k.yaml` exist
+and explicit configuration file has not been given, r10k will log a warning and
+use `/etc/puppetlabs/r10k/r10.yaml`.
 
 General options
 ---------------

data/lib/r10k/deployment/config/loader.rb

@@ -11,6 +11,7 @@ module R10K
 
         CONFIG_FILE = 'r10k.yaml'
         DEFAULT_LOCATION = File.join('/etc/puppetlabs/r10k', CONFIG_FILE)
+        OLD_DEFAULT_LOCATION = File.join('/etc', CONFIG_FILE)
 
         # Search for a deployment configuration file (r10k.yaml) in several locations
         def initialize
@@ -20,7 +21,21 @@ module R10K
 
         # @return [String] The path to the first valid configfile
         def search
-          first = @loadpath.find {|filename| File.file? filename}
+
+          # If both default files are present, issue a warning.
+          if (File.file? DEFAULT_LOCATION) && (File.file? OLD_DEFAULT_LOCATION)
+            logger.warn "Both #{DEFAULT_LOCATION} and #{OLD_DEFAULT_LOCATION} configuration files exist."
+            logger.warn "#{DEFAULT_LOCATION} will be used."
+          end
+
+          path = @loadpath.find {|filename| File.file? filename}
+
+          if path == OLD_DEFAULT_LOCATION
+            logger.warn "The r10k configuration file at #{OLD_DEFAULT_LOCATION} is deprecated."
+            logger.warn "Please move your r10k configuration to #{DEFAULT_LOCATION}."
+          end
+
+          path
         end
 
         private
@@ -33,6 +48,9 @@ module R10K
           # Add the AIO location for of r10k.yaml
           @loadpath << DEFAULT_LOCATION
 
+          # Add the old default location last.
+          @loadpath << OLD_DEFAULT_LOCATION
+
           @loadpath
         end
       end

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/r10k.gemspec

@@ -33,10 +33,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday_middleware-multi_json', '~> 0.0.6'
 
   s.add_dependency 'semantic_puppet', '~> 0.1.0'
+  s.add_dependency 'minitar'
 
   s.add_development_dependency 'rspec', '~> 3.1'
 
-  s.add_development_dependency 'minitar'
 
   s.add_development_dependency 'yard', '~> 0.8.7.3'
 

data/spec/unit/deployment/config/loader_spec.rb

@@ -8,16 +8,15 @@ describe R10K::Deployment::Config::Loader do
       expect(subject.loadpath).to include('/etc/puppetlabs/r10k/r10k.yaml')
     end
 
+    it 'includes /etc/r10k.yaml in the loadpath' do
+      expect(subject.loadpath).to include('/etc/r10k.yaml')
+    end
+
     it 'does include the current working directory in the loadpath' do
       allow(Dir).to receive(:getwd).and_return '/some/random/path/westvletren'
       expect(subject.loadpath).to include('/some/random/path/westvletren/r10k.yaml')
     end
 
-    # This was the old default location that is no longer supported as of 2.0.0.
-    it 'does not include /etc/r10k.yaml in the loadpath' do
-      expect(subject.loadpath).not_to include('/etc/r10k.yaml')
-    end
-
     it 'does not include /some/random/path/atomium/r10k.yaml in the loadpath' do
       expect(subject.loadpath).not_to include('/some/random/path/atomium/r10k.yaml')
     end
@@ -28,7 +27,36 @@ describe R10K::Deployment::Config::Loader do
     it 'returns the correct default location' do
       allow(File).to receive(:file?).and_return false
       allow(File).to receive(:file?).with('/etc/puppetlabs/r10k/r10k.yaml').and_return true
+      allow(File).to receive(:file?).with('/etc/r10k.yaml').and_return true
       expect(subject.search).to eq '/etc/puppetlabs/r10k/r10k.yaml'
     end
+
+    it 'issues a warning if both default locations are present' do
+      allow(File).to receive(:file?).and_return false
+      allow(File).to receive(:file?).with('/etc/puppetlabs/r10k/r10k.yaml').and_return true
+      allow(File).to receive(:file?).with('/etc/r10k.yaml').and_return true
+
+      logger_dbl = double('Logging')
+      allow(subject).to receive(:logger).and_return logger_dbl
+
+      expect(logger_dbl).to receive(:warn).with('Both /etc/puppetlabs/r10k/r10k.yaml and /etc/r10k.yaml configuration files exist.')
+      expect(logger_dbl).to receive(:warn).with('/etc/puppetlabs/r10k/r10k.yaml will be used.')
+
+      subject.search
+    end
+
+    it 'issues a warning if the old location is used' do
+      allow(File).to receive(:file?).and_return false
+      allow(File).to receive(:file?).with('/etc/puppetlabs/r10k/r10k.yaml').and_return false
+      allow(File).to receive(:file?).with('/etc/r10k.yaml').and_return true
+
+      logger_dbl = double('Logging')
+      allow(subject).to receive(:logger).and_return logger_dbl
+
+      expect(logger_dbl).to receive(:warn).with("The r10k configuration file at /etc/r10k.yaml is deprecated.")
+      expect(logger_dbl).to receive(:warn).with('Please move your r10k configuration to /etc/puppetlabs/r10k/r10k.yaml.')
+
+      subject.search
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Adrien Thebo
@@ -123,33 +123,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitar
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -514,7 +514,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Puppet environment and module deployment
@@ -582,3 +582,4 @@ test_files:
 - spec/unit/puppet_forge/unpacker_spec.rb
 - spec/unit/puppet_forge/connection_spec.rb
 - spec/unit/puppet_forge/tar/mini_spec.rb
+has_rdoc: