r10k 1.3.2 → 1.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2NmNmU5ZWE0MDlhNWRlODU2ODc3ZDdkZDRjZmE0ZTc4YWIxOTFhZg==
+    YjFlMGI2ZTNiYjgwYmU0YmExOWZiYTUyMDU0ZWY5NzNjOTUxMDgwMg==
   data.tar.gz: !binary |-
-    NTY0YTE3NWM5NTBjMmQ1YzQ4Njg4NzQ3YTVkOGYxZDFjYzFjYzcxYw==
+    OTc1ZTk4Y2Y2NWY5NDg5NmY2NDEyZTUyMDBhZWRmNGZjZjk0MjgwYw==
 SHA512:
   metadata.gz: !binary |-
-    OTU5YTUwNGYwZmZlOTFmOGMzNjg1NzFmM2MwYTc5NWQzYTQ5Njg4ODlhZWRj
-    ZTMxYWViNjE4ZmI3MjA2MjEyZmJmZmE5ZGU4ZWQyNTgwNTEyYmI4M2JlMmMz
-    NzRhNzlkZThhNThjOWQ4YzQyZGMzNjdhMTcyMTY5NmQ5MzcxYjQ=
+    NGRkZGIyNGI2ZWIzODk5NjBkN2Q2N2RhMWFmODk1N2NjYTNlYzFjMGM4NDJk
+    NzQ3MzkzMTEzNjY5MmMyZjdlZjFiMjIwZTY1MzQ1ZjRhZTg4MTQyN2EwYzlh
+    YzYyMTU3ZWY3ODZkOTBlMjJmOGU4OWNkZTY4ZDgzMDgzOTc4MzY=
   data.tar.gz: !binary |-
-    NmQxMzE5ZDZhYzgxYTQzNzQzNTRlYWUyODQ3ZGE5MTNiMDU4MzFjMjQ1YTQ1
-    MDcwMmJlODRhZmEzZDNkODIxOTc0NmZiNzgwMmRjNDVlNzRjY2VjMmNhYjAw
-    ZDcwYjZlNzBiNjVjNjFmZWMyYWIwNjkzNDMwMGNlMWMwMjdhMjU=
+    NmYzODIzY2YzM2QxNzllNWUzNTIyYTVhODgyZGQ2ODIzNjBkZDZkN2JkYmNk
+    YzliY2Q2OGRiM2U5MWRlNzFlM2Q1Y2VkYjk3NGI1ODRhOTQ4NjQxYTk0YWMx
+    ZjdjZmVhYTBhOTIwNGY5OTlmYmQzZjFjNWRhOTJlZmIwOWU3Njk=

data/CHANGELOG.mkd

@@ -1,6 +1,31 @@
 CHANGELOG
 =========
 
+1.3.3
+-----
+
+2014/09/11
+
+### User notes
+
+(GH-178) Failing to fetch a source git repo can wipe out environments
+
+When updating Git sources at the beginning of a deployment, if the fetch was
+interrupted r10k could cache an empty list of environments. This could cause
+r10k to remove all environments for that source. This was due to a method
+directly using a value that was supposed to be lazily evaluated and memoized. It
+has been fixed so that even if r10k cannot fetch a source it will still be able
+to deploy modules for environments, clean up removed environments, and correctly
+remove unmanaged environments.
+
+(GH-186) Rescue SyntaxError when checking Puppetfile syntax
+
+When a Puppetfile with invalid syntax is parsed it raises a SyntaxError,
+and the `r10k puppetfile check` code was not specifically handling that.
+Thus when checking an invalid file r10k was actually crashing and not
+gracefully handling the error. This was fixed to cleanly rescue the SyntaxError,
+optionally print stacktraces, and print an all ok message on success.
+
 1.3.2
 -----
 

data/lib/r10k/cli/puppetfile.rb

@@ -63,13 +63,15 @@ Puppetfile (http://bombasticmonkey.com/librarian-puppet/).
             puppetfile = R10K::Puppetfile.new(puppetfile_root, puppetfile_path, puppetfile)
             begin
               puppetfile.load
-            rescue LoadError => ex
-              $stderr.puts "ERROR: Puppetfile bad syntax"
-              ex.backtrace.each do |line|
-                  puts line
+            rescue SyntaxError, LoadError => e
+              $stderr.puts "ERROR: Could not parse Puppetfile"
+              $stderr.puts e.message
+              if opts[:trace]
+                $stderr.puts e.backtrace.join("\n")
               end
               exit 1
             end
+            puts "Syntax OK"
             exit 0
           end
         end

data/lib/r10k/deployment/basedir.rb

@@ -3,36 +3,37 @@ require 'r10k/deployment/environment'
 require 'r10k/util/purgeable'
 
 module R10K
-class Deployment
-class Basedir
-  # Represents a directory containing environments
+  class Deployment
 
-  def initialize(path,deployment)
-    @path       = path
-    @deployment = deployment
-  end
+    # Represents a directory containing environments
+    # @api private
+    class Basedir
 
-  include R10K::Util::Purgeable
+      def initialize(path,deployment)
+        @path       = path
+        @deployment = deployment
+      end
 
-  # Return the path of the basedir
-  # @note This implements a required method for the Purgeable mixin
-  # @return [String]
-  def managed_directory
-    @path
-  end
+      include R10K::Util::Purgeable
+
+      # Return the path of the basedir
+      # @note This implements a required method for the Purgeable mixin
+      # @return [String]
+      def managed_directory
+        @path
+      end
 
-  # List all environments that should exist in this basedir
-  # @note This implements a required method for the Purgeable mixin
-  # @return [Array<String>]
-  def desired_contents
-    @keepers = []
-    @deployment.sources.each do |source|
-      next unless source.managed_directory == @path
-      @keepers += source.desired_contents
+      # List all environments that should exist in this basedir
+      # @note This implements a required method for the Purgeable mixin
+      # @return [Array<String>]
+      def desired_contents
+        @deployment.sources.inject([])do |list, source|
+          if source.managed_directory == @path
+            list += source.desired_contents
+          end
+          list
+        end
+      end
     end
-    @keepers
   end
-
-end
-end
 end

data/lib/r10k/source/git.rb

@@ -75,10 +75,10 @@ class R10K::Source::Git < R10K::Source::Base
   def environments
     if not @cache.cached?
       []
-    elsif not @environments.empty?
-      @environments
-    else
+    elsif @environments.empty?
       @environments = generate_environments()
+    else
+      @environments
     end
   end
 
@@ -120,7 +120,7 @@ class R10K::Source::Git < R10K::Source::Base
   # @note This implements a required method for the Purgeable mixin
   # @return [Array<String>]
   def desired_contents
-    @environments.map {|env| env.dirname }
+    environments.map {|env| env.dirname }
   end
 
   private

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored