r10k 1.5.1 → 2.0.0

data/spec/unit/module_repository/forge_spec.rb

@@ -1,9 +1,21 @@
 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'
@@ -19,15 +31,33 @@ describe R10K::ModuleRepository::Forge do
     expect(forge.forge).to eq 'forge.example.local'
   end
 
-  describe "and the expected version is :latest", :vcr => true do
+  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
-      forge.conn.builder.insert_before(Faraday::Adapter::NetHttp, VCR::Middleware::Faraday)
+      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-rc1", "0.9.0", "1.0.0", "1.0.1"]
+      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
@@ -39,11 +69,11 @@ describe R10K::ModuleRepository::Forge do
     end
   end
 
-  describe "it handles errors from forgeapi.puppetlabs.com", :vcr => true do
+  describe "it handles errors from forgeapi.puppetlabs.com" do
     subject(:forge) { described_class.new }
 
     before do
-      forge.conn.builder.insert_before(Faraday::Adapter::NetHttp, VCR::Middleware::Faraday)
+      faraday_stubs.get('/v3/modules/dne-dne') { [404, {}, 'not found'] }
     end
 
     it "raises an error for a non-existant module" do

data/spec/unit/module_spec.rb

@@ -9,21 +9,21 @@ describe R10K::Module do
     end
   end
 
-  describe 'delegating to R10K::Module::Git' do
-    it "accepts name matching 'username/modulename' and no args" do
-      obj = R10K::Module.new('bar/quux', '/modulepath', [])
-      expect(obj).to be_a_kind_of(R10K::Module::Forge)
-    end
-
-    it "accepts name matching 'username/modulename' and a semver argument" do
-      obj = R10K::Module.new('bar/quux', '/modulepath', '10.0.0')
-      expect(obj).to be_a_kind_of(R10K::Module::Forge)
+  describe 'delegating to R10K::Module::Forge' do
+    [
+      ['bar/quux', []],
+      ['bar-quux', []],
+      ['bar/quux', ['8.0.0']],
+    ].each do |scenario|
+      it "accepts a name matching #{scenario[0]} and args #{scenario[1].inspect}" do
+        expect(R10K::Module.new(scenario[0], '/modulepath', scenario[1])).to be_a_kind_of(R10K::Module::Forge)
+      end
     end
   end
 
   it "raises an error if delegation fails" do
     expect {
-      R10K::Module.new('bar-quux', '/modulepath', ["NOPE NOPE NOPE NOPE!"])
+      R10K::Module.new('bar!quux', '/modulepath', ["NOPE NOPE NOPE NOPE!"])
     }.to raise_error RuntimeError, /doesn't have an implementation/
   end
 end

data/spec/unit/puppet_forge/connection_spec.rb

@@ -0,0 +1,41 @@
+require 'shared/puppet_forge/connection'
+
+describe PuppetForge::Connection do
+
+  let(:extended) { Object.new.extend(described_class) }
+
+  describe 'creating a new connection' do
+
+    let(:faraday_stubs) { Faraday::Adapter::Test::Stubs.new }
+
+    subject { extended.make_connection('https://some.site/url', [:test, faraday_stubs]) }
+
+    it 'parses response bodies with a JSON content-type into a hash' do
+      faraday_stubs.get('/json') { [200, {'Content-Type' => 'application/json'}, '{"hello": "world"}'] }
+      expect(subject.get('/json').body).to eq('hello' => 'world')
+    end
+
+    it 'returns the response body as-is when the content-type is not JSON' do
+      faraday_stubs.get('/binary') { [200, {'Content-Type' => 'application/octet-stream'}, 'I am a big bucket of binary data'] }
+      expect(subject.get('/binary').body).to eq('I am a big bucket of binary data')
+    end
+
+    it 'raises errors when the request has an error status code' do
+      faraday_stubs.get('/error') { [503, {}, "The server caught fire and cannot service your request right now"] }
+
+      expect {
+        subject.get('/error')
+      }.to raise_error(Faraday::ClientError, "the server responded with status 503")
+    end
+
+    context 'when an authorization value is provided' do
+      before(:each) do
+        allow(described_class).to receive(:authorization).and_return("auth-test value")
+      end
+
+      it 'sets authorization header on requests' do
+        expect(subject.headers).to include(:authorization => "auth-test value")
+      end
+    end
+  end
+end

data/spec/unit/puppet_forge/tar/mini_spec.rb

@@ -0,0 +1,87 @@
+require 'shared/puppet_forge/tar/mini'
+require 'shared/puppet_forge/error'
+
+
+describe PuppetForge::Tar::Mini do
+  let(:entry_class) do
+    Class.new do
+      attr_accessor :typeflag, :name
+      def initialize(name, typeflag)
+        @name = name
+        @typeflag = typeflag
+      end
+    end
+  end
+  let(:sourcefile) { '/the/module.tar.gz' }
+  let(:destdir)    { File.expand_path '/the/dest/dir' }
+  let(:sourcedir)  { '/the/src/dir' }
+  let(:destfile)   { '/the/dest/file.tar.gz' }
+  let(:minitar)    { described_class.new }
+  let(:tarfile_contents) { [entry_class.new('file', '0'), \
+                            entry_class.new('symlink', '2'), \
+                            entry_class.new('invalid', 'F')] }
+
+  it "unpacks a tar file" do
+    unpacks_the_entry(:file_start, 'thefile')
+
+    minitar.unpack(sourcefile, destdir)
+  end
+
+  it "does not allow an absolute path" do
+    unpacks_the_entry(:file_start, '/thefile')
+
+    expect {
+      minitar.unpack(sourcefile, destdir)
+    }.to raise_error(PuppetForge::InvalidPathInPackageError,
+                     "Attempt to install file into \"/thefile\" under \"#{destdir}\"")
+  end
+
+  it "does not allow a file to be written outside the destination directory" do
+    unpacks_the_entry(:file_start, '../../thefile')
+
+    expect {
+      minitar.unpack(sourcefile, destdir)
+    }.to raise_error(PuppetForge::InvalidPathInPackageError,
+                     "Attempt to install file into \"#{File.expand_path('/the/thefile')}\" under \"#{destdir}\"")
+  end
+
+  it "does not allow a directory to be written outside the destination directory" do
+    unpacks_the_entry(:dir, '../../thedir')
+
+    expect {
+      minitar.unpack(sourcefile, destdir)
+    }.to raise_error(PuppetForge::InvalidPathInPackageError,
+                     "Attempt to install file into \"#{File.expand_path('/the/thedir')}\" under \"#{destdir}\"")
+  end
+
+  it "packs a tar file" do
+    writer = double('GzipWriter')
+
+    expect(Zlib::GzipWriter).to receive(:open).with(destfile).and_yield(writer)
+    expect(Archive::Tar::Minitar).to receive(:pack).with(sourcedir, writer)
+
+    minitar.pack(sourcedir, destfile)
+  end
+
+  it "returns filenames in a tar separated into correct categories" do
+    reader = double('GzipReader')
+
+    expect(Zlib::GzipReader).to receive(:open).with(sourcefile).and_yield(reader)
+    expect(Archive::Tar::Minitar).to receive(:open).with(reader).and_return(tarfile_contents)
+    expect(Archive::Tar::Minitar).to receive(:unpack).with(reader, destdir, ['file']).and_yield(:file_start, 'thefile', nil)
+    
+    file_lists = minitar.unpack(sourcefile, destdir)
+
+    expect(file_lists[:valid]).to eq(['file'])
+    expect(file_lists[:invalid]).to eq(['invalid'])
+    expect(file_lists[:symlinks]).to eq(['symlink'])
+  end
+
+  def unpacks_the_entry(type, name)
+    reader = double('GzipReader')
+
+    expect(Zlib::GzipReader).to receive(:open).with(sourcefile).and_yield(reader)
+    expect(minitar).to receive(:validate_files).with(reader).and_return({:valid => [name]})
+    expect(Archive::Tar::Minitar).to receive(:unpack).with(reader, destdir, [name]).and_yield(type, name, nil)
+  end
+end

data/spec/unit/puppet_forge/tar_spec.rb

@@ -0,0 +1,9 @@
+require 'shared/puppet_forge/tar'
+
+describe PuppetForge::Tar do
+
+  it "returns an instance of minitar" do
+    expect(described_class.instance).to be_a_kind_of PuppetForge::Tar::Mini
+  end
+
+end

data/spec/unit/puppet_forge/unpacker_spec.rb

@@ -0,0 +1,59 @@
+require 'json'
+require 'tmpdir'
+require 'shared/puppet_forge/unpacker'
+
+describe PuppetForge::Unpacker do
+
+  let(:source)      { Dir.mktmpdir("source") }
+  let(:target)      { Dir.mktmpdir("unpacker") }
+  let(:module_name) { 'myusername-mytarball' }
+  let(:filename)    { Dir.mktmpdir("module") + "/module.tar.gz" }
+  let(:working_dir) { Dir.mktmpdir("working_dir") }
+  let(:trash_dir)   { Dir.mktmpdir("trash_dir") }
+
+  it "attempts to untar file to temporary location" do
+
+    minitar = double('PuppetForge::Tar::Mini')
+
+    expect(minitar).to receive(:unpack).with(filename, anything()) do |src, dest|
+      FileUtils.mkdir(File.join(dest, 'extractedmodule'))
+      File.open(File.join(dest, 'extractedmodule', 'metadata.json'), 'w+') do |file|
+        file.puts JSON.generate('name' => module_name, 'version' => '1.0.0')
+      end
+      true
+    end
+
+    expect(PuppetForge::Tar).to receive(:instance).and_return(minitar)
+    PuppetForge::Unpacker.unpack(filename, target, trash_dir)
+    expect(File).to be_directory(target)
+  end
+
+  it "returns the appropriate categories of the contents of the tar file from the tar implementation" do
+
+    minitar = double('PuppetForge::Tar::Mini')
+
+    expect(minitar).to receive(:unpack).with(filename, anything()) do |src, dest|
+      FileUtils.mkdir(File.join(dest, 'extractedmodule'))
+      File.open(File.join(dest, 'extractedmodule', 'metadata.json'), 'w+') do |file|
+        file.puts JSON.generate('name' => module_name, 'version' => '1.0.0')
+      end
+      { :valid => [File.join('extractedmodule', 'metadata.json')], :invalid => [], :symlinks => [] }
+    end
+
+    expect(PuppetForge::Tar).to receive(:instance).and_return(minitar)
+    file_lists = PuppetForge::Unpacker.unpack(filename, target, trash_dir)
+    expect(file_lists).to eq({:valid=>["extractedmodule/metadata.json"], :invalid=>[], :symlinks=>[]})
+    expect(File).to be_directory(target)
+  end
+
+  it "attempts to set the ownership of a target dir to a source dir's owner" do
+
+    source_path = Pathname.new(source)
+    target_path = Pathname.new(target)
+
+    expect(FileUtils).to receive(:chown_R).with(source_path.stat.uid, source_path.stat.gid, target_path)
+
+    PuppetForge::Unpacker.harmonize_ownership(source_path, target_path)
+  end
+
+end

data/spec/unit/puppet_forge/v3/module_release_spec.rb

@@ -0,0 +1,68 @@
+require 'shared/puppet_forge/v3/module_release'
+
+describe PuppetForge::V3::ModuleRelease do
+
+  subject { described_class.new('username-modulename', '3.1.4') }
+
+  let(:faraday_stubs) { Faraday::Adapter::Test::Stubs.new }
+
+  let(:conn) do
+    Faraday.new do |builder|
+      builder.adapter :test, faraday_stubs
+    end
+  end
+
+  before do
+    subject.conn = conn
+  end
+
+  it "creates a slug from the full_name and version" do
+    expect(subject.slug).to eq 'username-modulename-3.1.4'
+  end
+
+
+  describe '#data' do
+    it 'returns the body of the response' do
+      faraday_stubs.get('/v3/releases/username-modulename-3.1.4') { [200, {}, {'metadata' => 'yep'}] }
+      expect(subject.data).to eq('metadata' => 'yep')
+    end
+  end
+
+  describe '#download' do
+    it 'downloads the file to the provided path' do
+      faraday_stubs.get('/v3/files/username-modulename-3.1.4.tar.gz') { [200, {}, "I'm a file!"] }
+
+      path = Pathname.new('/some/path')
+      io   = instance_double('IO')
+
+      expect(path).to receive(:open).with('wb').and_yield io
+      expect(io).to receive(:write).with("I'm a file!")
+
+      subject.download(path)
+    end
+  end
+
+  describe '#verify' do
+    let(:digest) { instance_double('Digest::MD5') }
+
+    let(:path) { Pathname.new('/some/path') }
+
+    it "returns without error when the checksum matches" do
+      expect(Digest::MD5).to receive(:file).with(path).and_return(digest)
+      expect(digest).to receive(:hexdigest).and_return('823fe0a11fc0ef23a5853e2791880c9b')
+      expect(subject).to receive(:data).and_return('file_md5' => '823fe0a11fc0ef23a5853e2791880c9b')
+
+      subject.verify(path)
+    end
+
+    it "raises an error when the checksum doesn't match" do
+      expect(Digest::MD5).to receive(:file).with(path).and_return(digest)
+      expect(digest).to receive(:hexdigest).and_return('00000000000000000000000000000000')
+      expect(subject).to receive(:data).and_return('file_md5' => '823fe0a11fc0ef23a5853e2791880c9b')
+
+      expect {
+        subject.verify(path)
+      }.to raise_error(PuppetForge::V3::ModuleRelease::ChecksumMismatch, 'Expected /some/path checksum to be 823fe0a11fc0ef23a5853e2791880c9b, got 00000000000000000000000000000000')
+    end
+  end
+end

data/spec/unit/puppet_forge/v3/module_spec.rb

@@ -0,0 +1,67 @@
+require 'shared/puppet_forge/v3/module'
+
+describe PuppetForge::V3::Module do
+  subject { described_class.new('authorname-modulename') }
+
+  let(:faraday_stubs) { Faraday::Adapter::Test::Stubs.new }
+
+  let(:conn) do
+    Faraday.new do |builder|
+      builder.adapter :test, faraday_stubs
+    end
+  end
+
+  before do
+    subject.conn = conn
+  end
+
+  let(:releases_without_deletions) do
+      {"releases" => [
+          {"version" => "1.0.1"},
+          {"version" => "1.0.0"},
+          {"version" => "0.9.0"}
+        ]
+      }
+  end
+
+  let(:releases_with_deletions) do
+    {"releases" => [
+        {"version" => "0.4.0", "deleted_at" => "some point"},
+        {"version" => "0.3.0"}
+      ]
+    }
+  end
+
+  describe '#release' do
+    it 'creates a release object for the module with the given version' do
+      release = subject.release('3.1.4')
+      expect(release.slug).to eq 'authorname-modulename-3.1.4'
+    end
+
+    it 'passes along the module connection object' do
+      conn = Object.new
+      subject.conn = conn
+      release = subject.release('3.1.4')
+      expect(release.conn).to eq conn
+    end
+  end
+
+  describe '#versions' do
+    it "returns all module release versions" do
+      faraday_stubs.get('/v3/modules/authorname-modulename') { [200, {}, releases_without_deletions] }
+      expect(subject.versions).to eq ["0.9.0", "1.0.0", "1.0.1"]
+    end
+
+    it "ignores deleted releases" do
+      faraday_stubs.get('/v3/modules/authorname-modulename') { [200, {}, releases_with_deletions] }
+      expect(subject.versions).to eq ["0.3.0"]
+    end
+  end
+
+  describe '#latest_version' do
+    it "returns the most recent version" do
+      faraday_stubs.get('/v3/modules/authorname-modulename') { [200, {}, releases_without_deletions] }
+      expect(subject.latest_version).to eq '1.0.1'
+    end
+  end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.5.1
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-06-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
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,31 +62,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware-multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic_puppet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,31 +132,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -206,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -214,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -253,6 +198,7 @@ files:
 - integration/Gemfile
 - integration/README.mkd
 - integration/configs/README.mkd
+- integration/configs/pe/centos-5-64mda
 - integration/configs/pe/centos-6-64mda
 - integration/configs/pe/centos-7-64mda
 - integration/configs/pe/debian-6-64mda
@@ -260,6 +206,7 @@ files:
 - integration/configs/pe/redhat-6-64mda
 - integration/configs/pe/redhat-7-64mda
 - integration/configs/pe/sles-11-64mda
+- integration/configs/pe/sles-12-64mda
 - integration/configs/pe/ubuntu-1004-64mda
 - integration/configs/pe/ubuntu-1204-64mda
 - integration/configs/pe/ubuntu-1404-64mda
@@ -269,6 +216,7 @@ files:
 - integration/files/modules/hieratest/manifests/init.pp
 - integration/files/modules/unicode/files/pretend_unicode
 - integration/files/modules/unicode/manifests/init.pp
+- integration/files/pre-suite/git_config.pp.erb
 - integration/files/pre-suite/prod_env.config
 - integration/files/r10k_conf.yaml.erb
 - integration/lib/README.mkd
@@ -281,6 +229,15 @@ files:
 - integration/pre-suite/02_pe_r10k.rb
 - integration/pre-suite/03_test_utils.rb
 - integration/pre-suite/README.mkd
