librarian-puppet-maestrodev 0.9.9.3 → 0.9.9.4

data/lib/librarian/puppet/extension.rb

@@ -103,10 +103,14 @@ module Librarian
   end
 
   class Resolver
-    class Implementation
-      def debug_conflict(dependency, conflict)
-        raise Error, "Conflict between #{dependency} and #{conflict}"
+    # ensure we don't return nil, if manifests is nil we return a resolution that is not valid
+    def resolve(spec, partial_manifests = [])
+      manifests = implementation(spec).resolve(partial_manifests)
+      if manifests
+        enforce_consistency!(spec.dependencies, manifests)
+        manifests = sort(manifests)
       end
+      Resolution.new(spec.dependencies, manifests)
     end
   end
 end

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

@@ -103,7 +103,7 @@ module Librarian
             target = vendored?(name, version) ? vendored_path(name, version) : name
 
 
-            command = "puppet module install --version #{version} --target-dir '#{path}' --modulepath '#{path}' --ignore-dependencies '#{target}'"
+            command = "puppet module install --version #{version} --target-dir '#{path}' --module_repository '#{source}' --modulepath '#{path}' --ignore-dependencies '#{target}'"
             output = `#{command}`
 
             # Check for bad exit code

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

@@ -26,16 +26,21 @@ module Librarian
         end
 
         def dependencies
-          return {} unless modulefile?
-
-          metadata = ::Puppet::ModuleTool::Metadata.new
-
-          ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
-
-          metadata.dependencies.inject({}) do |h, dependency|
-            name = dependency.instance_variable_get(:@full_module_name)
-            version = dependency.instance_variable_get(:@version_requirement)
-            h.update(name => version)
+          return {} unless modulefile? or puppetfile?
+          
+          if modulefile?
+            metadata = ::Puppet::ModuleTool::Metadata.new
+
+            ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
+
+            metadata.dependencies.map do |dependency|
+              name = dependency.instance_variable_get(:@full_module_name)
+              version = dependency.instance_variable_get(:@version_requirement)
+              v = Librarian::Puppet::Requirement.new(version).gem_requirement
+              Dependency.new(name, v, forge_source)
+            end
+          elsif puppetfile?
+            Librarian::Puppet::Environment.new(:project_path => path).specfile.read.dependencies
           end
         end
 
@@ -46,6 +51,14 @@ module Librarian
         def modulefile?
           File.exists?(modulefile)
         end
+        
+        def puppetfile?
+          File.exists?(File.join(path, 'Puppetfile'))
+        end
+
+        def forge_source
+          Librarian::Puppet::Source::Forge.from_lock_options(environment, :remote=>"http://forge.puppetlabs.com")
+        end
       end
     end
   end
@@ -107,14 +120,7 @@ module Librarian
         end
 
         def fetch_dependencies(name, version, extra)
-          repository.dependencies.map do |k, v|
-            v = Requirement.new(v).gem_requirement
-            Dependency.new(k, v, forge_source)
-          end
-        end
-
-        def forge_source
-          Forge.from_lock_options(environment, :remote=>"http://forge.puppetlabs.com")
+          repository.dependencies
         end
 
       end

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "0.9.9.3"
+    VERSION = "0.9.9.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet-maestrodev
 version: !ruby/object:Gem::Version
-  version: 0.9.9.3
+  version: 0.9.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
@@ -165,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -17747547661605876
+      hash: -3974085254619562597
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -17747547661605876
+      hash: -3974085254619562597
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25