r10k 1.4.0 → 1.4.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmQxYWU2Zjk4NzkwODMwNWYyZWMxMTA0NGZmMjg3NGFiNDM1OThlNA==
-  data.tar.gz: !binary |-
-    ZmRiYjU3NDk4ZTA0ZDdiYTYxMDc4YTU2ZTg4MzQ5MjFkYjNmZjVlNw==
+SHA1:
+  metadata.gz: 3617d49776218c02d2e1de1f3f40cb267897f1a7
+  data.tar.gz: 668d68acdf49933248305d1c694637a29798b057
 SHA512:
-  metadata.gz: !binary |-
-    YjE4YmM1ZmFlNDA1NWVkODYwMGU4YzQzYjk2OTNhOWY0ZWIwMjFkYjZmZmFk
-    ZWE3ZTA1MzEzNzgxYzNhZmVhMmYzZTQ1YzUwNTRiMTQ1NWU4MmRhMWM4ODBk
-    YWMzMDE3ZmRiYWQzNDA0MzhmNjk0ZTBlYzBkNDdjN2IwYjJmMGM=
-  data.tar.gz: !binary |-
-    MjNiNGJhYmQ1YWNlYjc0MzVhZWNmYzUwNjM2ZWEwMzcwYjZjYjA3OGRhOTAw
-    ZDk4MTQ2ZjlmMWQ5ZDBjNzdiY2RjNjVmY2JiOWQ5MGVmNjRmNjliNWEzNjkx
-    YTQ4YjI1ZWYwZmE1ZTk2NWZiOTczNTUwZTA2OWRiNGZmMmM1NzM=
+  metadata.gz: 2e4f861e931a5c663e4315178bf17cc8ee61375634a9a1bef927ca23b2b2656caf18e37b56c2a889498a53c895c428a4a3901ee6a6cee61339cb1b544f455ebd
+  data.tar.gz: a2f13cac9fe9c31fa604803fb6576f2945ecc5fe16da7c08388b0dbd853b905782694dc6884cd0a666e1d708607d84a086a5436f3fb7c7b3897e67e5b4d247f4

data/CHANGELOG.mkd

@@ -1,6 +1,59 @@
 CHANGELOG
 =========
 
+1.4.1
+-----
+
+2015/01/09
+
+### User notes
+
+(GH-254) Puppetfile subcommands use non-zero exit codes on errors.
+
+The Puppetfile `install` and `purge` commands would always exit with an exit
+code of 0, regardless of if any errors occurred or if there was no Puppetfile
+available. This has been now corrected so that runtime errors cause r10k to exit
+with a non-zero exit code.
+
+(GH-260) Normalize deployed environment names on the command line.
+
+Version 1.4.0 removed the environment name normalization needed to deploy
+environments that had their directory names normalized; this has been remedied
+so that environment names on the command line are also normalized to match the
+corrections that r10k will make to the environment names.
+
+(GH-269) Improved error messages when trying to use non-existent Git refs.
+
+If a Git module tried to use a Git ref that did not exist, it would output a
+particularly unhelpful error message that didn't indicate what actually failed.
+This has been fixed so that if an invalid ref is used, r10k will actually report
+that the ref could not be used. What a brave new world we inhabit!
+
+(GH-271)/(GH-275) Report the name of invalid module names.
+
+The fix for GH-92 released in 1.4.0 added better handling and parsing of module
+names, but also added stricter parsing of module names and disallowed invalid
+characters that Puppet itself could not use. However when r10k encountered such
+an invalid module name, it would not report the module with the invalid name,
+making debugging harder than needed. In 1.4.1 r10k when r10k encounters an
+invalid module name it reports the invalid module name in the error message.
+
+### Thanks
+
+Thanks to the following contributors for their work on this release:
+
+  * [Lex Rivera](https://github.com/rlex) for discovering and reporting the r10k
+    puppetfile exit code bug (GH-254).
+  * [Eli Young](https://github.com/elyscape) for discovering and fixing the
+    environment normalization bug (GH-260).
+  * [Clayton O'Neill](https://github.com/dvorak) For adding better error
+    reporting of invalid module names (GH-275).
+
+Additional thanks to all those in #puppet and #r10k for endlessly helping new
+users of r10k, your assistance is invaluable!
+
+###
+
 1.4.0
 -----
 

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

@@ -13,7 +13,7 @@ module R10K
 
         def initialize(opts, argv)
           @opts = opts
-          @argv = argv
+          @argv = argv.map { |arg| arg.gsub(/\W/,'_') }
           setopts(opts, {
             :config     => :self,
             :puppetfile => :self,

data/lib/r10k/action/puppetfile/check.rb

@@ -26,10 +26,10 @@ module R10K
           pf = R10K::Puppetfile.new(@root, @moduledir, @path)
 
           begin
-            pf.load
+            pf.load!
             $stderr.puts "Syntax OK"
             true
-          rescue R10K::Error => e
+          rescue => e
             $stderr.puts R10K::Errors::Formatting.format_exception(e, @trace)
             false
           end

data/lib/r10k/action/puppetfile/install.rb

@@ -38,7 +38,7 @@ module R10K
         end
 
         def visit_puppetfile(pf)
-          pf.load
+          pf.load!
           yield
           pf.purge!
         end

data/lib/r10k/action/puppetfile/purge.rb

@@ -24,11 +24,11 @@ module R10K
 
         def call
           pf = R10K::Puppetfile.new(@root, @moduledir, @path)
-          pf.load
+          pf.load!
           pf.purge!
           true
         rescue => e
-          logger.error R10K::Errors::Formatting.format_exception(e, opts[:trace])
+          logger.error R10K::Errors::Formatting.format_exception(e, @trace)
           false
         end
       end

data/lib/r10k/git/errors.rb

@@ -10,31 +10,17 @@ module R10K
       attr_reader :ref
       attr_reader :git_dir
 
-      def initialize(*args)
+      def initialize(mesg, options = {})
         super
-
-        @hash    = @options[:ref]
+        @ref     = @options[:ref]
         @git_dir = @options[:git_dir]
       end
 
-      HASHLIKE = %r[[A-Fa-f0-9]]
-
-      # Print a friendly error message if an object hash is given as the message
       def message
-        if @mesg
-          msg = @mesg
-        else
-          msg = "Could not locate hash"
-
-          if @hash
-            msg << " '#{@hash}'"
-          end
-        end
-
+        msg = super
         if @git_dir
           msg << " at #{@git_dir}"
         end
-
         msg
       end
     end

data/lib/r10k/git/repository.rb

@@ -38,7 +38,7 @@ class R10K::Git::Repository
     if commit
       commit.chomp
     else
-      raise R10K::Git::UnresolvableRefError.new(:ref => pattern, :git_dir => git_dir)
+      raise R10K::Git::UnresolvableRefError.new("Could not resolve Git ref '#{ref}'", :ref => pattern, :git_dir => git_dir)
     end
   end
   alias rev_parse resolve_ref

data/lib/r10k/git/working_dir.rb

@@ -89,13 +89,9 @@ class R10K::Git::WorkingDir < R10K::Git::Repository
   #
   # @param ref [R10K::Git::Ref] The git reference to check out
   def checkout(ref)
-    if ref.resolvable?
-      git ["checkout", "--force", @ref.sha1], :path => @full_path
-    else
-      raise R10K::Git::UnresolvableRefError.new(
-        "Cannot check out unresolvable ref '#{@ref}'",
-        :git_dir => @full_path)
-    end
+    git ["checkout", "--force", @ref.sha1], :path => @full_path
+  rescue => e
+    raise R10K::Git::GitError.wrap(e, "Cannot check out Git ref '#{@ref}'")
   end
 
   # The currently checked out HEAD

data/lib/r10k/module/base.rb

@@ -96,7 +96,7 @@ class R10K::Module::Base
     elsif (match = title.match(/\A(\w+)[-\/](\w+)\Z/))
       [match[1], match[2]]
     else
-      raise ArgumentError, "Module names must match either 'modulename' or 'owner/modulename'"
+      raise ArgumentError, "Module name (#{title}) must match either 'modulename' or 'owner/modulename'"
     end
   end
 end

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/spec/unit/module/base_spec.rb

@@ -24,7 +24,7 @@ describe R10K::Module::Base do
     it "raises an error when the title is not correctly formatted" do
       expect {
         described_class.new('branan!eight_hundred', '/moduledir', [])
-      }.to raise_error(ArgumentError, "Module names must match either 'modulename' or 'owner/modulename'")
+      }.to raise_error(ArgumentError, "Module name (branan!eight_hundred) must match either 'modulename' or 'owner/modulename'")
     end
   end
 

metadata

@@ -1,186 +1,187 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Adrien Thebo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: '1.2'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: cri
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.1
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: systemu
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.2
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.10
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.2
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.8
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: faraday_middleware-multi_json
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.5
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7.3
-description: ! "    R10K provides a general purpose toolset for deploying Puppet environments
-  and modules.\n    It implements the Puppetfile format and provides a native implementation
-  of Puppet\n    dynamic environments.\n"
+  prerelease: false
+  type: :development
+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
+      dynamic environments.
 email: adrien@somethingsinistral.net
 executables:
 - r10k
@@ -372,31 +373,36 @@ homepage: http://github.com/adrienthebo/r10k
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.4
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Puppet environment and module deployment
 test_files:
+- spec/unit/module_spec.rb
+- spec/unit/keyed_factory_spec.rb
+- spec/unit/source_spec.rb
+- spec/unit/puppetfile_spec.rb
+- spec/unit/instance_cache_spec.rb
+- spec/unit/deployment_spec.rb
 - spec/unit/environment/base_spec.rb
 - spec/unit/environment/svn_spec.rb
 - spec/unit/environment/git_spec.rb
-- spec/unit/module_spec.rb
 - spec/unit/module_repository/forge_spec.rb
 - spec/unit/git/ref_spec.rb
 - spec/unit/git/working_dir_spec.rb
@@ -406,33 +412,28 @@ test_files:
 - spec/unit/git/head_spec.rb
 - spec/unit/git/alternates_spec.rb
 - spec/unit/git/tag_spec.rb
-- spec/unit/keyed_factory_spec.rb
 - spec/unit/deployment/environment_spec.rb
 - spec/unit/deployment/source_spec.rb
-- spec/unit/source_spec.rb
-- spec/unit/puppetfile_spec.rb
 - spec/unit/util/attempt_spec.rb
 - spec/unit/util/setopts_spec.rb
+- spec/unit/util/subprocess_spec.rb
 - spec/unit/util/subprocess/result_spec.rb
 - spec/unit/util/subprocess/subprocess_error_spec.rb
-- spec/unit/util/subprocess_spec.rb
 - spec/unit/util/core_ext/hash_ext_spec.rb
 - spec/unit/errors/formatting_spec.rb
-- spec/unit/instance_cache_spec.rb
 - spec/unit/action/visitor_spec.rb
 - spec/unit/action/cri_runner_spec.rb
-- spec/unit/action/puppetfile/cri_action_spec.rb
 - spec/unit/action/runner_spec.rb
+- spec/unit/action/puppetfile/cri_action_spec.rb
 - spec/unit/settings/container_spec.rb
 - spec/unit/svn/working_dir_spec.rb
 - spec/unit/svn/remote_spec.rb
 - spec/unit/source/base_spec.rb
 - spec/unit/source/svn_spec.rb
 - spec/unit/source/git_spec.rb
-- spec/unit/deployment_spec.rb
 - spec/unit/module/forge_spec.rb
 - spec/unit/module/base_spec.rb
 - spec/unit/module/svn_spec.rb
 - spec/unit/module/git_spec.rb
 - spec/unit/module/metadata_spec.rb
-has_rdoc: 
+has_rdoc: