librarian-puppet 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 010735fe88618f0ecd15edc880fa37086546d776
-  data.tar.gz: fc6e6b124d06ef74f249b813486880649aee3dbd
+  metadata.gz: b67a1e452129a68f620fd106459e65a989214ad1
+  data.tar.gz: 37194dd860f12e353a03677ed2d5f0bc6c7e8504
 SHA512:
-  metadata.gz: d65097488d97abe1ca30a251d62e02f3b3cebf0fb7ed1f594c7d98e3adec4e578dddf4e4ed5ffd73ee1627bf5eb4524097359e8777fb368f258fd0eb174bdef4
-  data.tar.gz: 6ee5fc74eebe8a99f970affcfd53949fce28b3926bbd1c0d9bf740e5c24d4297c01e3679f72e4abec5e4076bcb4bed786124cc454fdd36debd3411eca0c3ed6d
+  metadata.gz: 60d6ae144ba0ca780d18f204685d00294fce51c318df54e314003b9cc4ac6455193c95818b66c67ccc2b8ada0a1588b6114ab4333ba9d032b6b32ffadacd5202
+  data.tar.gz: 7de4706904ec8a96ad482f61c1fdcca5ca619549ad2d0555841c1f803de7cffcbc73c64e2a5cac420f9d8242fa34a89007057712699a1f70772bc284f85eab23

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://forge.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.0.7"
+    VERSION = "1.0.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 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