puppet-forge-server 1.7.1 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c02d81c3a75aec7225f4d2055b0103ba1bce3b08
-  data.tar.gz: c6e88d67050e2521ba3122a5dd42e86fcc075a55
+  metadata.gz: 5f1449614786bc09ef0b3ea9d05b0b95bc73c61b
+  data.tar.gz: cc504debfd84730de1ac4bfb9dc7c97f4d425979
 SHA512:
-  metadata.gz: 8d9068b15c85b51e9b7fae6bacf08c410d7faed77879b6179935489cf00e4b6d59ae0bd0afef2fcc01b89660a14b7e7331a00569c2bdf8275e1b64729666df13
-  data.tar.gz: 45c71d0b4f4501698e640fff45a8c9b8586c13c737005fd86d5ad6bc45c4beee728b090e6a7b7b8fa2da85999bd0f8284e4e2536e11455cb48256d7a076b24b1
+  metadata.gz: 990ad7b68a7d9c98879657691f8b641708430a454c3dc423ccb6ca897d98f7d54fffc05c389e0e624e1d5f79567e1e4b3a6645846bcd5ce8e11d3e202e90f1eb
+  data.tar.gz: dc67162f5bbca82fd01549bd8ec4233a68ea38edd17b328c80138b80a734e6ec6371c9aea17151619732a8878b0ffc3926f588ab8e032014c3c6f3d52defe5cb

data/lib/puppet_forge_server/backends/directory.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 #
-# Copyright 2014 North Development AB
+# Copyright 2015 North Development AB
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ module PuppetForgeServer::Backends
 
     def initialize(url)
       @module_dir = url
+      @log = PuppetForgeServer::Logger.get
     end
 
     def query_metadata(query, options = {})
@@ -61,6 +62,11 @@ module PuppetForgeServer::Backends
       return nil
     end
 
+    def normalize_metadata(metadata)
+      metadata['name'] = metadata['name'].gsub('/', '-')
+      metadata
+    end
+
     def parse_dependencies(metadata)
       metadata.dependencies = metadata.dependencies.dup.map do |dependency|
         PuppetForgeServer::Models::Dependency.new({:name => dependency['name'], :version_requirement => dependency['version_requirement']})
@@ -70,13 +76,20 @@ module PuppetForgeServer::Backends
 
     def get_file_metadata(file_name, options)
       options = ({:with_checksum => true}).merge(options)
-      Dir["#{@module_dir}/**/#{file_name}"].map do |path|
-        {
-            :metadata => parse_dependencies(PuppetForgeServer::Models::Metadata.new(read_metadata(path))),
+      file_metadata = []
+      Dir["#{@module_dir}/**/#{file_name}"].each do |path|
+        metadata_raw = read_metadata(path)
+        if metadata_raw
+          file_metadata << {
+            :metadata => parse_dependencies(PuppetForgeServer::Models::Metadata.new(normalize_metadata(metadata_raw))),
             :checksum => options[:with_checksum] == true ? Digest::MD5.file(path).hexdigest : nil,
             :path => "/#{Pathname.new(path).relative_path_from(Pathname.new(@module_dir))}"
-        }
+          }
+        else
+          @log.error "Failed reading metadata from #{path}"
+        end
       end
+      file_metadata
     end
   end
 end

data/lib/puppet_forge_server/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module PuppetForgeServer
-    VERSION = '1.7.1'
+    VERSION = '1.7.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-forge-server
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.3
 platform: ruby
 authors:
 - Ilja Bobkevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra