r10k 3.15.0 → 4.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/dependabot.yml +17 -0
- data/.github/workflows/docker.yml +4 -4
- data/.github/workflows/release.yml +2 -2
- data/.github/workflows/rspec_tests.yml +10 -11
- data/.github/workflows/stale.yml +1 -1
- data/CHANGELOG.mkd +66 -0
- data/CODEOWNERS +1 -2
- data/Gemfile +2 -2
- data/README.mkd +16 -17
- data/doc/common-patterns.mkd +1 -2
- data/doc/dynamic-environments/configuration.mkd +78 -2
- data/doc/puppetfile.mkd +9 -3
- data/integration/Gemfile +1 -1
- data/integration/Rakefile +1 -1
- data/integration/files/pre-suite/git_config.pp.erb +1 -1
- data/integration/pre-suite/00_pe_install.rb +3 -0
- data/integration/pre-suite/10_git_config.rb +0 -3
- data/integration/tests/Puppetfile/HTTP_PROXY_affects_git_source.rb +5 -4
- data/integration/tests/basic_functionality/negative/negative_bad_proxy.rb +1 -1
- data/integration/tests/basic_functionality/proxy_specified_in_configuration.rb +2 -2
- data/integration/tests/basic_functionality/proxy_with_puppetfile.rb +2 -2
- data/integration/tests/basic_functionality/rugged_git_provider_with_ssh.rb +3 -3
- data/integration/tests/basic_functionality/rugged_git_provider_without_ssh.rb +3 -3
- data/integration/tests/command_line/deploy_env_without_mod_update.rb +0 -3
- data/integration/tests/command_line/negative/neg_deploy_env_with_module_update.rb +0 -3
- data/integration/tests/git_source/HTTP_proxy_and_git_source.rb +5 -10
- data/integration/tests/git_source/git_source_git.rb +1 -4
- data/integration/tests/git_source/git_source_repeated_remote.rb +0 -3
- data/integration/tests/git_source/git_source_submodule.rb +1 -1
- data/integration/tests/git_source/negative/neg_git_unauthorized_ssh.rb +1 -1
- data/integration/tests/purging/content_not_purged_at_root.rb +0 -3
- data/integration/tests/purging/default_purging.rb +0 -3
- data/integration/tests/purging/{does_not_purge_files_on_white_list.rb → does_not_purge_files_on_allowlist.rb} +2 -5
- data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module.rb +0 -3
- data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module_static.rb +0 -3
- data/integration/tests/user_scenario/basic_workflow/multi_source_custom_forge_git_module.rb +0 -3
- data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_forge_module.rb +0 -3
- data/integration/tests/user_scenario/basic_workflow/negative/neg_disk_full.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/negative/neg_duplicate_module_names.rb +0 -3
- data/integration/tests/user_scenario/basic_workflow/negative/neg_inaccessible_forge.rb +3 -2
- data/integration/tests/user_scenario/basic_workflow/negative/neg_specify_deleted_forge_module.rb +1 -5
- data/integration/tests/user_scenario/basic_workflow/single_env_10000_files.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/single_env_custom_forge_git_module.rb +0 -3
- data/integration/tests/user_scenario/basic_workflow/single_env_custom_forge_module.rb +0 -3
- data/integration/tests/user_scenario/basic_workflow/single_env_large_files.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/single_env_module_already_installed.rb +0 -3
- data/integration/tests/user_scenario/basic_workflow/single_env_purge_unmanaged_modules.rb +0 -3
- data/integration/tests/user_scenario/basic_workflow/single_env_switch_forge_git_module.rb +0 -3
- data/integration/tests/user_scenario/basic_workflow/single_env_upgrade_forge_mod_revert_change.rb +0 -3
- data/integration/tests/user_scenario/complex_workflow/multi_env_add_change_remove.rb +0 -3
- data/lib/r10k/action/deploy/environment.rb +2 -19
- data/lib/r10k/action/deploy/module.rb +1 -0
- data/lib/r10k/action/puppetfile/check.rb +7 -0
- data/lib/r10k/action/puppetfile/install.rb +3 -1
- data/lib/r10k/cli/deploy.rb +15 -1
- data/lib/r10k/cli/puppetfile.rb +1 -0
- data/lib/r10k/content_synchronizer.rb +7 -2
- data/lib/r10k/environment.rb +0 -1
- data/lib/r10k/git/rugged/bare_repository.rb +4 -3
- data/lib/r10k/git/rugged/working_repository.rb +7 -5
- data/lib/r10k/git/shellgit/working_repository.rb +3 -3
- data/lib/r10k/git/stateful_repository.rb +2 -2
- data/lib/r10k/module/base.rb +3 -3
- data/lib/r10k/module/git.rb +18 -4
- data/lib/r10k/module_loader/puppetfile.rb +14 -9
- data/lib/r10k/puppetfile.rb +1 -1
- data/lib/r10k/settings.rb +6 -7
- data/lib/r10k/version.rb +1 -1
- data/locales/r10k.pot +34 -82
- data/r10k.gemspec +5 -7
- metadata +22 -211
- data/docker/.gitignore +0 -1
- data/docker/.rspec +0 -4
- data/docker/Gemfile +0 -11
- data/docker/Makefile +0 -99
- data/docker/README.md +0 -28
- data/docker/docker-compose.yml +0 -18
- data/docker/r10k/Dockerfile +0 -68
- data/docker/r10k/adduser.sh +0 -13
- data/docker/r10k/docker-entrypoint.d/10-analytics.sh +0 -30
- data/docker/r10k/docker-entrypoint.sh +0 -10
- data/docker/r10k/release.Dockerfile +0 -55
- data/docker/spec/dockerfile_spec.rb +0 -37
- data/docker/spec/fixtures/Puppetfile +0 -2
- data/integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb +0 -83
- data/integration/tests/basic_functionality/proxy_with_pe_only_module.rb +0 -128
- data/integration/tests/purging/invalid_whitelist_types.rb +0 -63
- data/integration/tests/user_scenario/basic_workflow/negative/neg_module_specified_at_deleted_release.rb +0 -49
- data/integration/tests/user_scenario/basic_workflow/single_env_module_last_release_deleted.rb +0 -68
- data/lib/r10k/environment/bare.rb +0 -13
- data/spec/fixtures/empty/.empty +0 -0
- data/spec/fixtures/integration/git/puppet-boolean-bare.tar +0 -0
- data/spec/fixtures/module/forge/bad_module/metadata.json +0 -1
- data/spec/fixtures/module/forge/eight_hundred/Modulefile +0 -8
- data/spec/fixtures/module/forge/eight_hundred/metadata.json +0 -19
- data/spec/fixtures/tarball/tarball.tar.gz +0 -0
- data/spec/fixtures/unit/action/r10k.yaml +0 -5
- data/spec/fixtures/unit/action/r10k_cachedir.yaml +0 -2
- data/spec/fixtures/unit/action/r10k_creds.yaml +0 -9
- data/spec/fixtures/unit/action/r10k_forge_auth.yaml +0 -4
- data/spec/fixtures/unit/action/r10k_forge_auth_no_url.yaml +0 -3
- data/spec/fixtures/unit/action/r10k_generate_types.yaml +0 -3
- data/spec/fixtures/unit/action/r10k_logging.yaml +0 -12
- data/spec/fixtures/unit/action/r10k_puppet_path.yaml +0 -3
- data/spec/fixtures/unit/puppetfile/argument-error/Puppetfile +0 -1
- data/spec/fixtures/unit/puppetfile/default-branch-override/Puppetfile +0 -5
- data/spec/fixtures/unit/puppetfile/duplicate-module-error/Puppetfile +0 -10
- data/spec/fixtures/unit/puppetfile/forge-override/Puppetfile +0 -8
- data/spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile +0 -1
- data/spec/fixtures/unit/puppetfile/load-error/Puppetfile +0 -1
- data/spec/fixtures/unit/puppetfile/name-error/Puppetfile +0 -1
- data/spec/fixtures/unit/puppetfile/valid-forge-with-version/Puppetfile +0 -1
- data/spec/fixtures/unit/puppetfile/valid-forge-without-version/Puppetfile +0 -1
- data/spec/fixtures/unit/puppetfile/various-modules/Puppetfile +0 -10
- data/spec/fixtures/unit/puppetfile/various-modules/Puppetfile.new +0 -10
- data/spec/fixtures/unit/puppetfile/various-modules/modules/apt/.gitkeep +0 -1
- data/spec/fixtures/unit/puppetfile/various-modules/modules/baz/.gitkeep +0 -1
- data/spec/fixtures/unit/puppetfile/various-modules/modules/buzz/.gitkeep +0 -1
- data/spec/fixtures/unit/puppetfile/various-modules/modules/canary/.gitkeep +0 -1
- data/spec/fixtures/unit/puppetfile/various-modules/modules/fizz/.gitkeep +0 -1
- data/spec/fixtures/unit/puppetfile/various-modules/modules/rpm/.gitkeep +0 -1
- data/spec/fixtures/unit/util/purgeable/managed_one/expected_1 +0 -0
- data/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/managed_symlink_file +0 -1
- data/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_allowlisted_2/ignored_1 +0 -0
- data/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_expected_1 +0 -0
- data/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_unmanaged_1 +0 -0
- data/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/unmanaged_symlink_dir +0 -1
- data/spec/fixtures/unit/util/purgeable/managed_one/managed_symlink_dir +0 -1
- data/spec/fixtures/unit/util/purgeable/managed_one/unmanaged_1 +0 -0
- data/spec/fixtures/unit/util/purgeable/managed_one/unmanaged_symlink_file +0 -1
- data/spec/fixtures/unit/util/purgeable/managed_two/.hidden/unmanaged_3 +0 -0
- data/spec/fixtures/unit/util/purgeable/managed_two/expected_2 +0 -0
- data/spec/fixtures/unit/util/purgeable/managed_two/unmanaged_2 +0 -0
- data/spec/fixtures/unit/util/subprocess/runner/no-execute.sh +0 -3
- data/spec/integration/git/rugged/bare_repository_spec.rb +0 -13
- data/spec/integration/git/rugged/cache_spec.rb +0 -33
- data/spec/integration/git/rugged/thin_repository_spec.rb +0 -14
- data/spec/integration/git/rugged/working_repository_spec.rb +0 -48
- data/spec/integration/git/shellgit/bare_repository_spec.rb +0 -13
- data/spec/integration/git/shellgit/thin_repository_spec.rb +0 -14
- data/spec/integration/git/shellgit/working_repository_spec.rb +0 -13
- data/spec/integration/git/stateful_repository_spec.rb +0 -175
- data/spec/integration/util/purageable_spec.rb +0 -41
- data/spec/matchers/exit_with.rb +0 -28
- data/spec/matchers/match_realpath.rb +0 -18
- data/spec/r10k-mocks/mock_config.rb +0 -33
- data/spec/r10k-mocks/mock_env.rb +0 -18
- data/spec/r10k-mocks/mock_source.rb +0 -17
- data/spec/r10k-mocks.rb +0 -3
- data/spec/shared-contexts/git-fixtures.rb +0 -55
- data/spec/shared-contexts/tarball.rb +0 -32
- data/spec/shared-examples/deploy-actions.rb +0 -69
- data/spec/shared-examples/git/bare_repository.rb +0 -132
- data/spec/shared-examples/git/thin_repository.rb +0 -26
- data/spec/shared-examples/git/working_repository.rb +0 -207
- data/spec/shared-examples/git-repository.rb +0 -38
- data/spec/shared-examples/puppetfile-action.rb +0 -39
- data/spec/shared-examples/settings/ancestry.rb +0 -44
- data/spec/shared-examples/subprocess-runner.rb +0 -89
- data/spec/spec_helper.rb +0 -41
- data/spec/unit/action/cri_runner_spec.rb +0 -72
- data/spec/unit/action/deploy/deploy_helpers_spec.rb +0 -38
- data/spec/unit/action/deploy/display_spec.rb +0 -61
- data/spec/unit/action/deploy/environment_spec.rb +0 -640
- data/spec/unit/action/deploy/module_spec.rb +0 -476
- data/spec/unit/action/puppetfile/check_spec.rb +0 -53
- data/spec/unit/action/puppetfile/cri_runner_spec.rb +0 -47
- data/spec/unit/action/puppetfile/install_spec.rb +0 -112
- data/spec/unit/action/puppetfile/purge_spec.rb +0 -60
- data/spec/unit/action/runner_spec.rb +0 -407
- data/spec/unit/action/visitor_spec.rb +0 -39
- data/spec/unit/cli_spec.rb +0 -9
- data/spec/unit/deployment/config_spec.rb +0 -33
- data/spec/unit/deployment_spec.rb +0 -162
- data/spec/unit/environment/bare_spec.rb +0 -13
- data/spec/unit/environment/base_spec.rb +0 -122
- data/spec/unit/environment/git_spec.rb +0 -114
- data/spec/unit/environment/name_spec.rb +0 -181
- data/spec/unit/environment/plain_spec.rb +0 -8
- data/spec/unit/environment/svn_spec.rb +0 -146
- data/spec/unit/environment/tarball_spec.rb +0 -45
- data/spec/unit/environment/with_modules_spec.rb +0 -122
- data/spec/unit/errors/formatting_spec.rb +0 -84
- data/spec/unit/feature_spec.rb +0 -50
- data/spec/unit/forge/module_release_spec.rb +0 -213
- data/spec/unit/git/alternates_spec.rb +0 -116
- data/spec/unit/git/cache_spec.rb +0 -66
- data/spec/unit/git/rugged/cache_spec.rb +0 -48
- data/spec/unit/git/rugged/credentials_spec.rb +0 -215
- data/spec/unit/git/shellgit/cache_spec.rb +0 -27
- data/spec/unit/git/stateful_repository_spec.rb +0 -45
- data/spec/unit/git_spec.rb +0 -102
- data/spec/unit/initializers_spec.rb +0 -68
- data/spec/unit/instance_cache_spec.rb +0 -78
- data/spec/unit/keyed_factory_spec.rb +0 -51
- data/spec/unit/logging/terminaloutputter_spec.rb +0 -53
- data/spec/unit/logging_spec.rb +0 -68
- data/spec/unit/module/base_spec.rb +0 -118
- data/spec/unit/module/forge_spec.rb +0 -271
- data/spec/unit/module/git_spec.rb +0 -387
- data/spec/unit/module/metadata_file_spec.rb +0 -68
- data/spec/unit/module/svn_spec.rb +0 -208
- data/spec/unit/module/tarball_spec.rb +0 -70
- data/spec/unit/module_loader/puppetfile_spec.rb +0 -421
- data/spec/unit/module_spec.rb +0 -114
- data/spec/unit/puppetfile_spec.rb +0 -304
- data/spec/unit/settings/collection_spec.rb +0 -123
- data/spec/unit/settings/container_spec.rb +0 -92
- data/spec/unit/settings/definition_spec.rb +0 -79
- data/spec/unit/settings/enum_definition_spec.rb +0 -20
- data/spec/unit/settings/inheritance_spec.rb +0 -38
- data/spec/unit/settings/list_spec.rb +0 -88
- data/spec/unit/settings/loader_spec.rb +0 -110
- data/spec/unit/settings/uri_definition_spec.rb +0 -23
- data/spec/unit/settings_spec.rb +0 -303
- data/spec/unit/source/base_spec.rb +0 -31
- data/spec/unit/source/exec_spec.rb +0 -81
- data/spec/unit/source/git_spec.rb +0 -233
- data/spec/unit/source/hash_spec.rb +0 -54
- data/spec/unit/source/svn_spec.rb +0 -196
- data/spec/unit/source/yaml_spec.rb +0 -42
- data/spec/unit/source_spec.rb +0 -10
- data/spec/unit/svn/remote_spec.rb +0 -21
- data/spec/unit/svn/working_dir_spec.rb +0 -56
- data/spec/unit/tarball_spec.rb +0 -57
- data/spec/unit/util/attempt_spec.rb +0 -82
- data/spec/unit/util/cacheable_spec.rb +0 -23
- data/spec/unit/util/commands_spec.rb +0 -61
- data/spec/unit/util/downloader_spec.rb +0 -98
- data/spec/unit/util/exec_env_spec.rb +0 -56
- data/spec/unit/util/purgeable_spec.rb +0 -267
- data/spec/unit/util/setopts_spec.rb +0 -83
- data/spec/unit/util/subprocess/result_spec.rb +0 -36
- data/spec/unit/util/subprocess/runner/posix_spec.rb +0 -7
- data/spec/unit/util/subprocess/runner/pump_spec.rb +0 -79
- data/spec/unit/util/subprocess/runner/windows_spec.rb +0 -7
- data/spec/unit/util/subprocess/subprocess_error_spec.rb +0 -26
- data/spec/unit/util/subprocess_spec.rb +0 -65
- data/spec/unit/util/symbolize_keys_spec.rb +0 -67
@@ -1,10 +0,0 @@
|
|
1
|
-
mod 'puppetlabs/apt', '3.0.0'
|
2
|
-
mod 'puppetlabs/stdlib', :latest
|
3
|
-
mod 'puppetlabs/concat'
|
4
|
-
mod 'puppetlabs/rpm', '2.1.1-pre1'
|
5
|
-
mod 'foo', git: 'this/remote', branch: 'main'
|
6
|
-
mod 'bar', git: 'this/remote', tag: 'v1.2.3'
|
7
|
-
mod 'baz', git: 'this/remote', commit: '123abc456'
|
8
|
-
mod 'fizz', git: 'this/remote', ref: '1234567890abcdef1234567890abcdef12345678'
|
9
|
-
mod 'buzz', git: 'this/remote', ref: 'refs/heads/main'
|
10
|
-
mod 'canary', local: true
|
@@ -1 +0,0 @@
|
|
1
|
-
This only exists so the directory can be committed to git for testing purposes.
|
@@ -1 +0,0 @@
|
|
1
|
-
This only exists so the directory can be committed to git for testing purposes.
|
@@ -1 +0,0 @@
|
|
1
|
-
This only exists so the directory can be committed to git for testing purposes.
|
@@ -1 +0,0 @@
|
|
1
|
-
This only exists so the directory can be committed to git for testing purposes.
|
@@ -1 +0,0 @@
|
|
1
|
-
This only exists so the directory can be committed to git for testing purposes.
|
@@ -1 +0,0 @@
|
|
1
|
-
This only exists so the directory can be committed to git for testing purposes.
|
File without changes
|
@@ -1 +0,0 @@
|
|
1
|
-
../expected_1
|
data/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_allowlisted_2/ignored_1
DELETED
File without changes
|
File without changes
|
File without changes
|
@@ -1 +0,0 @@
|
|
1
|
-
../../managed_two
|
@@ -1 +0,0 @@
|
|
1
|
-
spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1
|
File without changes
|
@@ -1 +0,0 @@
|
|
1
|
-
spec/fixtures/unit/util/purgeable/managed_one/expected_1
|
File without changes
|
File without changes
|
File without changes
|
@@ -1,13 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
require 'r10k/git/rugged/bare_repository'
|
3
|
-
|
4
|
-
describe R10K::Git::Rugged::BareRepository, :if => R10K::Features.available?(:rugged) do
|
5
|
-
include_context 'Git integration'
|
6
|
-
|
7
|
-
let(:dirname) { 'bare-repo.git' }
|
8
|
-
|
9
|
-
subject { described_class.new(basedir, dirname) }
|
10
|
-
|
11
|
-
it_behaves_like 'a git repository'
|
12
|
-
it_behaves_like 'a git bare repository'
|
13
|
-
end
|
@@ -1,33 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
require 'r10k/git/rugged/cache'
|
3
|
-
|
4
|
-
describe R10K::Git::Rugged::Cache, :if => R10K::Features.available?(:rugged) do
|
5
|
-
include_context 'Git integration'
|
6
|
-
|
7
|
-
let(:dirname) { 'working-repo' }
|
8
|
-
let(:remote_name) { 'origin' }
|
9
|
-
|
10
|
-
subject { described_class.new(remote) }
|
11
|
-
|
12
|
-
context "syncing with the remote" do
|
13
|
-
before(:each) do
|
14
|
-
subject.reset!
|
15
|
-
end
|
16
|
-
|
17
|
-
describe "with the correct configuration" do
|
18
|
-
it "is able to sync with the remote" do
|
19
|
-
subject.sync
|
20
|
-
expect(subject.synced?).to eq(true)
|
21
|
-
end
|
22
|
-
end
|
23
|
-
|
24
|
-
describe "with a out of date cached remote" do
|
25
|
-
it "updates the cached remote configuration" do
|
26
|
-
subject.repo.update_remote('foo', remote_name)
|
27
|
-
expect(subject.repo.remotes[remote_name]).to eq('foo')
|
28
|
-
subject.sync
|
29
|
-
expect(subject.repo.remotes[remote_name]).to eq(remote)
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
@@ -1,14 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
require 'r10k/git/rugged/thin_repository'
|
3
|
-
|
4
|
-
describe R10K::Git::Rugged::ThinRepository, :if => R10K::Features.available?(:rugged) do
|
5
|
-
include_context 'Git integration'
|
6
|
-
|
7
|
-
let(:dirname) { 'working-repo' }
|
8
|
-
|
9
|
-
let(:cacherepo) { R10K::Git::Rugged::Cache.generate(remote) }
|
10
|
-
|
11
|
-
subject { described_class.new(basedir, dirname, cacherepo) }
|
12
|
-
|
13
|
-
it_behaves_like "a git thin repository"
|
14
|
-
end
|
@@ -1,48 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
require 'r10k/git/rugged/working_repository'
|
3
|
-
|
4
|
-
describe R10K::Git::Rugged::WorkingRepository, :if => R10K::Features.available?(:rugged) do
|
5
|
-
include_context 'Git integration'
|
6
|
-
|
7
|
-
let(:dirname) { 'working-repo' }
|
8
|
-
|
9
|
-
subject { described_class.new(basedir, dirname) }
|
10
|
-
|
11
|
-
it_behaves_like 'a git repository'
|
12
|
-
it_behaves_like 'a git working repository'
|
13
|
-
|
14
|
-
describe "checking out an unresolvable ref" do
|
15
|
-
it "raises an error indicating that the ref was unresolvable" do
|
16
|
-
expect(subject).to receive(:resolve).with("unresolvable")
|
17
|
-
expect {
|
18
|
-
subject.checkout("unresolvable")
|
19
|
-
}.to raise_error(R10K::Git::GitError, /Unable to check out unresolvable ref 'unresolvable'/)
|
20
|
-
end
|
21
|
-
end
|
22
|
-
|
23
|
-
context "checking out a specific SHA" do
|
24
|
-
let(:_rugged_repo) { double("Repository") }
|
25
|
-
|
26
|
-
before do
|
27
|
-
subject.clone(remote)
|
28
|
-
allow(subject).to receive(:with_repo).and_yield(_rugged_repo)
|
29
|
-
allow(subject).to receive(:resolve).and_return("157011a4eaa27f1202a9d94335ee4876b26d377e")
|
30
|
-
end
|
31
|
-
|
32
|
-
describe "with force" do
|
33
|
-
it "does not receive a checkout call" do
|
34
|
-
expect(_rugged_repo).to_not receive(:checkout)
|
35
|
-
expect(_rugged_repo).to receive(:reset)
|
36
|
-
subject.checkout("157011a4eaa27f1202a9d94335ee4876b26d377e", {:force => true})
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
|
-
describe "without force" do
|
41
|
-
it "does receive a checkout call" do
|
42
|
-
expect(_rugged_repo).to receive(:checkout)
|
43
|
-
expect(_rugged_repo).to_not receive(:reset)
|
44
|
-
subject.checkout("157011a4eaa27f1202a9d94335ee4876b26d377e", {:force => false})
|
45
|
-
end
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
@@ -1,13 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
require 'r10k/git/shellgit/bare_repository'
|
3
|
-
|
4
|
-
describe R10K::Git::ShellGit::BareRepository do
|
5
|
-
include_context 'Git integration'
|
6
|
-
|
7
|
-
let(:dirname) { 'bare-repo.git' }
|
8
|
-
|
9
|
-
subject { described_class.new(basedir, dirname) }
|
10
|
-
|
11
|
-
it_behaves_like 'a git repository'
|
12
|
-
it_behaves_like 'a git bare repository'
|
13
|
-
end
|
@@ -1,14 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
require 'r10k/git/shellgit/thin_repository'
|
3
|
-
|
4
|
-
describe R10K::Git::ShellGit::ThinRepository do
|
5
|
-
include_context 'Git integration'
|
6
|
-
|
7
|
-
let(:dirname) { 'working-repo' }
|
8
|
-
|
9
|
-
let(:cacherepo) { R10K::Git::ShellGit::Cache.generate(remote) }
|
10
|
-
|
11
|
-
subject { described_class.new(basedir, dirname, cacherepo) }
|
12
|
-
|
13
|
-
it_behaves_like "a git thin repository"
|
14
|
-
end
|
@@ -1,13 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
require 'r10k/git/shellgit/working_repository'
|
3
|
-
|
4
|
-
describe R10K::Git::ShellGit::WorkingRepository do
|
5
|
-
include_context 'Git integration'
|
6
|
-
|
7
|
-
let(:dirname) { 'working-repo' }
|
8
|
-
|
9
|
-
subject { described_class.new(basedir, dirname) }
|
10
|
-
|
11
|
-
it_behaves_like 'a git repository'
|
12
|
-
it_behaves_like 'a git working repository'
|
13
|
-
end
|
@@ -1,175 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
require 'r10k/git'
|
3
|
-
require 'r10k/git/stateful_repository'
|
4
|
-
|
5
|
-
describe R10K::Git::StatefulRepository do
|
6
|
-
include_context 'Git integration'
|
7
|
-
|
8
|
-
let(:dirname) { 'working-repo' }
|
9
|
-
|
10
|
-
let(:cacherepo) { R10K::Git.cache.generate(remote) }
|
11
|
-
let(:thinrepo) { R10K::Git.thin_repository.new(basedir, dirname, cacherepo) }
|
12
|
-
let(:ref) { '0.9.x' }
|
13
|
-
|
14
|
-
subject { described_class.new(remote, basedir, dirname) }
|
15
|
-
|
16
|
-
describe 'status' do
|
17
|
-
describe "when the directory does not exist" do
|
18
|
-
it "is absent" do
|
19
|
-
expect(subject.status(ref)).to eq :absent
|
20
|
-
end
|
21
|
-
end
|
22
|
-
|
23
|
-
describe "when the directory is not a git repository" do
|
24
|
-
it "is mismatched" do
|
25
|
-
thinrepo.path.mkdir
|
26
|
-
expect(subject.status(ref)).to eq :mismatched
|
27
|
-
end
|
28
|
-
end
|
29
|
-
|
30
|
-
describe "when the directory has a .git file" do
|
31
|
-
it "is mismatched" do
|
32
|
-
thinrepo.path.mkdir
|
33
|
-
File.open("#{thinrepo.path}/.git", "w") {}
|
34
|
-
expect(subject.status(ref)).to eq :mismatched
|
35
|
-
end
|
36
|
-
end
|
37
|
-
|
38
|
-
describe "when the repository doesn't match the desired remote" do
|
39
|
-
it "is mismatched" do
|
40
|
-
thinrepo.clone(remote, {:ref => '1.0.0'})
|
41
|
-
allow(subject.repo).to receive(:origin).and_return('http://some.site/repo.git')
|
42
|
-
expect(subject.status(ref)).to eq :mismatched
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
describe "when the wrong ref is checked out" do
|
47
|
-
it "is outdated" do
|
48
|
-
thinrepo.clone(remote, {:ref => '1.0.0'})
|
49
|
-
expect(subject.status(ref)).to eq :outdated
|
50
|
-
end
|
51
|
-
end
|
52
|
-
|
53
|
-
describe "when the ref is a branch and the cache is not synced" do
|
54
|
-
it "is outdated" do
|
55
|
-
thinrepo.clone(remote, {:ref => ref})
|
56
|
-
cacherepo.reset!
|
57
|
-
expect(subject.status(ref)).to eq :outdated
|
58
|
-
end
|
59
|
-
end
|
60
|
-
|
61
|
-
describe "when the ref can't be resolved" do
|
62
|
-
let(:ref) { '1.1.x' }
|
63
|
-
|
64
|
-
it "is outdated" do
|
65
|
-
thinrepo.clone(remote, {:ref => '0.9.x'})
|
66
|
-
expect(subject.status(ref)).to eq :outdated
|
67
|
-
end
|
68
|
-
end
|
69
|
-
|
70
|
-
describe "when the workdir has local modifications" do
|
71
|
-
it "is dirty when workdir is up to date" do
|
72
|
-
thinrepo.clone(remote, {:ref => ref})
|
73
|
-
File.open(File.join(thinrepo.path, 'README.markdown'), 'a') { |f| f.write('local modifications!') }
|
74
|
-
|
75
|
-
expect(subject.status(ref)).to eq :dirty
|
76
|
-
end
|
77
|
-
|
78
|
-
it "is dirty when workdir is not up to date" do
|
79
|
-
thinrepo.clone(remote, {:ref => '1.0.0'})
|
80
|
-
File.open(File.join(thinrepo.path, 'README.markdown'), 'a') { |f| f.write('local modifications!') }
|
81
|
-
|
82
|
-
expect(subject.status(ref)).to eq :dirty
|
83
|
-
end
|
84
|
-
end
|
85
|
-
|
86
|
-
describe "when the workdir has spec dir modifications" do
|
87
|
-
before(:each) do
|
88
|
-
thinrepo.clone(remote, {:ref => ref})
|
89
|
-
FileUtils.mkdir_p(File.join(thinrepo.path, 'spec'))
|
90
|
-
File.open(File.join(thinrepo.path, 'spec', 'file_spec.rb'), 'a') { |f| f.write('local modifications!') }
|
91
|
-
thinrepo.stage_files(['spec/file_spec.rb'])
|
92
|
-
end
|
93
|
-
it "is dirty with exclude_spec false" do
|
94
|
-
expect(subject.status(ref, false)).to eq :dirty
|
95
|
-
end
|
96
|
-
|
97
|
-
it "is insync with exclude_spec true" do
|
98
|
-
expect(subject.status(ref, true)).to eq :insync
|
99
|
-
end
|
100
|
-
end
|
101
|
-
|
102
|
-
describe "if the right ref is checked out" do
|
103
|
-
it "is insync" do
|
104
|
-
thinrepo.clone(remote, {:ref => ref})
|
105
|
-
expect(subject.status(ref)).to eq :insync
|
106
|
-
end
|
107
|
-
end
|
108
|
-
end
|
109
|
-
|
110
|
-
describe "syncing" do
|
111
|
-
describe "when the ref is unresolvable" do
|
112
|
-
let(:ref) { '1.1.x' }
|
113
|
-
|
114
|
-
it "raises an error" do
|
115
|
-
expect {
|
116
|
-
subject.sync(ref)
|
117
|
-
}.to raise_error(R10K::Git::UnresolvableRefError)
|
118
|
-
end
|
119
|
-
end
|
120
|
-
|
121
|
-
describe "when the repo is absent" do
|
122
|
-
it "creates the repo" do
|
123
|
-
subject.sync(ref)
|
124
|
-
expect(subject.status(ref)).to eq :insync
|
125
|
-
end
|
126
|
-
end
|
127
|
-
|
128
|
-
describe "when the repo is mismatched" do
|
129
|
-
it "removes and recreates the repo" do
|
130
|
-
thinrepo.path.mkdir
|
131
|
-
subject.sync(ref)
|
132
|
-
expect(subject.status(ref)).to eq :insync
|
133
|
-
end
|
134
|
-
end
|
135
|
-
|
136
|
-
describe "when the repo is out of date" do
|
137
|
-
it "updates the repository" do
|
138
|
-
thinrepo.clone(remote, {:ref => '1.0.0'})
|
139
|
-
subject.sync(ref)
|
140
|
-
expect(subject.status(ref)).to eq :insync
|
141
|
-
end
|
142
|
-
end
|
143
|
-
|
144
|
-
describe "when the workdir is dirty" do
|
145
|
-
before(:each) do
|
146
|
-
thinrepo.clone(remote, {:ref => ref})
|
147
|
-
File.open(File.join(thinrepo.path, 'README.markdown'), 'a') { |f| f.write('local modifications!') }
|
148
|
-
end
|
149
|
-
|
150
|
-
context "when force == true" do
|
151
|
-
let(:force) { true }
|
152
|
-
|
153
|
-
it "warns and overwrites local modifications" do
|
154
|
-
expect(subject.logger).to receive(:warn).with(/overwriting local modifications/i)
|
155
|
-
|
156
|
-
subject.sync(ref, force)
|
157
|
-
|
158
|
-
expect(subject.status(ref)).to eq :insync
|
159
|
-
end
|
160
|
-
end
|
161
|
-
|
162
|
-
context "when force != true" do
|
163
|
-
let(:force) { false }
|
164
|
-
|
165
|
-
it "warns and does not overwrite local modifications" do
|
166
|
-
expect(subject.logger).to receive(:warn).with(/skipping.*due to local modifications/i)
|
167
|
-
|
168
|
-
subject.sync(ref, force)
|
169
|
-
|
170
|
-
expect(subject.status(ref)).to eq :dirty
|
171
|
-
end
|
172
|
-
end
|
173
|
-
end
|
174
|
-
end
|
175
|
-
end
|
@@ -1,41 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
require 'r10k/util/purgeable'
|
3
|
-
require 'r10k/util/cleaner'
|
4
|
-
|
5
|
-
require 'tmpdir'
|
6
|
-
|
7
|
-
RSpec.describe R10K::Util::Purgeable do
|
8
|
-
it 'purges only unmanaged files' do
|
9
|
-
Dir.mktmpdir do |envdir|
|
10
|
-
managed_directory = "#{envdir}/managed_one"
|
11
|
-
desired_contents = [
|
12
|
-
"#{managed_directory}/expected_1",
|
13
|
-
"#{managed_directory}/managed_subdir_1",
|
14
|
-
"#{managed_directory}/managed_symlink_dir",
|
15
|
-
"#{managed_directory}/managed_subdir_1/subdir_expected_1",
|
16
|
-
"#{managed_directory}/managed_subdir_1/managed_symlink_file",
|
17
|
-
]
|
18
|
-
|
19
|
-
FileUtils.cp_r('spec/fixtures/unit/util/purgeable/managed_one/',
|
20
|
-
managed_directory)
|
21
|
-
|
22
|
-
cleaner = R10K::Util::Cleaner.new([managed_directory], desired_contents)
|
23
|
-
|
24
|
-
cleaner.purge!({ recurse: true, whitelist: ["**/subdir_allowlisted_2"] })
|
25
|
-
|
26
|
-
# Files present after purge
|
27
|
-
expect(File.exist?("#{managed_directory}/expected_1")).to be true
|
28
|
-
expect(File.exist?("#{managed_directory}/managed_subdir_1")).to be true
|
29
|
-
expect(File.exist?("#{managed_directory}/managed_symlink_dir")).to be true
|
30
|
-
expect(File.exist?("#{managed_directory}/managed_subdir_1/subdir_expected_1")).to be true
|
31
|
-
expect(File.exist?("#{managed_directory}/managed_subdir_1/managed_symlink_file")).to be true
|
32
|
-
expect(File.exist?("#{managed_directory}/managed_subdir_1/subdir_allowlisted_2")).to be true
|
33
|
-
|
34
|
-
# Purged files
|
35
|
-
expect(File.exist?("#{managed_directory}/unmanaged_1")).to be false
|
36
|
-
expect(File.exist?("#{managed_directory}/managed_subdir_1/unmanaged_symlink_dir")).to be false
|
37
|
-
expect(File.exist?("#{managed_directory}/unmanaged_symlink_file")).to be false
|
38
|
-
expect(File.exist?("#{managed_directory}/managed_subdir_1/subdir_unmanaged_1")).to be false
|
39
|
-
end
|
40
|
-
end
|
41
|
-
end
|
data/spec/matchers/exit_with.rb
DELETED
@@ -1,28 +0,0 @@
|
|
1
|
-
RSpec::Matchers.define :exit_with do |expected|
|
2
|
-
|
3
|
-
supports_block_expectations
|
4
|
-
|
5
|
-
match do |block|
|
6
|
-
actual = nil
|
7
|
-
begin
|
8
|
-
block.call
|
9
|
-
rescue SystemExit => e
|
10
|
-
actual = e.status
|
11
|
-
end
|
12
|
-
actual and actual == expected
|
13
|
-
end
|
14
|
-
|
15
|
-
failure_message do |actual|
|
16
|
-
"expected exit with code #{expected} but " +
|
17
|
-
(actual.nil? ? " exit was not called" : "we exited with #{actual} instead")
|
18
|
-
end
|
19
|
-
|
20
|
-
failure_message_when_negated do |actual|
|
21
|
-
"expected that exit would not be called with #{expected}"
|
22
|
-
end
|
23
|
-
|
24
|
-
description do
|
25
|
-
"expect exit with #{expected}"
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
@@ -1,18 +0,0 @@
|
|
1
|
-
RSpec::Matchers.define :match_realpath do |expected|
|
2
|
-
|
3
|
-
match do |actual|
|
4
|
-
actual == expected || realpath(actual) == realpath(expected)
|
5
|
-
end
|
6
|
-
|
7
|
-
failure_message do |actual|
|
8
|
-
"expected that #{actual} would have a real path of #{expected}"
|
9
|
-
end
|
10
|
-
|
11
|
-
failure_message_when_negated do |actual|
|
12
|
-
"expected that #{actual} would not have a real path of #{expected}"
|
13
|
-
end
|
14
|
-
|
15
|
-
def realpath(path)
|
16
|
-
Pathname.new(path).realpath.to_s
|
17
|
-
end
|
18
|
-
end
|
@@ -1,33 +0,0 @@
|
|
1
|
-
require 'r10k/deployment/config'
|
2
|
-
|
3
|
-
module R10K
|
4
|
-
class Deployment
|
5
|
-
class MockConfig
|
6
|
-
|
7
|
-
attr_accessor :hash
|
8
|
-
|
9
|
-
def initialize(hash)
|
10
|
-
@hash = hash.merge(deploy: {})
|
11
|
-
end
|
12
|
-
|
13
|
-
def configfile
|
14
|
-
"/some/nonexistent/config_file"
|
15
|
-
end
|
16
|
-
|
17
|
-
# Perform a scan for key and check for both string and symbol keys
|
18
|
-
def setting(key)
|
19
|
-
@hash[key]
|
20
|
-
end
|
21
|
-
|
22
|
-
alias [] setting
|
23
|
-
|
24
|
-
def settings
|
25
|
-
@hash
|
26
|
-
end
|
27
|
-
|
28
|
-
def merge(other)
|
29
|
-
hash.merge(other)
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
data/spec/r10k-mocks/mock_env.rb
DELETED
@@ -1,18 +0,0 @@
|
|
1
|
-
require 'r10k/environment'
|
2
|
-
require 'r10k/util/purgeable'
|
3
|
-
|
4
|
-
class R10K::Environment::Mock < R10K::Environment::Base
|
5
|
-
include R10K::Util::Purgeable
|
6
|
-
|
7
|
-
def sync
|
8
|
-
"synced"
|
9
|
-
end
|
10
|
-
|
11
|
-
def status
|
12
|
-
:insync
|
13
|
-
end
|
14
|
-
|
15
|
-
def signature
|
16
|
-
"mock"
|
17
|
-
end
|
18
|
-
end
|
@@ -1,17 +0,0 @@
|
|
1
|
-
require 'r10k/source'
|
2
|
-
require 'r10k-mocks/mock_env'
|
3
|
-
|
4
|
-
class R10K::Source::Mock < R10K::Source::Base
|
5
|
-
R10K::Source.register(:mock, self)
|
6
|
-
|
7
|
-
def environments
|
8
|
-
if @_environments.nil?
|
9
|
-
corrected_environment_names = @options[:environments].map do |env|
|
10
|
-
R10K::Environment::Name.new(env, :prefix => @prefix, :invalid => 'correct_and_warn')
|
11
|
-
end
|
12
|
-
@_environments = corrected_environment_names.map { |env| R10K::Environment::Mock.new(env.name, @basedir, env.dirname, { overrides: @options[:overrides] }) }
|
13
|
-
end
|
14
|
-
|
15
|
-
@_environments
|
16
|
-
end
|
17
|
-
end
|
data/spec/r10k-mocks.rb
DELETED
@@ -1,55 +0,0 @@
|
|
1
|
-
require 'archive/tar/minitar'
|
2
|
-
require 'tmpdir'
|
3
|
-
|
4
|
-
shared_context "Git integration" do
|
5
|
-
|
6
|
-
# Use tmpdir for cached git repositories
|
7
|
-
|
8
|
-
before(:all) do
|
9
|
-
@old_cache_root = R10K::Git::Cache.settings[:cache_root]
|
10
|
-
R10K::Git::Cache.settings[:cache_root] = Dir.mktmpdir
|
11
|
-
end
|
12
|
-
|
13
|
-
after(:all) do
|
14
|
-
FileUtils.remove_entry_secure(R10K::Git::Cache.settings[:cache_root])
|
15
|
-
R10K::Git::Cache.settings[:cache_root] = @old_cache_root
|
16
|
-
end
|
17
|
-
|
18
|
-
# Create a mutable path for remote repositories
|
19
|
-
|
20
|
-
def fixture_path
|
21
|
-
File.join(PROJECT_ROOT, 'spec', 'fixtures', 'integration', 'git')
|
22
|
-
end
|
23
|
-
|
24
|
-
def remote_path
|
25
|
-
@remote_path
|
26
|
-
end
|
27
|
-
|
28
|
-
def populate_remote_path
|
29
|
-
Archive::Tar::Minitar.unpack(File.join(fixture_path, 'puppet-boolean-bare.tar'), remote_path)
|
30
|
-
end
|
31
|
-
|
32
|
-
def clear_remote_path
|
33
|
-
FileUtils.remove_entry_secure(remote_path)
|
34
|
-
end
|
35
|
-
|
36
|
-
before(:all) do
|
37
|
-
@remote_path = Dir.mktmpdir
|
38
|
-
populate_remote_path
|
39
|
-
end
|
40
|
-
|
41
|
-
after(:all) do
|
42
|
-
clear_remote_path
|
43
|
-
@remote_path = nil
|
44
|
-
end
|
45
|
-
|
46
|
-
let(:remote) { Pathname.new(File.join(remote_path, 'puppet-boolean.git')).realpath.to_s }
|
47
|
-
|
48
|
-
# Create a temp path for the git basedir and clean it up when finished
|
49
|
-
|
50
|
-
let(:basedir) { Dir.mktmpdir }
|
51
|
-
|
52
|
-
after do
|
53
|
-
FileUtils.remove_entry_secure(basedir)
|
54
|
-
end
|
55
|
-
end
|
@@ -1,32 +0,0 @@
|
|
1
|
-
require 'tmpdir'
|
2
|
-
require 'fileutils'
|
3
|
-
|
4
|
-
shared_context "Tarball" do
|
5
|
-
# Suggested subject:
|
6
|
-
#
|
7
|
-
# subject { described_class.new('fixture-tarball', fixture_tarball, checksum: fixture_checksum) }
|
8
|
-
#
|
9
|
-
let(:fixture_tarball) do
|
10
|
-
File.expand_path('spec/fixtures/tarball/tarball.tar.gz', PROJECT_ROOT)
|
11
|
-
end
|
12
|
-
|
13
|
-
let(:fixture_checksum) { '292e692ad18faabd4f9b21037d51f0185e04b69f82c522a54af91fb5b88c2d3b' }
|
14
|
-
|
15
|
-
# Use tmpdir for cached tarballs
|
16
|
-
let(:tmpdir) { Dir.mktmpdir }
|
17
|
-
|
18
|
-
# `moduledir` and `cache_root` are available for examples to use in creating
|
19
|
-
# their subjects
|
20
|
-
let(:moduledir) { File.join(tmpdir, 'modules').tap { |path| Dir.mkdir(path) } }
|
21
|
-
let(:cache_root) { File.join(tmpdir, 'cache').tap { |path| Dir.mkdir(path) } }
|
22
|
-
|
23
|
-
around(:each) do |example|
|
24
|
-
if subject.is_a?(R10K::Tarball)
|
25
|
-
subject.settings[:cache_root] = cache_root
|
26
|
-
elsif subject.respond_to?(:tarball) && subject.tarball.is_a?(R10K::Tarball)
|
27
|
-
subject.tarball.settings[:cache_root] = cache_root
|
28
|
-
end
|
29
|
-
example.run
|
30
|
-
FileUtils.remove_entry_secure(tmpdir)
|
31
|
-
end
|
32
|
-
end
|