From 832de6349a71ea66b0582af0591f2bada1783ab0 Mon Sep 17 00:00:00 2001 From: sebastia Date: Wed, 18 Nov 2015 20:01:56 +0000 Subject: [PATCH] Update to 2.1.1, OK jasper@ --- sysutils/ruby-r10k/Makefile | 5 ++- sysutils/ruby-r10k/distinfo | 4 +- sysutils/ruby-r10k/pkg/PLIST | 79 ++++++++++++++++++------------------ 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/sysutils/ruby-r10k/Makefile b/sysutils/ruby-r10k/Makefile index 81ca4b9fa66..4e43856733f 100644 --- a/sysutils/ruby-r10k/Makefile +++ b/sysutils/ruby-r10k/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 2015/08/18 14:22:14 sebastia Exp $ +# $OpenBSD: Makefile,v 1.5 2015/11/18 20:01:56 sebastia Exp $ COMMENT = Puppet module management -DISTNAME = r10k-2.0.3 +DISTNAME = r10k-2.1.1 CATEGORIES = sysutils HOMEPAGE = https://github.com/puppetlabs/r10k MAINTAINER = Sebastian Reitenbach @@ -19,6 +19,7 @@ RUN_DEPENDS += archivers/ruby-minitar,${MODRUBY_FLAVOR}>=0,<2 \ devel/ruby-json_pure,${MODRUBY_FLAVOR}>=1.8.2 \ devel/ruby-log4r,${MODRUBY_FLAVOR}=1.1.10 \ devel/ruby-semantic_puppet,${MODRUBY_FLAVOR}>=0.1.0,<0.2 \ + devel/ruby-puppet_forge,${MODRUBY_FLAVOR}>=2.1.1,<3 \ www/ruby-faraday,${MODRUBY_FLAVOR}>=0.9.0,<0.10 \ www/ruby-faraday_middleware,${MODRUBY_FLAVOR}>=0.9.0,<0.10 \ www/ruby-faraday_middleware-multi_json,${MODRUBY_FLAVOR}>=0.0.6,<0.1.0 diff --git a/sysutils/ruby-r10k/distinfo b/sysutils/ruby-r10k/distinfo index 2c8639e27e6..f7ca6d0e852 100644 --- a/sysutils/ruby-r10k/distinfo +++ b/sysutils/ruby-r10k/distinfo @@ -1,2 +1,2 @@ -SHA256 (r10k-2.0.3.gem) = 7yjBedMMaQgCEyCug1y0Qx7ZOUIzaYU7LYkN4v/qVPg= -SIZE (r10k-2.0.3.gem) = 160256 +SHA256 (r10k-2.1.1.gem) = ZnhESpIqSa9Wm0jNfcMnm2qDOWrbAuvArw5BnGDCezQ= +SIZE (r10k-2.1.1.gem) = 167936 diff --git a/sysutils/ruby-r10k/pkg/PLIST b/sysutils/ruby-r10k/pkg/PLIST index 8dcc26860f1..4bd1e35963f 100644 --- a/sysutils/ruby-r10k/pkg/PLIST +++ b/sysutils/ruby-r10k/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2015/07/01 09:00:38 sebastia Exp $ +@comment $OpenBSD: PLIST,v 1.4 2015/11/18 20:01:56 sebastia Exp $ ${GEM_BIN}/r10k${GEM_BIN_SUFFIX} ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ @@ -114,10 +114,15 @@ ${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/user_scenario/complex_w ${GEM_LIB}/gems/${DISTNAME}/integration/tests/ ${GEM_LIB}/gems/${DISTNAME}/integration/tests/README.mkd ${GEM_LIB}/gems/${DISTNAME}/integration/tests/basic_functionality/ +${GEM_LIB}/gems/${DISTNAME}/integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/basic_functionality/negative/ +${GEM_LIB}/gems/${DISTNAME}/integration/tests/basic_functionality/negative/attempt_to_install_peonly_module_without_license.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/basic_functionality/negative/neg_deploy_with_invalid_r10k_yaml.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/basic_functionality/negative/neg_deploy_with_missing_r10k_yaml.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/basic_functionality/negative/neg_invalid_git_provider.rb +${GEM_LIB}/gems/${DISTNAME}/integration/tests/basic_functionality/negative/negative_bad_proxy.rb +${GEM_LIB}/gems/${DISTNAME}/integration/tests/basic_functionality/proxy_specified_in_configuration.rb +${GEM_LIB}/gems/${DISTNAME}/integration/tests/basic_functionality/proxy_with_puppetfile.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/basic_functionality/rugged_git_provider_with_ssh.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/basic_functionality/rugged_git_provider_without_ssh.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/command_line/ @@ -180,9 +185,11 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/action/ +${GEM_LIB}/gems/${DISTNAME}/lib/r10k/action/base.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/action/cri_runner.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/action/deploy/ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/action/deploy.rb +${GEM_LIB}/gems/${DISTNAME}/lib/r10k/action/deploy/deploy_helpers.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/action/deploy/display.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/action/deploy/environment.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/action/deploy/module.rb @@ -204,9 +211,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/cli/puppetfile.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/cli/version.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/deployment/ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/deployment.rb -${GEM_LIB}/gems/${DISTNAME}/lib/r10k/deployment/config/ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/deployment/config.rb -${GEM_LIB}/gems/${DISTNAME}/lib/r10k/deployment/config/loader.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/environment/ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/environment.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/environment/base.rb @@ -232,6 +237,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/git/rugged.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/git/rugged/bare_repository.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/git/rugged/base_repository.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/git/rugged/cache.rb +${GEM_LIB}/gems/${DISTNAME}/lib/r10k/git/rugged/credentials.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/git/rugged/thin_repository.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/git/rugged/working_repository.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/git/shellgit/ @@ -242,6 +248,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/git/shellgit/cache.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/git/shellgit/thin_repository.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/git/shellgit/working_repository.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/git/stateful_repository.rb +${GEM_LIB}/gems/${DISTNAME}/lib/r10k/initializers.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/instance_cache.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/keyed_factory.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/logging/ @@ -252,6 +259,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/module.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/module/base.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/module/forge.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/module/git.rb +${GEM_LIB}/gems/${DISTNAME}/lib/r10k/module/local.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/module/metadata_file.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/module/svn.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/module_repository/ @@ -260,8 +268,13 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/module_repository/forge.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/puppetfile.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/settings/ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/settings.rb +${GEM_LIB}/gems/${DISTNAME}/lib/r10k/settings/collection.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/settings/container.rb +${GEM_LIB}/gems/${DISTNAME}/lib/r10k/settings/definition.rb +${GEM_LIB}/gems/${DISTNAME}/lib/r10k/settings/enum_definition.rb +${GEM_LIB}/gems/${DISTNAME}/lib/r10k/settings/loader.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/settings/mixin.rb +${GEM_LIB}/gems/${DISTNAME}/lib/r10k/settings/uri_definition.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/source/ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/source.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/source/base.rb @@ -291,24 +304,6 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/util/subprocess/runner/windows.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/util/subprocess/subprocess_error.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/util/symbolize_keys.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/version.rb -${GEM_LIB}/gems/${DISTNAME}/lib/shared/ -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet/ -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet/module_tool/ -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet/module_tool/metadata.rb -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet_forge/ -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet_forge/connection/ -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet_forge/connection.rb -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet_forge/connection/connection_failure.rb -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet_forge/error.rb -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet_forge/tar/ -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet_forge/tar.rb -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet_forge/tar/mini.rb -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet_forge/unpacker.rb -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet_forge/v3/ -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet_forge/v3.rb -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet_forge/v3/module.rb -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet_forge/v3/module_release.rb -${GEM_LIB}/gems/${DISTNAME}/lib/shared/puppet_forge/version.rb ${GEM_LIB}/gems/${DISTNAME}/r10k.gemspec ${GEM_LIB}/gems/${DISTNAME}/r10k.yaml.example ${GEM_LIB}/gems/${DISTNAME}/spec/ @@ -327,15 +322,16 @@ ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/module/forge/eight_hundred/Modulefile ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/module/forge/eight_hundred/metadata.json ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/ ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/ +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/argument-error/ +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/argument-error/Puppetfile ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/invalid-syntax/ ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/load-error/ ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/load-error/Puppetfile ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/ ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/subprocess/ -${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/subprocess/posix/ -${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/subprocess/posix/runner/ -${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/subprocess/posix/runner/no-execute.sh +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/subprocess/runner/ +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/subprocess/runner/no-execute.sh ${GEM_LIB}/gems/${DISTNAME}/spec/integration/ ${GEM_LIB}/gems/${DISTNAME}/spec/integration/git/ ${GEM_LIB}/gems/${DISTNAME}/spec/integration/git/rugged/ @@ -358,23 +354,31 @@ ${GEM_LIB}/gems/${DISTNAME}/spec/r10k-mocks/mock_source.rb ${GEM_LIB}/gems/${DISTNAME}/spec/shared-contexts/ ${GEM_LIB}/gems/${DISTNAME}/spec/shared-contexts/git-fixtures.rb ${GEM_LIB}/gems/${DISTNAME}/spec/shared-examples/ +${GEM_LIB}/gems/${DISTNAME}/spec/shared-examples/deploy-actions.rb ${GEM_LIB}/gems/${DISTNAME}/spec/shared-examples/git/ ${GEM_LIB}/gems/${DISTNAME}/spec/shared-examples/git-repository.rb ${GEM_LIB}/gems/${DISTNAME}/spec/shared-examples/git/bare_repository.rb ${GEM_LIB}/gems/${DISTNAME}/spec/shared-examples/git/thin_repository.rb ${GEM_LIB}/gems/${DISTNAME}/spec/shared-examples/git/working_repository.rb +${GEM_LIB}/gems/${DISTNAME}/spec/shared-examples/puppetfile-action.rb ${GEM_LIB}/gems/${DISTNAME}/spec/shared-examples/subprocess-runner.rb ${GEM_LIB}/gems/${DISTNAME}/spec/spec_helper.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/ ${GEM_LIB}/gems/${DISTNAME}/spec/unit/action/ ${GEM_LIB}/gems/${DISTNAME}/spec/unit/action/cri_runner_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/action/deploy/ +${GEM_LIB}/gems/${DISTNAME}/spec/unit/action/deploy/deploy_helpers_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/action/deploy/display_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/action/deploy/environment_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/action/deploy/module_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/action/puppetfile/ +${GEM_LIB}/gems/${DISTNAME}/spec/unit/action/puppetfile/check_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/action/puppetfile/cri_runner_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/action/puppetfile/install_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/action/puppetfile/purge_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/action/runner_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/action/visitor_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/deployment/ -${GEM_LIB}/gems/${DISTNAME}/spec/unit/deployment/config/ -${GEM_LIB}/gems/${DISTNAME}/spec/unit/deployment/config/loader_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/deployment/config_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/deployment_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/environment/ @@ -392,10 +396,12 @@ ${GEM_LIB}/gems/${DISTNAME}/spec/unit/git/alternates_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/git/cache_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/git/rugged/ ${GEM_LIB}/gems/${DISTNAME}/spec/unit/git/rugged/cache_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/git/rugged/credentials_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/git/shellgit/ ${GEM_LIB}/gems/${DISTNAME}/spec/unit/git/shellgit/cache_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/git/stateful_repository_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/git_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/initializers_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/instance_cache_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/keyed_factory_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/logging/ @@ -410,23 +416,15 @@ ${GEM_LIB}/gems/${DISTNAME}/spec/unit/module/svn_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/module_repository/ ${GEM_LIB}/gems/${DISTNAME}/spec/unit/module_repository/forge_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/module_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet/ -${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet/module_tool/ -${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet/module_tool/metadata_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet_forge/ -${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet_forge/connection/ -${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet_forge/connection/connection_failure_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet_forge/connection_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet_forge/tar/ -${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet_forge/tar/mini_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet_forge/tar_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet_forge/unpacker_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet_forge/v3/ -${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet_forge/v3/module_release_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet_forge/v3/module_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppetfile_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/settings/ +${GEM_LIB}/gems/${DISTNAME}/spec/unit/settings/collection_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/settings/container_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/settings/definition_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/settings/enum_definition_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/settings/loader_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/settings/uri_definition_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/settings_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/source/ ${GEM_LIB}/gems/${DISTNAME}/spec/unit/source/base_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/source/git_spec.rb @@ -445,6 +443,7 @@ ${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/subprocess/result_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/subprocess/runner/ ${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/subprocess/runner/posix_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/subprocess/runner/pump_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/subprocess/runner/windows_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/subprocess/subprocess_error_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/subprocess_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/symbolize_keys_spec.rb