r10k 1.2.0rc1 → 1.2.0rc2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDUwMzg3OTY2MGUxZjA3MmFkMmQyNTAxOTUyMTc2YmJjNDU3ZWIyMg==
+    ZDA2OGNkZDI0MjI2M2UxODU5NmFjYTcxMTFiZmRlMWYxNjdmNTZiNw==
   data.tar.gz: !binary |-
-    ODkwYWNjOGRjNzcyMGEwYTJiOTM5ZmE0ZDcwYjdlYzdkYjkwMmE2YQ==
+    YWJmZjEyYzdjMTQ3YzA3MDYzNzY3NWQzYTUzNTZlNmI1ZmQwMTg1OA==
 SHA512:
   metadata.gz: !binary |-
-    ZmRmZmJiMjRkMGM3MjcwZGRlODk2YTAzZDM4ZTYwNTFhZTNhYjA0ZTg4Yzg5
-    M2M3OTI2YjgxYjdjZTE3NjQ5MWU1MmY3ZTcxYTg0ZTA1MDQ0MmI0ODI0NTI3
-    NWJmMDk0M2NhODczNjllNzA4MDU4ODJiNjRmOWQ4NzNjMmQ3YmU=
+    ZjY5NmRiYTc1ZDkwN2JhOWFkN2Y3NjFkZWY0OGM2MjJjMzNkOTk4ZTVjYTI4
+    YmIxYjFhMmRjNmIyYjYzMmU4ZmEyYWIxMDQwZjhhZjAxNWUxOGZmMmRkMmZk
+    ZmIwZTAzMTMxZjY5MzJhMzM4ZGJmOTZhMWU4NGE5ZDFkYTgwOTA=
   data.tar.gz: !binary |-
-    MzExZTMyY2VjZTI4N2E3M2M2NjQ3Yzg4YTZmYzZjMjUwMmE0ZmQ4MjNmMWJk
-    MmY3NTEwNmJlNDVkNWI5MGEyN2MwMjZjMmQ0NjYyYmJmZTQ0ZGNkYTU2MzZi
-    NWRmZTViMTBjZGEzYTAwOTdiMmYzYmNkMmM2NThkM2U1MGQyMjk=
+    ODYwY2YwZmIyMTA3ZDQwNWUzMzlmOWNmYTBiMmU3YzE1M2YyMDU3ZTdhNmRk
+    MzA2NDMyNTRhOTI0M2NjYTk1NjEzYzY5MjdmNWZhYTE1NmVlODA0NDU3YjBl
+    NjVlMDc0ZGI1YmZiYWY2NDYxMGYyNDNhYmQ1MWEzMGU5ODUyMzQ=

data/CHANGELOG

@@ -4,7 +4,7 @@ CHANGELOG
 1.2.0
 -----
 
-2014/02/08
+Unreleased
 
 ### User Notes
 
@@ -27,6 +27,47 @@ Modules can swap out sources. When an existing module is changed from Forge to
 Git, for instance, the existing module will be removed before the new module is
 installed. (GH-30)
 
+1.2.0rc2
+--------
+
+2014/02/27
+
+### Notes
+
+Git repositories were not tracking their upstream remotes, repos should now
+properly update upstream changes.
+
+Git reference clones now fetch their cache remotes immediately after the
+initial clone.
+
+1.2.0rc1
+--------
+
+2014/02/08
+
+Release Candidate 1 for 1.2.0
+
+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/git.rb

@@ -5,6 +5,7 @@ module R10K
     require 'r10k/git/ref'
     require 'r10k/git/tag'
     require 'r10k/git/head'
+    require 'r10k/git/remote_head'
     require 'r10k/git/commit'
 
     require 'r10k/git/repository'

data/lib/r10k/git/cache.rb

@@ -73,7 +73,7 @@ class R10K::Git::Cache < R10K::Git::Repository
   # @return [Array<String>] A list the branches for the git repository
   def branches
     output = git %w[for-each-ref refs/heads --format %(refname)], :git_dir => git_dir
-    output.scan(%r[refs/heads/(.*)$]).flatten
+    output.stdout.scan(%r[refs/heads/(.*)$]).flatten
   end
 
   # @return [true, false] If the repository has been locally cached

data/lib/r10k/git/remote_head.rb

@@ -0,0 +1,13 @@
+require 'r10k/git'
+
+# @api private
+class R10K::Git::RemoteHead < R10K::Git::Head
+
+  def sha1
+    if @repository.nil?
+      raise ArgumentError, "Cannot resolve #{self.inspect}: no associated git repository"
+    else
+      @repository.resolve_head("refs/remotes/cache/#{@head}")
+    end
+  end
+end

data/lib/r10k/git/repository.rb

@@ -30,19 +30,10 @@ class R10K::Git::Repository
   #
   # @return [String] The dereferenced hash of `pattern`
   def resolve_ref(pattern)
-    commit = nil
-    begin
-      all_commits = git ['show-ref', '-s', pattern], :git_dir => git_dir
-      commit = all_commits.lines.first
-    rescue R10K::Util::Subprocess::SubprocessError
-    end
-
-    if commit.nil?
-      begin
-        commit = git ['rev-parse', "#{ref}^{commit}"], :git_dir => git_dir
-      rescue R10K::Util::Subprocess::SubprocessError
-      end
-    end
+    commit   = resolve_tag(pattern)
+    commit ||= resolve_remote_head(pattern)
+    commit ||= resolve_head(pattern)
+    commit ||= resolve_commit(pattern)
 
     if commit
       commit.chomp
@@ -52,6 +43,55 @@ class R10K::Git::Repository
   end
   alias rev_parse resolve_ref
 
+  def resolve_tag(pattern)
+    output = git ['show-ref', '--tags', '-s', pattern], :git_dir => git_dir, :raise_on_fail => false
+
+    if output.success?
+      output.stdout.lines.first
+    end
+  end
+
+  def resolve_head(pattern)
+    output = git ['show-ref', '--heads', '-s', pattern], :git_dir => git_dir, :raise_on_fail => false
+
+    if output.success?
+      output.stdout.lines.first
+    end
+  end
+
+  def resolve_remote_head(pattern, remote = 'origin')
+    pattern = "refs/remotes/#{remote}/#{pattern}"
+    output = git ['show-ref', '-s', pattern], :git_dir => git_dir, :raise_on_fail => false
+
+    if output.success?
+      output.stdout.lines.first
+    end
+  end
+
+  # Define the same interface for resolving refs.
+  def resolve_commit(pattern)
+    output = git ['rev-parse', "#{pattern}^{commit}"], :git_dir => git_dir, :raise_on_fail => false
+
+    if output.success?
+      output.stdout.chomp
+    end
+  end
+
+  # @return [Hash<String, String>] A hash of remote names and fetch URLs
+  # @api private
+  def remotes
+    output = git ['remote', '-v'], :git_dir => git_dir
+
+    ret = {}
+    output.stdout.each_line do |line|
+      next if line.match /\(push\)/
+      name, url, _ = line.split(/\s+/)
+      ret[name] = url
+    end
+
+    ret
+  end
+
   private
 
   # Fetch objects and refs from the given git remote
@@ -69,12 +109,15 @@ class R10K::Git::Repository
   # @option opts [String] :path
   # @option opts [String] :git_dir
   # @option opts [String] :work_tree
+  # @option opts [String] :raise_on_fail
   #
   # @raise [R10K::ExecutionFailure] If the executed command exited with a
   #   nonzero exit code.
   #
   # @return [String] The git command output
   def git(cmd, opts = {})
+    raise_on_fail = opts.fetch(:raise_on_fail, true)
+
     argv = %w{git}
 
     if opts[:path]
@@ -92,12 +135,11 @@ class R10K::Git::Repository
     argv.concat(cmd)
 
     subproc = R10K::Util::Subprocess.new(argv)
-    subproc.raise_on_fail = true
+    subproc.raise_on_fail = raise_on_fail
     subproc.logger = self.logger
 
     result = subproc.execute
 
-    # todo ensure that logging always occurs even if the command fails to run
-    result.stdout
+    result
   end
 end

data/lib/r10k/git/working_dir.rb

@@ -55,11 +55,8 @@ class R10K::Git::WorkingDir < R10K::Git::Repository
   def sync
     if not cloned?
       clone
-    elsif fetch?
-      fetch_from_cache
-      checkout(@ref)
-    elsif needs_checkout?
-      checkout(@ref)
+    else
+      update
     end
   end
 
