librarian-puppet 0.9.15 → 0.9.16

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzhlYjZhM2FkYjljZjdiMTMzMTRkODY5ZGUzNTBmNTdmNDMwM2JiYw==
-  data.tar.gz: !binary |-
-    OGM1ODBkNzUxNzk1MjQyNDk3NzI4NDg5OWE0ZmVjZjRlNzc2ZTM5OQ==
+SHA1:
+  metadata.gz: 54463e29423057063ec5adeda81c88af20dcb792
+  data.tar.gz: 6e4031576cfc15cc883c6de125175d5e60a2f5a6
 SHA512:
-  metadata.gz: !binary |-
-    ZDRlYzU1NzExYTc2MDYzODZmYWE3NWE3ODliNmIyYjg0MzU1ZmRhMTZhMGUz
-    NGRiNzQyMjljODFjMDk3YzI5ZDk5NjdhYTBhZGVmZjJhZmUyMWYxMGM1YTVl
-    MGEyMDYxYjJlMTMwYzFmNGJhNDI5ZDdjMGNhZTQ3ODRmOWU3ZGU=
-  data.tar.gz: !binary |-
-    ZmE5N2ExNTQwYmI4OWNmMDkyZjYyYWVjNjJmYTk0MzY1YWIwZjlkNWI2MTAy
-    MzAzYTk2M2VlMWU2MDYyNDU5YWFjNjFhNjdhMTk3NjJjMWM2OTdlNDRlZjlm
-    NDFkMmJkYzc4ZWY4YmYwODg3NDJiYjgzMzgzZjc2OWI5ZjA1NzY=
+  metadata.gz: 38b2d8ad9114c859f95986966c63892087510c5684e6825691294d845717c0d56f53d1972cb8f27963fb5af686e300e3b856db7d693391b2b64afcccc92fc8b9
+  data.tar.gz: 1e7a9a199b12c1793c2b9114748136e5b60105ed2fe2bdcc3ca9edc301f8b294c65ae716febd9f3f4cf2f2884f47fe878cdbc75a0e53aa06960550972c2ef721

data/README.md

@@ -40,10 +40,10 @@ This Puppetfile will download all the dependencies listed in your Modulefile fro
     mod "puppetlabs/razor"
     mod "puppetlabs/ntp", "0.0.3"
 
-    mod "apt",
+    mod "puppetlabs/apt",
       :git => "git://github.com/puppetlabs/puppetlabs-apt.git"
 
