librarian-puppet 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbe00d37667721e7a61be8fb75277e88f75dec0d
-  data.tar.gz: 6655c8212fe01704c529ea35fcbc7ada5ed14a1b
+  metadata.gz: ef4fd59f2a6e41ed320ea0bb94eb6374af121092
+  data.tar.gz: a8575338727993713ef495723986d28e71007244
 SHA512:
-  metadata.gz: 41f48efc10bb44b6ab924bc2040d686264a1e74ee58f1a179bf23552e4947df3f2b94251fc92d96ad3ada0ad2fe3bada5c765a5ff7f174c2da67b1fe69f9a44e
-  data.tar.gz: 59f9a5784cf4c0f801806c6821cf5c7ca33fbb577022ef6fcdae428d932d24ff918e0692bee4a8aebe9cab60de901de9d2f40a90587aaf9a008475d41c3c7f4f
+  metadata.gz: d006b91e46d7c964aacbeed2a88e4e385e9c8357e1a9f2920dced67d008ee0acba6d868f7dffccca7acc5ddc0642de1e43f680a96a7379b8f0b767090fe3222a
+  data.tar.gz: 666b2ee1a3d469fd23272495d228a9d6c64b8df70a2e7ae9a29ef8eee64bee06fca3bfdb495e06b23757413263c93d993bb637309ea292c127f8845c48097396

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

@@ -91,7 +91,7 @@ module Librarian
 
             command = %W{puppet module install --version #{version} --target-dir}
             command.push(*[path.to_s, "--module_repository", module_repository, "--modulepath", path.to_s, "--module_working_dir", path.to_s, "--ignore-dependencies", target])
-            debug { "Executing puppet module install for #{name} #{version}" }
+            debug { "Executing puppet module install for #{name} #{version}: #{command.join(" ")}" }
 
             begin
               Librarian::Posix.run!(command)
@@ -136,11 +136,34 @@ module Librarian
 
         private
 
+          # Issue #223 dependencies may be duplicated
+          def clear_duplicated_dependencies(data)
+            return nil if data.nil?
+            data.each do |m,versions|
+              versions.each do |v|
+                if v["dependencies"] and !v["dependencies"].empty?
+                  dependency_names = v["dependencies"].map {|d| d[0]}
+                  duplicated = dependency_names.select{ |e| dependency_names.count(e) > 1 }
+                  unless duplicated.empty?
+                    duplicated.uniq.each do |module_duplicated|
+                      to_remove = []
+                      v["dependencies"].each_index{|i| to_remove << i if module_duplicated == v["dependencies"][i][0]}
+                      warn { "Module #{m}@#{v["version"]} contains duplicated dependencies for #{module_duplicated}, ignoring all but the first of #{to_remove.map {|i| v["dependencies"][i]}}" }
+                      to_remove.slice(1..-1).reverse.each {|i| v["dependencies"].delete_at(i) }
+                      v["dependencies"] = v["dependencies"] - to_remove.slice(1..-1)
+                    end
+                  end
+                end
+              end
+            end
+            data
+          end
+
           # get and cache the API data for a specific module with all its versions and dependencies
           def api_data(module_name)
             return @api_data[module_name] if @api_data
             # call API and cache data
-            @api_data = api_call(module_name)
+            @api_data = clear_duplicated_dependencies(api_call(module_name))
             if @api_data.nil?
               raise Error, "Unable to find module '#{name}' on #{source}"
             end
@@ -152,7 +175,7 @@ module Librarian
             # if we already got all the versions, find in cached data
             return @api_data[module_name].detect{|x| x['version'] == version.to_s} if @api_data
             # otherwise call the api for this version if not cached already
-            @api_version_data[version] = api_call(name, version) if @api_version_data[version].nil?
+            @api_version_data[version] = clear_duplicated_dependencies(api_call(name, version)) if @api_version_data[version].nil?
             @api_version_data[version]
           end
 

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

@@ -28,10 +28,14 @@ module Librarian
           return vendor_checkout! if vendor_cached?
 
           if environment.local?
-            raise Error, "Could not find a local copy of #{uri} at #{sha}."
+            raise Error, "Could not find a local copy of #{uri}#{" at #{sha}" unless sha.nil?}."
           end
 
-          super
+          begin
+            super
+          rescue Librarian::Posix::CommandFailure => e
+            raise Error, "Could not checkout #{uri}#{" at #{sha}" unless sha.nil?}: #{e}"
+          end
 
           cache_in_vendor(repository.path) if environment.vendor?
         end

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian