r10k 1.1.4 → 1.2.0rc1

data/spec/unit/module/git_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require 'r10k/module/git'
+
+describe R10K::Module::Git do
+
+  describe "determining the status" do
+    subject do
+      described_class.new(
+        'boolean',
+        '/moduledir',
+        {
+          :git => 'git://github.com/adrienthebo/puppet-boolean'
+        }
+      )
+    end
+
+    it "is absent when the working dir is absent" do
+      expect(subject.working_dir).to receive(:exist?).and_return false
+      expect(subject.status).to eq :absent
+    end
+
+    it "is mismatched Then the working dir is not a git repository" do
+      allow(subject.working_dir).to receive(:exist?).and_return true
+      expect(subject.working_dir).to receive(:git?).and_return false
+      expect(subject.status).to eq :mismatched
+    end
+
+    it "is mismatched when the expected remote does not match the actual remote" do
+      allow(subject.working_dir).to receive(:exist?).and_return true
+      expect(subject.working_dir).to receive(:git?).and_return true
+      expect(subject.working_dir).to receive(:remote).and_return 'nope'
+      expect(subject.status).to eq :mismatched
+    end
+
+    it "is outdated when the working dir is outdated" do
+      allow(subject.working_dir).to receive(:exist?).and_return true
+      expect(subject.working_dir).to receive(:git?).and_return true
+      expect(subject.working_dir).to receive(:outdated?).and_return true
+      expect(subject.status).to eq :outdated
+    end
+
+    it "is insync if all other conditions are satisfied" do
+      allow(subject.working_dir).to receive(:exist?).and_return true
+      expect(subject.working_dir).to receive(:git?).and_return true
+      expect(subject.working_dir).to receive(:outdated?).and_return false
+      expect(subject.status).to eq :insync
+    end
+  end
+end

data/spec/unit/module/metadata_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+require 'r10k/module/metadata'
+
+describe R10K::Module::Metadata do
+
+  let(:path) { double 'pathname' }
+
+  subject(:metadata) { described_class.new(path) }
+
+  it "defaults the version to R10K::SemVer::MIN" do
+    expect(metadata.version).to eq R10K::SemVer::MIN
+  end
+
+  describe "determining if the metadata file exists" do
+    it "doesn't exist if the given path isn't a file" do
+      allow(path).to receive(:file?).and_return false
+      expect(metadata).to_not be_exist
+    end
+
+    it "doesn't exist if the given path is an unreadable file" do
+      allow(path).to receive(:file?).and_return true
+      allow(path).to receive(:readable?).and_return false
+
+      expect(metadata).to_not be_exist
+    end
+
+    it "exists if the given path exists and is readable" do
+      allow(path).to receive(:file?).and_return true
+      allow(path).to receive(:readable?).and_return true
+
+      expect(metadata).to be_exist
+    end
+  end
+
+  it "doesn't raise an error on invalid JSON" do
+    allow(metadata).to receive(:exist?).and_return true
+    allow(path).to receive(:read).and_return "Aha! You thought this was JSON!"
+
+    metadata.read
+  end
+
+  describe "parsing a metadata file" do
+    let(:json) do
+      fixture_file = File.expand_path('spec/fixtures/module/forge/eight_hundred/metadata.json', PROJECT_ROOT)
+      File.read(fixture_file)
+    end
+
+    before do
+      allow(metadata).to receive(:exist?).and_return true
+      allow(path).to receive(:read).and_return(json)
+
+      metadata.read
+    end
+
+    it "extracts the module name" do
+      expect(metadata.name).to eq 'eight_hundred'
+    end
+
+    it "extracts the module author" do
+      expect(metadata.author).to eq 'branan'
+    end
+
+    it "extracts the module version" do
+      expect(metadata.version).to be_a_kind_of R10K::SemVer
+      expect(metadata.version).to eq R10K::SemVer.new('8.0.0')
+    end
+  end
+end

data/spec/unit/module/svn_spec.rb

@@ -0,0 +1,146 @@
+require 'spec_helper'
+
+require 'r10k/module/svn'
+
+describe R10K::Module::SVN do
+
+  include_context 'fail on execution'
+
+  describe "determining it implements a Puppetfile mod" do
+    it "implements mods with the :svn hash key" do
+      implements = described_class.implement?('r10k-fixture-repo', :svn => 'https://github.com/adrienthebo/r10k-fixture-repo')
+      expect(implements).to eq true
+    end
+  end
+
+  describe "instantiating based on Puppetfile configuration" do
+    it "can specify a revision with the :rev key" do
+      svn = described_class.new('foo', '/moduledir', :rev => 'r10')
+      expect(svn.expected_revision).to eq 'r10'
+    end
+
+    it "can specify a revision with the :revision key" do
+      svn = described_class.new('foo', '/moduledir', :revision => 'r10')
+      expect(svn.expected_revision).to eq 'r10'
+    end
+
+    it "can specify a path within the SVN repo" do
+      svn = described_class.new('foo', '/moduledir', :svn_path => 'branches/something/foo')
+      expect(svn.svn_path).to eq 'branches/something/foo'
+    end
+  end
+
+  describe "determining the status" do
+    subject { described_class.new('foo', '/moduledir', :svn => 'https://github.com/adrienthebo/r10k-fixture-repo', :rev => 123) }
+
+    let(:working_dir) { double 'working_dir' }
+
+    before do
+      allow(R10K::SVN::WorkingDir).to receive(:new).and_return working_dir
+    end
+
+    it "is :absent if the module directory is absent" do
+      allow(subject).to receive(:exist?).and_return false
+
+      expect(subject.status).to eq :absent
+    end
+
+    it "is :mismatched if the directory is present but not an SVN repo" do
+      allow(subject).to receive(:exist?).and_return true
+
+      allow(working_dir).to receive(:is_svn?).and_return false
+
+      expect(subject.status).to eq :mismatched
+    end
+
+    it "is mismatched when the wrong SVN URL is checked out" do
+      allow(subject).to receive(:exist?).and_return true
+
+      allow(working_dir).to receive(:is_svn?).and_return true
+      allow(working_dir).to receive(:url).and_return 'svn://nope/trunk'
+
+      expect(subject.status).to eq :mismatched
+    end
+
+    it "is :outdated when the expected rev doesn't match the actual rev" do
+      allow(subject).to receive(:exist?).and_return true
+
+      allow(working_dir).to receive(:is_svn?).and_return true
+      allow(working_dir).to receive(:url).and_return 'https://github.com/adrienthebo/r10k-fixture-repo'
+      allow(working_dir).to receive(:revision).and_return 99
+
+      expect(subject.status).to eq :outdated
+    end
+
+    it "is :insync if all other conditions are satisfied" do
+      allow(subject).to receive(:exist?).and_return true
+
+      allow(working_dir).to receive(:is_svn?).and_return true
+      allow(working_dir).to receive(:url).and_return 'https://github.com/adrienthebo/r10k-fixture-repo'
+      allow(working_dir).to receive(:revision).and_return 123
+
+      expect(subject.status).to eq :insync
+    end
+  end
+
+  describe "and the expected version is :latest" do
+    it "sets the expected version based on the latest SVN revision"
+  end
+
+  describe "synchronizing" do
+
+    subject { described_class.new('foo', '/moduledir', :svn => 'https://github.com/adrienthebo/r10k-fixture-repo', :rev => 123) }
+
+    before do
+      allow(File).to receive(:directory?).with('/moduledir').and_return true
+    end
+
+    describe "and the state is :absent" do
+      before { allow(subject).to receive(:status).and_return :absent }
+
+      it "installs the SVN module" do
+        expect(subject).to receive(:install)
+        subject.sync
+      end
+    end
+
+    describe "and the state is :mismatched" do
+      before { allow(subject).to receive(:status).and_return :mismatched }
+
+      it "reinstalls the module" do
+        expect(subject).to receive(:reinstall)
+
+        subject.sync
+      end
+
+      it "removes the existing directory" do
+        expect(subject.full_path).to receive(:rmtree)
+        allow(subject).to receive(:install)
+
+        subject.sync
+      end
+    end
+
+    describe "and the state is :outdated" do
+      before { allow(subject).to receive(:status).and_return :outdated }
+
+      it "upgrades the repository" do
+        expect(subject).to receive(:update)
+
+        subject.sync
+      end
+    end
+
+    describe "and the state is :insync" do
+      before { allow(subject).to receive(:status).and_return :insync }
+
+      it "doesn't change anything" do
+        expect(subject).to receive(:install).never
+        expect(subject).to receive(:reinstall).never
+        expect(subject).to receive(:update).never
+
+        subject.sync
+      end
+    end
+  end
+end

