librarian-puppet-maestrodev 0.9.7.3 → 0.9.7.4

data/lib/librarian/puppet/extension.rb

@@ -24,17 +24,23 @@ module Librarian
           when String
             puppet_to_gem_version(arg)
           else
-            # Gem::Requirement, do nothing
-            arg
+            # Gem::Requirement, convert to string (ie. =1.0) so we can concat later
+            # Gem::Requirements can not be concatenated
+            arg.requirements.map{|x,y| "#{x}#{y}"}
           end
-        end
+        end.flatten
       end
 
-      # convert Puppet '1.x' versions to gem supported versions '~>1.0'
+      # convert Puppet versions to gem supported versions
+      # '1.x' to '~>1.0'
+      # '>=1.1.0 <2.0.0' to ['>=1.1.0', '<2.0.0']
       # http://docs.puppetlabs.com/puppet/2.7/reference/modules_publishing.html
       def puppet_to_gem_version(version)
-        matched = /(.*)\.x/.match(version)
-        matched.nil? ? version : "~>#{matched[1]}.0"
+        constraints = version.scan(/([~<>=]*[ ]*[\d\.x]+)/).flatten # split the constraints
+        constraints.map do |constraint|
+          matched = /(.*)\.x/.match(constraint)
+          matched.nil? ? constraint : "~>#{matched[1]}.0"
+        end
       end
     end
   end

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

@@ -268,8 +268,13 @@ module Librarian
         end
 
         def fetch_dependencies(name, version, version_uri)
+          environment.logger.debug { "      Fetching dependencies for #{name} #{version}" }
           repo(name).dependencies(version).map do |k, v|
-            Dependency.new(k, v, nil)
+            begin
+              Dependency.new(k, v, nil)
+            rescue ArgumentError => e
+              raise Error, "Error fetching dependency for #{name} [#{version}]: #{k} [#{v}]: #{e}"
+            end
           end
         end
 

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "0.9.7.3"
+    VERSION = "0.9.7.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet-maestrodev
 version: !ruby/object:Gem::Version
-  version: 0.9.7.3
+  version: 0.9.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -244,7 +244,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1625184598670827076
+      hash: -150972363980444721
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1625184598670827076
+      hash: -150972363980444721
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24