librarian-puppet 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a7c6bf3dfb88d0d44e3c718e302167e04508fc2
-  data.tar.gz: d5affa81eab4acc5aff6b93ee39bfbe3e97a2e85
+  metadata.gz: 004c9886df1b5f4d003a64f076c2e66bfa349fc4
+  data.tar.gz: a473d2c6cf25a3eb249e24bc6615ab270598fd50
 SHA512:
-  metadata.gz: d4de7b61cffafdc51b4e46bcf7c42fd88da267620804ce52f6c55e85724e0993f71756720530ce47a7535122f13158cc5baba38485f9ccd5dc8c0c138bacb437
-  data.tar.gz: 743f2f84ad57d0041656e28824e59e906fdc5ab717d866ca09f151c1f1ca22fadf45acb49317f0c48bd69ac28196d71d5858aa271672fcef7491f856ffa89b95
+  metadata.gz: 3103eb328eeffd401c6cfe890b44f2a59b211b67d99f01c10371460f152e8e0149f362b909d136b918c664e52be950cf3c2147729739a759d5ed660f4a223a83
+  data.tar.gz: aa66afd24a2b72e50a8690ab20ec5828f95e3eba3b4866b6501b32eaf9c37909317482385607982bf9eb1c9f7547f82c769c67099315177c5c88034c2d08c840

data/README.md

@@ -88,6 +88,10 @@ This declares that we want to use the official Puppet Labs Forge as our default
 source when pulling down modules.  If you run your own local forge, you may
 want to change this.
 
+    metadata
+
+Download all the dependencies listed in your `metadata.json` or `Modulefile` from the Puppet Forge.
+
     mod 'puppetlabs-razor'
 
 Pull in the latest version of the Puppet Labs Razor module from the default
@@ -259,7 +263,7 @@ and transforming it: replace hyphens (`-`) with underscores (`_`) and periods
 
 Configuration affects how various commands operate.
 
-* The `path` config sets the cookbooks directory to install to. If a relative
+* The `path` config sets the directory to install to. If a relative
   path, it is relative to the directory containing the `Puppetfile`. The
   equivalent environment variable is `LIBRARIAN_PUPPET_PATH`.
 

data/lib/librarian/puppet.rb

@@ -16,10 +16,10 @@ module Librarian
       return @@puppet_version unless @@puppet_version.nil?
 
       begin
-        @@puppet_version = Librarian::Posix.run!(%W{puppet --version})
-      rescue Librarian::Posix::CommandFailure => error
+        @@puppet_version = Librarian::Posix.run!(%W{puppet --version}).strip
+      rescue Errno::ENOENT, Librarian::Posix::CommandFailure => error
         msg = "Unable to load puppet. Please install it using native packages for your platform (eg .deb, .rpm, .dmg, etc)."
-        msg += "\npuppet --version returned #{error.status}"
+        msg += "\npuppet --version returned #{error.status}" if error.respond_to? :status
         msg += "\n#{error.message}" unless error.message.nil?
         $stderr.puts msg
         exit 1

data/lib/librarian/puppet/action/install.rb

@@ -1,3 +1,5 @@
+require 'librarian/action/install'
+
 module Librarian
   module Puppet
     module Action

data/lib/librarian/puppet/action/resolve.rb

@@ -1,3 +1,5 @@
+require 'librarian/action/resolve'
+
 module Librarian
   module Puppet
     module Action

data/lib/librarian/puppet/source/forge/repo.rb

@@ -135,7 +135,7 @@ module Librarian
             min_version    = Gem::Version.create('2.7.13')
 
             if Librarian::Puppet.puppet_gem_version < min_version
-              raise Error, "To get modules from the forge, we use the puppet faces module command. For this you need at least puppet version 2.7.13 and you have #{puppet_version}"
+              raise Error, "To get modules from the forge, we use the puppet faces module command. For this you need at least puppet version 2.7.13 and you have #{Librarian::Puppet.puppet_version}"
             end
           end
 

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Tim Sharpe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarianp
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: rsync
   requirement: !ruby/object:Gem::Requirement
@@ -43,16 +43,16 @@ dependencies:
   name: puppet_forge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Bundler for your Puppet modules