r10k 3.14.1 → 3.15.1

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'
@@ -45,7 +43,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'yard', '~> 0.9.11'
 
-  s.files        = %x[git ls-files].split($/)
+  s.files        = %x[git ls-files].split($/).reject { |f| f.match(%r{^spec}) }
   s.require_path = 'lib'
   s.bindir       = 'bin'
   s.executables  = 'r10k'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.14.1
+  version: 3.15.1
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-08-18 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
@@ -462,149 +467,6 @@ files:
 - locales/r10k.pot
 - r10k.gemspec
 - r10k.yaml.example
-- spec/fixtures/empty/.empty
-- spec/fixtures/integration/git/puppet-boolean-bare.tar
-- spec/fixtures/module/forge/bad_module/metadata.json
-- spec/fixtures/module/forge/eight_hundred/Modulefile
-- spec/fixtures/module/forge/eight_hundred/metadata.json
-- spec/fixtures/tarball/tarball.tar.gz
-- spec/fixtures/unit/action/r10k.yaml
-- spec/fixtures/unit/action/r10k_cachedir.yaml
-- spec/fixtures/unit/action/r10k_creds.yaml
-- spec/fixtures/unit/action/r10k_forge_auth.yaml
-- spec/fixtures/unit/action/r10k_forge_auth_no_url.yaml
-- spec/fixtures/unit/action/r10k_generate_types.yaml
-- spec/fixtures/unit/action/r10k_logging.yaml
-- spec/fixtures/unit/action/r10k_puppet_path.yaml
-- spec/fixtures/unit/puppetfile/argument-error/Puppetfile
-- spec/fixtures/unit/puppetfile/default-branch-override/Puppetfile
-- spec/fixtures/unit/puppetfile/duplicate-module-error/Puppetfile
-- spec/fixtures/unit/puppetfile/forge-override/Puppetfile
-- spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile
-- spec/fixtures/unit/puppetfile/load-error/Puppetfile
-- spec/fixtures/unit/puppetfile/name-error/Puppetfile
-- spec/fixtures/unit/puppetfile/valid-forge-with-version/Puppetfile
-- spec/fixtures/unit/puppetfile/valid-forge-without-version/Puppetfile
-- spec/fixtures/unit/puppetfile/various-modules/Puppetfile
-- spec/fixtures/unit/puppetfile/various-modules/Puppetfile.new
-- spec/fixtures/unit/util/purgeable/managed_one/expected_1
-- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/managed_symlink_file
-- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_allowlisted_2/ignored_1
-- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_expected_1
-- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_unmanaged_1
-- spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/unmanaged_symlink_dir
-- spec/fixtures/unit/util/purgeable/managed_one/managed_symlink_dir
-- spec/fixtures/unit/util/purgeable/managed_one/unmanaged_1
-- spec/fixtures/unit/util/purgeable/managed_one/unmanaged_symlink_file
-- spec/fixtures/unit/util/purgeable/managed_two/.hidden/unmanaged_3
-- spec/fixtures/unit/util/purgeable/managed_two/expected_2
-- spec/fixtures/unit/util/purgeable/managed_two/unmanaged_2
-- spec/fixtures/unit/util/subprocess/runner/no-execute.sh
-- spec/integration/git/rugged/bare_repository_spec.rb
-- spec/integration/git/rugged/cache_spec.rb
-- spec/integration/git/rugged/thin_repository_spec.rb
-- spec/integration/git/rugged/working_repository_spec.rb
-- spec/integration/git/shellgit/bare_repository_spec.rb
-- spec/integration/git/shellgit/thin_repository_spec.rb
-- spec/integration/git/shellgit/working_repository_spec.rb
-- spec/integration/git/stateful_repository_spec.rb
-- spec/integration/util/purageable_spec.rb
-- spec/matchers/exit_with.rb
-- spec/matchers/match_realpath.rb
-- spec/r10k-mocks.rb
-- spec/r10k-mocks/mock_config.rb
-- spec/r10k-mocks/mock_env.rb
-- spec/r10k-mocks/mock_source.rb
-- spec/shared-contexts/git-fixtures.rb
-- spec/shared-contexts/tarball.rb
-- spec/shared-examples/deploy-actions.rb
-- spec/shared-examples/git-repository.rb
-- spec/shared-examples/git/bare_repository.rb
-- spec/shared-examples/git/thin_repository.rb
-- spec/shared-examples/git/working_repository.rb
-- spec/shared-examples/puppetfile-action.rb
-- spec/shared-examples/settings/ancestry.rb
-- spec/shared-examples/subprocess-runner.rb
-- spec/spec_helper.rb
-- spec/unit/action/cri_runner_spec.rb
-- spec/unit/action/deploy/deploy_helpers_spec.rb
-- spec/unit/action/deploy/display_spec.rb
-- spec/unit/action/deploy/environment_spec.rb
-- spec/unit/action/deploy/module_spec.rb
-- spec/unit/action/puppetfile/check_spec.rb
-- spec/unit/action/puppetfile/cri_runner_spec.rb
-- spec/unit/action/puppetfile/install_spec.rb
-- spec/unit/action/puppetfile/purge_spec.rb
-- spec/unit/action/runner_spec.rb
-- spec/unit/action/visitor_spec.rb
-- spec/unit/cli_spec.rb
-- spec/unit/deployment/config_spec.rb
-- spec/unit/deployment_spec.rb
-- spec/unit/environment/bare_spec.rb
-- spec/unit/environment/base_spec.rb
-- spec/unit/environment/git_spec.rb
-- spec/unit/environment/name_spec.rb
-- spec/unit/environment/plain_spec.rb
-- spec/unit/environment/svn_spec.rb
-- spec/unit/environment/tarball_spec.rb
-- spec/unit/environment/with_modules_spec.rb
-- spec/unit/errors/formatting_spec.rb
-- spec/unit/feature_spec.rb
-- spec/unit/forge/module_release_spec.rb
-- spec/unit/git/alternates_spec.rb
-- spec/unit/git/cache_spec.rb
-- spec/unit/git/rugged/cache_spec.rb
-- spec/unit/git/rugged/credentials_spec.rb
-- spec/unit/git/shellgit/cache_spec.rb
-- spec/unit/git/stateful_repository_spec.rb
-- spec/unit/git_spec.rb
-- spec/unit/initializers_spec.rb
-- spec/unit/instance_cache_spec.rb
-- spec/unit/keyed_factory_spec.rb
-- spec/unit/logging/terminaloutputter_spec.rb
-- spec/unit/logging_spec.rb
-- spec/unit/module/base_spec.rb
-- spec/unit/module/forge_spec.rb
-- spec/unit/module/git_spec.rb
-- spec/unit/module/metadata_file_spec.rb
-- spec/unit/module/svn_spec.rb
-- spec/unit/module/tarball_spec.rb
-- spec/unit/module_loader/puppetfile_spec.rb
-- spec/unit/module_spec.rb
-- spec/unit/puppetfile_spec.rb
-- spec/unit/settings/collection_spec.rb
-- spec/unit/settings/container_spec.rb
-- spec/unit/settings/definition_spec.rb
-- spec/unit/settings/enum_definition_spec.rb
-- spec/unit/settings/inheritance_spec.rb
-- spec/unit/settings/list_spec.rb
-- spec/unit/settings/loader_spec.rb
-- spec/unit/settings/uri_definition_spec.rb
-- spec/unit/settings_spec.rb
-- spec/unit/source/base_spec.rb
-- spec/unit/source/exec_spec.rb
-- spec/unit/source/git_spec.rb
-- spec/unit/source/hash_spec.rb
-- spec/unit/source/svn_spec.rb
-- spec/unit/source/yaml_spec.rb
-- spec/unit/source_spec.rb
-- spec/unit/svn/remote_spec.rb
-- spec/unit/svn/working_dir_spec.rb
-- spec/unit/tarball_spec.rb
-- spec/unit/util/attempt_spec.rb
-- spec/unit/util/cacheable_spec.rb
-- spec/unit/util/commands_spec.rb
-- spec/unit/util/downloader_spec.rb
-- spec/unit/util/exec_env_spec.rb
-- spec/unit/util/purgeable_spec.rb
-- spec/unit/util/setopts_spec.rb
-- spec/unit/util/subprocess/result_spec.rb
-- spec/unit/util/subprocess/runner/posix_spec.rb
-- spec/unit/util/subprocess/runner/pump_spec.rb
-- spec/unit/util/subprocess/runner/windows_spec.rb
-- spec/unit/util/subprocess/subprocess_error_spec.rb
-- spec/unit/util/subprocess_spec.rb
-- spec/unit/util/symbolize_keys_spec.rb
 homepage: https://github.com/puppetlabs/r10k
 licenses:
 - Apache-2.0

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

data/spec/fixtures/module/forge/bad_module/metadata.json

@@ -1 +0,0 @@
-I am bad JSON!

data/spec/fixtures/module/forge/eight_hundred/Modulefile

@@ -1,8 +0,0 @@
-name    'branan-eight_hundred'
-version '8.0.0'
-source  'https://github.com/branan/puppet-module-eight_hundred'
-author  'Branan Purvine-Riley'
-license 'Apache License 2.0'
-summary '800 modules! WOOOOOOO!'
-description '800 modules! WOOOOOOOOOOOOOOOOOO!'
-project_page 'https://github.com/branan/puppet-module-eight_hundred'

data/spec/fixtures/module/forge/eight_hundred/metadata.json

@@ -1,19 +0,0 @@
-{
-  "checksums": {
-    "Modulefile": "1e780d794bcd6629dc3006129fc02edf"
-  },
-  "license": "Apache License 2.0",
-  "types": [
-
-  ],
-  "version": "8.0.0",
-  "dependencies": [
-
-  ],
-  "summary": "800 modules! WOOOOOOO!",
-  "source": "https://github.com/branan/puppet-module-eight_hundred",
-  "description": "800 modules! WOOOOOOOOOOOOOOOOOO!",
-  "author": "Branan Purvine-Riley",
-  "name": "branan-eight_hundred",
-  "project_page": "https://github.com/branan/puppet-module-eight_hundred"
-}

data/spec/fixtures/unit/action/r10k.yaml

@@ -1,5 +0,0 @@
----
-  cachedir: /config_cachedir
-  deploy:
-    generate_types: /config_generate_types
-    puppet_path: /config_puppet_path

data/spec/fixtures/unit/action/r10k_cachedir.yaml

@@ -1,2 +0,0 @@
----
-  cachedir: /config_cachedir

data/spec/fixtures/unit/action/r10k_creds.yaml

@@ -1,9 +0,0 @@
----
-  git:
-    private_key: '/global/config/private/key'
-    oauth_token: '/global/config/oauth/token'
-    repositories:
-      - remote: 'git@myfakegitserver.com:user/repo.git'
-        private_key: '/config/private/key'
-      - remote: 'https://myfakegitserver.com/user/repo.git'
-        oauth_token: '/config/oauth/token'

data/spec/fixtures/unit/action/r10k_forge_auth.yaml

@@ -1,4 +0,0 @@
----
-forge:
-  baseurl: 'http://private-forge.com'
-  authorization_token: 'faketoken'

data/spec/fixtures/unit/action/r10k_forge_auth_no_url.yaml

@@ -1,3 +0,0 @@
----
-forge:
-  authorization_token: 'faketoken'

data/spec/fixtures/unit/action/r10k_generate_types.yaml

@@ -1,3 +0,0 @@
----
-  deploy:
-    generate_types: /config_generate_types

data/spec/fixtures/unit/action/r10k_logging.yaml

@@ -1,12 +0,0 @@
----
-  logging:
-    level: FATAL
-
-    outputs:
-      - type: file
-        parameters:
-          filename: r10k.log
-
-      - type: syslog
-
-    disable_default_stderr: true

data/spec/fixtures/unit/action/r10k_puppet_path.yaml

@@ -1,3 +0,0 @@
----
-  deploy:
-    puppet_path: /config_puppet_path

data/spec/fixtures/unit/puppetfile/argument-error/Puppetfile

@@ -1 +0,0 @@
-mod 'branan/eight_hundred', '1.0.0', :git => 'https://github.com/branan/eight_hundred', :ref => 'master'

data/spec/fixtures/unit/puppetfile/default-branch-override/Puppetfile

@@ -1,5 +0,0 @@
-mod 'cd4pe',
-  :git => 'test@randomurl.com:something/some_module.git',
-  :ref => 'expected_ref',
-  :default_branch => 'here_lies_the_default_branch'
-

data/spec/fixtures/unit/puppetfile/duplicate-module-error/Puppetfile

@@ -1,10 +0,0 @@
-forge "http://forge.puppetlabs.com"
-
-mod "puppetlabs/stdlib", '4.11.0'
-mod "puppetlabs/stdlib", '4.12.0'
-mod "puppetlabs/concat", '2.1.0'
-mod "otheruser/concat", '2.1.0'
-
-mod 'apache',
-  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
-  :branch => 'docs_experiment'

data/spec/fixtures/unit/puppetfile/forge-override/Puppetfile

@@ -1,8 +0,0 @@
-forge "my.custom.forge.com"
-
-mod "puppetlabs/stdlib", '4.12.0'
-mod "puppetlabs/concat", '2.1.0'
-
-mod 'apache',
-  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
-  :branch => 'docs_experiment'

data/spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile

@@ -1 +0,0 @@
-mod 'branan/eight_hundred' :git => 'https://github.com/branan/eight_hundred'

data/spec/fixtures/unit/puppetfile/load-error/Puppetfile

@@ -1 +0,0 @@
-require 'a-shrubbery!'

data/spec/fixtures/unit/puppetfile/name-error/Puppetfile

@@ -1 +0,0 @@
-mod 'branan/eight_hundred', undefined_lookup_function('eight_hundred')

data/spec/fixtures/unit/puppetfile/valid-forge-with-version/Puppetfile

@@ -1 +0,0 @@
-mod 'puppetlabs/apt', '2.1.1'

data/spec/fixtures/unit/puppetfile/valid-forge-without-version/Puppetfile

@@ -1 +0,0 @@
-mod 'puppetlabs/apt'

data/spec/fixtures/unit/puppetfile/various-modules/Puppetfile

@@ -1,10 +0,0 @@
-mod 'puppetlabs/apt', '2.1.1'
-mod 'puppetlabs/stdlib', :latest
-mod 'puppetlabs/concat'
-mod 'puppetlabs/rpm', '2.1.1-pre1'
-mod 'foo', git: 'this/remote', branch: 'main'
-mod 'bar', git: 'this/remote', tag: 'v1.2.3'
-mod 'baz', git: 'this/remote', commit: '123abc456'
-mod 'fizz', git: 'this/remote', ref: '1234567890abcdef1234567890abcdef12345678'
-mod 'buzz', git: 'this/remote', ref: 'refs/heads/main'
-mod 'canary', local: true

data/spec/fixtures/unit/puppetfile/various-modules/Puppetfile.new

@@ -1,10 +0,0 @@
-mod 'puppetlabs/apt', '3.0.0'
-mod 'puppetlabs/stdlib', :latest
-mod 'puppetlabs/concat'
-mod 'puppetlabs/rpm', '2.1.1-pre1'
-mod 'foo', git: 'this/remote', branch: 'main'
-mod 'bar', git: 'this/remote', tag: 'v1.2.3'
-mod 'baz', git: 'this/remote', commit: '123abc456'
-mod 'fizz', git: 'this/remote', ref: '1234567890abcdef1234567890abcdef12345678'
-mod 'buzz', git: 'this/remote', ref: 'refs/heads/main'
-mod 'canary', local: true

data/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/managed_symlink_file

@@ -1 +0,0 @@
-../expected_1

data/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/unmanaged_symlink_dir

@@ -1 +0,0 @@
-../../managed_two

data/spec/fixtures/unit/util/purgeable/managed_one/managed_symlink_dir

@@ -1 +0,0 @@
-spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1

data/spec/fixtures/unit/util/purgeable/managed_one/unmanaged_symlink_file

@@ -1 +0,0 @@
-spec/fixtures/unit/util/purgeable/managed_one/expected_1

data/spec/fixtures/unit/util/subprocess/runner/no-execute.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-echo "This was supposed to be non-executable..."

data/spec/integration/git/rugged/bare_repository_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-require 'r10k/git/rugged/bare_repository'
-
-describe R10K::Git::Rugged::BareRepository, :if => R10K::Features.available?(:rugged) do
-  include_context 'Git integration'
-
-  let(:dirname) { 'bare-repo.git' }
-
-  subject { described_class.new(basedir, dirname) }
-
-  it_behaves_like 'a git repository'
-  it_behaves_like 'a git bare repository'
-end

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

@@ -1,33 +0,0 @@
-require 'spec_helper'
-require 'r10k/git/rugged/cache'
-
-describe R10K::Git::Rugged::Cache, :if => R10K::Features.available?(:rugged) do
-  include_context 'Git integration'
-
-  let(:dirname) { 'working-repo' }
-  let(:remote_name) { 'origin' }
-
-  subject { described_class.new(remote) }
-
-  context "syncing with the remote" do
-    before(:each) do
-      subject.reset!
-    end
-
-    describe "with the correct configuration" do
-      it "is able to sync with the remote" do
-        subject.sync
-        expect(subject.synced?).to eq(true)
-      end
-    end
-
-    describe "with a out of date cached remote" do
-      it "updates the cached remote configuration" do
-        subject.repo.update_remote('foo', remote_name)
-        expect(subject.repo.remotes[remote_name]).to eq('foo')
-        subject.sync
-        expect(subject.repo.remotes[remote_name]).to eq(remote)
-      end
-    end
-  end
-end

data/spec/integration/git/rugged/thin_repository_spec.rb

@@ -1,14 +0,0 @@
-require 'spec_helper'
-require 'r10k/git/rugged/thin_repository'
-
-describe R10K::Git::Rugged::ThinRepository, :if => R10K::Features.available?(:rugged) do
-  include_context 'Git integration'
-
-  let(:dirname) { 'working-repo' }
-
-  let(:cacherepo) { R10K::Git::Rugged::Cache.generate(remote) }
-
-  subject { described_class.new(basedir, dirname, cacherepo) }
-
-  it_behaves_like "a git thin repository"
-end

data/spec/integration/git/rugged/working_repository_spec.rb

@@ -1,48 +0,0 @@
-require 'spec_helper'
-require 'r10k/git/rugged/working_repository'
-
-describe R10K::Git::Rugged::WorkingRepository, :if => R10K::Features.available?(:rugged) do
-  include_context 'Git integration'
-
-  let(:dirname) { 'working-repo' }
-
-  subject { described_class.new(basedir, dirname) }
-
-  it_behaves_like 'a git repository'
-  it_behaves_like 'a git working repository'
-
-  describe "checking out an unresolvable ref" do
-    it "raises an error indicating that the ref was unresolvable" do
-      expect(subject).to receive(:resolve).with("unresolvable")
-      expect {
-        subject.checkout("unresolvable")
-      }.to raise_error(R10K::Git::GitError, /Unable to check out unresolvable ref 'unresolvable'/)
-    end
-  end
-
-  context "checking out a specific SHA" do
-    let(:_rugged_repo) { double("Repository") }
-
-    before do
-      subject.clone(remote)
-      allow(subject).to receive(:with_repo).and_yield(_rugged_repo)
-      allow(subject).to receive(:resolve).and_return("157011a4eaa27f1202a9d94335ee4876b26d377e")
-    end
-
-    describe "with force" do
-      it "does not receive a checkout call" do
-        expect(_rugged_repo).to_not receive(:checkout)
-        expect(_rugged_repo).to receive(:reset)
-        subject.checkout("157011a4eaa27f1202a9d94335ee4876b26d377e", {:force => true})
-      end
-    end
-
-    describe "without force" do
-      it "does receive a checkout call" do
-        expect(_rugged_repo).to receive(:checkout)
-        expect(_rugged_repo).to_not receive(:reset)
-        subject.checkout("157011a4eaa27f1202a9d94335ee4876b26d377e", {:force => false})
-      end
-    end
-  end
-end