r10k 3.14.0 → 3.15.0

data/lib/r10k/git/stateful_repository.rb

@@ -36,7 +36,7 @@ class R10K::Git::StatefulRepository
   end
 
   # Returns true if the sync actually updated the repo, false otherwise
-  def sync(ref, force=true)
+  def sync(ref, force=true, exclude_spec=false)
     @cache.sync if sync_cache?(ref)
 
     sha = @cache.resolve(ref)
@@ -45,7 +45,7 @@ class R10K::Git::StatefulRepository
       raise R10K::Git::UnresolvableRefError.new(_("Unable to sync repo to unresolvable ref '%{ref}'") % {ref: ref}, :git_dir => @repo.git_dir)
     end
 
-    workdir_status = status(ref)
+    workdir_status = status(ref, exclude_spec)
 
     updated = true
     case workdir_status
@@ -75,7 +75,7 @@ class R10K::Git::StatefulRepository
     updated
   end
 
-  def status(ref)
+  def status(ref, exclude_spec=false)
     if !@repo.exist?
       :absent
     elsif !@cache.exist?
@@ -88,7 +88,7 @@ class R10K::Git::StatefulRepository
       :mismatched
     elsif @repo.head.nil?
       :mismatched
-    elsif @repo.dirty?
+    elsif @repo.dirty?(exclude_spec)
       :dirty
     elsif !(@repo.head == @cache.resolve(ref))
       :outdated

data/lib/r10k/module/base.rb

@@ -60,8 +60,12 @@ class R10K::Module::Base
     @environment = environment
     @overrides = args.delete(:overrides) || {}
     @spec_deletable = true
-    @exclude_spec = args.delete(:exclude_spec)
-    @exclude_spec = @overrides[:modules].delete(:exclude_spec) if @overrides.dig(:modules, :exclude_spec)
+    @exclude_spec = false
+    @exclude_spec = @overrides.dig(:modules, :exclude_spec) if @overrides.dig(:modules, :exclude_spec)
+    if args.has_key?(:exclude_spec)
+      logger.debug2 _("Overriding :exclude_spec setting with per module setting for #{@title}")
+      @exclude_spec = args.delete(:exclude_spec)
+    end
     @origin = 'external' # Expect Puppetfile or R10k::Environment to set this to a specific value
 
     @requested_modules = @overrides.dig(:modules, :requested_modules) || []

data/lib/r10k/module/forge.rb

@@ -13,16 +13,7 @@ class R10K::Module::Forge < R10K::Module::Base
   R10K::Module.register(self)
 
   def self.implement?(name, args)
-    args[:type].to_s == 'forge' ||
-      (!!
-       ((args.keys & %i{git svn type}).empty? &&
-        args.has_key?(:version) &&
-        name.match(%r[\w+[/-]\w+]) &&
-        valid_version?(args[:version])))
-  end
-
-  def self.valid_version?(expected_version)
-    expected_version == :latest || expected_version.nil? || PuppetForge::Util.version_valid?(expected_version)
+    args[:type].to_s == 'forge'
   end
 
   def self.statically_defined_version(name, args)
@@ -54,11 +45,20 @@ class R10K::Module::Forge < R10K::Module::Base
       :type    => ::R10K::Util::Setopts::Ignore,
     }, :raise_on_unhandled => false)
 
+    # Validate version and raise on issue. Title is validated by base class.
+    unless valid_version?(@expected_version)
+      raise ArgumentError, _("Module version %{ver} is not a valid Forge module version") % {ver: @expected_version}
+    end
+
     @expected_version ||= current_version || :latest
 
     @v3_module = PuppetForge::V3::Module.new(:slug => @title)
   end
 
+  def valid_version?(version)
+    version == :latest || version.nil? || PuppetForge::Util.version_valid?(version)
+  end
+
   # @param [Hash] opts Deprecated
   # @return [Boolean] true if the module was updated, false otherwise
   def sync(opts={})

data/lib/r10k/module/git.rb

@@ -9,8 +9,6 @@ class R10K::Module::Git < R10K::Module::Base
 
   def self.implement?(name, args)
     args.has_key?(:git) || args[:type].to_s == 'git'
-  rescue
-    false
   end
 
   # Will be called if self.implement? above returns true. Will return
@@ -69,7 +67,7 @@ class R10K::Module::Git < R10K::Module::Base
       :default_branch_override => :default_override_ref,
     }, :raise_on_unhandled => false)
 
-    force = @overrides.dig(:modules, :force)
+    force = @overrides[:force]
     @force = force == false ? false : true
 
     @desired_ref ||= 'master'
@@ -102,7 +100,7 @@ class R10K::Module::Git < R10K::Module::Base
   def sync(opts={})
     force = opts[:force] || @force
     if should_sync?
-      updated = @repo.sync(version, force)
+      updated = @repo.sync(version, force, @exclude_spec)
     else
       updated = false
     end

data/lib/r10k/module/local.rb

@@ -8,7 +8,7 @@ class R10K::Module::Local < R10K::Module::Base
   R10K::Module.register(self)
 
   def self.implement?(name, args)
-    args.is_a?(Hash) && (args[:local] || args[:type].to_s == 'local')
+    args[:local] || args[:type].to_s == 'local'
   end
 
   def self.statically_defined_version(*)

data/lib/r10k/module_loader/puppetfile/dsl.rb

@@ -15,7 +15,7 @@ module R10K
           if args.is_a?(Hash)
             opts = args
           else
-            opts = { version: args }
+            opts = { type: 'forge', version: args }
           end
 
           if @metadata_only

data/lib/r10k/module_loader/puppetfile.rb

@@ -157,11 +157,14 @@ module R10K
           return @modules
         end
 
-        # If this module's metadata has a static version and that version
-        # matches the existing module declaration use it, otherwise create
-        # a regular module to sync.
-        unless mod.version && (mod.version == @existing_module_versions_by_name[mod.name])
-          mod = mod.to_implementation
+        # If this module's metadata has a static version, and that version
+        # matches the existing module declaration, and it ostensibly
+        # has already has been deployed to disk, use it. Otherwise create a
+        # regular module to sync.
+        unless mod.version &&
+               mod.version == @existing_module_versions_by_name[mod.name] &&
+               File.directory?(mod.path)
+            mod = mod.to_implementation
         end
 
         @modules << mod
@@ -196,8 +199,10 @@ module R10K
       end
 
       def parse_module_definition(name, info)
+        # The only valid (deprecated) way a module can be defined with a
+        # non-hash info is if it is a Forge module.
         if !info.is_a?(Hash)
-          info = { version: info }
+          info = { type: 'forge', version: info }
         end
 
         info[:overrides] = @overrides

data/lib/r10k/settings/container.rb

@@ -1,3 +1,4 @@
+require 'set'
 # Defines a collection for application settings
 #
 # This implements a hierarchical interface to application settings. Containers

data/lib/r10k/version.rb

@@ -2,5 +2,5 @@ module R10K
   # When updating to a new major (X) or minor (Y) version, include `#major` or
   # `#minor` (respectively) in your commit message to trigger the appropriate
   # release. Otherwise, a new patch (Z) version will be released.
-  VERSION = '3.14.0'
+  VERSION = '3.15.0'
 end

data/locales/r10k.pot

@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2021 Puppet, Inc.
+# Copyright (C) 2022 Puppet, Inc.
 # This file is distributed under the same license as the r10k package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: r10k 3.9.3-170-g8cb36435\n"
+"Project-Id-Version: r10k 3.9.3-208-gb88bb368\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
-"POT-Creation-Date: 2021-11-16 21:43+0000\n"
-"PO-Revision-Date: 2021-11-16 21:43+0000\n"
+"POT-Creation-Date: 2022-02-07 21:13+0000\n"
+"PO-Revision-Date: 2022-02-07 21:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -115,7 +115,7 @@ msgstr ""
 msgid "%{class} has not implemented method %{method}"
 msgstr ""
 
-#: ../lib/r10k/environment/name.rb:78
+#: ../lib/r10k/environment/name.rb:83
 msgid "Improper configuration value given for strip_component setting in %{src} source. Value must be a string, a /regex/, false, or omitted. Got \"%{val}\" (%{type})"
 msgstr ""
 
@@ -395,27 +395,31 @@ msgstr ""
 msgid "Module %{name} with args %{args} doesn't have an implementation. (Are you using the right arguments?)"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:83
+#: ../lib/r10k/module/base.rb:66
+msgid "Overriding :exclude_spec setting with per module setting for #{@title}"
+msgstr ""
+
+#: ../lib/r10k/module/base.rb:87
 msgid "Spec dir for #{@title} will not be deleted because it is not in the moduledir"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:95
+#: ../lib/r10k/module/base.rb:99
 msgid "Deleting spec data at #{spec_path}"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:103
+#: ../lib/r10k/module/base.rb:107
 msgid "No spec dir detected at #{spec_path}, skipping deletion"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:116
+#: ../lib/r10k/module/base.rb:120
 msgid "Deploying module to %{path}"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:119
+#: ../lib/r10k/module/base.rb:123
 msgid "Only updating modules %{modules}, skipping module %{name}"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:175
+#: ../lib/r10k/module/base.rb:179
 msgid "Module name (%{title}) must match either 'modulename' or 'owner/modulename'"
 msgstr ""
 
@@ -423,6 +427,10 @@ msgstr ""
 msgid "Not updating module %{name}, assuming content unchanged"
 msgstr ""
 
+#: ../lib/r10k/module/forge.rb:50
+msgid "Module version %{ver} is not a valid Forge module version"
+msgstr ""
+
 #: ../lib/r10k/module/forge.rb:98
 msgid "The module %{title} does not appear to have any published releases, cannot determine latest version."
 msgstr ""
@@ -435,7 +443,7 @@ msgstr ""
 msgid "Forge module names must match 'owner/modulename', instead got #{title}"
 msgstr ""
 
-#: ../lib/r10k/module/git.rb:81
+#: ../lib/r10k/module/git.rb:79
 msgid "Cannot track control repo branch for content '%{name}' when not part of a git-backed environment, will use default if available."
 msgstr ""
 
@@ -479,11 +487,11 @@ msgstr ""
 msgid "Puppetfile %{path} missing or unreadable"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:228
+#: ../lib/r10k/module_loader/puppetfile.rb:230
 msgid "Puppetfiles cannot contain duplicate module names."
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:230
+#: ../lib/r10k/module_loader/puppetfile.rb:232
 msgid "Remove the duplicates of the following modules: %{dupes}"
 msgstr ""
 

data/r10k.gemspec

@@ -23,21 +23,19 @@ Gem::Specification.new do |s|
   s.license  = 'Apache-2.0'
 
   s.add_dependency 'colored2',   '3.1.2'
-  s.add_dependency 'cri', '2.15.10'
+  s.add_dependency 'cri', '>= 2.15.10'
 
   s.add_dependency 'log4r',     '1.1.10'
   s.add_dependency 'multi_json', '~> 1.10'
 
-  s.add_dependency 'puppet_forge', '~> 2.3.0'
+  s.add_dependency 'puppet_forge', '>= 2.3.0'
 
   s.add_dependency 'gettext-setup', '~>0.24'
-  # These two pins narrow what is allowed by gettext-setup,
-  # to preserve compatability with Ruby 2.4
-  s.add_dependency 'fast_gettext', '~> 1.1.0'
-  s.add_dependency 'gettext', ['>= 3.0.2', '< 3.3.0']
+  s.add_dependency 'fast_gettext', ['>= 1.1.0', '< 3.0.0']
+  s.add_dependency 'gettext', ['>= 3.0.2', '< 4.0.0']
 
   s.add_dependency 'jwt', '~> 2.2.3'
-  s.add_dependency 'minitar', '~> 0.9.0'
+  s.add_dependency 'minitar', '~> 0.9'
 
   s.add_development_dependency 'rspec', '~> 3.1'
 

data/spec/fixtures/unit/puppetfile/various-modules/modules/apt/.gitkeep

@@ -0,0 +1 @@
+This only exists so the directory can be committed to git for testing purposes.

data/spec/fixtures/unit/puppetfile/various-modules/modules/baz/.gitkeep

@@ -0,0 +1 @@
+This only exists so the directory can be committed to git for testing purposes.

data/spec/fixtures/unit/puppetfile/various-modules/modules/buzz/.gitkeep

@@ -0,0 +1 @@
+This only exists so the directory can be committed to git for testing purposes.

data/spec/fixtures/unit/puppetfile/various-modules/modules/canary/.gitkeep

@@ -0,0 +1 @@
+This only exists so the directory can be committed to git for testing purposes.

data/spec/fixtures/unit/puppetfile/various-modules/modules/fizz/.gitkeep

@@ -0,0 +1 @@
+This only exists so the directory can be committed to git for testing purposes.

data/spec/fixtures/unit/puppetfile/various-modules/modules/rpm/.gitkeep

@@ -0,0 +1 @@
+This only exists so the directory can be committed to git for testing purposes.

data/spec/integration/git/stateful_repository_spec.rb

@@ -83,6 +83,22 @@ describe R10K::Git::StatefulRepository do
       end
     end
 
+    describe "when the workdir has spec dir modifications" do
+      before(:each) do
+        thinrepo.clone(remote, {:ref => ref})
+        FileUtils.mkdir_p(File.join(thinrepo.path, 'spec'))
+        File.open(File.join(thinrepo.path, 'spec', 'file_spec.rb'), 'a') { |f| f.write('local modifications!') }
+        thinrepo.stage_files(['spec/file_spec.rb'])
+      end
+      it "is dirty with exclude_spec false" do
+        expect(subject.status(ref, false)).to eq :dirty
+      end
+
+      it "is insync with exclude_spec true" do
+        expect(subject.status(ref, true)).to eq :insync
+      end
+    end
+
     describe "if the right ref is checked out" do
       it "is insync" do
         thinrepo.clone(remote, {:ref => ref})

data/spec/unit/action/deploy/module_spec.rb

@@ -231,7 +231,7 @@ describe R10K::Action::Deploy::Module do
         original.call(settings.merge({
           sources: {
             main: {
-              remote: 'git://not/a/remote',
+              remote: 'https://not/a/remote',
               basedir: '/not/a/basedir',
               type: 'git'
             }
@@ -253,9 +253,9 @@ describe R10K::Action::Deploy::Module do
         loader = environment.loader
         allow(loader).to receive(:puppetfile_content).and_return('')
         expect(loader).to receive(:load) do
-          loader.add_module('mod1', { git: 'git://remote' })
-          loader.add_module('mod2', { git: 'git://remote' })
-          loader.add_module('mod3', { git: 'git://remote' })
+          loader.add_module('mod1', { git: 'https://remote' })
+          loader.add_module('mod2', { git: 'https://remote' })
+          loader.add_module('mod3', { git: 'https://remote' })
 
           loaded_content = loader.load!
           loaded_content[:modules].each do |mod|
@@ -290,7 +290,7 @@ describe R10K::Action::Deploy::Module do
         original.call(settings.merge({
           sources: {
             main: {
-              remote: 'git://not/a/remote',
+              remote: 'https://not/a/remote',
               basedir: '/not/a/basedir',
               type: 'git'
             }
@@ -315,8 +315,8 @@ describe R10K::Action::Deploy::Module do
           # it so it will create the correct loaded_content.
           allow(loader).to receive(:puppetfile_content).and_return('')
           expect(loader).to receive(:load) do
-            loader.add_module('mod1', { git: 'git://remote' })
-            loader.add_module('mod2', { git: 'git://remote' })
+            loader.add_module('mod1', { git: 'https://remote' })
+            loader.add_module('mod2', { git: 'https://remote' })
 
             loaded_content = loader.load!
             loaded_content[:modules].each do |mod|

data/spec/unit/environment/git_spec.rb

@@ -9,7 +9,7 @@ describe R10K::Environment::Git do
       '/some/nonexistent/environmentdir',
       'gitref',
       {
-        :remote => 'git://git-server.site/my-repo.git',
+        :remote => 'https://git-server.site/my-repo.git',
         :ref    => 'd026ea677116424d2968edb9cee8cbc24d09322b',
       }
     )
@@ -45,7 +45,7 @@ describe R10K::Environment::Git do
     end
 
     it "can return the environment remote" do
-      expect(subject.remote).to eq 'git://git-server.site/my-repo.git'
+      expect(subject.remote).to eq 'https://git-server.site/my-repo.git'
     end
 
     it "can return the environment ref" do

data/spec/unit/environment/with_modules_spec.rb

@@ -72,4 +72,51 @@ describe R10K::Environment::WithModules do
       expect(returned_modules.map(&:name).sort).to eq(%w[concat exec stdlib zebra])
     end
   end
+
+  describe "module options" do
+    let(:subject_params) {{
+      :modules => {
+        'hieradata' => {
+          :type => 'git',
+          :source => 'git@git.example.com:site_data.git',
+          :install_path => ''
+        },
+        'site_data_2' => {
+          :type => 'git',
+          :source => 'git@git.example.com:site_data.git',
+          :install_path => 'subdir'
+        },
+
+      }
+    }}
+
+    it "should support empty install_path" do
+      modules = subject.modules
+      expect(modules[0].title).to eq 'hieradata'
+      expect(modules[0].path).to eq Pathname.new('/some/nonexistent/environmentdir/prefix_release42/hieradata')
+
+    end
+
+    it "should support install_path" do
+      modules = subject.modules
+      expect(modules[1].title).to eq 'site_data_2'
+      expect(modules[1].path).to eq Pathname.new('/some/nonexistent/environmentdir/prefix_release42/subdir/site_data_2')
+    end
+
+    context "with invalid configuration" do
+      let(:subject_params) {{
+      :modules => {
+          'site_data_2' => {
+            :type => 'git',
+            :source => 'git@git.example.com:site_data.git',
+            :install_path => '/absolute_path_outside_of_containing_environment'
+          }
+        }
+      }}
+
+      it "raises an error" do
+        expect{ subject.modules }.to raise_error(R10K::Error, /Environment cannot.*outside of containing environment.*/i)
+      end
+    end
+  end
 end

data/spec/unit/git/alternates_spec.rb

@@ -13,13 +13,13 @@ describe R10K::Git::Alternates do
     it "reads the alternates file and splits on lines" do
       expect(subject.file).to receive(:file?).and_return true
       expect(subject.file).to receive(:readlines).and_return([
-        "/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git\n",
-        "/vagrant/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git\n",
+        "/var/cache/r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git\n",
+        "/vagrant/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git\n",
       ])
 
       expect(subject.read).to eq([
-        "/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
-        "/vagrant/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
+        "/var/cache/r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git",
+        "/vagrant/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git",
       ])
     end
 
@@ -33,17 +33,17 @@ describe R10K::Git::Alternates do
   describe "determining if an entry is already present" do
     before do
       allow(subject).to receive(:to_a).and_return([
-        "/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
-        "/vagrant/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
+        "/var/cache/r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git",
+        "/vagrant/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git",
       ])
     end
 
     it "is true if the element is in the array of read entries" do
-      expect(subject).to include("/vagrant/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git")
+      expect(subject).to include("/vagrant/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git")
     end
 
     it "is false if the element is not in the array of read entries" do
-      expect(subject).to_not include("/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git")
+      expect(subject).to_not include("/tmp/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git")
     end
   end
 
@@ -52,7 +52,7 @@ describe R10K::Git::Alternates do
     describe "and the git objects/info directory does not exist" do
       it "raises an error when the parent directory does not exist" do
         expect {
-          subject.write(["/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git"])
+          subject.write(["/tmp/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git"])
         }.to raise_error(R10K::Git::GitError,"Cannot write /some/nonexistent/path/.git/objects/info/alternates; parent directory does not exist")
       end
     end
@@ -66,51 +66,51 @@ describe R10K::Git::Alternates do
       end
 
       it "creates the alternates file with the new entry when not present" do
-        subject.write(["/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git"])
-        expect(io.string).to eq("/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git\n")
+        subject.write(["/tmp/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git"])
+        expect(io.string).to eq("/tmp/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git\n")
       end
 
       it "rewrites the file with all alternate entries" do
-        subject.write(["/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
-                       "/vagrant/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
-                       "/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git"])
+        subject.write(["/var/cache/r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git",
+                       "/vagrant/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git",
+                       "/tmp/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git"])
 
         expect(io.string).to eq(<<-EOD)
-/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git
-/vagrant/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git
-/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git
+/var/cache/r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git
+/vagrant/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git
+/tmp/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git
         EOD
       end
     end
 
     describe "appending a new alternate object entry" do
       it "re-writes the file with the new entry concatenated to the file" do
-        expect(subject).to receive(:to_a).and_return(["/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
-                                                       "/vagrant/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git"])
+        expect(subject).to receive(:to_a).and_return(["/var/cache/r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git",
+                                                       "/vagrant/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git"])
 
-        expect(subject).to receive(:write).with(["/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
-                                                 "/vagrant/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
-                                                 "/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git"])
+        expect(subject).to receive(:write).with(["/var/cache/r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git",
+                                                 "/vagrant/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git",
+                                                 "/tmp/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git"])
 
-        subject.add("/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git")
+        subject.add("/tmp/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git")
       end
     end
   end
 
   describe "conditionally appending a new alternate object entry" do
     before do
-      expect(subject).to receive(:read).and_return(%w[/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git])
+      expect(subject).to receive(:read).and_return(%w[/var/cache/r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git])
     end
 
     it "adds the entry and returns true when the entry doesn't exist" do
-      expect(subject).to receive(:write).with(["/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
-                                               "/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git"])
-      expect(subject.add?("/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git")).to eq true
+      expect(subject).to receive(:write).with(["/var/cache/r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git",
+                                               "/tmp/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git"])
+      expect(subject.add?("/tmp/.r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git")).to eq true
     end
 
     it "doesn't modify the file and returns false when the entry exists" do
       expect(subject).to_not receive(:write)
-      expect(subject.add?("/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git")).to eq false
+      expect(subject.add?("/var/cache/r10k/git/https---github.com-puppetlabs-puppetlabs-apache.git")).to eq false
     end
   end
 end

data/spec/unit/git/cache_spec.rb

@@ -21,7 +21,7 @@ describe R10K::Git::Cache do
     end
   end
 
-  let(:remote) { 'git://some/git/remote' }
+  let(:remote) { 'https://some/git/remote' }
   subject { subclass.new(remote) }
 
   describe "updating the cache" do

data/spec/unit/git/rugged/cache_spec.rb

@@ -5,7 +5,7 @@ describe R10K::Git::Rugged::Cache, :unless => R10K::Util::Platform.jruby? do
     require 'r10k/git/rugged/cache'
   end
 
-  subject(:cache) { described_class.new('git://some/git/remote') }
+  subject(:cache) { described_class.new('https://some/git/remote') }
 
   it "wraps a Rugged::BareRepository instance" do
     expect(cache.repo).to be_a_kind_of R10K::Git::Rugged::BareRepository
@@ -31,7 +31,7 @@ describe R10K::Git::Rugged::Cache, :unless => R10K::Util::Platform.jruby? do
     before do
       allow(subject.repo).to receive(:exist?).and_return true
       allow(subject.repo).to receive(:fetch)
-      allow(subject.repo).to receive(:remotes).and_return({ 'origin' => 'git://some/git/remote' })
+      allow(subject.repo).to receive(:remotes).and_return({ 'origin' => 'https://some/git/remote' })
     end
 
     it "does not update the URLs if they match" do

data/spec/unit/git/shellgit/cache_spec.rb

@@ -3,7 +3,7 @@ require 'r10k/git/shellgit/cache'
 
 describe R10K::Git::ShellGit::Cache do
 
-  subject { described_class.new('git://some/git/remote') }
+  subject { described_class.new('https://some/git/remote') }
 
   it "wraps a ShellGit::BareRepository instance" do
     expect(subject.repo).to be_a_kind_of R10K::Git::ShellGit::BareRepository

data/spec/unit/git/stateful_repository_spec.rb

@@ -4,7 +4,7 @@ require 'r10k/git/stateful_repository'
 
 describe R10K::Git::StatefulRepository do
 
-  let(:remote) { 'git://some.site/some-repo.git' }
+  let(:remote) { 'https://some.site/some-repo.git' }
   let(:ref) { '0.9.x' }
 
   subject { described_class.new(remote, '/some/nonexistent/basedir', 'some-dirname') }