r10k 1.3.5 → 1.4.0

data/spec/unit/util/subprocess/subprocess_error_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'r10k/util/subprocess'
+
+describe R10K::Util::Subprocess::SubprocessError do
+  let(:result) do
+    R10K::Util::Subprocess::Result.new(%w[/usr/bin/gti --zoom], "zooming on stdout", "zooming on stderr", 42)
+  end
+
+  describe "formatting the message" do
+    subject(:message) { described_class.new("Execution failed", :result => result).message }
+
+    it "includes the exception message and formatted result" do
+      expect(message).to eq(
+        [
+          "Execution failed:",
+          "Command: /usr/bin/gti --zoom",
+          "Stdout:",
+          "zooming on stdout",
+          "Stderr:",
+          "zooming on stderr",
+          "Exit code: 42",
+        ].join("\n")
+      )
+    end
+  end
+end

data/spec/unit/util/subprocess_spec.rb

@@ -19,8 +19,7 @@ describe R10K::Util::Subprocess do
 
     let(:runner) do
       double('R10K::Util::Subprocess::Runner').tap do |i|
-        allow(i).to receive(:run)
-        allow(i).to receive(:result).and_return(result)
+        allow(i).to receive(:run).and_return(result)
       end
     end
 
@@ -46,10 +45,6 @@ describe R10K::Util::Subprocess do
       end
 
       it "raises an exception if raise_on_fail is true" do
-        if RUBY_VERSION =~ /^2\./
-          pending "Ruby 2.x and RSpec 2.x fail when raising an exception with a custom #to_s method"
-        end
-
         subject.raise_on_fail = true
 
         allow(result).to receive(:exit_code).and_return(255)
@@ -57,7 +52,7 @@ describe R10K::Util::Subprocess do
 
         expect {
           subject.execute
-        }.to raise_error(R10K::Util::Subprocess::SubprocessError, /Command .* exited with 255: Command not found/)
+        }.to raise_error(R10K::Util::Subprocess::SubprocessError, /Command exited with non-zero exit code/)
       end
 
       it "doesn't raise an exception if raise_on_fail is false" do

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.3.5
-  prerelease: 
+  version: 1.4.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: cri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: systemu
   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,23 +55,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,23 +83,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware-multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,39 +139,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -213,22 +188,38 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .nodeset.yml
-- .rspec
 - .travis.yml
 - CHANGELOG.mkd
+- CONTRIBUTING.mkd
 - Gemfile
 - LICENSE
-- README.markdown
-- Rakefile
+- README.mkd
 - bin/r10k
+- doc/common-patterns.mkd
 - doc/dynamic-environments.mkd
 - doc/dynamic-environments/configuration.mkd
-- doc/dynamic-environments/git-environments.markdown
+- doc/dynamic-environments/git-environments.mkd
 - doc/dynamic-environments/introduction.mkd
+- doc/dynamic-environments/master-configuration.mkd
+- doc/dynamic-environments/quickstart.mkd
+- doc/dynamic-environments/svn-environments.mkd
 - doc/dynamic-environments/usage.mkd
-- doc/puppetfile.markdown
+- doc/dynamic-environments/workflow-guide.mkd
+- doc/faq.mkd
+- doc/puppetfile.mkd
 - lib/r10k.rb
+- lib/r10k/action/cri_runner.rb
+- lib/r10k/action/deploy.rb
+- lib/r10k/action/deploy/display.rb
+- lib/r10k/action/deploy/environment.rb
+- lib/r10k/action/deploy/module.rb
+- lib/r10k/action/puppetfile.rb
+- lib/r10k/action/puppetfile/check.rb
+- lib/r10k/action/puppetfile/cri_runner.rb
+- lib/r10k/action/puppetfile/install.rb
+- lib/r10k/action/puppetfile/purge.rb
+- lib/r10k/action/runner.rb
+- lib/r10k/action/visitor.rb
 - lib/r10k/cli.rb
 - lib/r10k/cli/deploy.rb
 - lib/r10k/cli/environment.rb
@@ -254,6 +245,7 @@ files:
 - lib/r10k/environment/git.rb
 - lib/r10k/environment/svn.rb
 - lib/r10k/errors.rb
+- lib/r10k/errors/formatting.rb
 - lib/r10k/execution.rb
 - lib/r10k/git.rb
 - lib/r10k/git/alternates.rb
@@ -296,9 +288,12 @@ files:
 - 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/core_ext/hash_ext.rb
 - lib/r10k/util/platform.rb
 - lib/r10k/util/purgeable.rb
+- lib/r10k/util/setopts.rb
 - lib/r10k/util/subprocess.rb
 - lib/r10k/util/subprocess/io.rb
 - lib/r10k/util/subprocess/posix.rb
@@ -306,6 +301,7 @@ files:
 - lib/r10k/util/subprocess/posix/runner.rb
 - lib/r10k/util/subprocess/result.rb
 - lib/r10k/util/subprocess/runner.rb
