r10k 2.1.0 → 2.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWM0YTE3ZTkwYmEyZDkxZTE0ZDdlMzUyOGEzODI0Zjk1ZGU4OWI4MQ==
+    MTVkMmIxYThmNTlhNWYzZDA2OGM2ZTk4NWY1NGUwODcxNzViNDU2MA==
   data.tar.gz: !binary |-
-    ZjM0ZGE5NDk2ZjE1YjM0ZDA0NjU4MzE5ZmRmYmI5NzFkYjkxMjViMw==
+    MjIwNDQ0NjhkNTgyNWUxMDgzN2U0OWQ4MDYzYjMxZTk4Y2ZmMmM1ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MTc2MTFjZjBiNTljNGY0NzQyZDhiNDllOTFmYjEyOTY5OTA1MzViMDlhM2I4
-    MTczZjQwMWE1NjI3MTEwNjllYTlkOTcyZDgyZjFkZWI2MTYxODc5ZDhkOGZl
-    YjQxZDE2YmY4ZTc1YjY3MGJjMjE4ZWMyYzk1YmQ3NGJmZDgyZjk=
+    NTQ5YjcxZWI0OWI4MGRiMWUyNjkxODgyYTNhMmM1YjFhNTdkYjFhOTg2MTU5
+    OTM0ZWJmNDBkYzA1NjhlMzVmODdjYWYxODAwY2UxYTA0YzIyYjQ1N2ZjNmY4
+    N2JlMWViZGM0ZTRhOTU4M2IxMTUzZDQ4NzEzY2NmODE0MmQzY2U=
   data.tar.gz: !binary |-
-    MGJlYWJlZmU0MzczZmNjZmY4MTA1M2RhMGM2YjY3ODM5NjkwNGRhMzE5Y2Zj
-    YjMzZTU5ODk0NGIwYmFiMTVjMWJjMGY0OTIyMTFiMzcwZjUzN2JhNWE3MzY3
-    N2JlNTZlMWQ1ZGE1YTE1YjgxZDQwMWM1NDZkMGMwZDM5NjQzYjI=
+    ZGFiMTA0NTE1NTBkODA2ZGVjOTcwZWMwMTlkMmI1NTdkMDRmY2FkMjYyMWRm
+    YWQ3NDViNjU3Y2UyOTkzM2RkOGM3M2YxNjRjY2FjODU1ZmFjMmQ1YTNjNGNm
+    MTYxZmVmMGFmMzMyYTI3OTg2ZTJjMzQ4Nzk3OWE0OTU3ODg1OGI=

data/CHANGELOG.mkd

@@ -1,6 +1,31 @@
 CHANGELOG
 =========
 
+2.1.1
+-----
+
+2015/11/12
+
+### Notes
+
+(CODEMGMT-440) Defer git alternates setup
+
+The fix for RK-175 that updated the Git alternates file for repositories was happening too early, and
+could cause issues when multiple r10k processes were running concurrently. This has been fixed so that
+the alternates file update is deferred till the first time the git repository is actually accessed.
+
+(RK-187) Consider thin repos with a .git file (not directory) to be mismatched
+
+If a given Git thin repository had a .git file where r10k expected there to be a directory it would
+behave badly; this has been fixed so that if r10k encounters this case it treats the repository as
+mismatched.
+
+(RK-181) Correctly set baseurl/proxy with shared PuppetForge URL
+
+A combination of some odd connection handling behavior in the puppet_forge gem combined with some
+bad assumptions in r10k prevented users from being able to actually set a custom forge baseurl;
+this has been fixed.
+
 2.1.0
 -----
 

data/lib/r10k/forge/module_release.rb

@@ -37,7 +37,10 @@ module R10K
         @full_name = PuppetForge::V3.normalize_name(full_name)
         @version   = version
 
-        PuppetForge::V3::Release.conn = conn
+        # Copy the PuppetForge base connection to the release class; the connection
+        # objects are created in the class instances and thus are not shared with
+        # subclasses.
+        PuppetForge::V3::Release.conn = PuppetForge::V3::Base.conn
         @forge_release = PuppetForge::V3::Release.new({ :name => @full_name, :version => @version, :slug => "#{@full_name}-#{@version}" })
 
         @download_path = Pathname.new(Dir.mktmpdir) + (@forge_release.slug + '.tar.gz')
@@ -120,30 +123,6 @@ module R10K
           download_path.delete
         end
       end
-
-      private
-
-      def conn
-        if settings[:baseurl]
-          PuppetForge.host = settings[:baseurl]
-          conn = PuppetForge::Connection.make_connection(settings[:baseurl])
-        else
-          PuppetForge.host = "https://forgeapi.puppetlabs.com"
-          conn = PuppetForge::Connection.default_connection
-        end
-        conn.proxy(proxy)
-        conn
-      end
-
-      def proxy
-        [
-          settings[:proxy],
-          ENV['HTTPS_PROXY'],
-          ENV['https_proxy'],
-          ENV['HTTP_PROXY'],
-          ENV['http_proxy']
-        ].find { |value| value }
-      end
     end
   end
 end