+- integration/scripts/README.mkd
+- integration/scripts/setup_r10k_env_centos5.sh
+- integration/scripts/setup_r10k_env_centos6.sh
+- integration/scripts/setup_r10k_env_rhel7.sh
+- integration/scripts/setup_r10k_env_sles11.sh
+- integration/scripts/setup_r10k_env_sles12.sh
+- integration/scripts/setup_r10k_env_ubuntu1004.sh
+- integration/scripts/setup_r10k_env_ubuntu1204.sh
+- integration/scripts/setup_r10k_env_ubuntu1404.sh
 - integration/test_run_scripts/README.mkd
 - integration/test_run_scripts/all_tests-rugged-pe-centos6.sh
 - integration/test_run_scripts/all_tests-rugged-pe-rhel7.sh
@@ -300,6 +257,9 @@ files:
 - integration/tests/README.mkd
 - integration/tests/basic_functionality/negative/neg_deploy_with_invalid_r10k_yaml.rb
 - integration/tests/basic_functionality/negative/neg_deploy_with_missing_r10k_yaml.rb
+- integration/tests/basic_functionality/negative/neg_invalid_git_provider.rb
+- integration/tests/basic_functionality/rugged_git_provider_with_ssh.rb
+- integration/tests/basic_functionality/rugged_git_provider_without_ssh.rb
 - integration/tests/command_line/deploy_env_without_mod_update.rb
 - integration/tests/command_line/negative/neg_deploy_env_with_module_update.rb
 - integration/tests/command_line/negative/neg_invalid_cli_dep_flag.rb
@@ -346,6 +306,8 @@ files:
 - integration/tests/user_scenario/basic_workflow/single_env_upgrade_forge_mod_revert_change.rb
 - integration/tests/user_scenario/complex_workflow/multi_env_add_change_remove.rb
 - integration/tests/user_scenario/complex_workflow/multi_env_remove_re-add.rb
+- integration/tests/user_scenario/complex_workflow/multi_env_unamanaged.rb
+- integration/tests/user_scenario/complex_workflow/single_env_git_module_update.rb
 - lib/r10k.rb
 - lib/r10k/action/cri_runner.rb
 - lib/r10k/action/deploy.rb
@@ -361,24 +323,13 @@ files:
 - lib/r10k/action/visitor.rb
 - lib/r10k/cli.rb
 - lib/r10k/cli/deploy.rb
-- lib/r10k/cli/environment.rb
-- lib/r10k/cli/environment/deploy.rb
-- lib/r10k/cli/environment/list.rb
-- lib/r10k/cli/environment/stale.rb
 - lib/r10k/cli/ext/logging.rb
 - lib/r10k/cli/help.rb
-- lib/r10k/cli/module.rb
-- lib/r10k/cli/module/deploy.rb
-- lib/r10k/cli/module/list.rb
 - lib/r10k/cli/puppetfile.rb
-- lib/r10k/cli/synchronize.rb
 - lib/r10k/cli/version.rb
 - lib/r10k/deployment.rb
-- lib/r10k/deployment/basedir.rb
 - lib/r10k/deployment/config.rb
 - lib/r10k/deployment/config/loader.rb
-- lib/r10k/deployment/environment.rb
-- lib/r10k/deployment/source.rb
 - lib/r10k/environment.rb
 - lib/r10k/environment/base.rb
 - lib/r10k/environment/git.rb
@@ -389,15 +340,11 @@ files:
 - lib/r10k/feature.rb
 - lib/r10k/feature/collection.rb
 - lib/r10k/features.rb
+- lib/r10k/forge/module_release.rb
 - lib/r10k/git.rb
 - lib/r10k/git/alternates.rb
 - lib/r10k/git/cache.rb
-- lib/r10k/git/commit.rb
 - lib/r10k/git/errors.rb
-- lib/r10k/git/head.rb
-- lib/r10k/git/ref.rb
-- lib/r10k/git/remote_head.rb
-- lib/r10k/git/repository.rb
 - lib/r10k/git/rugged.rb
 - lib/r10k/git/rugged/bare_repository.rb
 - lib/r10k/git/rugged/base_repository.rb
@@ -411,8 +358,6 @@ files:
 - lib/r10k/git/shellgit/thin_repository.rb
 - lib/r10k/git/shellgit/working_repository.rb
 - lib/r10k/git/stateful_repository.rb
-- lib/r10k/git/tag.rb
-- lib/r10k/git/working_dir.rb
 - lib/r10k/instance_cache.rb
 - lib/r10k/keyed_factory.rb
 - lib/r10k/logging.rb
@@ -426,8 +371,6 @@ files:
 - lib/r10k/module_repository.rb
 - lib/r10k/module_repository/forge.rb
 - lib/r10k/puppetfile.rb
-- lib/r10k/registry.rb
-- lib/r10k/semver.rb
 - lib/r10k/settings.rb
 - lib/r10k/settings/container.rb
 - lib/r10k/settings/mixin.rb
@@ -438,17 +381,11 @@ files:
 - lib/r10k/svn.rb
 - lib/r10k/svn/remote.rb
 - lib/r10k/svn/working_dir.rb
-- lib/r10k/task.rb
-- lib/r10k/task/deployment.rb
-- lib/r10k/task/environment.rb
-- lib/r10k/task/module.rb
-- lib/r10k/task/puppetfile.rb
-- lib/r10k/task_runner.rb
 - lib/r10k/util/attempt.rb
 - lib/r10k/util/basedir.rb
 - lib/r10k/util/commands.rb
 - lib/r10k/util/exec_env.rb
-- lib/r10k/util/monkey_patches.rb
+- lib/r10k/util/license.rb
 - lib/r10k/util/platform.rb
 - lib/r10k/util/purgeable.rb
 - lib/r10k/util/setopts.rb
@@ -462,6 +399,15 @@ files:
 - lib/r10k/util/symbolize_keys.rb
 - lib/r10k/version.rb
 - lib/shared/puppet/module_tool/metadata.rb
+- lib/shared/puppet_forge/connection.rb
+- lib/shared/puppet_forge/error.rb
+- lib/shared/puppet_forge/tar.rb
+- lib/shared/puppet_forge/tar/mini.rb
+- lib/shared/puppet_forge/unpacker.rb
+- lib/shared/puppet_forge/v3.rb
+- lib/shared/puppet_forge/v3/module.rb
+- lib/shared/puppet_forge/v3/module_release.rb
+- lib/shared/puppet_forge/version.rb
 - r10k.gemspec
 - r10k.yaml.example
 - spec/fixtures/empty/.empty
@@ -472,11 +418,6 @@ files:
 - spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile
 - spec/fixtures/unit/puppetfile/load-error/Puppetfile
 - spec/fixtures/unit/util/subprocess/posix/runner/no-execute.sh
-- spec/fixtures/vcr/cassettes/R10K_ModuleRepository_Forge/and_the_expected_version_is_latest/can_fetch_all_versions_of_a_given_module.yml
-- spec/fixtures/vcr/cassettes/R10K_ModuleRepository_Forge/and_the_expected_version_is_latest/can_fetch_the_latest_version_of_a_given_module.yml
-- spec/fixtures/vcr/cassettes/R10K_ModuleRepository_Forge/and_the_expected_version_is_latest/ignores_deleted_releases.yml
-- spec/fixtures/vcr/cassettes/R10K_ModuleRepository_Forge/it_handles_errors_from_forgeapi_puppetlabs_com/raises_an_error_for_a_non-existant_module.yml
-- spec/fixtures/vcr/cassettes/R10K_Module_Forge/and_the_expected_version_is_latest/sets_the_expected_version_based_on_the_latest_forge_version.yml
 - spec/integration/git/rugged/bare_repository_spec.rb
 - spec/integration/git/rugged/thin_repository_spec.rb
 - spec/integration/git/rugged/working_repository_spec.rb
@@ -491,7 +432,6 @@ files:
 - spec/r10k-mocks/mock_env.rb
 - spec/r10k-mocks/mock_source.rb
 - spec/shared-contexts/git-fixtures.rb
-- spec/shared-examples/git-ref.rb
 - spec/shared-examples/git-repository.rb
 - spec/shared-examples/git/bare_repository.rb
 - spec/shared-examples/git/thin_repository.rb
@@ -504,7 +444,6 @@ files:
 - spec/unit/action/visitor_spec.rb
 - spec/unit/deployment/config/loader_spec.rb
 - spec/unit/deployment/config_spec.rb
-- spec/unit/deployment/environment_spec.rb
 - spec/unit/deployment_spec.rb
 - spec/unit/environment/base_spec.rb
 - spec/unit/environment/git_spec.rb
@@ -512,17 +451,12 @@ files:
 - spec/unit/environment/svn_spec.rb
 - spec/unit/errors/formatting_spec.rb
 - spec/unit/feature_spec.rb
+- spec/unit/forge/module_release_spec.rb
 - spec/unit/git/alternates_spec.rb
 - spec/unit/git/cache_spec.rb
-- spec/unit/git/commit_spec.rb
-- spec/unit/git/head_spec.rb
-- spec/unit/git/ref_spec.rb
-- spec/unit/git/repository_spec.rb
 - spec/unit/git/rugged/cache_spec.rb
 - spec/unit/git/shellgit/cache_spec.rb
 - spec/unit/git/stateful_repository_spec.rb
-- spec/unit/git/tag_spec.rb
-- spec/unit/git/working_dir_spec.rb
 - spec/unit/git_spec.rb
 - spec/unit/instance_cache_spec.rb
 - spec/unit/keyed_factory_spec.rb
@@ -536,6 +470,12 @@ files:
 - spec/unit/module_repository/forge_spec.rb
 - spec/unit/module_spec.rb
 - spec/unit/puppet/module_tool/metadata_spec.rb
+- spec/unit/puppet_forge/connection_spec.rb
+- spec/unit/puppet_forge/tar/mini_spec.rb
+- spec/unit/puppet_forge/tar_spec.rb
+- spec/unit/puppet_forge/unpacker_spec.rb
+- spec/unit/puppet_forge/v3/module_release_spec.rb
+- spec/unit/puppet_forge/v3/module_spec.rb
 - spec/unit/puppetfile_spec.rb
 - spec/unit/settings/container_spec.rb
 - spec/unit/source/base_spec.rb
@@ -547,7 +487,6 @@ files:
 - spec/unit/util/attempt_spec.rb
 - spec/unit/util/commands_spec.rb
 - spec/unit/util/exec_env_spec.rb
-- spec/unit/util/monkey_patches_spec.rb
 - spec/unit/util/setopts_spec.rb
 - spec/unit/util/subprocess/result_spec.rb
 - spec/unit/util/subprocess/runner/posix_spec.rb
@@ -558,27 +497,26 @@ files:
 homepage: http://github.com/adrienthebo/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: '0'
+      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: 1.8.23.2
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Puppet environment and module deployment
 test_files:
 - spec/integration/git/stateful_repository_spec.rb
@@ -594,26 +532,19 @@ test_files:
 - spec/unit/environment/git_spec.rb
 - spec/unit/module_spec.rb
 - spec/unit/module_repository/forge_spec.rb
-- spec/unit/git/ref_spec.rb
 - spec/unit/git/stateful_repository_spec.rb
-- spec/unit/git/working_dir_spec.rb
 - spec/unit/git/cache_spec.rb
-- spec/unit/git/commit_spec.rb
-- spec/unit/git/repository_spec.rb
-- spec/unit/git/head_spec.rb
 - spec/unit/git/shellgit/cache_spec.rb
 - spec/unit/git/alternates_spec.rb
-- spec/unit/git/tag_spec.rb
 - spec/unit/git/rugged/cache_spec.rb
+- spec/unit/forge/module_release_spec.rb
 - spec/unit/keyed_factory_spec.rb
 - spec/unit/puppet/module_tool/metadata_spec.rb
 - spec/unit/deployment/config/loader_spec.rb
-- spec/unit/deployment/environment_spec.rb
 - spec/unit/deployment/config_spec.rb
 - spec/unit/feature_spec.rb
 - spec/unit/source_spec.rb
 - spec/unit/puppetfile_spec.rb
-- spec/unit/util/monkey_patches_spec.rb
 - spec/unit/util/exec_env_spec.rb
 - spec/unit/util/attempt_spec.rb
 - spec/unit/util/setopts_spec.rb
@@ -645,4 +576,9 @@ test_files:
 - spec/unit/module/svn_spec.rb
 - spec/unit/module/git_spec.rb
 - spec/unit/logging_spec.rb
-has_rdoc: 
+- spec/unit/puppet_forge/tar_spec.rb
+- spec/unit/puppet_forge/v3/module_spec.rb
+- spec/unit/puppet_forge/v3/module_release_spec.rb
+- spec/unit/puppet_forge/unpacker_spec.rb
+- spec/unit/puppet_forge/connection_spec.rb
+- spec/unit/puppet_forge/tar/mini_spec.rb