r10k 1.2.4 → 1.3.0rc1

data/spec/unit/util/core_ext/hash_ext_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+require 'r10k/util/core_ext/hash_ext'
+
+describe R10K::Util::CoreExt::HashExt::SymbolizeKeys do
+  it "doesn't monky patch core types" do
+    # And now for a diatribe on monkey patching.
+    #
+    # Seriously. Monkey patching objects on a global objects without a very
+    # good reason is evil. On a case by case basis, sure, it can make life
+    # a bit easier but it also can grossly complicate things. If you do need to
+    # add a method to every type of an object because it'll be used everywhere,
+    # go for it. However if you only need a given method in a limited area,
+    # `Object#extend` is your friend.
+    #
+    # Fin.
+    expect(Hash.new).to_not respond_to(:symbolize_keys!)
+  end
+
+  describe "on an instance that extends #{described_class}" do
+    subject { Hash.new.extend(described_class) }
+
+    it "deletes all keys that are strings" do
+      subject['foo'] = 'bar'
+      subject[:baz] = 'quux'
+
+      subject.symbolize_keys!
+      expect(subject).to_not have_key('foo')
+    end
+
+    it "replaces the deleted keys with interned strings" do
+      subject['foo'] = 'bar'
+      subject[:baz] = 'quux'
+
+      subject.symbolize_keys!
+      expect(subject[:foo]).to eq 'bar'
+    end
+
+    it "raises an error if there is an existing symbol for a given string key" do
+      subject['foo'] = 'bar'
+      subject[:foo] = 'quux'
+
+      expect {
+        subject.symbolize_keys!
+      }.to raise_error(TypeError, /An existing interned key/)
+    end
+
+    it "does not modify existing symbol entries" do
+      subject['foo'] = 'bar'
+      subject[:baz] = 'quux'
+
+      subject.symbolize_keys!
+      expect(subject[:baz]).to eq 'quux'
+    end
+
+    it "does not modify keys that are not strings or symbols" do
+      key = %w[foo]
+      subject[key] = 'bar'
+
+      subject.symbolize_keys!
+      expect(subject[key]).to eq 'bar'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0rc1
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -191,7 +191,7 @@ files:
 - .nodeset.yml
 - .rspec
 - .travis.yml
-- CHANGELOG
+- CHANGELOG.mkd
 - Gemfile
 - LICENSE
 - README.markdown
@@ -224,10 +224,13 @@ files:
 - 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
+- lib/r10k/environment/svn.rb
 - lib/r10k/errors.rb
 - lib/r10k/execution.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
@@ -237,6 +240,8 @@ files:
 - lib/r10k/git/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
 - lib/r10k/module.rb
 - lib/r10k/module/base.rb
@@ -252,6 +257,12 @@ files:
 - lib/r10k/settings.rb
 - lib/r10k/settings/container.rb
 - lib/r10k/settings/mixin.rb
+- lib/r10k/source.rb
+- lib/r10k/source/base.rb
+- lib/r10k/source/git.rb
+- lib/r10k/source/svn.rb
+- lib/r10k/svn.rb
+- lib/r10k/svn/remote.rb
 - lib/r10k/svn/working_dir.rb
 - lib/r10k/task.rb
 - lib/r10k/task/deployment.rb
@@ -259,6 +270,7 @@ files:
 - lib/r10k/task/module.rb
 - lib/r10k/task/puppetfile.rb
 - lib/r10k/task_runner.rb
+- lib/r10k/util/core_ext/hash_ext.rb
 - lib/r10k/util/platform.rb
 - lib/r10k/util/purgeable.rb
 - lib/r10k/util/subprocess.rb
@@ -297,7 +309,8 @@ files:
 - spec/system/version_spec.rb
 - spec/unit/deployment/environment_spec.rb
 - spec/unit/deployment/source_spec.rb
-- spec/unit/git/alternates_spec.rb
+- spec/unit/environment/git_spec.rb
+- spec/unit/environment/svn_spec.rb
 - spec/unit/git/cache_spec.rb
 - spec/unit/git/commit_spec.rb
 - spec/unit/git/head_spec.rb
@@ -305,14 +318,20 @@ files:
 - spec/unit/git/repository_spec.rb
 - spec/unit/git/tag_spec.rb
 - spec/unit/git/working_dir_spec.rb
+- spec/unit/instance_cache_spec.rb
+- spec/unit/keyed_factory_spec.rb
 - spec/unit/module/forge_spec.rb
 - spec/unit/module/git_spec.rb
 - spec/unit/module/metadata_spec.rb
 - spec/unit/module/svn_spec.rb
 - spec/unit/module_repository/forge_spec.rb
 - spec/unit/module_spec.rb
-- spec/unit/registry_spec.rb
 - spec/unit/settings/container_spec.rb
+- spec/unit/source/git_spec.rb
+- spec/unit/source/svn_spec.rb
+- spec/unit/source_spec.rb
+- spec/unit/svn/remote_spec.rb
+- spec/unit/util/core_ext/hash_ext_spec.rb
 - spec/unit/util/subprocess_spec.rb
 homepage: http://github.com/adrienthebo/r10k
 licenses:
@@ -363,9 +382,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.1
@@ -378,7 +397,8 @@ test_files:
 - spec/system/module/forge/install_spec.rb
 - spec/system/module/svn/update_spec.rb
 - spec/system/module/svn/install_spec.rb
-- spec/unit/registry_spec.rb
+- spec/unit/environment/svn_spec.rb
+- spec/unit/environment/git_spec.rb
 - spec/unit/module_spec.rb
 - spec/unit/module_repository/forge_spec.rb
 - spec/unit/git/ref_spec.rb
@@ -387,12 +407,18 @@ test_files:
 - spec/unit/git/commit_spec.rb
 - spec/unit/git/repository_spec.rb
 - spec/unit/git/head_spec.rb
-- spec/unit/git/alternates_spec.rb
 - spec/unit/git/tag_spec.rb
+- spec/unit/keyed_factory_spec.rb
 - spec/unit/deployment/environment_spec.rb
 - spec/unit/deployment/source_spec.rb
+- spec/unit/source_spec.rb
 - spec/unit/util/subprocess_spec.rb
+- spec/unit/util/core_ext/hash_ext_spec.rb
+- spec/unit/instance_cache_spec.rb
 - spec/unit/settings/container_spec.rb
+- spec/unit/svn/remote_spec.rb
+- spec/unit/source/svn_spec.rb
+- spec/unit/source/git_spec.rb
 - spec/unit/module/forge_spec.rb
 - spec/unit/module/svn_spec.rb
 - spec/unit/module/git_spec.rb

data/lib/r10k/git/alternates.rb

@@ -1,49 +0,0 @@
-require 'pathname'
-
-# Manage `$GIT_DIR/objects/info/alternates`
-#
-# @see man gitrepository-layout(5)
-class R10K::Git::Alternates
-
-  # @attribute [r] file
-  #   @return [Pathname] The alternates file
-  attr_reader :file
-
-  # @param git_dir [String] The path to the git repository
-  def initialize(git_dir)
-    @file = Pathname.new(File.join(git_dir, 'objects', 'info', 'alternates'))
-  end
-
-  def to_a
-    read()
-  end
-
-  def <<(path)
-    write(to_a << path)
-  end
-
-  def include?(path)
-    to_a.include?(path)
-  end
-
-  private
-
-  def write(entries)
-    if ! @file.parent.directory?
-      raise R10K::Git::GitError, "Cannot write #{@file}; parent directory does not exist"
-    end
-    @file.open("w") do |fh|
-      entries.each do |entry|
-        fh.puts(entry)
-      end
-    end
-  end
-
-  def read
-    entries = []
-    if @file.file?
-      entries = @file.readlines.map(&:chomp)
-    end
-    entries
-  end
-end

data/spec/unit/git/alternates_spec.rb

@@ -1,90 +0,0 @@
-require 'spec_helper'
-require 'stringio'
-require 'r10k/git'
-
-describe R10K::Git::Alternates do
-  subject { described_class.new("/some/nonexistent/path/.git") }
-
-  it "interacts with the alternates file in the given git repository" do
-    expect(subject.file.to_s).to eq("/some/nonexistent/path/.git/objects/info/alternates")
-  end
-
-  describe "reading alternate object entries" do
-    it "reads the alternates file and splits on lines" do
-      expect(subject.file).to receive(:file?).and_return true
-      expect(subject.file).to receive(:readlines).and_return([
-        "/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git\n",
-        "/vagrant/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git\n",
-      ])
-
-      expect(subject.to_a).to eq([
-        "/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
-        "/vagrant/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
-      ])
-    end
-
-    it "returns an empty array when the file is not present" do
-      expect(subject.file).to receive(:file?).and_return false
-      expect(subject.file).to receive(:readlines).never
-      expect(subject.to_a).to eq([])
-    end
-  end
-
-  describe "determining if an entry is already present" do
-    before do
-      allow(subject).to receive(:to_a).and_return([
-        "/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
-        "/vagrant/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
-      ])
-    end
-
-    it "is true if the element is in the array of read entries" do
-      expect(subject).to include("/vagrant/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git")
-    end
-
-    it "is false if the element is not in the array of read entries" do
-      expect(subject).to_not include("/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git")
-    end
-  end
-
-  describe "appending a new alternate object entry" do
-    describe "and the git objects/info directory does not exist" do
-      it "raises an error when the parent directory does not exist" do
-        expect {
-          subject << "/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git"
-        }.to raise_error(R10K::Git::GitError,"Cannot write /some/nonexistent/path/.git/objects/info/alternates; parent directory does not exist")
-      end
-    end
-
-    describe "and the git objects/info directory exists" do
-      let(:io) { StringIO.new }
-
-      before do
-        expect(subject.file).to receive(:open).with('w').and_yield(io)
-        subject.file.stub_chain(:parent, :directory?).and_return true
-      end
-
-
-      it "creates the alternates file with the new entry when not present" do
-        expect(subject).to receive(:to_a).and_return([])
-        subject << "/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git"
-
-        expect(io.string).to eq("/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git\n")
-      end
-
-      it "rewrites the file with all alternate entries" do
-        expect(subject).to receive(:to_a).and_return([
-          "/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
-          "/vagrant/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git",
-        ])
-        subject << "/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git"
-
-        expect(io.string).to eq(<<-EOD)
-/var/cache/r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git
-/vagrant/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git
-/tmp/.r10k/git/git---github.com-puppetlabs-puppetlabs-apache.git
-        EOD
-      end
-    end
-  end
-end