@@ -110,6 +107,11 @@ class R10K::Git::WorkingDir < R10K::Git::Repository
     @ref.fetch? or needs_checkout?
   end
 
+  # Prefer remote heads from the 'cache' remote over the real remote
+  def resolve_remote_head(pattern, remote = 'cache')
+    super(pattern, remote)
+  end
+
   private
 
   def fetch?
@@ -136,6 +138,7 @@ class R10K::Git::WorkingDir < R10K::Git::Repository
     # that doing a normal `git pull` on a directory will work.
     git ["clone", "--reference", @cache.git_dir, @remote, @full_path]
     git ["remote", "add", "cache", @cache.git_dir], :path => @full_path
+    git ['fetch', 'cache'], :path => @full_path
     checkout(@ref)
   end
 

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.reverse.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.reverse
+    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/util/subprocess/result.rb

@@ -21,7 +21,6 @@ class R10K::Util::Subprocess::Result
   #   @return [Integer]
   attr_reader :exit_code
 
-
   def initialize(argv, stdout, stderr, exit_code)
     @argv = argv
     @cmd = argv.join(' ')
@@ -33,4 +32,12 @@ class R10K::Util::Subprocess::Result
   def [](field)
     send(field)
   end
+
+  def failed?
+    exit_code != 0
+  end
+
+  def success?
+    exit_code == 0
+  end
 end

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '1.2.0rc1'
+  VERSION = '1.2.0rc2'
 end

data/spec/unit/git/cache_spec.rb

@@ -29,7 +29,7 @@ describe R10K::Git::Cache do
     end
 
     it "lists local branches using git for-each-ref" do
-      expect(cache).to receive(:git).with(%w[for-each-ref refs/heads --format %(refname)], anything).and_return refs
+      expect(cache).to receive(:git).with(%w[for-each-ref refs/heads --format %(refname)], anything).and_return(double(:stdout => refs))
 
       expect(cache.branches).to eq %w[master next next-fetch-errors next-update-forge-modules]
     end

data/spec/unit/git/repository_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'r10k/git'
+
+describe R10K::Git::Repository do
+  include_context "fail on execution"
+
+  describe "remotes" do
+    let(:output) do
+      "cache	/home/user/.r10k/git/git@github.com-org-org-modules (fetch)\n" +
+      "cache	/home/user/.r10k/git/git@github.com-org-org-modules (push)\n" +
+      "origin	git@github.com:org/org-modules (fetch)\n" +
+      "origin	git@github.com:org/org-modules (push)\n"
+    end
+
+    it "generates a hash of remote names and remote URLs" do
+      expect(subject).to receive(:git).with(%w[remote -v], anything).and_return(double(:stdout => output))
+
+      expect(subject.remotes).to eq(
+        'cache'  => '/home/user/.r10k/git/git@github.com-org-org-modules',
+        'origin' => 'git@github.com:org/org-modules',
+      )
+    end
+  end
+end

data/spec/unit/git/working_dir_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'r10k/git'
 
 describe R10K::Git::WorkingDir do
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.2.0rc1
+  version: 1.2.0rc2
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -227,6 +227,7 @@ files:
 - lib/r10k/git/errors.rb
 - lib/r10k/git/head.rb
 - lib/r10k/git/ref.rb
+- lib/r10k/git/remote_head.rb
 - lib/r10k/git/repository.rb
 - lib/r10k/git/tag.rb
 - lib/r10k/git/working_dir.rb
@@ -287,6 +288,7 @@ files:
 - spec/unit/git/commit_spec.rb
 - spec/unit/git/head_spec.rb
 - spec/unit/git/ref_spec.rb
+- spec/unit/git/repository_spec.rb
 - spec/unit/git/tag_spec.rb
 - spec/unit/git/working_dir_spec.rb
 - spec/unit/module/forge_spec.rb
@@ -368,6 +370,7 @@ test_files:
 - spec/unit/git/working_dir_spec.rb
 - spec/unit/git/cache_spec.rb
 - spec/unit/git/commit_spec.rb
+- spec/unit/git/repository_spec.rb
 - spec/unit/git/head_spec.rb
 - spec/unit/git/tag_spec.rb
 - spec/unit/deployment/environment_spec.rb