r10k 3.14.2 → 3.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d1dda7446b3f3ee95e7833edf157b7ef8632e0c1404bcfdd7c981078dd0ebf0
-  data.tar.gz: fe4af9146645978078592086e1896fb1fc6a26082b86deef9072db6d45cb9d16
+  metadata.gz: c2085c3475000f081d4ff3ff19fd5f009080c9238c5e532449a24f306b2aa107
+  data.tar.gz: fb38a94d17d20cdd75aba6c5817cad33c77ed408307f32aa54bc4f65dabba022
 SHA512:
-  metadata.gz: 84a6ab98f760f8de79be0ff4a1f6185c23431ccee3c1d481df7a91441130f225cc318744b2fb57e8b8504f27cb86694d6ecdda086e728c703ac8278cc5c8989b
-  data.tar.gz: df7654c91652b281d87f9a8352a361466107c2e98cfabaddbeba1e9b75344523e0151f8353523d990ced52b8994d83a05556d1f9ecb41b8c49cb016d7bc3d166
+  metadata.gz: 6de1e925f24ec5edf168c5a4d177030be2d351493ab65274998bbd02b67fa84910d3a28d800bdd03d255e4fb0cceeac1b8d09a615cb181986ee22bd4e155e0fb
+  data.tar.gz: f4294cd171f9665c70d9573ad082003e5cd272aa42b2f949c41bc6874399c92010e1065140544770807444e8cf60b52d0733add89cfbd0b4839381c918932004

data/.github/workflows/docker.yml

@@ -27,6 +27,11 @@ jobs:
         with:
           ruby-version: 2.6.x
       - run: gem install bundler
+      - uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       - name: Build container
         working-directory: docker
         run: |

data/.github/workflows/rspec_tests.yml

@@ -15,6 +15,7 @@ jobs:
           - {os: ubuntu-18.04, ruby: 2.5}
           - {os: ubuntu-18.04, ruby: 2.6}
           - {os: ubuntu-18.04, ruby: 2.7}
+          - {os: ubuntu-18.04, ruby: 3.1}
           - {os: ubuntu-18.04, ruby: jruby-9.2.10.0}
           - {os: windows-2019, ruby: 2.5}
           - {os: windows-2019, ruby: 2.6}

data/CHANGELOG.mkd

@@ -4,6 +4,15 @@ CHANGELOG
 Unreleased
 ----------
 
+3.15.0
+------
+
+- Support and test Ruby 3
+- Allow puppet_forge 3.x & newer versions of fast_gettext/gettext [#1302](https://github.com/puppetlabs/r10k/pull/1302)
+- Allow newer cri versions [#1302](https://github.com/puppetlabs/r10k/pull/1302)
+- Fix error when using install_path from environment module [#1288](https://github.com/puppetlabs/r10k/issues/1288)
+- (RK-399) Do not warn about local modifications in the spec directory when `exclude_spec` is set [#1291](https://github.com/puppetlabs/r10k/pull/1291)
+
 3.14.2
 ------
 

data/README.mkd

@@ -18,7 +18,7 @@ Requirements
 ------------
 
 R10k supports the Ruby versions `>= 2.4.0`. It's tested on Ruby 2.4.0 up to
-Ruby 2.7.0 + Jruby.
+Ruby 3.1.0 + Jruby.
 
 R10k requires additional components, depending on how you plan on managing
 environments and modules.
@@ -61,7 +61,7 @@ for installation.
 If you have more specific needs or plan on modifying r10k you can run it out of
 a git repository using Bundler for dependencies:
 
-    git clone git://github.com/puppetlabs/r10k
+    git clone https://github.com/puppetlabs/r10k
     cd r10k
     bundle install
     bundle exec r10k help

data/doc/dynamic-environments/configuration.mkd

@@ -398,13 +398,16 @@ specific documentation for more information.
 The 'remote' setting specifies where the source repository should be fetched
 from. It may be any valid URL that the source may check out or clone. The remote
 must be able to be fetched without any interactive input, eg usernames or
-passwords cannot be prompted for in order to fetch the remote.
+passwords cannot be prompted for in order to fetch the remote. We support the
+`git`, `ssh`, and `https` transport protocols. An SSH private key or access
+token must be provided for authentication. Only `https` may be used without
+authentication. See [GitHub's blog on protocol security](https://github.blog/2021-09-01-improving-git-protocol-security-github/) for more info.
 
 ```yaml
 ---
 sources:
   mysource:
-    remote: 'git://git-server.site/my-org/main-modules'
+    remote: 'https://git-server.site/my-org/main-modules'
 ```
 
 ### basedir
@@ -522,7 +525,7 @@ hiera data files are kept. In this case you will specify a single source:
 ---
 sources:
   operations:
-    remote: 'git://git-server.site/my-org/org-modules'
+    remote: 'https://git-server.site/my-org/org-modules'
     basedir: '/etc/puppet/environments'
 ```
 
@@ -535,10 +538,10 @@ repository and your modules in another repository, you can specify two sources:
 ---
 sources:
   operations:
-    remote: 'git://git-server.site/my-org/org-modules'
+    remote: 'https://git-server.site/my-org/org-modules'
     basedir: '/etc/puppet/environments'
   hiera:
-    remote: 'git://git-server.site/my-org/org-hiera-data'
+    remote: 'https://git-server.site/my-org/org-hiera-data'
     basedir: '/etc/puppet/hiera-data'
 ```
 
@@ -553,15 +556,15 @@ not the modules of other groups.
 ---
 sources:
   main:
-    remote: 'git://git-server.site/my-org/main-modules'
+    remote: 'https://git-server.site/my-org/main-modules'
     basedir: '/etc/puppet/environments'
     prefix: false # Prefix defaults to false so this is only here for clarity
   qa:
-    remote: 'git://git-server.site/my-org/qa-puppet-modules'
+    remote: 'https://git-server.site/my-org/qa-puppet-modules'
     basedir: '/etc/puppet/environments'
     prefix: true
   dev:
-    remote: 'git://git-server.site/my-org/dev-puppet-modules'
+    remote: 'https://git-server.site/my-org/dev-puppet-modules'
     basedir: '/etc/puppet/environments'
     prefix: true
 ```
@@ -587,11 +590,11 @@ must override the `prefix` so environment folders line up in both directories:
 ---
 sources:
   app1_data:
-    remote: 'git://git-server.site/my-org/app1-hieradata'
+    remote: 'https://git-server.site/my-org/app1-hieradata'
     basedir: '/etc/puppet/hieradata'
     prefix: "app1"
   app1_modules:
-    remote: 'git://git-server.site/my-org/app1-puppet-modules'
+    remote: 'https://git-server.site/my-org/app1-puppet-modules'
     basedir: '/etc/puppet/environments'
     prefix: "app1"
 ```

data/doc/dynamic-environments/workflow-guide.mkd

@@ -38,7 +38,7 @@ mod "puppetlabs/ntp"
 
 # Your modules:
 mod "custom_facts",
-  :git => "git://github.com/user/custom_facts"
+  :git => "https://github.com/user/custom_facts"
 ```
 
 For any existing modules that you branched, add a reference to the new branch
@@ -46,7 +46,7 @@ name. Don't forget the comma at the end of the *:git* value.
 
 ```
 mod "other_module",
-  :git => "git://github.com/user/other_module",
+  :git => "https://github.com/user/other_module",
   :ref => "feature"
 ```
 
@@ -159,7 +159,7 @@ the *:git* value.
 
 ```
 mod "other_module",
-  :git => "git://github.com/user/other_module",
+  :git => "https://github.com/user/other_module",
   :ref => "feature"
 ```
 

data/doc/faq.mkd

@@ -17,7 +17,7 @@ modify. For example creating the script:
 
 ```
 $ cat /usr/local/bin/generate-puppet-types.sh
-!#/bin/bash
+#!/bin/bash
 
 for environment in $1; do
   /opt/puppetlabs/bin/puppet generate types --environment $environment

data/docker/Makefile

@@ -7,6 +7,10 @@ hadolint_available := $(shell hadolint --help > /dev/null 2>&1; echo $$?)
 hadolint_command := hadolint
 hadolint_container := ghcr.io/hadolint/hadolint:latest
 alpine_version := 3.14
+# --load (--output=type=docker) can only be used with a single arch / platform
+# https://github.com/docker/buildx/issues/59
+output_type := docker
+platform := linux/amd64
 export BUNDLE_PATH = $(PWD)/.bundle/gems
 export BUNDLE_BIN = $(PWD)/.bundle/bin
 export GEMFILE = $(PWD)/Gemfile
@@ -32,6 +36,10 @@ else
 	dockerfile_context := $(PWD)/..
 endif
 
+ifeq ($(IS_LATEST),true)
+	latest_tag := --tag $(NAMESPACE)/r10k:$(LATEST_VERSION)
+endif
+
 prep:
 	@git fetch --unshallow 2> /dev/null ||:
 	@git fetch origin 'refs/tags/*:refs/tags/*'
@@ -52,17 +60,15 @@ build: prep
 	docker pull alpine:$(alpine_version)
 	docker buildx build \
 		${DOCKER_BUILD_FLAGS} \
-		--load \
+		--output=type=$(output_type) \
+		--platform $(platform) \
 		--build-arg alpine_version=$(alpine_version) \
 		--build-arg vcs_ref=$(vcs_ref) \
 		--build-arg build_date=$(build_date) \
 		--build-arg version=$(VERSION) \
 		--build-arg pupperware_analytics_stream=$(PUPPERWARE_ANALYTICS_STREAM) \
 		--file r10k/$(dockerfile) \
-		--tag $(NAMESPACE)/r10k:$(VERSION) $(dockerfile_context)
-ifeq ($(IS_LATEST),true)
-	@docker tag $(NAMESPACE)/r10k:$(VERSION) puppet/r10k:$(LATEST_VERSION)
-endif
+		--tag $(NAMESPACE)/r10k:$(VERSION) $(latest_tag) $(dockerfile_context)
 
 test: prep
 	@bundle install --path $$BUNDLE_PATH --gemfile $$GEMFILE --with test
@@ -71,11 +77,12 @@ test: prep
 		bundle exec --gemfile $$GEMFILE \
 		rspec spec
 
-push-image: prep
-	@docker push $(NAMESPACE)/r10k:$(VERSION)
-ifeq ($(IS_LATEST),true)
-	@docker push $(NAMESPACE)/r10k:$(LATEST_VERSION)
-endif
+# call build to produce multiple architectures
+# uses cached output from amd64 build target if it exists
+# registry output is equivalent to --push
+push-image: platform=linux/amd64,linux/arm64
+push-image: output_type=registry
+push-image: prep build
 
 push-readme:
 	@docker pull sheogorath/readme-to-dockerhub

data/integration/tests/git_source/HTTP_proxy_and_git_source.rb

@@ -16,7 +16,7 @@ r10k_config_bak_path = "#{r10k_config_path}.bak"
 
 puppetfile =<<-EOS
 mod 'motd',
-  :git    => 'git://github.com/puppetlabs/puppetlabs-motd'
+  :git    => 'https://github.com/puppetlabs/puppetlabs-motd'
 EOS
 
 proxy_env_value = 'http://cattastic.net:3219'

data/integration/tests/git_source/git_source_repeated_remote.rb

@@ -29,11 +29,11 @@ CONF
 # Install the same module in two different places
 puppetfile = <<-EOS
 mod 'prod_apache',
-  :git => 'git://github.com/puppetlabs/puppetlabs-apache.git',
+  :git => 'https://github.com/puppetlabs/puppetlabs-apache.git',
   :tag => 'v6.0.0'
 
 mod 'test_apache',
-  :git => 'git://github.com/puppetlabs/puppetlabs-apache.git',
+  :git => 'https://github.com/puppetlabs/puppetlabs-apache.git',
   :tag => 'v6.0.0'
 EOS
 

data/integration/tests/purging/content_not_purged_at_root.rb

@@ -30,12 +30,12 @@ CONF
 puppetfile = <<-EOS
 mod 'non_module_object_1',
   :install_path => './',
-  :git => 'git://github.com/puppetlabs/control-repo.git',
+  :git => 'https://github.com/puppetlabs/control-repo.git',
   :branch => 'production'
 
 mod 'non_module_object_2',
  :install_path => '',
- :git => 'git://github.com/puppetlabs/control-repo.git',
+ :git => 'https://github.com/puppetlabs/control-repo.git',
   :branch => 'production'
 EOS
 

data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module.rb

@@ -27,7 +27,7 @@ stdlib_notify_message_regex = /The test message is:.*one.*=>.*1.*two.*=>.*bats.*
 puppet_file = <<-PUPPETFILE
 mod "puppetlabs/motd"
 mod 'puppetlabs/stdlib',
-  :git => 'git://github.com/puppetlabs/puppetlabs-stdlib.git',
+  :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git',
   :tag => 'v7.0.1'
 PUPPETFILE
 

data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module_static.rb

@@ -31,7 +31,7 @@ puppet_file = <<-PUPPETFILE
 moduledir '#{@module_path}'
 mod "puppetlabs/motd"
 mod 'puppetlabs/stdlib',
-  :git => 'git://github.com/puppetlabs/puppetlabs-stdlib.git',
+  :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git',
   :tag => 'v7.0.1'
 PUPPETFILE
 

data/integration/tests/user_scenario/basic_workflow/multi_source_custom_forge_git_module.rb

@@ -65,7 +65,7 @@ env_structs = {:production => GitEnv.new('/git_repos',
                                          '/git_repos_alt/environments_alt.git',
                                          '/root/environments_alt',
                                          '/root/environments_alt/Puppetfile',
-                                         'mod "puppetlabs/stdlib", :git => "git://github.com/puppetlabs/puppetlabs-stdlib.git", :tag => "v7.0.1"',
+                                         'mod "puppetlabs/stdlib", :git => "https://github.com/puppetlabs/puppetlabs-stdlib.git", :tag => "v7.0.1"',
                                          '/root/environments_alt/manifests/site.pp',
                                          create_site_pp(master_certname, stage_env_manifest)
                                         ),

data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_git_module.rb

@@ -15,7 +15,7 @@ r10k_fqp = get_r10k_fqp(master)
 
 #File
 puppet_file = <<-PUPPETFILE
-mod 'broken', :git => 'git://github.com/puppetlabs/puppetlabs-broken'
+mod 'broken', :git => 'https://github.com/puppetlabs/puppetlabs-broken'
 PUPPETFILE
 
 puppet_file_path = File.join(git_environments_path, 'Puppetfile')

data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_git_module_ref.rb

@@ -12,7 +12,7 @@ r10k_fqp = get_r10k_fqp(master)
 #File
 puppet_file = <<-PUPPETFILE
 mod 'broken',
-  :git => 'git://github.com/puppetlabs/puppetlabs-motd',
+  :git => 'https://github.com/puppetlabs/puppetlabs-motd',
   :ref => 'does_not_exist'
 PUPPETFILE
 

data/integration/tests/user_scenario/basic_workflow/single_env_custom_forge_git_module.rb

@@ -28,7 +28,7 @@ notify_message_regex = /I am in the production environment/
 puppet_file = <<-PUPPETFILE
 mod "puppetlabs/motd"
 mod 'puppetlabs/inifile',
-  :git => 'git://github.com/puppetlabs/puppetlabs-inifile',
+  :git => 'https://github.com/puppetlabs/puppetlabs-inifile',
   :tag => 'v5.0.1'
 PUPPETFILE
 

data/integration/tests/user_scenario/basic_workflow/single_env_switch_forge_git_module.rb

@@ -27,7 +27,7 @@ PUPPETFILE
 
 puppet_file_git = <<-PUPPETFILE
 mod "puppetlabs/motd",
-  :git => 'git://github.com/puppetlabs/puppetlabs-motd',
+  :git => 'https://github.com/puppetlabs/puppetlabs-motd',
   :tag => '1.2.0'
 PUPPETFILE
 

data/lib/r10k/environment/with_modules.rb

@@ -103,6 +103,29 @@ class R10K::Environment::WithModules < R10K::Environment::Base
     end
   end
 
+  def resolve_path(base, dirname, path)
+    if Pathname.new(path).absolute?
+      cleanpath(path)
+    else
+      cleanpath(File.join(base, dirname, path))
+    end
+  end
+
+  # .cleanpath is as good as we can do without touching the filesystem.
+  # The .realpath methods will choke if some of the intermediate paths
+  # are missing, even though in some cases we will create them later as
+  # needed.
+  def cleanpath(path)
+    Pathname.new(path).cleanpath.to_s
+  end
+
+  def validate_install_path(path, modname)
+    unless /^#{Regexp.escape(@basedir)}.*/ =~ path
+      raise R10K::Error.new("Environment cannot manage content '#{modname}' outside of containing environment: #{path} is not within #{@basedir}")
+    end
+    true
+  end
+
   # @param [String] name
   # @param [Hash] args
   def add_module(name, args)
@@ -111,7 +134,7 @@ class R10K::Environment::WithModules < R10K::Environment::Base
     args[:overrides] = @overrides
 
     if install_path = args.delete(:install_path)
-      install_path = resolve_install_path(install_path)
+      install_path = resolve_path(@basedir, @dirname, install_path)
       validate_install_path(install_path, name)
     else
       install_path = @moduledir

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

@@ -75,6 +75,13 @@ class R10K::Git::Rugged::ThinRepository < R10K::Git::Rugged::WorkingRepository
     end
   end
 
+  def stage_files(files=['.'])
+    with_repo do |repo|
+      index = repo.index
+      files.each { |p| index.add( :path => p ) }
+    end
+  end
+
   private
 
   # Override the parent class repo setup so that we can make sure the alternates file is up to date

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

@@ -117,11 +117,15 @@ class R10K::Git::Rugged::WorkingRepository < R10K::Git::Rugged::BaseRepository
     with_repo { |repo| repo.config['remote.origin.url'] }
   end
 
-  def dirty?
+  def dirty?(exclude_spec=false)
     with_repo do |repo|
-      diff = repo.diff_workdir('HEAD')
+      if exclude_spec
+        diff = repo.diff_workdir('HEAD').select { |d| ! d.delta.old_file[:path].start_with?('spec/') }
+      else
+        diff = repo.diff_workdir('HEAD').to_a
+      end
 
-      diff.each_patch do |p|
+      diff.each do |p|
         logger.debug(_("Found local modifications in %{file_path}" % {file_path: File.join(@path, p.delta.old_file[:path])}))
         logger.debug1(p.to_s)
       end

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

@@ -43,6 +43,10 @@ class R10K::Git::ShellGit::ThinRepository < R10K::Git::ShellGit::WorkingReposito
     git(['ls-tree', '-t', '-r', '--name-only', ref], :path => @path.to_s).stdout.split("\n")
   end
 
+  def stage_files(files=['.'])
+    git(['add', files].flatten, :path => @path.to_s)
+  end
+
   private
 
   def setup_cache_remote

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

@@ -90,11 +90,12 @@ class R10K::Git::ShellGit::WorkingRepository < R10K::Git::ShellGit::BaseReposito
   end
 
   # does the working tree have local modifications to tracked files?
-  def dirty?
+  def dirty?(exclude_spec=false)
     result = git(['diff-index', '--exit-code', '--name-only', 'HEAD'], :path => @path.to_s, :raise_on_fail => false)
 
     if result.exit_code != 0
       dirty_files = result.stdout.split('\n')
+      dirty_files.delete_if { |f| f.start_with?('spec/') } if exclude_spec
 
       dirty_files.each do |file|
         logger.debug(_("Found local modifications in %{file_path}" % {file_path: File.join(@path, file)}))
@@ -103,7 +104,7 @@ class R10K::Git::ShellGit::WorkingRepository < R10K::Git::ShellGit::BaseReposito
         logger.debug1 { git(['diff-index', '-p', 'HEAD', file], :path => @path.to_s, :raise_on_fail => false).stdout }
       end
 
-      return true
+      return dirty_files.size > 0
     else
       return false
     end

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/git.rb

@@ -100,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/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.2'
+  VERSION = '3.15.0'
 end

data/r10k.gemspec

@@ -23,18 +23,16 @@ 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'

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') }

data/spec/unit/module/git_spec.rb

@@ -44,7 +44,7 @@ describe R10K::Module::Git do
         described_class.new(
           'branan/eight_hundred',
           '/moduledir',
-          { :git => 'git://git-server.site/branan/puppet-eight_hundred' }
+          { :git => 'https://git-server.site/branan/puppet-eight_hundred' }
         )
       end
 
@@ -66,7 +66,7 @@ describe R10K::Module::Git do
         described_class.new(
           'eight_hundred',
           '/moduledir',
-          { :git => 'git://git-server.site/branan/puppet-eight_hundred' }
+          { :git => 'https://git-server.site/branan/puppet-eight_hundred' }
         )
       end
 
@@ -86,7 +86,7 @@ describe R10K::Module::Git do
 
   describe "properties" do
     subject do
-      described_class.new('boolean', '/moduledir', {:git => 'git://git.example.com/adrienthebo/puppet-boolean'})
+      described_class.new('boolean', '/moduledir', {:git => 'https://git.example.com/adrienthebo/puppet-boolean'})
     end
 
     before(:each) do
@@ -154,7 +154,7 @@ describe R10K::Module::Git do
       described_class.new(
         'boolean',
         '/moduledir',
-        { :git => 'git://git.example.com/adrienthebo/puppet-boolean' }
+        { :git => 'https://git.example.com/adrienthebo/puppet-boolean' }
       )
     end
 
@@ -171,7 +171,7 @@ describe R10K::Module::Git do
       described_class.new('boolean', '/moduledir', base_opts.merge(extra_opts), env)
     end
 
-    let(:base_opts) { { git: 'git://git.example.com/adrienthebo/puppet-boolean' } }
+    let(:base_opts) { { git: 'https://git.example.com/adrienthebo/puppet-boolean' } }
 
     before(:each) do
       allow(mock_repo).to receive(:head).and_return('abc123')

data/spec/unit/module_loader/puppetfile_spec.rb

@@ -12,7 +12,7 @@ describe R10K::ModuleLoader::Puppetfile do
           environment: R10K::Environment::Git.new('env',
                                                   '/test/basedir/',
                                                   'env',
-                                                  { remote: 'git://foo/remote',
+                                                  { remote: 'https://foo/remote',
                                                     ref: 'env' })
         }
       end

data/spec/unit/util/cacheable_spec.rb

@@ -6,10 +6,10 @@ RSpec.describe R10K::Util::Cacheable do
   subject { Object.new.extend(R10K::Util::Cacheable) }
 
   describe "dirname sanitization" do
-    let(:input) { 'git://some/git/remote' }
+    let(:input) { 'https://some/git/remote' }
 
     it 'sanitizes URL to directory name' do
-      expect(subject.sanitized_dirname(input)).to eq('git---some-git-remote')
+      expect(subject.sanitized_dirname(input)).to eq('https---some-git-remote')
     end
 
     context 'with username and password' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.14.2
+  version: 3.15.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -28,14 +28,14 @@ dependencies:
   name: cri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.15.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.15.10
 - !ruby/object:Gem::Dependency
@@ -70,14 +70,14 @@ dependencies:
   name: puppet_forge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
@@ -98,16 +98,22 @@ dependencies:
   name: fast_gettext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: gettext
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +123,7 @@ dependencies:
         version: 3.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -127,7 +133,7 @@ dependencies:
         version: 3.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +221,6 @@ files:
 - ".github/workflows/rspec_tests.yml"
 - ".github/workflows/stale.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.mkd
 - CODEOWNERS
 - CONTRIBUTING.mkd

data/.travis.yml

@@ -1,42 +0,0 @@
----
-language: ruby
-bundler_args: "--without system"
-script: "bundle exec rspec --color --format documentation spec"
-notifications:
-  email: false
-sudo: false
-jdk:
-  - openjdk11
-before_install: gem install bundler -v '< 2' --no-document
-matrix:
-  include:
-    - stage: r10k tests
-      rvm: 2.3.0
-    - stage: r10k container tests
-      dist: focal
-      language: ruby
-      services:
-        - docker
-      rvm: 2.6.6
-      env:
-        - DOCKER_COMPOSE_VERSION=1.28.6
-        - DOCKER_BUILDX_VERSION=0.5.1
-        # necessary to prevent overwhelming TravisCI build output limits
-        - DOCKER_BUILD_FLAGS="--progress plain"
-      before_install:
-        - sudo rm /usr/local/bin/docker-compose
-        - curl --location https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname --kernel-name`-`uname --machine` > docker-compose
-        - chmod +x docker-compose
-        - sudo mv docker-compose /usr/local/bin
-        - mkdir -vp ~/.docker/cli-plugins
-        - curl --location https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 > ~/.docker/cli-plugins/docker-buildx
-        - chmod +x ~/.docker/cli-plugins/docker-buildx
-        - docker buildx create --name travis_builder --use
-      script:
-        - set -e
-        - cd docker
-        - make lint
-        - make build
-        - make test
-      after_script:
-        - docker buildx rm travis_builder