r10k 1.1.3 → 1.1.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTRiMTQ2ZTY4M2U0YjFkNmU0NTJjMDgzMmQxOTY0NjkxODA4ZGU5ZQ==
+  data.tar.gz: !binary |-
+    NDlmZmRjZjljZDUzMzI2YTc5ODVlMThmODY0ZTY2YjEyZTVlNGY4Zg==
+SHA512:
+  metadata.gz: !binary |-
+    MWU3YTljOWYwYjljZDYzMzY3OGQyMzg2YzRmN2ZmNDM3NDM2M2E1MmI1MDA5
+    MmNlMTM1OGNlYTk4Y2E0NWIyNmY4MWE5Yzk4ZjE4MTQ1YWY4NDFkMWYzNGIx
+    YTNhOWIzZTU5YzNkYWFmYzY3OWJlMGNmN2QxOTg0NjI4ZGM3ZjM=
+  data.tar.gz: !binary |-
+    YmRmY2IyOGY0ZGVkZTFiZjVhNzY4M2U2NjdlY2U5MTMwNTliNjE0ZjAxMTIx
+    NDM5ZjY5ZTg2ZDlkY2I4MmI0N2RmYjA3MjQzNTJmY2Y3YWEwMTg2ZDQyZjhj
+    MDU2YmVlZWZjNmU1OGY1M2IxYTBiOWE3YTQzYTI0MTI0ODQ5ZmY=

data/CHANGELOG

@@ -1,6 +1,27 @@
 CHANGELOG
 =========
 
+1.1.4
+-----
+
+2014-02-24
+
+This is a backwards compatible bugfix release.
+
+### Notes
+
+  * (GH-90) Multiple environments with the same name but with different sources
+    were previously colliding and some environments were being ignored. This has
+    been fixed and all environments should be deployed when updates are run.
+
+### Thanks
+
+Thanks to the following contributors for their their extraordinary patience and
+help in for chasing down GH-90:
+
+  * Andreas Ntaflos (antaflos)
+  * Igor Galić (igalic)
+
 1.1.3
 -----
 

data/lib/r10k/task/deployment.rb

@@ -11,33 +11,40 @@ module Deployment
 
     private
 
-    def load_environments!
-      @environments = @deployment.environments.inject({}) do |hash, env|
-        hash[env.dirname] = env
-        hash
-      end
-    end
+    def active_environments(names)
 
-    # @param [Array<String>] names The list of environments to deploy.
-    #
-    def with_environments(names = [], &block)
-      load_environments!
+      active = []
 
-      # If an explicit list of environments were not given, deploy everything
-      if names.size > 0
-        to_deploy = names
+      all_environments = @deployment.environments
+      if names.empty?
+        active = all_environments
       else
-        to_deploy = @environments.keys
-      end
+        # This has average case O(N^2) but N should remain relatively small, so
+        # while this should be optimized that optimization can wait a while.
+        names.each do |env_name|
+
+          matching = all_environments.select do |env|
+            env.dirname == env_name
+          end
 
-      to_deploy.each do |env_name|
-        if (env = @environments[env_name])
-          yield env
-        else
-          logger.warn "Environment #{env_name} not found in any source"
-          task_runner.succeeded = false
+          if matching.empty?
+            logger.warn "Environment #{env_name} not found in any source"
+            task_runner.succeeded = false
+          else
+            active.concat(matching)
+          end
         end
       end
+
+      active
+    end
+
+    # @param [Array<String>] names The list of environments to deploy.
+    #
+    def with_environments(names = [])
+      active_environments(names).each do |env|
+        yield env
+      end
     end
   end
 

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.1.4
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -184,6 +171,7 @@ files:
 homepage: http://github.com/adrienthebo/r10k
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: ! 'NOTICE
 
   ======
@@ -223,22 +211,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Puppet environment and module deployment
 test_files:
 - spec/unit/registry_spec.rb