librarian-puppet-maestrodev 0.9.11.2 → 0.9.11.3

data/lib/librarian/puppet.rb

@@ -1,16 +1,33 @@
 require 'librarian'
 require 'fileutils'
+require 'open3'
+require 'open3_backport' if RUBY_VERSION < '1.9'
+
+status = nil
+out = nil
+error = nil
 
 begin
-  require 'puppet'
-rescue LoadError
+  Open3.popen3('puppet --version') {|stdin, stdout, stderr, wait_thr|
+    pid = wait_thr.pid # pid of the started process.
+    out = stdout.read
+    status = wait_thr.value # Process::Status object returned.
+  }
+rescue => e
+  error = e
+end
+
+if status.nil? or status.exitstatus != 0
   $stderr.puts <<-EOF
-Unable to load puppet. Either install it using native packages for your
-platform (eg .deb, .rpm, .dmg, etc) or as a gem (gem install puppet).
+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?}
 EOF
   exit 1
 end
 
+PUPPET_VERSION=out.split(' ').first.strip
+
 require 'librarian/puppet/extension'
 require 'librarian/puppet/version'
 

data/lib/librarian/puppet/environment.rb

@@ -28,14 +28,6 @@ module Librarian
         vendor_path.join('source')
       end
 
-      def cache_path
-        project_path.join(".tmp/librarian/cache")
-      end
-
-      def scratch_path
-        project_path.join(".tmp/librarian/scratch")
-      end
-
       def vendor!
         vendor_cache.mkpath  unless vendor_cache.exist?
         vendor_source.mkpath unless vendor_source.exist?

data/lib/librarian/puppet/extension.rb

@@ -32,6 +32,13 @@ module Librarian
         end.flatten
       end
     end
+
+    alias :eql? :==
+
+    def hash
+      self.to_s.hash
+    end
+
   end
 
   # Fixes for librarian not yet released in their gem

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

@@ -107,7 +107,7 @@ module Librarian
 
           def check_puppet_module_options
             min_version    = Gem::Version.create('2.7.13')
-            puppet_version = Gem::Version.create(`puppet --version`.split(' ').first.strip.gsub('-', '.'))
+            puppet_version = Gem::Version.create(PUPPET_VERSION.gsub('-', '.'))
 
             if puppet_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}"

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

@@ -1,5 +1,6 @@
 require 'librarian/source/git'
 require 'librarian/puppet/source/local'
+require 'puppet'
 
 module Librarian
   module Source
@@ -67,7 +68,7 @@ module Librarian
         end
 
         def fetch_dependencies(name, version, extra)
-          dependencies = []
+          dependencies = Set.new
 
           if modulefile?
             metadata = ::Puppet::ModuleTool::Metadata.new
@@ -75,16 +76,16 @@ module Librarian
             ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
 
             metadata.dependencies.each do |dependency|
-              name = dependency.instance_variable_get(:@full_module_name)
+              dependency_name = dependency.instance_variable_get(:@full_module_name)
               version = dependency.instance_variable_get(:@version_requirement)
               gem_requirement = Requirement.new(version).gem_requirement
-              dependencies.push Dependency.new(name, gem_requirement, forge_source)
+              dependencies << Dependency.new(dependency_name, gem_requirement, forge_source)
             end
           end
 
           if specfile?
             spec = environment.dsl(Pathname(specfile))
-            dependencies.concat spec.dependencies
+            dependencies.merge spec.dependencies
           end
 
           dependencies

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "0.9.11.2"
+    VERSION = "0.9.11.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet-maestrodev
 version: !ruby/object:Gem::Version
-  version: 0.9.11.2
+  version: 0.9.11.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
-  requirement: &9016520 !ruby/object:Gem::Requirement
+  requirement: &21733960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *9016520
+  version_requirements: *21733960
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &9016000 !ruby/object:Gem::Requirement
+  requirement: &21730100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9016000
+  version_requirements: *21730100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9015400 !ruby/object:Gem::Requirement
+  requirement: &21728140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9015400
+  version_requirements: *21728140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9014940 !ruby/object:Gem::Requirement
+  requirement: &21740560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9014940
+  version_requirements: *21740560
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &9014460 !ruby/object:Gem::Requirement
+  requirement: &21735820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9014460
+  version_requirements: *21735820
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &9013760 !ruby/object:Gem::Requirement
+  requirement: &21750980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9013760
+  version_requirements: *21750980
 - !ruby/object:Gem::Dependency
   name: puppet
-  requirement: &9029000 !ruby/object:Gem::Requirement
+  requirement: &21749380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9029000
+  version_requirements: *21749380
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &9027820 !ruby/object:Gem::Requirement
+  requirement: &21744980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '5'
   type: :development
   prerelease: false
-  version_requirements: *9027820
+  version_requirements: *21744980
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &9026840 !ruby/object:Gem::Requirement
+  requirement: &21758580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9026840
+  version_requirements: *21758580
 description: ! "Simplify deployment of your Puppet infrastructure by\n  automatically
   pulling in modules from the forge and git repositories with\n  a single command."
 email:
@@ -153,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1603487387827623136
+      hash: 1390188008599857275
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1603487387827623136
+      hash: 1390188008599857275
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.9