data/lib/r10k/git/rugged/thin_repository.rb

@@ -66,11 +66,9 @@ class R10K::Git::Rugged::ThinRepository < R10K::Git::Rugged::WorkingRepository
   # Override the parent class repo setup so that we can make sure the alternates file is up to date
   # before we create the Rugged::Repository object, which reads from the alternates file.
   def setup_rugged_repo
-    if git_dir.exist?
-      entry_added = alternates.add?(@cache_repo.objects_dir.to_s)
-      if entry_added
-        logger.debug2 { "Updated repo #{@path} to include alternate object db path #{@cache_repo.objects_dir}" }
-      end
+    entry_added = alternates.add?(@cache_repo.objects_dir.to_s)
+    if entry_added
+      logger.debug2 { "Updated repo #{@path} to include alternate object db path #{@cache_repo.objects_dir}" }
     end
     super
   end

data/lib/r10k/git/rugged/working_repository.rb

@@ -13,7 +13,6 @@ class R10K::Git::Rugged::WorkingRepository < R10K::Git::Rugged::BaseRepository
   # @param dirname [String] The directory name of the Git repository
   def initialize(basedir, dirname)
     @path = Pathname.new(File.join(basedir, dirname))
-    setup_rugged_repo
   end
 
   # Clone this git repository
@@ -99,9 +98,14 @@ class R10K::Git::Rugged::WorkingRepository < R10K::Git::Rugged::BaseRepository
 
   private
 
-  def setup_rugged_repo
-    if exist? && git_dir.exist?
-      @_rugged_repo = ::Rugged::Repository.new(@path.to_s, :alternates => alternates.to_a)
+  def with_repo
+    if @_rugged_repo.nil? && git_dir.exist?
+      setup_rugged_repo
     end
+    super
+  end
+
+  def setup_rugged_repo
+    @_rugged_repo = ::Rugged::Repository.new(@path.to_s, :alternates => alternates.to_a)
   end
 end

data/lib/r10k/git/shellgit/thin_repository.rb

@@ -11,12 +11,6 @@ class R10K::Git::ShellGit::ThinRepository < R10K::Git::ShellGit::WorkingReposito
   def initialize(basedir, dirname, cache_repo)
     @cache_repo = cache_repo
     super(basedir, dirname)
-    if git_dir.exist?
-      entry_added = alternates.add?(@cache_repo.objects_dir.to_s)
-      if entry_added
-        logger.debug2 { "Updated repo #{@path} to include alternate object db path #{@cache_repo.objects_dir}" }
-      end
-    end
   end
 
   # Clone this git repository
@@ -51,4 +45,21 @@ class R10K::Git::ShellGit::ThinRepository < R10K::Git::ShellGit::WorkingReposito
     git ["remote", "add", "cache", @cache_repo.git_dir.to_s], :path => @path.to_s
     fetch
   end
+
+  def git(cmd, opts = {})
+    if !@_synced_alternates
+      sync_alternates
+      @_synced_alternates = true
+    end
+    super
+  end
+
+  def sync_alternates
+    if git_dir.exist?
+      entry_added = alternates.add?(@cache_repo.objects_dir.to_s)
+      if entry_added
+        logger.debug2 { "Updated repo #{@path} to include alternate object db path #{@cache_repo.objects_dir}" }
+      end
+    end
+  end
 end

data/lib/r10k/git/stateful_repository.rb

@@ -59,6 +59,8 @@ class R10K::Git::StatefulRepository
       :absent
     elsif !@repo.git_dir.exist?
       :mismatched
+    elsif !@repo.git_dir.directory?
+      :mismatched
     elsif !(@repo.origin == @remote)
       :mismatched
     elsif !(@repo.head == @cache.resolve(@ref))

data/lib/r10k/initializers.rb

@@ -47,8 +47,8 @@ module R10K
 
     class ForgeInitializer < BaseInitializer
       def call
-        with_setting(:proxy) { |value| R10K::Forge::ModuleRelease.settings[:proxy] = value }
-        with_setting(:baseurl) { |value| R10K::Forge::ModuleRelease.settings[:baseurl] = value }
+        with_setting(:baseurl) { |value| PuppetForge.host = value }
+        with_setting(:proxy) { |value| PuppetForge::V3::Base.conn.proxy(value) }
       end
     end
   end

data/lib/r10k/module/forge.rb

@@ -60,7 +60,7 @@ class R10K::Module::Forge < R10K::Module::Base
   def expected_version
     if @expected_version == :latest
       begin
-      @expected_version = @v3_module.current_release.version
+        @expected_version = @v3_module.current_release.version
       rescue Faraday::ResourceNotFound => e
         raise PuppetForge::ReleaseNotFound, "The module #{@title} does not exist on #{PuppetForge::V3::Release.conn.url_prefix}.", e.backtrace
       end