-    mod "stdlib",
+    mod "puppetlabs/stdlib",
       :git => "git://github.com/puppetlabs/puppetlabs-stdlib.git"
 
 *See [jenkins-appliance](https://github.com/aussielunix/jenkins-appliance) for
@@ -51,7 +51,7 @@ a puppet repo already setup to use librarian-puppet.*
 
 ### Recursive module dependency resolving
 
-When fetching a module from a `:git`-source all dependencies specified in its
+When fetching a module all dependencies specified in its
 `Modulefile` and `Puppetfile` will be resolved and installed.
 
 ### Puppetfile Breakdown
@@ -71,20 +71,20 @@ source.
 
 Pull in version 0.0.3 of the Puppet Labs NTP module from the default source.
 
-    mod "apt",
+    mod "puppetlabs/apt",
       :git => "git://github.com/puppetlabs/puppetlabs-apt.git"
 
 Our puppet infrastructure repository depends on the `apt` module from the
 Puppet Labs GitHub repos and checks out the `master` branch.
 
-    mod "apt",
+    mod "puppetlabs/apt",
       :git => "git://github.com/puppetlabs/puppetlabs-apt.git",
       :ref => '0.0.3'
 
 Our puppet infrastructure repository depends on the `apt` module from the
 Puppet Labs GitHub repos and checks out a tag of `0.0.3`.
 
-    mod "apt",
+    mod "puppetlabs/apt",
       :git => "git://github.com/puppetlabs/puppetlabs-apt.git",
       :ref => 'feature/master/dans_refactor'
 
@@ -106,7 +106,7 @@ with many modules in it. If we need a module from such a repository, we can
 use the `:path =>` option here to help Librarian-puppet drill down and find the
 module subdirectory.
 
-    mod "apt",
+    mod "puppetlabs/apt",
       :git => "git://github.com/fake/puppet-modules.git",
       :path => "modules/apt"
 

data/lib/librarian/puppet.rb

@@ -1,42 +1,15 @@
 require 'librarian'
 require 'fileutils'
-require 'open3'
-require 'open3_backport' if RUBY_VERSION < '1.9'
 
-status = nil
 out = nil
-err = nil
-error = nil
-
 begin
-  if RUBY_VERSION < '1.9'
-    # Ruby 1.8.x backport of popen3 doesn't allow the 'env' hash argument
-    # Not sanitizing the environment for the moment.
-    Open3.popen3('puppet --version') { |stdin, stdout, stderr, wait_thr|
-      pid = wait_thr.pid # pid of the started process.
-      out = stdout.read
-      err = stderr.read
-      status = wait_thr.value # Process::Status object returned.
-    }
-  else
-    env_reset = {'GEM_PATH' => nil, 'BUNDLE_APP_CONFIG' => nil, 'BUNDLE_CONFIG' => nil, 'BUNDLE_GEMFILE' => nil}
-    Open3.popen3(env_reset, 'puppet --version') { |stdin, stdout, stderr, wait_thr|
-      pid = wait_thr.pid # pid of the started process.
-      out = stdout.read
-      err = stderr.read
-      status = wait_thr.value # Process::Status object returned.
-    }
-  end
-rescue => e
-  error = e
-end
+  out = Librarian::Posix.run!(%W{puppet --version})
+rescue Librarian::Posix::CommandFailure => error
 
-if status.nil? or status.exitstatus != 0
   $stderr.puts <<-EOF
 Unable to load puppet. Please install it using native packages for your platform (eg .deb, .rpm, .dmg, etc).
-#{out.nil? or out.empty? ? "puppet --version returned #{status.exitstatus}" : out}
-#{error.message unless error.nil?}
-#{err unless err.nil?}
+puppet --version returned #{status.exitstatus}
+#{error.message unless error.message.nil?}
 EOF
   exit 1
 end

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

@@ -101,18 +101,29 @@ module Librarian
 
             path.mkpath
 
-            target = vendored?(name, version) ? vendored_path(name, version) : name
+            target = vendored?(name, version) ? vendored_path(name, version).to_s : name
 
 
-            command = "puppet module install --version #{version} --target-dir '#{path}' --module_repository '#{source}' --modulepath '#{path}' --module_working_dir '#{path}' --ignore-dependencies '#{target}'"
+            command = %W{puppet module install --version #{version} --target-dir}
+            command.push(*[path.to_s, "--module_repository", source.to_s, "--modulepath", path.to_s, "--module_working_dir", path.to_s, "--ignore-dependencies", target])
             debug { "Executing puppet module install for #{name} #{version}" }
-            output = `#{command}`
 
-            # Check for bad exit code
-            unless $? == 0
+            begin
+              Librarian::Posix.run!(command)
+            rescue Posix::CommandFailure => e
               # Rollback the directory if the puppet module had an error
-              path.unlink
-              raise Error, "Error executing puppet module install:\n#{command}\nError:\n#{output}"
+              begin
+                path.unlink
+              rescue => u
+                warn("Unable to rollback path #{path}: #{u}")
+              end
+              tar = Dir[File.join(path.to_s, "**/*.tar.gz")]
+              msg = ""
+              if e.message =~ /Unexpected EOF in archive/ and !tar.empty?
+                file = tar.first
+                msg = " (looks like an incomplete download of #{file})"
+              end
+              raise Error, "Error executing puppet module install#{msg}:\n#{command.join(" ")}\nError:\n#{e.message}"
             end
 
           end

data/lib/librarian/puppet/source/git.rb

@@ -48,17 +48,13 @@ module Librarian
           repository.path.rmtree if repository.path.exist?
           repository.path.mkpath
 
-          Dir.chdir(repository.path.to_s) do
-            %x{tar xzf #{vendor_tgz}}
-          end
+          run!(%W{tar xzf #{vendor_tgz}}, :chdir => repository.path.to_s)
 
           repository_cached!
         end
 
         def cache_in_vendor(tmp_path)
-          Dir.chdir(tmp_path.to_s) do
-            %x{git archive #{sha} | gzip > #{vendor_tgz}}
-          end
+          run!(%W{git archive #{sha} | gzip > #{vendor_tgz}}, :chdir => tmp_path.to_s)
         end
 
       end

data/lib/librarian/puppet/source/githubtarball.rb

@@ -22,9 +22,11 @@ module Librarian
           def initialize(source, name)
             self.source = source
             self.name = name
+            warn { "githubtarball sources are deprecated: #{name} [#{source}]" }
           end
 
           def versions
+            return @versions if @versions
             data = api_call("/repos/#{source.uri}/tags")
             if data.nil?
               raise Error, "Unable to find module '#{source.uri}' on https://github.com"
@@ -36,7 +38,9 @@ module Librarian
               version !~ /\A\d\.\d(\.\d.*)?\z/
             end
 
-            all_versions.compact
+            @versions = all_versions.compact
+            debug { "  Module #{name} found versions: #{@versions.join(", ")}" }
+            @versions
           end
 
           def manifests
@@ -86,7 +90,7 @@ module Librarian
 
             target = vendored?(source.uri, version) ? vendored_path(source.uri, version) : name
 
-            `tar xzf #{target} -C #{path}`
+            Librarian::Posix.run!(%W{tar xzf #{target} -C #{path}})
           end
 
           def vendored?(name, version)

data/lib/librarian/puppet/source/local.rb

@@ -23,13 +23,11 @@ module Librarian
           found_path = found_path(name)
           raise Error, "Path for #{name} doesn't contain a puppet module" if found_path.nil?
 
-          if name.include? '/'
-            new_name = name.split('/').last
-            debug { "Invalid module name '#{name}', guessing you meant '#{new_name}'" }
-            name = new_name
+          unless name.include? '/'
+            warn { "Invalid module name '#{name}', you should qualify it with 'ORGANIZATION/#{name}' for resolution to work correctly" }
           end
 
-          install_path = environment.install_path.join(name)
+          install_path = environment.install_path.join(name.split('/').last)
           if install_path.exist?
             debug { "Deleting #{relative_path_to(install_path)}" }
             install_path.rmtree

data/lib/librarian/puppet/templates/Puppetfile

@@ -3,6 +3,9 @@
 
 forge "http://forge.puppetlabs.com"
 
+# use dependencies defined in Modulefile
+modulefile
+
 # mod 'puppetlabs/stdlib'
 
 # mod 'ntp',

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "0.9.15"
+    VERSION = "0.9.16"
   end
 end

metadata

@@ -1,125 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: open3_backport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -140,18 +126,20 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "Simplify deployment of your Puppet infrastructure by\n  automatically
-  pulling in modules from the forge and git repositories with\n  a single command."
+description: |-
+  Simplify deployment of your Puppet infrastructure by
+    automatically pulling in modules from the forge and git repositories with
+    a single command.
 email:
 - tim@sharpe.id.au
 executables:
@@ -189,12 +177,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []