librarian-puppet 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aea15d42f3f537214c5256248b821f12558b266f
-  data.tar.gz: d0f110467f43c2f090bb8697988731f0020e32b2
+  metadata.gz: 292735ed218859976126f0a08ee529645f3a2805
+  data.tar.gz: f0a8b83aaf1d6f243b6c09580884ec4e33b6f96e
 SHA512:
-  metadata.gz: 9b0df8f65615913ab73d48d03a8d29fc1753cf26009a96aaf821e49368d8fbbab1b51dd89c513f98644764dcda6bb84c826bb0b4e2bf3132f42964ce3de1aeb8
-  data.tar.gz: 03ffefa4e42cabf289f754b24763d98a44f671f8198f89f27a39758703615e1c090259f9a1426c15d03bb1f2d3e30523b7c32562739c142abb336ba887689164
+  metadata.gz: 87a3a7d30bdb73d810bd15e681a197ef6960ab5f88203f1c8ca52c36b5293dd6bd5ea2c5bf30206805c628e65abe2050d4396b4089be99e230e4a225e30ecc60
+  data.tar.gz: dd981e980e3a32b42ed911181b448b986af2e48f88c29ab9eb6d3fb538f5c4daaa8bd3b12be450baa9291534b9a8ae1a185561ef63a9c4198578b7a66f18cd40

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

@@ -96,7 +96,7 @@ module Librarian
               warn { "Replacing Puppet Forge API URL to use v3 #{module_repository} as required by your client version #{Librarian::Puppet.puppet_version}" }
             end
 
-            m = module_repository.match(%r{^http(s)?://forgeapi\.puppetlabs\.com})
+            m = module_repository.match(%r{^http(s)?://forge(api)?\.puppetlabs\.com})
             if Forge.client_api_version() == 1 and m
               ssl = m[1]
               # Puppet 2.7 can't handle the 302 returned by the https url, so stick to http

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

@@ -37,41 +37,37 @@ module Librarian
         def fetch_dependencies(name, version, extra)
           dependencies = Set.new
 
-          dependencyList = if metadata?
-            JSON.parse(File.read(metadata))['dependencies']
-          elsif modulefile?
-            evaluate_modulefile(modulefile).dependencies.map do |dependency|
-              {
-                'name' => dependency.instance_variable_get(:@full_module_name),
-                'version_requirement' => dependency.instance_variable_get(:@version_requirement)
-              }
-            end
-          else []
-          end
-
-          dependencyList.each do |d|
-            gem_requirement = Requirement.new(d['version_requirement']).gem_requirement
-            dependencies << Dependency.new(d['name'], gem_requirement, forge_source)
-          end
-
           if specfile?
             spec = environment.dsl(Pathname(specfile))
             dependencies.merge spec.dependencies
           end
 
+          parsed_metadata['dependencies'].each do |d|
+            gem_requirement = Requirement.new(d['version_requirement']).gem_requirement
+            new_dependency = Dependency.new(d['name'], gem_requirement, forge_source)
+            # Avoid duplicated dependencies with different sources
+            unless dependencies.find { |spec_dependency| spec_dependency.name == new_dependency.name && spec_dependency.requirement == new_dependency.requirement }
+              dependencies << new_dependency
+            end
+          end
+
           dependencies
         end
 
         def forge_source
-          Forge.from_lock_options(environment, :remote=>"http://forge.puppetlabs.com")
+          Forge.from_lock_options(environment, :remote => "https://forgeapi.puppetlabs.com")
         end
 
         private
 
         # Naming this method 'version' causes an exception to be raised.
         def module_version
-          return '0.0.1' unless modulefile?
-          evaluate_modulefile(modulefile).version
+          if parsed_metadata['version']
+            parsed_metadata['version']
+          else
+            warn { "Module #{to_s} does not have version, defaulting to 0.0.1" }
+            '0.0.1'
+          end
         end
 
         def require_puppet
@@ -106,6 +102,28 @@ module Librarian
           metadata
         end
 
+        def parsed_metadata
+          @metadata ||= if metadata?
+            JSON.parse(File.read(metadata))
+          elsif modulefile?
+            # translate Modulefile to metadata.json
+            evaluated = evaluate_modulefile(modulefile)
+            {
+              'version' => evaluated.version,
+              'dependencies' => evaluated.dependencies.map do |dependency|
+                {
+                  'name' => dependency.instance_variable_get(:@full_module_name),
+                  'version_requirement' => dependency.instance_variable_get(:@version_requirement)
+                }
+              end
+            }
+          else
+            warn { "Could not find metadata.json nor Modulefile at #{filesystem_path}" }
+            {}
+          end
+          @metadata
+        end
+
         def modulefile
           File.join(filesystem_path, 'Modulefile')
         end

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Tim Sharpe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian