r10k 3.3.3 → 3.4.0

data/lib/r10k/source/yaml.rb

@@ -0,0 +1,20 @@
+class R10K::Source::Yaml < R10K::Source::Hash
+  R10K::Source.register(:yaml, self)
+
+  def initialize(name, basedir, options = {})
+    config = options[:config] || '/etc/puppetlabs/r10k/environments.yaml'
+
+    begin
+      contents = ::YAML.load_file(config)
+    rescue => e
+      raise ConfigError, _("Couldn't open environments file %{file}: %{err}") % {file: config, err: e.message}
+    end
+
+    # Set the environments key for the parent class to consume
+    options[:environments] = contents
+
+    # All we need to do is supply options with the :environments hash.
+    # The R10K::Source::Hash parent class takes care of the rest.
+    super(name, basedir, options)
+  end
+end

data/lib/r10k/source/yamldir.rb

@@ -0,0 +1,32 @@
+class R10K::Source::Yamldir < R10K::Source::Hash
+  R10K::Source.register(:yamldir, self)
+
+  def initialize(name, basedir, options = {})
+    config = options[:config] || '/etc/puppetlabs/r10k/environments.d'
+
+    unless File.directory?(config)
+      raise R10K::Deployment::Config::ConfigError, _("Error opening %{dir}: config must be a directory") % {dir: config}
+    end
+
+    unless File.readable?(config)
+      raise R10K::Deployment::Config::ConfigError, _("Error opening %{dir}: permission denied") % {dir: config}
+    end
+
+    environment_data = Dir.glob(File.join(config, '*.yaml')).reduce({}) do |memo,path|
+      name = File.basename(path, '.yaml')
+      begin
+        contents = ::YAML.load_file(path)
+      rescue => e
+        raise R10K::Deployment::Config::ConfigError, _("Error loading %{path}: %{err}") % {path: path, err: e.message}
+      end
+      memo.merge({name => contents })
+    end
+
+    # Set the environments key for the parent class to consume
+    options[:environments] = environment_data
+
+    # All we need to do is supply options with the :environments hash.
+    # The R10K::Source::Hash parent class takes care of the rest.
+    super(name, basedir, options)
+  end
+end

data/lib/r10k/util/attempt.rb

@@ -1,7 +1,7 @@
 require 'r10k/logging'
 require 'r10k/errors/formatting'
 require 'r10k/util/setopts'
-require 'colored'
+require 'colored2'
 
 module R10K
   module Util

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '3.3.3'
+  VERSION = '3.4.0'
 end

data/locales/r10k.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: r10k 3.3.0-7-g6a2159a\n"
+"Project-Id-Version: r10k 3.3.3-22-g3035320\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
-"POT-Creation-Date: 2019-06-14 22:40+0000\n"
-"PO-Revision-Date: 2019-06-14 22:40+0000\n"
+"POT-Creation-Date: 2019-12-17 14:55+0000\n"
+"PO-Revision-Date: 2019-12-17 14:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -52,7 +52,7 @@ msgid "Environment %{env_dir} is new, updating all modules"
 msgstr ""
 
 #: ../lib/r10k/action/deploy/environment.rb:143
-msgid "Deploying Puppetfile content %{mod_path}"
+msgid "Deploying %{origin} content %{path}"
 msgstr ""
 
 #: ../lib/r10k/action/deploy/module.rb:49
@@ -107,6 +107,14 @@ msgstr ""
 msgid "%{class} has not implemented method %{method}"
 msgstr ""
 
+#: ../lib/r10k/environment/with_modules.rb:104
+msgid "Puppetfile cannot contain module names defined by environment %{name}"
+msgstr ""
+
+#: ../lib/r10k/environment/with_modules.rb:106
+msgid "Remove the conflicting definitions of the following modules: %{conflicts}"
+msgstr ""
+
 #: ../lib/r10k/feature.rb:27
 msgid "Testing to see if feature %{name} is available."
 msgstr ""
@@ -131,19 +139,19 @@ msgstr ""
 msgid "Proc %{block} for feature %{name} returned %{output}"
 msgstr ""
 
-#: ../lib/r10k/forge/module_release.rb:164
+#: ../lib/r10k/forge/module_release.rb:196
 msgid "Unpacking %{tarball_cache_path} to %{target_dir} (with tmpdir %{tmp_path})"
 msgstr ""
 
-#: ../lib/r10k/forge/module_release.rb:166
+#: ../lib/r10k/forge/module_release.rb:198
 msgid "Valid files unpacked: %{valid_files}"
 msgstr ""
 
-#: ../lib/r10k/forge/module_release.rb:168
+#: ../lib/r10k/forge/module_release.rb:200
 msgid "These files existed in the module's tar file, but are invalid filetypes and were not unpacked: %{invalid_files}"
 msgstr ""
 
-#: ../lib/r10k/forge/module_release.rb:171
+#: ../lib/r10k/forge/module_release.rb:203
 msgid "Symlinks are unsupported and were not unpacked from the module tarball. %{release_slug} contained these ignored symlinks: %{symlinks}"
 msgstr ""
 
@@ -295,19 +303,19 @@ msgstr ""
 msgid "Module %{name} with args %{args} doesn't have an implementation. (Are you using the right arguments?)"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:105
+#: ../lib/r10k/module/base.rb:110
 msgid "Module name (%{title}) must match either 'modulename' or 'owner/modulename'"
 msgstr ""
 
-#: ../lib/r10k/module/forge.rb:70 ../lib/r10k/module/forge.rb:95
+#: ../lib/r10k/module/forge.rb:70 ../lib/r10k/module/forge.rb:99
 msgid "The module %{title} does not exist on %{url}."
 msgstr ""
 
-#: ../lib/r10k/module/forge.rb:170
+#: ../lib/r10k/module/forge.rb:174
 msgid "Forge module names must match 'owner/modulename'"
 msgstr ""
 
-#: ../lib/r10k/module/git.rb:92
+#: ../lib/r10k/module/git.rb:97
 msgid "Unhandled options %{unhandled} specified for %{class}"
 msgstr ""
 
@@ -323,35 +331,35 @@ msgstr ""
 msgid "Using Puppetfile '%{puppetfile}'"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:70
+#: ../lib/r10k/puppetfile.rb:71
 msgid "Puppetfile %{path} missing or unreadable"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:80
+#: ../lib/r10k/puppetfile.rb:84
 msgid "Failed to evaluate %{path}"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:90
+#: ../lib/r10k/puppetfile.rb:98
 msgid "Puppetfiles cannot contain duplicate module names."
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:92
+#: ../lib/r10k/puppetfile.rb:100
 msgid "Remove the duplicates of the following modules: %{dupes}"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:179
+#: ../lib/r10k/puppetfile.rb:192
 msgid "Updating modules with %{pool_size} threads"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:190
+#: ../lib/r10k/puppetfile.rb:203
 msgid "Error during concurrent deploy of a module: %{message}"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:212
+#: ../lib/r10k/puppetfile.rb:225
 msgid "Module thread %{id} exiting: %{message}"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:269
+#: ../lib/r10k/puppetfile.rb:282
 msgid "unrecognized declaration '%{method}'"
 msgstr ""
 
@@ -435,6 +443,22 @@ msgstr ""
 msgid "Branch %{branch} filtered out by ignore_branch_prefixes %{ibp}"
 msgstr ""
 
+#: ../lib/r10k/source/yaml.rb:10
+msgid "Couldn't open environments file %{file}: %{err}"
+msgstr ""
+
+#: ../lib/r10k/source/yamldir.rb:8
+msgid "Error opening %{dir}: config must be a directory"
+msgstr ""
+
+#: ../lib/r10k/source/yamldir.rb:12
+msgid "Error opening %{dir}: permission denied"
+msgstr ""
+
+#: ../lib/r10k/source/yamldir.rb:20
+msgid "Error loading %{path}: %{err}"
+msgstr ""
+
 #: ../lib/r10k/svn/working_dir.rb:43
 msgid "Both username and password must be specified"
 msgstr ""

data/r10k.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.license  = 'Apache-2.0'
 
-  s.add_dependency 'colored',   '1.2'
+  s.add_dependency 'colored2',   '3.1.2'
   s.add_dependency 'cri',       '2.15.6'
 
   s.add_dependency 'log4r',     '1.1.10'

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

@@ -369,6 +369,7 @@ describe R10K::Action::Deploy::Environment do
       allow(mock_forge_module_1).to receive(:repo).and_raise(NoMethodError)
 
       fake_env = Fake_Environment.new(@tmp_path, {:name => "my_cool_environment", :signature => "pablo picasso"})
+      allow(fake_env).to receive(:modules).and_return(mock_puppetfile.modules)
       subject.send(:write_environment_info!, fake_env, "2019-01-01 23:23:22 +0000", true)
 
       file_contents = File.read("#{@tmp_path}/.r10k-deploy.json")

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: colored2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: cri
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +161,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
+- ".github/workflows/docker.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.mkd
@@ -168,7 +169,6 @@ files:
 - CONTRIBUTING.mkd
 - Gemfile
 - LICENSE
-- MAINTAINERS
 - README.mkd
 - Rakefile
 - azure-pipelines.yml
@@ -193,10 +193,11 @@ files:
 - docker/Gemfile
 - docker/Makefile
 - docker/README.md
-- docker/distelli-manifest.yml
 - docker/r10k/Dockerfile
+- docker/r10k/adduser.sh
 - docker/r10k/docker-entrypoint.d/10-analytics.sh
 - docker/r10k/docker-entrypoint.sh
+- docker/r10k/release.Dockerfile
 - docker/spec/dockerfile_spec.rb
 - docker/spec/fixtures/Puppetfile
 - integration/Gemfile
@@ -319,10 +320,12 @@ files:
 - lib/r10k/deployment.rb
 - lib/r10k/deployment/config.rb
 - lib/r10k/environment.rb
+- lib/r10k/environment/bare.rb
 - lib/r10k/environment/base.rb
 - lib/r10k/environment/git.rb
 - lib/r10k/environment/name.rb
 - lib/r10k/environment/svn.rb
+- lib/r10k/environment/with_modules.rb
 - lib/r10k/errors.rb
 - lib/r10k/errors/formatting.rb
 - lib/r10k/feature.rb
@@ -373,7 +376,10 @@ files:
 - lib/r10k/source.rb
 - lib/r10k/source/base.rb
 - lib/r10k/source/git.rb
+- lib/r10k/source/hash.rb
 - lib/r10k/source/svn.rb
+- lib/r10k/source/yaml.rb
+- lib/r10k/source/yamldir.rb
 - lib/r10k/svn.rb
 - lib/r10k/svn/remote.rb
 - lib/r10k/svn/working_dir.rb
@@ -532,8 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Puppet environment and module deployment

data/MAINTAINERS

@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "file_format": "This MAINTAINERS file format is described at https://github.com/puppetlabs/maintainers",
-  "issues": "https://tickets.puppet.com/browse/RK",
-  "internal_list": "https://groups.google.com/a/puppet.com/forum/?hl=en#!forum/discuss-code-manager-maintainers", 
-  "people": [
-    {
-      "github": "andersonmills",
-      "email": "anderson@puppet.com",
-      "name": "Anderson Mills"
-    },
-    {
-      "github": "scotje",
-      "email": "jesse@puppet.com",
-      "name": "Jesse Scott"
-    }
-  ]
-}

data/docker/distelli-manifest.yml

@@ -1,9 +0,0 @@
-pe-and-platform/r10k:
-  PreBuild:
-    - make lint
-  Build:
-    - make build PUPPERWARE_ANALYTICS_STREAM=production
-    - make test
-  AfterBuildSuccess:
-    - docker login -u "$DISTELLI_DOCKER_USERNAME" -p "$DISTELLI_DOCKER_PW" "$DISTELLI_DOCKER_ENDPOINT"
-    - make publish