data/spec/unit/module_repository/forge_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+require 'r10k/module_repository/forge'
+
+describe R10K::ModuleRepository::Forge do
+
+  it "uses the official forge by default" do
+    forge = described_class.new
+    expect(forge.forge).to eq 'forge.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", :vcr => true, :unless => (RUBY_VERSION == '1.8.7') do
+    subject(:forge) { described_class.new }
+
+    before do
+      forge.conn.builder.insert_before(Faraday::Adapter::NetHttp, VCR::Middleware::Faraday)
+    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"]
+    end
+
+    it "can fetch the latest version of a given module" do
+      expect(forge.latest_version('adrien/boolean')).to eq "1.0.1"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0rc1
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -66,20 +66,76 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.10
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.8
+- !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.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +150,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.7.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.7.3
 description: ! "    R10K provides a general purpose toolset for deploying Puppet environments
   and modules.\n    It implements the Puppetfile format and provides a native implementation
   of Puppet\n    dynamic environments.\n"
@@ -104,12 +188,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .nodeset.yml
+- .rspec
 - .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE
 - README.markdown
+- Rakefile
 - bin/r10k
+- doc/dynamic-environments.markdown
+- doc/puppetfile.markdown
 - lib/r10k.rb
 - lib/r10k/cli.rb
 - lib/r10k/cli/deploy.rb
@@ -132,21 +221,31 @@ files:
 - lib/r10k/deployment/source.rb
 - lib/r10k/errors.rb
 - lib/r10k/execution.rb
+- lib/r10k/git.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/repository.rb
+- lib/r10k/git/tag.rb
 - lib/r10k/git/working_dir.rb
 - lib/r10k/logging.rb
 - lib/r10k/module.rb
 - lib/r10k/module/base.rb
 - lib/r10k/module/forge.rb
 - lib/r10k/module/git.rb
+- lib/r10k/module/metadata.rb
+- lib/r10k/module/svn.rb
+- 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
+- lib/r10k/svn/working_dir.rb
 - lib/r10k/task.rb
 - lib/r10k/task/deployment.rb
 - lib/r10k/task/environment.rb
@@ -154,17 +253,47 @@ files:
 - lib/r10k/task/puppetfile.rb
 - lib/r10k/task_runner.rb
 - lib/r10k/util/purgeable.rb
+- lib/r10k/util/subprocess.rb
+- lib/r10k/util/subprocess/io.rb
+- lib/r10k/util/subprocess/result.rb
+- lib/r10k/util/subprocess/runner.rb
 - lib/r10k/version.rb
 - r10k.gemspec
 - r10k.yaml.example
 - spec/fixtures/empty/.empty
 - spec/fixtures/module/forge/eight_hundred/Modulefile
 - spec/fixtures/module/forge/eight_hundred/metadata.json
+- 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/looking_up_versions.yml
+- spec/fixtures/vcr/cassettes/R10K_ModuleRepository_Forge/looking_up_versions/can_fetch_all_versions_of_a_given_module.yml
+- spec/fixtures/vcr/cassettes/R10K_ModuleRepository_Forge/looking_up_versions/can_fetch_the_latest_version_of_a_given_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/rspec-system-r10k/puppetfile.rb
+- spec/rspec-system-r10k/tmpdir.rb
+- spec/shared-examples/git-ref.rb
 - spec/spec_helper.rb
+- spec/system-provisioning/el.rb
+- spec/system/module/forge/install_spec.rb
+- spec/system/module/git/install_spec.rb
+- spec/system/module/svn/install_spec.rb
+- spec/system/module/svn/update_spec.rb
+- spec/system/spec_helper.rb
+- spec/system/system-helpers.rb
+- spec/system/version_spec.rb
 - spec/unit/deployment/environment_spec.rb
 - spec/unit/deployment/source_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/tag_spec.rb
 - spec/unit/git/working_dir_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
@@ -217,9 +346,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
@@ -227,11 +356,25 @@ signing_key:
 specification_version: 4
 summary: Puppet environment and module deployment
 test_files:
+- spec/system/version_spec.rb
+- spec/system/module/git/install_spec.rb
+- 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/module_spec.rb
+- spec/unit/module_repository/forge_spec.rb
+- spec/unit/git/ref_spec.rb
 - spec/unit/git/working_dir_spec.rb
+- spec/unit/git/cache_spec.rb
+- spec/unit/git/commit_spec.rb
+- spec/unit/git/head_spec.rb
+- spec/unit/git/tag_spec.rb
 - spec/unit/deployment/environment_spec.rb
 - spec/unit/deployment/source_spec.rb
 - spec/unit/settings/container_spec.rb
 - spec/unit/module/forge_spec.rb
+- spec/unit/module/svn_spec.rb
+- spec/unit/module/git_spec.rb
+- spec/unit/module/metadata_spec.rb
 has_rdoc: