r10k 2.1.1 → 2.2.0

data/.travis.yml

@@ -10,3 +10,6 @@ rvm:
   - "2.1.0"
   - "2.0.0"
   - "1.9.3"
+  - "jruby-19mode"
+jdk:
+    - oraclejdk8

data/CHANGELOG.mkd

@@ -1,6 +1,35 @@
 CHANGELOG
 =========
 
+2.2.0
+-----
+
+2016/03/08
+
+### Notes
+
+(RK-154) Per-repo config for Git sources
+
+Git repository options, such as the SSH private key, can now be set indepdently for each repository
+when using the Rugged provider. See [documentation](https://github.com/puppetlabs/r10k/blob/master/doc/git/providers.mkd#ssh-configuration-1)
+for details.
+
+(RK-220) Improved error message for unreadable SSH keys
+
+r10k will now check to ensure that the configured SSH private key for a given repository is readable
+before attempting to connect. This will result in a clearer error message in situations where the
+key file is not readable.
+
+(CODEMGMT-453) Support for running under JRuby 1.7 with shellgit provider
+
+r10k should now run successfully under JRuby 1.7.x when using the "shellgit" provider.
+
+(MAINT) Documentation fixes
+
+Various errors and inconsistencies in the documentation have been fixed thanks to contributions
+from [Paul Tobias](https://github.com/tobiaspal), [Rob Nelson](https://github.com/rnelson0), and
+[David Danzilio](https://github.com/danzilio). Thanks!
+
 2.1.1
 -----
 

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :extra do
-  gem 'rugged', '~> 0.21.4'
+  gem 'rugged', '~> 0.21.4', :platforms => :ruby
 end
 
 group :development do

data/README.mkd

@@ -77,6 +77,7 @@ Puppetfile, and managing Git and SVN based dynamic environments. For more
 information see the topic specific documentation:
 
   * [Puppetfile Documentation](doc/puppetfile.mkd)
+   * [Updating your Puppetfile](doc/updating-your-puppetfile.mkd)
   * [Environment Deployment Documentation](doc/dynamic-environments.mkd)
   * [Quickstart](doc/dynamic-environments/quickstart.mkd)
   * [Common Patterns](doc/common-patterns.mkd)

data/doc/dynamic-environments/configuration.mkd

@@ -68,6 +68,49 @@ git:
 See the [git provider documentation](../git/providers.mkd) for more information
 regarding Git providers.
 
+#### username
+
+The username setting is only used by the Rugged git provider.
+
+The username option sets the username for SSH remotes when the SSH URL does not provide
+a username. When used with a Git hosting service this is most sensibly set to 'git'.
+
+The username defaults to the username of the currently logged in user.
+
+```yaml
+git:
+  username: "git"
+```
+
+#### private_key
+
+The private_key setting is only used by the Rugged git provider.
+
+The private_key option specifies the path to the default Git SSH private key for Git SSH remotes.
+The private_key setting must be set if SSH remotes are used.
+
+```yaml
+git:
+  private_key: "/etc/puppetlabs/r10k/ssh/id_rsa"
+```
+
+#### repositories
+
+The repositories option allows configuration to be set on a per-remote basis. Each entry is a map of
+the repository URL and per-repository configuration for that repo.
+
+##### private_key
+
+A repository specific private key to use for SSH connections for the given repository URL. This
+overrides the global private_key setting.
+
+```yaml
+git:
+  repositories:
+    "ssh://tessier-ashpool.freeside/protected-repo.git":
+      private_key: "/etc/puppetlabs/r10k/ssh/id_rsa-protected-repo-deploy-key"
+```
+
 ### forge
 
 The 'forge' setting is a hash that contains settings for downloading modules

data/doc/dynamic-environments/quickstart.mkd

@@ -109,7 +109,7 @@ Configure r10k by creating the following directory structure and file `/etc/pupp
 
 Populate the repository by cloning it locally and performing each of the following actions within it:
 
-Note that puppet defaults to the `production` environnment. You may wish to change your default git
+Note that puppet defaults to the `production` environment. You may wish to change your default git
 branch from `master` to `production` in order to match this. Alternatively, you can set your agents'
 environment to `master`.
 

data/doc/faq.mkd

@@ -99,7 +99,7 @@ environment to indicate which directories contain modules:
 
 ```
 # environment.conf
-modulepath: modules:external-modules
+modulepath = modules:external-modules
 ```
 
 #### Move your local modules
@@ -111,7 +111,7 @@ directories contain modules.
 
 ```
 # environment.conf
-modulepath: internal-modules::modules
+modulepath = internal-modules:modules
 ```
 
 #### What does the name mean?

data/doc/git/providers.mkd

@@ -40,9 +40,9 @@ greater to use this provider.
 
 ### SSH Configuration
 
-In order to use rugged with SSH based Git repositories, the 'private_key' option
-must be provided. An optional 'username' field can be provided when the Git
-remote URL does not provide a username.
+Since the rugged provider does not read ~/.ssh if using SSH based Git
+repositories, the 'private_key' option must be provided. An optional 'username'
+field can be provided when the Git remote URL does not provide a username.
 
 ```yaml
 git:
@@ -50,6 +50,18 @@ git:
   username: 'git'
 ```
 
+If you have per repository private keys you can add them with the repositories list.
+
+```yaml
+git:
+  # default private key
+  private_key: '/root/.ssh/id_rsa'
+  repositories:
+    - remote: "git@github.com:my_org/private_repo"
+      # private key for this repo only
+      private_key: '/root/.ssh/private_repo_id'
+```
+
 #### Supported transports with Rugged
 
 Rugged compiles libgit2 and and the Ruby bindings when the gem is installed. You
@@ -72,7 +84,7 @@ irb(main):001:0> require('rugged')
 => true
 irb(main):002:0> Rugged.features
 => [:threads, :https, :ssh]
-irb(main):003:0> 
+irb(main):003:0>
 ```
 You will require the ':https' or ':ssh' features to use the respective protocols
 in your Puppetfile module references or in r10k.yaml. R10K 2.0.0 and later will

data/doc/updating-your-puppetfile.mkd

@@ -0,0 +1,38 @@
+Updating Your Puppetfile
+========================
+
+Over time, your Puppetfile may become stale and reference older versions of modules or miss dependencies for the modules. Your Puppetfile will require maintenance to keep it up to date.
+
+Manual Updates
+--------------
+
+You can manually update your Puppetfile very easily. By visiting the module's homepage on the [Puppet Forge](https://forge.puppetlabs.com/), you can determine the new version of a module and update it:
+
+    # Original
+    mod 'puppetlabs/apache', '0.10.0'
+    
+    # New
+    mod 'puppetlabs/apache', '1.0.0'
+
+When using a module directly from a git/svn repo, the `:tag` or `:ref` should be updated:
+
+    # Original
+    mod 'apache',
+      :git => 'https://github.com/puppetlabs/puppetlabs-apache',
+      :tag => '0.10.0'
+      
+    # Original
+    mod 'apache',
+      :git => 'https://github.com/puppetlabs/puppetlabs-apache',
+      :tag => '1.0.0'
+
+Dependency tracking can be done on the Puppet Forge as well by looking at the Dependency tab (Ex: [puppetlabs/apache](https://forge.puppetlabs.com/puppetlabs/apache/dependencies) and visiting each module in turn, or examining `metadata.json` in non-forge modules.
+
+Automatic Updates
+-----------------
+
+The manual update process is sufficient when updating a small number of modules for a specific effort. Automatic tooling is helpful when updating a lengthier number of modules and for scheduled updates. A number of tools have been provided by the Puppet user community to assist with this. You are encouraged to review each tool before using them, and use of these tools is at your own risk.
+
+* [ra10ke](https://rubygems.org/gems/ra10ke) ([project page](https://github.com/tampakrap/ra10ke/)) - A set of rake tasks to scan the Puppetfile for out of date modules
+* [puppetfile-updater](https://rubygems.org/gems/puppetfile-updater/) ([project page](https://github.com/camptocamp/puppetfile-updater)) - A set of rake tasks to scan the Puppetfile, find newer versions, update the Puppetfile, and commit the changes.
+* [generate-puppetfile](https://rubygems.org/gems/generate-puppetfile) ([project page](https://github.com/rnelson0/puppet-generate-puppetfile)) - A command line tool to generate raw Puppetfiles, update existing Puppetfiles, and optionally generate a `.fixtures.yml` file.

data/lib/r10k/git.rb

@@ -2,6 +2,7 @@ require 'r10k/features'
 require 'r10k/errors'
 require 'r10k/settings'
 require 'r10k/logging'
+require 'r10k/util/platform'
 
 module R10K
   module Git
@@ -133,5 +134,10 @@ module R10K
 
     def_setting_attr :private_key
     def_setting_attr :username
+    def_setting_attr :repositories, {}
+
+    def self.get_repo_settings(remote)
+      self.settings[:repositories].find {|r| r[:remote] == remote }
+    end
   end
 end

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

@@ -26,12 +26,28 @@ class R10K::Git::Rugged::Credentials
 
   def get_ssh_key_credentials(url, username_from_url)
     user = get_git_username(url, username_from_url)
-    private_key = R10K::Git.settings[:private_key]
 
-    if private_key.nil?
+    per_repo_private_key = nil
+    if per_repo_settings = R10K::Git.get_repo_settings(url)
+      per_repo_private_key = per_repo_settings[:private_key]
+    end
+
+    global_private_key = R10K::Git.settings[:private_key]
+
+    if per_repo_private_key
+      private_key = per_repo_private_key
+      logger.debug2 "Using per-repository private key #{private_key} for URL #{url.inspect}"
+    elsif global_private_key
+      private_key = global_private_key
+      logger.debug2 "URL #{url.inspect} has no per-repository private key using '#{private_key}'."
+    else
       raise R10K::Git::GitError.new("Git remote #{url.inspect} uses the SSH protocol but no private key was given", :git_dir => @repository.path.to_s)
     end
 
+    if !File.readable?(private_key)
+      raise R10K::Git::GitError.new("Unable to use SSH key auth for #{url.inspect}: private key #{private_key.inspect} is missing or unreadable", :git_dir => @repository.path.to_s)
+    end
+
     Rugged::Credentials::SshKey.new(:username => user, :privatekey => private_key)
   end
 

data/lib/r10k/initializers.rb

@@ -42,6 +42,7 @@ module R10K
         with_setting(:provider) { |value| R10K::Git.provider = value }
         with_setting(:username) { |value| R10K::Git.settings[:username] = value }
         with_setting(:private_key) { |value| R10K::Git.settings[:private_key] = value }
+        with_setting(:repositories) { |value| R10K::Git.settings[:repositories] = value }
       end
     end
 

data/lib/r10k/settings.rb

@@ -27,7 +27,22 @@ module R10K
         Definition.new(:private_key, {
           :desc => "The path to the SSH private key for Git SSH remotes.
                     Only used by the 'rugged' Git provider.",
-        })
+        }),
+
+        Definition.new(:repositories, {
+        :desc => "Repository specific configuration.",
+        :default => [],
+        :normalize => lambda do |repositories|
+        # The config file loading logic recursively converts hash keys that are strings to symbols,
+        # It doesn't understand hashes inside arrays though so we have to do this manually.
+          repositories.map do |repo|
+            repo.inject({}) do |retval, (key, value)|
+              retval[key.to_sym] = value
+              retval
+            end
+          end
+        end
+      }),
       ])
     end
 

data/lib/r10k/settings/collection.rb

@@ -39,6 +39,7 @@ module R10K
       def assign(newvalues)
         return if newvalues.nil?
 
+        # TODO: this results in inconsistency for hashes inside arrays.
         R10K::Util::SymbolizeKeys.symbolize_keys!(newvalues)
         @settings.each_pair do |name, setting|
           if newvalues.key?(name)

data/lib/r10k/settings/container.rb

@@ -31,9 +31,9 @@ class R10K::Settings::Container
 
     if @settings[key]
       @settings[key]
-    elsif @parent and (pkey = @parent[key])
-      @settings[key] = pkey
-      pkey
+    elsif @parent && (pkey = @parent[key])
+      @settings[key] = pkey.dup
+      @settings[key]
     end
   end
 

data/lib/r10k/util/platform.rb

@@ -4,7 +4,10 @@ module R10K
   module Util
     module Platform
       def self.platform
-        if self.windows?
+        # Test JRuby first to handle JRuby on Windows as well.
+        if self.jruby?
+          :jruby
+        elsif self.windows?
           :windows
         else
           :posix
@@ -15,8 +18,12 @@ module R10K
         RbConfig::CONFIG['host_os'] =~ /mswin|win32|dos|mingw|cygwin/i
       end
 
+      def self.jruby?
+        RUBY_PLATFORM == "java"
+      end
+
       def self.posix?
-        !windows?
+        !windows? && !jruby?
       end
     end
   end

data/lib/r10k/util/subprocess.rb

@@ -18,6 +18,8 @@ module R10K
       def self.runner
         if R10K::Util::Platform.windows?
           R10K::Util::Subprocess::Runner::Windows
+        elsif R10K::Util::Platform.jruby?
+          R10K::Util::Subprocess::Runner::JRuby
         else
           R10K::Util::Subprocess::Runner::POSIX
         end

data/lib/r10k/util/subprocess/runner.rb

@@ -5,6 +5,7 @@ class R10K::Util::Subprocess::Runner
 
   require 'r10k/util/subprocess/runner/windows'
   require 'r10k/util/subprocess/runner/posix'
+  require 'r10k/util/subprocess/runner/jruby'
 
   # @!attribute [rw] cwd
   #   @return [String] The directory to be used as the cwd when executing

data/lib/r10k/util/subprocess/runner/jruby.rb

@@ -0,0 +1,23 @@
+require 'open3'
+require 'r10k/util/subprocess/runner'
+
+# Run processes under JRuby.
+#
+# This implementation relies on Open3.capture3 to run commands and capture
+# results. In contrast to the POSIX runner this cannot be used in an
+# asynchronous manner as-is; implementing that will probably mean launching a
+# thread and invoking #capture3 in that thread.
+class R10K::Util::Subprocess::Runner::JRuby < R10K::Util::Subprocess::Runner
+
+  def initialize(argv)
+    @argv = argv
+  end
+
+  def run
+    spawn_opts = @cwd ? {:chdir => @cwd} : {}
+    stdout, stderr, status = Open3.capture3(*@argv, spawn_opts)
+    @result = R10K::Util::Subprocess::Result.new(@argv, stdout, stderr, status.exitstatus)
+  rescue Errno::ENOENT, Errno::EACCES => e
+    @result = R10K::Util::Subprocess::Result.new(@argv, '', e.message, 255)
+  end
+end

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 end

data/r10k.gemspec

@@ -28,11 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'log4r',     '1.1.10'
   s.add_dependency 'multi_json', '~> 1.10'
 
-  s.add_dependency 'puppet_forge',                  '~> 2.1.1'
-  s.add_dependency 'faraday',                       '~> 0.9.0'
-  s.add_dependency 'faraday_middleware',            '~> 0.9.0'
-  s.add_dependency 'faraday_middleware-multi_json', '~> 0.0.6'
-
+  s.add_dependency 'puppet_forge', '~> 2.1.1'
   s.add_dependency 'semantic_puppet', '~> 0.1.0'
   s.add_dependency 'minitar'
 

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

@@ -1,7 +1,10 @@
 require 'spec_helper'
-require 'r10k/git/rugged/cache'
 
-describe R10K::Git::Rugged::Cache do
+describe R10K::Git::Rugged::Cache, :unless => R10K::Util::Platform.jruby? do
+  before(:all) do
+    require 'r10k/git/rugged/cache'
+  end
+
   subject(:cache) { described_class.new('git://some/git/remote') }
 
   it "wraps a Rugged::BareRepository instance" do

data/spec/unit/git/rugged/credentials_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
-require 'r10k/git/rugged/credentials'
-require 'rugged/credentials'
 
-describe R10K::Git::Rugged::Credentials do
+describe R10K::Git::Rugged::Credentials, :unless => R10K::Util::Platform.jruby? do
+  before(:all) do
+    require 'r10k/git/rugged/credentials'
+    require 'rugged/credentials'
+  end
 
   let(:repo) { R10K::Git::Rugged::BareRepository.new("/some/nonexistent/path", "repo.git") }
 
@@ -33,7 +35,24 @@ describe R10K::Git::Rugged::Credentials do
   end
 
   describe "generating ssh key credentials" do
-    after { R10K::Git.settings.reset! }
+    after(:each) { R10K::Git.settings.reset! }
+
+    it "prefers a per-repository SSH private key" do
+      allow(File).to receive(:readable?).with("/etc/puppetlabs/r10k/ssh/tessier-ashpool-id_rsa").and_return true
+      R10K::Git.settings[:repositories] = [{ remote: "ssh://git@tessier-ashpool.freeside/repo.git",
+        private_key: "/etc/puppetlabs/r10k/ssh/tessier-ashpool-id_rsa"}]
+      creds = subject.get_ssh_key_credentials("ssh://git@tessier-ashpool.freeside/repo.git", nil)
+      expect(creds).to be_a_kind_of(Rugged::Credentials::SshKey)
+      expect(creds.instance_variable_get(:@privatekey)).to eq("/etc/puppetlabs/r10k/ssh/tessier-ashpool-id_rsa")
+    end
+
+    it "falls back to the global SSH private key" do
+      allow(File).to receive(:readable?).with("/etc/puppetlabs/r10k/ssh/id_rsa").and_return true
+      R10K::Git.settings[:private_key] = "/etc/puppetlabs/r10k/ssh/id_rsa"
+      creds = subject.get_ssh_key_credentials("ssh://git@tessier-ashpool.freeside/repo.git", nil)
+      expect(creds).to be_a_kind_of(Rugged::Credentials::SshKey)
+      expect(creds.instance_variable_get(:@privatekey)).to eq("/etc/puppetlabs/r10k/ssh/id_rsa")
+    end
 
     it "raises an error if no key has been set" do
       R10K::Git.settings[:private_key] = nil
@@ -42,11 +61,20 @@ describe R10K::Git::Rugged::Credentials do
       }.to raise_error(R10K::Git::GitError, /no private key was given/)
     end
 
-    it "generates the rugged sshkey credential type" do
+    it "raises an error if the private key is unreadable" do
       R10K::Git.settings[:private_key] = "/some/nonexistent/.ssh/key"
+      expect(File).to receive(:readable?).with("/some/nonexistent/.ssh/key").and_return false
+      expect {
+        subject.get_ssh_key_credentials("https://tessier-ashpool.freeside/repo.git", nil)
+      }.to raise_error(R10K::Git::GitError, /Unable to use SSH key auth for.*is missing or unreadable/)
+    end
+
+    it "generates the rugged sshkey credential type" do
+      allow(File).to receive(:readable?).with("/etc/puppetlabs/r10k/ssh/id_rsa").and_return true
+      R10K::Git.settings[:private_key] = "/etc/puppetlabs/r10k/ssh/id_rsa"
       creds = subject.get_ssh_key_credentials("https://tessier-ashpool.freeside/repo.git", nil)
       expect(creds).to be_a_kind_of(Rugged::Credentials::SshKey)
-      expect(creds.instance_variable_get(:@privatekey)).to eq("/some/nonexistent/.ssh/key")
+      expect(creds.instance_variable_get(:@privatekey)).to eq("/etc/puppetlabs/r10k/ssh/id_rsa")
     end
   end
 
@@ -59,7 +87,8 @@ describe R10K::Git::Rugged::Credentials do
 
   describe "generating credentials" do
     it "creates ssh key credentials for the sshkey allowed type" do
-      R10K::Git.settings[:private_key] = "/some/nonexistent/.ssh/key"
+      allow(File).to receive(:readable?).with("/etc/puppetlabs/r10k/ssh/id_rsa").and_return true
+      R10K::Git.settings[:private_key] = "/etc/puppetlabs/r10k/ssh/id_rsa"
       expect(subject.call("https://tessier-ashpool.freeside/repo.git", nil, [:ssh_key])).to be_a_kind_of(Rugged::Credentials::SshKey)
     end
 

data/spec/unit/git_spec.rb

@@ -11,10 +11,12 @@ describe R10K::Git do
       expect(described_class.default_name).to eq :shellgit
     end
 
-    it 'returns rugged when the git executable is absent and the rugged library is present' do
-      expect(R10K::Features).to receive(:available?).with(:shellgit).and_return false
-      expect(R10K::Features).to receive(:available?).with(:rugged).and_return true
-      expect(described_class.default_name).to eq :rugged
+    context 'under c-based rubies', :unless => R10K::Util::Platform.jruby? do
+      it 'returns rugged when the git executable is absent and the rugged library is present' do
+        expect(R10K::Features).to receive(:available?).with(:shellgit).and_return false
+        expect(R10K::Features).to receive(:available?).with(:rugged).and_return true
+        expect(described_class.default_name).to eq :rugged
+      end
     end
 
     it 'raises an error when the git executable and rugged library are absent' do
@@ -51,24 +53,50 @@ describe R10K::Git do
       }.to raise_error(R10K::Error, "Git provider 'shellgit' is not functional.")
     end
 
-    it "sets the current provider if the provider exists and is functional" do
-      expect(R10K::Features).to receive(:available?).with(:rugged).and_return true
-      described_class.provider = :rugged
-      expect(described_class.provider).to eq(R10K::Git::Rugged)
+    context 'under c-based rubies', :unless => R10K::Util::Platform.jruby? do
+      it "sets the current provider if the provider exists and is functional" do
+        expect(R10K::Features).to receive(:available?).with(:rugged).and_return true
+        described_class.provider = :rugged
+        expect(described_class.provider).to eq(R10K::Git::Rugged)
+      end
+    end
+
+    context 'under jruby', :if => R10K::Util::Platform.jruby? do
+      it "sets the current provider if the provider exists and is functional" do
+        expect(R10K::Features).to receive(:available?).with(:shellgit).and_return true
+        described_class.provider = :shellgit
+        expect(described_class.provider).to eq(R10K::Git::ShellGit)
+      end
     end
   end
 
   describe "retrieving the current provider" do
-    it "uses the default if a provider has not been set" do
-      expect(described_class).to receive(:default_name).and_return :rugged
-      expect(described_class.provider).to eq(R10K::Git::Rugged)
+    context 'under c-based rubies', :unless => R10K::Util::Platform.jruby? do
+      it "uses the default if a provider has not been set" do
+        expect(described_class).to receive(:default_name).and_return :rugged
+        expect(described_class.provider).to eq(R10K::Git::Rugged)
+      end
+
+      it "uses an explicitly set provider" do
+        expect(R10K::Features).to receive(:available?).with(:rugged).and_return true
+        described_class.provider = :rugged
+        expect(described_class).to_not receive(:default)
+        expect(described_class.provider).to eq R10K::Git::Rugged
+      end
     end
 
-    it "uses an explicitly set provider" do
-      expect(R10K::Features).to receive(:available?).with(:rugged).and_return true
-      described_class.provider = :rugged
-      expect(described_class).to_not receive(:default)
-      expect(described_class.provider).to eq R10K::Git::Rugged
+    context 'under jruby', :if => R10K::Util::Platform.jruby? do
+      it "uses the default if a provider has not been set" do
+        expect(described_class).to receive(:default_name).and_return :shellgit
+        expect(described_class.provider).to eq(R10K::Git::ShellGit)
+      end
+
+      it "uses an explicitly set provider" do
+        expect(R10K::Features).to receive(:available?).with(:shellgit).and_return true
+        described_class.provider = :shellgit
+        expect(described_class).to_not receive(:default)
+        expect(described_class.provider).to eq R10K::Git::ShellGit
+      end
     end
   end
 end

data/spec/unit/settings/container_spec.rb

@@ -59,6 +59,13 @@ describe R10K::Settings::Container do
         expect(subject[:v]).to eq 'child'
       end
 
+      it 'duplicates and stores the parent object to avoid modifying the parent object' do
+        parent[:v] = {}
+        subject[:v][:hello] = "world"
+        expect(subject[:v]).to eq({hello: "world"})
+        expect(parent[:v]).to eq({})
+      end
+
       it 'falls back to the parent value if it does not have a value' do
         parent[:v] = 'parent'
         expect(subject[:v]).to eq 'parent'

data/spec/unit/settings_spec.rb

@@ -149,7 +149,14 @@ describe R10K::Settings do
     describe "git settings" do
       it "passes settings through to the git settings" do
         output = subject.evaluate("git" => {"provider" => "shellgit", "username" => "git"})
-        expect(output[:git]).to eq(:provider => :shellgit, :username => "git", :private_key => nil)
+        expect(output[:git]).to eq(:provider => :shellgit, :username => "git", :private_key => nil, :repositories => [])
+      end
+
+      it "handles keywords in repository settings" do
+        output = subject.evaluate("git" => {"provider" => "shellgit",
+                                  "username" => "git",
+                                  "repositories" => [ {"remote" => "foo"} ]})
+        expect(output[:git]).to eq(:provider => :shellgit, :username => "git", :private_key => nil, :repositories => [{remote: "foo"}])
       end
     end
 

data/spec/unit/util/subprocess/runner/windows_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'r10k/util/subprocess/runner'
 
-describe R10K::Util::Subprocess::Runner::Windows do
+describe R10K::Util::Subprocess::Runner::Windows, :if => R10K::Util::Platform.windows? do
   fixture_root = File.expand_path('spec/fixtures/unit/util/subprocess/runner', PROJECT_ROOT)
   it_behaves_like 'a subprocess runner', fixture_root
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet_forge
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,55 +86,15 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.1
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware-multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: semantic_puppet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -139,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -160,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -167,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -209,6 +186,7 @@ files:
 - doc/git/cloning-and-mirroring.mkd
 - doc/git/providers.mkd
 - doc/puppetfile.mkd
+- doc/updating-your-puppetfile.mkd
 - integration/Gemfile
 - integration/README.mkd
 - integration/configs/README.mkd
@@ -391,8 +369,6 @@ files:
 - lib/r10k/module/local.rb
 - lib/r10k/module/metadata_file.rb
 - lib/r10k/module/svn.rb
-- lib/r10k/module_repository.rb
-- lib/r10k/module_repository/forge.rb
 - lib/r10k/puppetfile.rb
 - lib/r10k/settings.rb
 - lib/r10k/settings/collection.rb
@@ -420,6 +396,7 @@ files:
 - lib/r10k/util/subprocess.rb
 - lib/r10k/util/subprocess/result.rb
 - lib/r10k/util/subprocess/runner.rb
+- lib/r10k/util/subprocess/runner/jruby.rb
 - lib/r10k/util/subprocess/runner/posix.rb
 - lib/r10k/util/subprocess/runner/pump.rb
 - lib/r10k/util/subprocess/runner/windows.rb
@@ -496,7 +473,6 @@ files:
 - spec/unit/module/git_spec.rb
 - spec/unit/module/metadata_file_spec.rb
 - spec/unit/module/svn_spec.rb
-- spec/unit/module_repository/forge_spec.rb
 - spec/unit/module_spec.rb
 - spec/unit/puppetfile_spec.rb
 - spec/unit/settings/collection_spec.rb
@@ -526,26 +502,26 @@ files:
 homepage: https://github.com/puppetlabs/r10k
 licenses:
 - Apache-2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 1.8.29
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Puppet environment and module deployment
 test_files: []
-has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTVkMmIxYThmNTlhNWYzZDA2OGM2ZTk4NWY1NGUwODcxNzViNDU2MA==
-  data.tar.gz: !binary |-
-    MjIwNDQ0NjhkNTgyNWUxMDgzN2U0OWQ4MDYzYjMxZTk4Y2ZmMmM1ZQ==
-SHA512:
-  metadata.gz: !binary |-
-    NTQ5YjcxZWI0OWI4MGRiMWUyNjkxODgyYTNhMmM1YjFhNTdkYjFhOTg2MTU5
-    OTM0ZWJmNDBkYzA1NjhlMzVmODdjYWYxODAwY2UxYTA0YzIyYjQ1N2ZjNmY4
-    N2JlMWViZGM0ZTRhOTU4M2IxMTUzZDQ4NzEzY2NmODE0MmQzY2U=
-  data.tar.gz: !binary |-
-    ZGFiMTA0NTE1NTBkODA2ZGVjOTcwZWMwMTlkMmI1NTdkMDRmY2FkMjYyMWRm
-    YWQ3NDViNjU3Y2UyOTkzM2RkOGM3M2YxNjRjY2FjODU1ZmFjMmQ1YTNjNGNm
-    MTYxZmVmMGFmMzMyYTI3OTg2ZTJjMzQ4Nzk3OWE0OTU3ODg1OGI=

data/lib/r10k/module_repository.rb

@@ -1,8 +0,0 @@
-module R10K
-
-  # Locations that can be queried for remote module metadata
-  module ModuleRepository
-
-    require 'r10k/module_repository/forge'
-  end
-end

data/lib/r10k/module_repository/forge.rb

@@ -1,81 +0,0 @@
-require 'r10k/module_repository'
-require 'r10k/version'
-require 'r10k/logging'
-require 'r10k/errors'
-
-require 'faraday'
-require 'faraday_middleware/multi_json'
-require 'faraday_middleware'
-
-class R10K::ModuleRepository::Forge
-
-  include R10K::Logging
-
-  # @!attribute [r] forge
-  #   @return [String] The forge hostname to use for requests
-  attr_reader :forge
-
-  # @!attribute [r] :conn
-  #   @api private
-  #   @return [Faraday]
-  attr_reader :conn
-
-  def initialize(forge = 'forgeapi.puppetlabs.com')
-    if forge =~ /forge\.puppetlabs\.com/
-      logger.warn("#{forge} does not support the latest puppet forge API. Please update to \"forge 'https://forgeapi.puppetlabs.com'\"")
-      forge = 'forgeapi.puppetlabs.com'
-    end
-    @forge = forge
-    @conn  = make_conn
-  end
-
-  # Query for all published versions of a module
-  #
-  # @example
-  #   forge = R10K::ModuleRepository::Forge.new
-  #   forge.versions('adrien/boolean')
-  #   #=> ["0.9.0-rc1", "0.9.0", "1.0.0", "1.0.1"]
-  #
-  # @param module_name [String] The fully qualified module name
-  # @return [Array<String>] All published versions of the given module
-  def versions(module_name)
-    path = "/v3/modules/#{module_name.tr('/','-')}"
-    response = @conn.get(path)
-
-    if response.status != 200
-      raise R10K::Error.new("Request to Puppet Forge '#{path}' failed. Status: #{response.status}")
-    end
-
-    releases = response.body['releases'].reject { |r| r['deleted_at'] }
-    releases = releases.map do |version_info|
-      version_info['version']
-    end
-    releases.reverse
-  end
-
-  # Query for the newest published version of a module
-  #
-  # @example
-  #   forge = R10K::ModuleRepository::Forge.new
-  #   forge.latest_version('adrien/boolean')
-  #   #=> "1.0.1"
-  #
-  # @param module_name [String] The fully qualified module name
-  # @return [String] The latest published version of the given module
-  def latest_version(module_name)
-    versions(module_name).last
-  end
-
-  private
-
-  def make_conn
-    Faraday.new(:url => "https://#{@forge}") do |builder|
-      builder.request(:multi_json)
-      builder.response(:multi_json)
-
-      # This needs to be _after_ request/response configuration for testing
-      # purposes. Without this ordering the tests get badly mangled.
-      builder.adapter(Faraday.default_adapter)
-    end
-  end
-end

data/spec/unit/module_repository/forge_spec.rb

@@ -1,83 +0,0 @@
-require 'spec_helper'
-
-require 'faraday'
-
-require 'r10k/module_repository/forge'
-
-describe R10K::ModuleRepository::Forge do
-
-  let(:faraday_stubs) { Faraday::Adapter::Test::Stubs.new }
-
-  let(:conn) do
-    Faraday.new { |builder| builder.adapter(:test, faraday_stubs) }
-  end
-
-  before do
-    allow_any_instance_of(described_class).to receive(:make_conn).and_return conn
-  end
-
-  it "uses the official forge by default" do
-    forge = described_class.new
-    expect(forge.forge).to eq 'forgeapi.puppetlabs.com'
-  end
-
-  it "replaces old forge with forgeapi" do
-    forge = described_class.new(forge='forge.puppetlabs.com')
-    expect(forge.forge).to eq 'forgeapi.puppetlabs.com'
-  end
-
-  it "can use a private forge" do
-    forge = described_class.new('forge.example.local')
-    expect(forge.forge).to eq 'forge.example.local'
-  end
-
-  describe "and the expected version is :latest" do
-    subject(:forge) { described_class.new }
-
-    let(:boolean_body) do
-        {"releases" => [
-            {"version" => "1.0.1"},
-            {"version" => "1.0.0"},
-            {"version" => "0.9.0"}
-          ]
-        }
-    end
-
-    let(:spotty_body) do
-      {"releases" => [
-          {"version" => "0.4.0", "deleted_at" => "some point"},
-          {"version" => "0.3.0"}
-        ]
-      }
-    end
-
-    before do
-      faraday_stubs.get('/v3/modules/adrien-boolean') { [200, {}, boolean_body] }
-      faraday_stubs.get('/v3/modules/r10ktesting-spotty') { [200, {}, spotty_body] }
-    end
-
-    it "can fetch all versions of a given module" do
-      expect(forge.versions('adrien/boolean')).to eq ["0.9.0", "1.0.0", "1.0.1"]
-    end
-
-    it "can fetch the latest version of a given module" do
-      expect(forge.latest_version('adrien/boolean')).to eq "1.0.1"
-    end
-
-    it "ignores deleted releases" do
-      expect(forge.latest_version('r10ktesting/spotty')).to eq "0.3.0"
-    end
-  end
-
-  describe "it handles errors from forgeapi.puppetlabs.com" do
-    subject(:forge) { described_class.new }
-
-    before do
-      faraday_stubs.get('/v3/modules/dne-dne') { [404, {}, 'not found'] }
-    end
-
-    it "raises an error for a non-existant module" do
-      expect { forge.versions('dne/dne') }.to raise_error(R10K::Error)
-    end
-  end
-end