+- lib/r10k/util/subprocess/subprocess_error.rb
 - lib/r10k/util/subprocess/windows.rb
 - lib/r10k/util/subprocess/windows/io.rb
 - lib/r10k/util/subprocess/windows/runner.rb
@@ -315,28 +311,32 @@ files:
 - spec/fixtures/empty/.empty
 - spec/fixtures/module/forge/eight_hundred/Modulefile
 - spec/fixtures/module/forge/eight_hundred/metadata.json
+- spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile
+- spec/fixtures/unit/puppetfile/load-error/Puppetfile
 - 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/matchers/exit_with.rb
+- spec/r10k-mocks.rb
+- spec/r10k-mocks/mock_config.rb
+- spec/r10k-mocks/mock_env.rb
+- spec/r10k-mocks/mock_source.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/action/cri_runner_spec.rb
+- spec/unit/action/puppetfile/cri_action_spec.rb
+- spec/unit/action/runner_spec.rb
+- spec/unit/action/visitor_spec.rb
 - spec/unit/deployment/environment_spec.rb
 - spec/unit/deployment/source_spec.rb
+- spec/unit/deployment_spec.rb
+- spec/unit/environment/base_spec.rb
 - spec/unit/environment/git_spec.rb
 - spec/unit/environment/svn_spec.rb
+- spec/unit/errors/formatting_spec.rb
 - spec/unit/git/alternates_spec.rb
 - spec/unit/git/cache_spec.rb
 - spec/unit/git/commit_spec.rb
@@ -347,84 +347,53 @@ files:
 - spec/unit/git/working_dir_spec.rb
 - spec/unit/instance_cache_spec.rb
 - spec/unit/keyed_factory_spec.rb
+- spec/unit/module/base_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/puppetfile_spec.rb
 - spec/unit/settings/container_spec.rb
+- spec/unit/source/base_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/svn/working_dir_spec.rb
+- spec/unit/util/attempt_spec.rb
 - spec/unit/util/core_ext/hash_ext_spec.rb
+- spec/unit/util/setopts_spec.rb
+- spec/unit/util/subprocess/result_spec.rb
+- spec/unit/util/subprocess/subprocess_error_spec.rb
 - spec/unit/util/subprocess_spec.rb
 homepage: http://github.com/adrienthebo/r10k
 licenses:
-- Apache 2.0
-post_install_message: ! 'NOTICE
-
-  ======
-
-
-  If you are upgrading from 1.1.0 and are using multiple sources, please read
-
-  this. (If not, feel free to continue with your regularly scheduled day.)
-
-
-  GH-48 (https://github.com/adrienthebo/r10k/issues/48) introduced the ability
-
-  for environments to be prefixed with the source name so that multiple sources
-
-  installed into the same directory would not overwrite each other. However
-
-  prefixing was automatically enabled and would break existing setups where
-
-  multiple sources were cloned into different directories.
-
-
-  Because this introduced a breaking change, SemVer dictates that the automatic
-
-  prefixing has to be rolled back. Prefixing can be enabled but always defaults
-
-  to off. If you are relying on this behavior you will need to update your r10k.yaml
-
-  to enable prefixing on a per-source basis.
-
-
-  Please see the issue (https://github.com/adrienthebo/r10k/issues/48) for more
-
-  information.
-
-'
+- 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'
 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.4
 signing_key: 
-specification_version: 3
+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/environment/base_spec.rb
 - spec/unit/environment/svn_spec.rb
 - spec/unit/environment/git_spec.rb
 - spec/unit/module_spec.rb
@@ -441,14 +410,28 @@ test_files:
 - spec/unit/deployment/environment_spec.rb
 - spec/unit/deployment/source_spec.rb
 - spec/unit/source_spec.rb
+- spec/unit/puppetfile_spec.rb
+- spec/unit/util/attempt_spec.rb
+- spec/unit/util/setopts_spec.rb
+- spec/unit/util/subprocess/result_spec.rb
+- spec/unit/util/subprocess/subprocess_error_spec.rb
 - spec/unit/util/subprocess_spec.rb
 - spec/unit/util/core_ext/hash_ext_spec.rb
+- spec/unit/errors/formatting_spec.rb
 - spec/unit/instance_cache_spec.rb
+- spec/unit/action/visitor_spec.rb
+- spec/unit/action/cri_runner_spec.rb
+- spec/unit/action/puppetfile/cri_action_spec.rb
+- spec/unit/action/runner_spec.rb
 - spec/unit/settings/container_spec.rb
+- spec/unit/svn/working_dir_spec.rb
 - spec/unit/svn/remote_spec.rb
+- spec/unit/source/base_spec.rb
 - spec/unit/source/svn_spec.rb
 - spec/unit/source/git_spec.rb
+- spec/unit/deployment_spec.rb
 - spec/unit/module/forge_spec.rb
+- spec/unit/module/base_spec.rb
 - spec/unit/module/svn_spec.rb
 - spec/unit/module/git_spec.rb
 - spec/unit/module/metadata_spec.rb