puppet-forge-server 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a52acbf7c0c982ac11d22101fad03ebfc4b013e2
-  data.tar.gz: 3893b0a073c6122880c9488dcbf1f24a056c43bd
+  metadata.gz: c2f76a6ce28b85b7c576026282e4a7d17d98786c
+  data.tar.gz: 56f8489041c6e6e1dc255da8b1f258ae1fd6bc2e
 SHA512:
-  metadata.gz: 4603163ac0d1c51a41beaa6f6b3c118b2c90c80590af9afb10a57f831d8a27aabb548673a2c479aaba34c3a312539f46e4c534f9b14acce4ab0ed89f50db6a1c
-  data.tar.gz: 59725a047ab27ff5dfea353fb0d3801d336cb47034f66a9d165ef623e686513520982080afa25d32c2aea2ab22c758d8a3c0645a9be572d9f30271adc8269cb8
+  metadata.gz: 5998e7d012207cc1acbfe5ae4b5e6cf9167c8839a591c29535016d7be70b1eacdfbd8d05c38c7e08861a9ecaa94f02eedf473fdf1c464c37620062490f7033ee
+  data.tar.gz: ba83a1f3d43b6a5b87910a4948decab146f9533a3bac2f5eebd91e4417cf0abec591772beca9ed4c5ccd5663fdbcc2d99640e529ad94000a9ed36bf1f7f4ba1a

data/lib/puppet_forge_server.rb

@@ -51,6 +51,7 @@ module PuppetForgeServer
   module Models
     autoload :Builder, 'puppet_forge_server/models/builder'
     autoload :Metadata, 'puppet_forge_server/models/metadata'
+    autoload :Dependency, 'puppet_forge_server/models/dependency'
   end
 
   module Utils

data/lib/puppet_forge_server/api/v1/releases.rb

@@ -21,9 +21,7 @@ module PuppetForgeServer::Api::V1
         {
             :file => "/api/v1/files#{element[:path]}",
             :version => element[:metadata].version,
-            :dependencies => element[:metadata].dependencies.map do |dependency|
-              [dependency['name'], dependency['version_requirement']]
-            end
+            :dependencies => element[:metadata].dependencies.map {|dep| [dep.name, dep.version_requirement]}
         }
       end.version_sort_by { |r| r[:version] }
     end

data/lib/puppet_forge_server/app/version3.rb

@@ -44,8 +44,7 @@ module PuppetForgeServer::App
       halt 400, json({:errors => ["'#{params[:module]}' is not a valid release slug"]}) unless author && name && version
       releases = releases(author, name, version)
       halt 404, json({:errors => ['404 Not found']}) unless releases
-      PuppetForgeServer::Logger.get(:server).error "Requested releases count is more than 1:\n#{releases}" if releases.count > 1
-      json releases.first
+      json releases.last
     end
 
     get '/v3/releases' do
@@ -73,8 +72,12 @@ module PuppetForgeServer::App
         backend.get_metadata(author, name)
       end.flatten.compact.uniq
       halt 404, json({:errors => ['404 Not found']}) if metadata.empty?
-      PuppetForgeServer::Logger.get(:server).error "Requested module count is more than 1:\n#{metadata}" if metadata.count > 1
-      json get_modules(metadata).first
+      modules = get_modules(metadata)
+      if modules.count > 1
+        PuppetForgeServer::Logger.get(:server).warn "There were more than oen module found for '#{author}-#{name}'"
+        PuppetForgeServer::Logger.get(:server).debug(modules.to_s)
+      end
+      json modules.first
     end
 
     get '/v3/modules' do

data/lib/puppet_forge_server/backends/directory.rb

@@ -61,11 +61,18 @@ module PuppetForgeServer::Backends
       return nil
     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']})
+      end.flatten
+      metadata
+    end
+
     def get_file_metadata(file_name, options)
       options = ({:with_checksum => true}).merge(options)
       Dir["#{@module_dir}/**/#{file_name}"].map do |path|
         {
-            :metadata => PuppetForgeServer::Models::Metadata.new(read_metadata(path)),
+            :metadata => parse_dependencies(PuppetForgeServer::Models::Metadata.new(read_metadata(path))),
             :checksum => options[:with_checksum] == true ? Digest::MD5.hexdigest(File.read(path)) : nil,
             :path => "/#{Pathname.new(path).relative_path_from(Pathname.new(@module_dir))}"
         }

data/lib/puppet_forge_server/backends/proxy.rb

@@ -24,6 +24,7 @@ module PuppetForgeServer::Backends
       @url = url
       @cache_dir = File.join(cache_dir, Digest::SHA1.hexdigest(@url))
       @http_client = http_client
+      @log = PuppetForgeServer::Logger.get
 
       # Create directory structure for all alphabetic letters
       (10...36).each do |i|
@@ -43,16 +44,20 @@ module PuppetForgeServer::Backends
         path = File.join(@cache_dir, file_name[0], file_name)
       end
       File.open(path, 'rb')
-    rescue OpenURI::HTTPError
-      # ignore
+    rescue => e
+      @log.error("#{self.class.name} failed downloading file '#{relative_path}'")
+      @log.error("Error: #{e}")
+      return nil
     end
 
     def upload(file_data)
-      PuppetForgeServer::Logger.get(:server).debug 'File upload is not supported by the proxy backends'
+      @log.debug 'File upload is not supported by the proxy backends'
       false
     end
 
     protected
+    attr_reader :log
+
     def get(relative_url)
       @http_client.get(url(relative_url))
     end

data/lib/puppet_forge_server/backends/proxy_v1.rb

@@ -33,8 +33,10 @@ module PuppetForgeServer::Backends
       query ="#{author}/#{name}"
       begin
         get_module_metadata(JSON.parse(get("/modules.json?q=#{query}")).select { |e| e['full_name'].match("#{query}") }, options)
-      rescue OpenURI::HTTPError
-        #ignore
+      rescue => e
+        @log.debug("#{self.class.name} failed querying metadata for '#{query}' with options #{options}")
+        @log.debug("Error: #{e}")
+        return nil
       end
     end
 
@@ -42,8 +44,10 @@ module PuppetForgeServer::Backends
       options = ({:with_checksum => true}).merge(options)
       begin
         get_module_metadata(JSON.parse(get("/modules.json?q=#{query}")).select { |e| e['full_name'].match("*#{query}*") }, options)
-      rescue OpenURI::HTTPError
-        #ignore
+      rescue => e
+        @log.debug("#{self.class.name} failed querying metadata for '#{query}' with options #{options}")
+        @log.debug("Error: #{e}")
+        return nil
       end
     end
 
@@ -58,6 +62,13 @@ module PuppetForgeServer::Backends
       element
     end
 
+    def parse_dependencies(metadata)
+      metadata.dependencies = metadata.dependencies.dup.map do |dependency|
+        PuppetForgeServer::Models::Dependency.new({:name => dependency[0], :version_requirement => dependency.length > 1 ? dependency[1] : nil})
+      end.flatten
+      metadata
+    end
+
     def get_module_metadata(modules, options)
       modules.map do |element|
         version = options['version'] ? "&version=#{options['version']}" : ''
@@ -65,7 +76,7 @@ module PuppetForgeServer::Backends
           tags = element['tag_list'] ? element['tag_list'] : nil
           raw_metadata = read_metadata(element, release)
           {
-              :metadata => PuppetForgeServer::Models::Metadata.new(raw_metadata),
+              :metadata => parse_dependencies(PuppetForgeServer::Models::Metadata.new(raw_metadata)),
               :checksum => options[:with_checksum] ? Digest::MD5.hexdigest(File.read(get_file_buffer(release['file']))) : nil,
               :path => "#{release['file']}",
               :tags => tags

data/lib/puppet_forge_server/backends/proxy_v3.rb

@@ -31,8 +31,10 @@ module PuppetForgeServer::Backends
       begin
         releases = options[:version] ? [JSON.parse(get("/v3/releases/#{query}-#{options[:version]}"))] : get_all_result_pages("/v3/releases?module=#{query}")
         get_release_metadata(releases)
-      rescue OpenURI::HTTPError
-        #ignore
+      rescue => e
+        @log.debug("#{self.class.name} failed querying metadata for '#{query}' with options #{options}")
+        @log.debug("Error: #{e}")
+        nil
       end
     end
 
@@ -40,8 +42,10 @@ module PuppetForgeServer::Backends
       begin
         releases = get_all_result_pages("/v3/modules?query=#{query}").map {|element| element['current_release']}
         get_release_metadata(releases)
-      rescue OpenURI::HTTPError
-        #ignore
+      rescue => e
+        @log.debug("#{self.class.name} failed querying metadata for '#{query}' with options #{options}")
+        @log.debug("Error: #{e}")
+        nil
       end
     end
 
@@ -61,10 +65,17 @@ module PuppetForgeServer::Backends
       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']})
+      end.flatten
+      metadata
+    end
+
     def get_release_metadata(releases)
       releases.map do |element|
         {
-            :metadata => PuppetForgeServer::Models::Metadata.new(normalize_metadata(element['metadata'])),
+            :metadata => parse_dependencies(PuppetForgeServer::Models::Metadata.new(normalize_metadata(element['metadata']))),
             :checksum => element['file_md5'],
             :path => element['file_uri'],
             :tags => (element['tags'] + (element['metadata']['tags'] ? element['metadata']['tags'] : [])).flatten.uniq

data/lib/puppet_forge_server/logger.rb

@@ -19,6 +19,7 @@ require 'logger'
 
 module PuppetForgeServer
   class Logger
+    @@DEFAULT_LOG_LEVEL = ::Logger::INFO
     @@DEFAULT_DESTINATION = STDERR
     @@DEFAULT_DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S'
     @static_loggers = {:server => nil, :access => nil}
@@ -30,6 +31,7 @@ module PuppetForgeServer
           datetime = datetime.strftime @@DEFAULT_DATETIME_FORMAT
           "[#{datetime}] #{severity}  #{msg}\n"
         end
+        logger.level = @@DEFAULT_LOG_LEVEL
         logger
       end
     end

data/lib/puppet_forge_server/models/builder.rb

@@ -26,10 +26,17 @@ module PuppetForgeServer::Models
       PuppetForge::Logger.get.error "Method #{method_name} with args #{args} not found in #{self.class.to_s}" unless method_name == :to_ary
     end
 
-    def to_hash
+    def to_hash(obj = self)
       hash = {}
-      self.instance_variables.each do |var|
-        hash[var.to_s.delete('@')] = self.instance_variable_get var
+      obj.instance_variables.each do |var|
+        var_value = obj.instance_variable_get(var)
+        hash[var.to_s.delete('@')] = if var_value.kind_of?(Array)
+          var_value.map {|v| to_hash(v)}
+        elsif var_value.respond_to?(:to_hash)
+         var_value.to_hash
+        else
+          var_value
+        end
       end
       hash
     end

data/lib/puppet_forge_server/models/dependency.rb

@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+#
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+module PuppetForgeServer::Models
+  class Dependency < Builder
+
+    attr_accessor :name
+    attr_accessor :version_requirement
+
+    def initialize(attributes)
+      super(attributes)
+    end
+
+    def ==(other)
+      other && self.class.equal?(other.class) &&
+          @name == other.name &&
+          @version_requirement == other.version_requirement
+    end
+
+    def hash
+      @name.hash ^ @version_requirement.hash
+    end
+
+    def eql?(other)
+      other && self.class.equal?(other.class) &&
+          @name.eql?(other.name) &&
+          @version_requirement.eql?(other.version_requirement)
+    end
+  end
+end

data/lib/puppet_forge_server/server.rb

@@ -40,11 +40,17 @@ module PuppetForgeServer
       if options[:log_dir]
         FileUtils.mkdir_p options[:log_dir]
         server_loggers = [File.join(options[:log_dir], 'server.log')]
-        server_loggers << STDERR if options[:debug]
         access_loggers = [File.join(options[:log_dir], 'access.log')]
-        access_loggers << STDERR if options[:debug]
+        if options[:debug]
+          server_loggers << STDERR
+          access_loggers << STDERR
+        end
         PuppetForgeServer::Logger.set({:server => server_loggers, :access => access_loggers})
       end
+      if options[:debug]
+        PuppetForgeServer::Logger.get(:server).level = ::Logger::DEBUG
+        PuppetForgeServer::Logger.get(:access).level = ::Logger::DEBUG
+      end
       PuppetForgeServer::Logger.get
     end
 

data/lib/puppet_forge_server/version.rb

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

data/spec/unit/logger_spec.rb

@@ -48,6 +48,7 @@ module PuppetForgeServer
 
     describe '#debug' do
       it 'should log message on level debug' do
+        logger.level = ::Logger::DEBUG
         expect(logger).to respond_to(:debug)
         logger.debug msg
         expect(test_io.string).to include("DEBUG  #{msg}")

data/spec/unit/models/dependency_spec.rb

@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+#
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+
+module PuppetForgeServer::Models
+  describe Dependency do
+    let(:name) { 'dummy_name' }
+    let(:version_requirement) { '0.0.0' }
+    let(:dependency) { PuppetForgeServer::Models::Dependency.new({:name => name, :version_requirement => version_requirement}) }
+    describe '#initialize' do
+      it 'should create a dependency instance' do
+        expect(dependency.name).to eq name
+        expect(dependency.version_requirement).to eq version_requirement
+      end
+    end
+
+    describe '#hash' do
+      it 'should calculate hash from name and version_requirement' do
+        expect(dependency.hash).to eq(name.hash ^ version_requirement.hash)
+      end
+    end
+
+    describe '#eql?' do
+      it 'should be equal based only on name and version_requirement' do
+        dependency2 = dependency.clone
+        expect(dependency).to eq dependency2
+        dependency2.name = 'something_else'
+        expect(dependency).not_to eq dependency2
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-forge-server
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Ilja Bobkevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -188,6 +188,7 @@ files:
 - lib/puppet_forge_server/http/http_client.rb
 - lib/puppet_forge_server/logger.rb
 - lib/puppet_forge_server/models/builder.rb
+- lib/puppet_forge_server/models/dependency.rb
 - lib/puppet_forge_server/models/metadata.rb
 - lib/puppet_forge_server/patches.rb
 - lib/puppet_forge_server/server.rb
@@ -202,6 +203,7 @@ files:
 - spec/unit/app/version2_spec.rb
 - spec/unit/backends/directory_spec.rb
 - spec/unit/logger_spec.rb
+- spec/unit/models/dependency_spec.rb
 - spec/unit/models/metadata_spec.rb
 - spec/unit/server_spec.rb
 homepage: https://github.com/unibet/puppet-forge-server
@@ -233,5 +235,6 @@ test_files:
 - spec/unit/app/version2_spec.rb
 - spec/unit/backends/directory_spec.rb
 - spec/unit/logger_spec.rb
+- spec/unit/models/dependency_spec.rb
 - spec/unit/models/metadata_spec.rb
 - spec/unit/server_spec.rb