r10k 1.1.0 → 1.1.1rc1

data/lib/r10k/deployment.rb

@@ -60,9 +60,8 @@ class Deployment
 
   def load_sources
     sources = @config.setting(:sources)
-    prefix = sources.length > 1
     @_sources = sources.map do |(name, hash)|
-      R10K::Deployment::Source.vivify(name, hash, prefix)
+      R10K::Deployment::Source.vivify(name, hash)
     end
   end
 

data/lib/r10k/deployment/basedir.rb

@@ -0,0 +1,38 @@
+require 'r10k/git/cache'
+require 'r10k/deployment/environment'
+require 'r10k/util/purgeable'
+
+module R10K
+class Deployment
+class Basedir
+  # Represents a directory containing environments
+
+  def initialize(path,deployment)
+    @path       = path
+    @deployment = deployment
+  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
+    end
+    @keepers
+  end
+
+end
+end
+end

data/lib/r10k/deployment/source.rb

@@ -1,5 +1,6 @@
 require 'r10k/git/cache'
 require 'r10k/deployment/environment'
+require 'r10k/deployment/basedir'
 require 'r10k/util/purgeable'
 
 module R10K
@@ -27,6 +28,20 @@ class Source
   #   @return [Array<R10K::Deployment::Environment>] All environments for this source
   attr_reader :environments
 
+  # Create a new source from a hash representation
+  #
+  # @param name [String] The name of the source
+  # @param opts [Hash] The properties to use for the source
+  # @param prefix [true, false] Whether to prefix the source name to created
+  #   environments
+  #
+  # @option opts [String] :remote The git remote for the given source
+  # @option opts [String] :basedir The directory to create environments in
+  # @option opts [true, false] :prefix Whether the environment names should
+  #   be prefixed by the source name. Defaults to false. This takes precedence
+  #   over the `prefix` argument
+  #
+  # @return [R10K::Deployment::Source]
   def self.vivify(name, attrs, prefix = false)
     remote  = (attrs.delete(:remote) || attrs.delete('remote'))
     basedir = (attrs.delete(:basedir) || attrs.delete('basedir'))

data/lib/r10k/task/deployment.rb

@@ -102,21 +102,14 @@ module Deployment
 
     def initialize(deployment)
       @deployment = deployment
+      @basedirs   = @deployment.sources.map { |x| x.basedir }.uniq
     end
 
     def call
-      @deployment.sources.each do |source|
-        stale_envs = source.stale_contents
-
-        dir = source.managed_directory
-
-        if stale_envs.empty?
-          logger.debug "No stale environments in #{dir}"
-        else
-          logger.info "Purging stale environments from #{dir}"
-          logger.debug "Stale modules in #{dir}: #{stale_envs.join(', ')}"
-          source.purge!
-        end
+      @basedirs.each do |path|
+        basedir = R10K::Deployment::Basedir.new(path,@deployment)
+        logger.info "Purging stale environments from #{path}"
+        basedir.purge!
       end
     end
   end

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '1.1.0'
+  VERSION = '1.1.1rc1'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.1.1rc1
+  prerelease: 5
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -135,6 +135,7 @@ files:
 - lib/r10k/deployment/environment.rb
 - lib/r10k/deployment/config/loader.rb
 - lib/r10k/deployment/config.rb
+- lib/r10k/deployment/basedir.rb
 - lib/r10k/deployment/source.rb
 - lib/r10k/util/purgeable.rb
 - lib/r10k/cli/environment.rb
@@ -172,8 +173,43 @@ files:
 - spec/unit/settings/container_spec.rb
 - spec/unit/module/forge_spec.rb
 homepage: http://github.com/adrienthebo/r10k
-licenses: []
-post_install_message: 
+licenses:
+- Apache 2.0
+post_install_message: ! 'NOTICE
+
+  ======
+
+
+  If you are upgrading from 1.1.0 and are using multiple sources, please read
+
+  this. (If not, feel free to continue with your regularly scheduled day.)
+
+
+  GH-48 (https://github.com/adrienthebo/r10k/issues/48) introduced the ability
+
+  for environments to be prefixed with the source name so that multiple sources
+
+  installed into the same directory would not overwrite each other. However
+
+  prefixing was automatically enabled and would break existing setups where
+
+  multiple sources were cloned into different directories.
+
+
+  Because this introduced a breaking change, SemVer dictates that the automatic
+
+  prefixing has to be rolled back. Prefixing can be enabled but always defaults
+
+  to off. If you are relying on this behavior you will need to update your r10k.yaml
+
+  to enable prefixing on a per-source basis.
+
+
+  Please see the issue (https://github.com/adrienthebo/r10k/issues/48) for more
+
+  information.
+
+'
 rdoc_options: []
 require_paths:
 - lib
@@ -186,9 +222,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23