data/lib/r10k/settings.rb

@@ -35,6 +35,14 @@ module R10K
       R10K::Settings::Collection.new(:forge, [
         URIDefinition.new(:proxy, {
           :desc => "An optional proxy server to use when downloading modules from the forge.",
+          :default => lambda do
+            [
+              ENV['HTTPS_PROXY'],
+              ENV['https_proxy'],
+              ENV['HTTP_PROXY'],
+              ENV['http_proxy']
+            ].find { |value| value }
+          end
         }),
 
         URIDefinition.new(:baseurl, {

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/spec/integration/git/stateful_repository_spec.rb

@@ -26,6 +26,14 @@ describe R10K::Git::StatefulRepository do
       end
     end
 
+    describe "when the directory has a .git file" do
+      it "is mismatched" do
+        thinrepo.path.mkdir
+        File.open("#{thinrepo.path}/.git", "w") {}
+        expect(subject.status).to eq :mismatched
+      end
+    end
+
     describe "when the repository doesn't match the desired remote" do
       it "is mismatched" do
         thinrepo.clone(remote, {:ref => '1.0.0'})

data/spec/unit/forge/module_release_spec.rb

@@ -18,38 +18,6 @@ describe R10K::Forge::ModuleRelease do
     subject.unpack_path = unpack_path
   end
 
-  describe 'setting the proxy' do
-    %w[HTTPS_PROXY https_proxy HTTP_PROXY http_proxy].each do |env_var|
-      it "respects the #{env_var} environment variable" do
-        R10K::Util::ExecEnv.withenv(env_var => "http://proxy.value") do
-          subject = described_class.new('branan-eight_hundred', '8.0.0')
-          proxy_uri = forge_release_class.conn.proxy.uri
-          expect(proxy_uri.to_s).to eq "http://proxy.value"
-        end
-      end
-    end
-
-    describe 'using application settings' do
-      before { described_class.settings[:proxy] = 'http://proxy.setting' }
-      after { described_class.settings.reset! }
-
-      it 'has a setting for the forge proxy' do
-        subject = described_class.new('branan-eight_hundred', '8.0.0')
-        proxy_uri = forge_release_class.conn.proxy.uri
-        expect(proxy_uri.to_s).to eq "http://proxy.setting"
-      end
-
-      it 'prefers the proxy setting over an environment variable' do
-        R10K::Util::ExecEnv.withenv('HTTPS_PROXY' => "http://proxy.from.env") do
-          subject = described_class.new('branan-eight_hundred', '8.0.0')
-          proxy_uri = forge_release_class.conn.proxy.uri
-          expect(proxy_uri.to_s).to eq "http://proxy.setting"
-        end
-      end
-    end
-
-  end
-
   describe '#download' do
     it "downloads the module from the forge into `download_path`" do
       expect(subject.forge_release).to receive(:download).with(download_path)

data/spec/unit/initializers_spec.rb

@@ -22,15 +22,15 @@ describe R10K::Initializers::GitInitializer do
 end
 
 describe R10K::Initializers::ForgeInitializer do
-  it "configures the Forge proxy" do
-    subject = described_class.new({:proxy => 'http://my.site.proxy:3128'})
-    expect(R10K::Forge::ModuleRelease.settings).to receive(:[]=).with(:proxy, 'http://my.site.proxy:3128')
+  it "sets the PuppetForge host" do
+    subject = described_class.new({:baseurl => 'https://my.site.forge'})
+    expect(PuppetForge).to receive(:host=).with('https://my.site.forge')
     subject.call
   end
 
-  it "configures the Forge baseurl" do
-    subject = described_class.new({:baseurl => 'https://my.site.forge'})
-    expect(R10K::Forge::ModuleRelease.settings).to receive(:[]=).with(:baseurl, 'https://my.site.forge')
+  it "configures PuppetForge connection proxy" do
+    subject = described_class.new({:proxy => 'http://my.site.proxy:3128'})
+    expect(PuppetForge::V3::Base.conn).to receive(:proxy).with('http://my.site.proxy:3128')
     subject.call
   end
 end

data/spec/unit/settings_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'r10k/settings'
+require 'r10k/util/exec_env'
 
 describe R10K::Settings do
   describe "git settings" do
@@ -52,6 +53,17 @@ describe R10K::Settings do
           expect(err.errors[:proxy].message).to match(/could not be parsed as a URL/)
         end
       end
+
+      describe "setting a default value" do
+        %w[HTTPS_PROXY https_proxy HTTP_PROXY http_proxy].each do |env_var|
+          it "respects the #{env_var} environment variable" do
+            R10K::Util::ExecEnv.withenv(env_var => "http://proxy.value/#{env_var}") do
+              output = subject.evaluate({})
+              expect(output[:proxy]).to eq("http://proxy.value/#{env_var}")
+            end
+          end
+        end
+      end
     end
 
     describe "baseurl" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored