puppet-forge-server 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a171b2b28c33323c957641164b1a785700ea6372
-  data.tar.gz: 35cfa215febc8ccf95dbbfa0165ddfdc40a051cc
+  metadata.gz: 1f47167acd969b4e7d7725a351d02c9a4d6e5608
+  data.tar.gz: fe6cb62aec95aa35517235e90f965ac267b72790
 SHA512:
-  metadata.gz: f94bc68aa70ab4cc0c294768bb8d94e4b1f7a9047b29499049b937f5c0d57e0be7b5972527a7afbb1edd69d81b59207640274a7264faab123dfc96dd270786e7
-  data.tar.gz: 2e329e028ae4385997e450ef9349e18a8431c9d673c8ecf59564de45e56599fe056ad158c73a6573f897fbb1e57d1a229a28b902fb59cd9e270a343ab5826b2f
+  metadata.gz: bb7deb4e4e51e3a1c0942de9e5455740b70587bccee7720d011ad61a75f5d87072357434bcca429a747fbab6f4b243aa9abe74f33b394d3fd38198f3d20ed3e3
+  data.tar.gz: 2ca911fd043d05967a887815d8121b76c0d2960f82d7922ef562fa3b1c476a94d36bdb8a4cfe3c01946e8888dbefe036ceff2bfa49e3359f125c7128dbd00049

data/README.md

@@ -1,6 +1,6 @@
 # Puppet Forge Server
 
-Private Puppet Forge Server supporting local files and both v1 and v3 API proxies. Heavily inspired by the [Puppet Library](https://github.com/drrb/puppet-library).
+Private Puppet Forge Server supporting local files and both v1 and v3 API proxies.
 
 [![Build Status](https://api.travis-ci.org/unibet/puppet-forge-server.svg)](https://travis-ci.org/unibet/puppet-forge-server)
 [![Gem Version](https://badge.fury.io/rb/puppet-forge-server.svg)](http://badge.fury.io/rb/puppet-forge-server)
@@ -216,5 +216,4 @@ Puppet module *metadata* json representation is used as a main business *model*.
 
 ## Reference
 
-* [Puppet Library](https://github.com/drrb/puppet-library)
 * [Puppet Anvil](https://github.com/jhaals/puppet-anvil)

data/lib/puppet_forge_server.rb

@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'puppet_forge_server/patches'
 require 'puppet_forge_server/version'
+require 'puppet_forge_server/patches/gem.rb'
 
 module PuppetForgeServer
   autoload :Server, 'puppet_forge_server/server'
@@ -57,7 +57,6 @@ module PuppetForgeServer
   module Utils
     autoload :Archiver, 'puppet_forge_server/utils/archiver'
     autoload :OptionParser, 'puppet_forge_server/utils/option_parser'
-    autoload :Url, 'puppet_forge_server/utils/url'
     autoload :Buffer, 'puppet_forge_server/utils/buffer'
     autoload :Http, 'puppet_forge_server/utils/http'
   end
@@ -65,4 +64,4 @@ module PuppetForgeServer
   module Http
     autoload :HttpClient, 'puppet_forge_server/http/http_client'
   end
-end
+end

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

@@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 #
-# Copyright 2014 drrb
-# 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.
@@ -19,49 +18,37 @@ module PuppetForgeServer::Api::V1
   module Modules
 
     def get_modules(metadata)
-      modules = metadata.map do |element|
-        name = element[:metadata].name.sub(/^[^-]+-/, '')
-        full_name = element[:metadata].name.sub('-', '/')
-        {
+      modules = {}
+      metadata.each do |element|
+        if modules[element[:metadata].name]
+          if max_version(modules[element[:metadata].name][:version], element[:metadata].version) == element[:metadata].version
+            modules[element[:metadata].name][:desc] = element[:metadata].description
+            modules[element[:metadata].name][:version] = element[:metadata].version
+            modules[element[:metadata].name][:project_url] = element[:metadata].project_page
+          end
+          modules[element[:metadata].name][:releases] = (modules[element[:metadata].name][:releases] + releases_version(element[:metadata])).uniq.sort_by { |r| Gem::Version.new(r[:version]) }.reverse
+          modules[element[:metadata].name][:tag_list] = (modules[element[:metadata].name][:tag_list] + element[:tags]).uniq.compact
+        else
+          name = element[:metadata].name.sub(/^[^-]+-/, '')
+          modules[element[:metadata].name] = {
             :author => element[:metadata].author,
-            :full_name => full_name,
+            :full_name => element[:metadata].name.sub('-', '/'),
             :name => name,
             :desc => element[:metadata].description,
             :version => element[:metadata].version,
             :project_url => element[:metadata].project_page,
-            :releases => [{:version => element[:metadata].version}],
-            :tag_list => [element[:metadata].author, name]
-        }
+            :releases => releases_version(element[:metadata]),
+            :tag_list =>  element[:tags] ? element[:tags] : [element[:metadata].author, name],
+          }
+        end
       end
 
-      merge_modules(modules)
+      modules.values
     end
 
     private
-    def merge_modules(modules)
-      grouped_modules = modules.group_by do |result|
-        result[:full_name]
-      end
-
-      grouped_modules.values.map do |value|
-        merge_values(value)
-      end.flatten.uniq
-    end
-
-    def merge_values(value)
-      highest_version, tags, releases = value.inject([nil, [], []]) do |(highest_version, tags, releases), result|
-        [
-            max_version(highest_version, result[:version]),
-            tags + (result[:tag_list] || []),
-            releases + (result[:releases] || [])
-        ]
-      end
-
-      value.first.tap do |result|
-        result[:version] = highest_version
-        result[:tag_list] = tags.uniq
-        result[:releases] = releases.uniq.version_sort_by { |r| r[:version] }.reverse
-      end
+    def releases_version(metadata)
+      [{:version => metadata.version}]
     end
 
     def max_version(left, right)

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

@@ -21,9 +21,9 @@ module PuppetForgeServer::Api::V1
         {
             :file => "/api/v1/files#{element[:path]}",
             :version => element[:metadata].version,
-            :dependencies => element[:metadata].dependencies.map {|dep| [dep.name, dep.version_requirement]}
+            :dependencies => element[:metadata].dependencies.map {|dep| [dep.name, dep.version_requirement]}.compact
         }
-      end.version_sort_by { |r| r[:version] }
+      end.uniq{|r| r[:version]}.sort_by {|r| Gem::Version.new(r[:version])}
     end
   end
 end

data/lib/puppet_forge_server/api/v3/modules.rb

@@ -23,22 +23,21 @@ module PuppetForgeServer::Api::V3
       metadata.each do |element|
         if modules[element[:metadata].name]
           if max_version(modules[element[:metadata].name][:current_release][:version], element[:metadata].version) == element[:metadata].version
+            # Saving curret release tags for merging with new max version current release
             tags = modules[element[:metadata].name][:current_release][:tags]
             modules[element[:metadata].name][:current_release] = get_releases([element]).first
-            modules[element[:metadata].name][:current_release][:tags] = (modules[element[:metadata].name][:current_release][:tags] + tags).uniq
+            modules[element[:metadata].name][:current_release][:tags] = (modules[element[:metadata].name][:current_release][:tags] + tags).uniq.compact
           end
-          modules[element[:metadata].name][:releases] = (modules[element[:metadata].name][:releases] + releases_version(element[:metadata])).version_sort_by { |r| r[:version] }.reverse
+          modules[element[:metadata].name][:releases] = (modules[element[:metadata].name][:releases] + releases_version(element[:metadata])).uniq.sort_by { |r| Gem::Version.new(r[:version]) }.reverse
         else
-          name = element[:metadata].name.sub(/^[^-]+-/, '')
-          author = element[:metadata].name.split('-')[0]
           modules[element[:metadata].name] = {
               :uri => "/v3/modules/#{element[:metadata].name}",
-              :name => name,
+              :name => element[:metadata].name.sub(/^[^-]+-/, ''),
               :homepage_url => element[:metadata].project_page,
               :issues_url => element[:metadata].issues_url,
               :releases => releases_version(element[:metadata]),
               :current_release => get_releases([element]).first,
-              :owner => {:username => author, :uri => "/v3/users/#{author}"}
+              :owner => {:username => element[:metadata].author, :uri => "/v3/users/#{element[:metadata].author}"}
           }
         end
       end

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

@@ -33,7 +33,7 @@ module PuppetForgeServer::Api::V3
             :file_uri => "/v3/files#{element[:path]}",
             :file_md5 => element[:checksum]
         }
-      end.version_sort_by { |r| r[:version] }
+      end.uniq{|r| r[:version]}.sort_by { |r| Gem::Version.new(r[:version]) }
     end
   end
 end

data/lib/puppet_forge_server/backends/directory.rb

@@ -54,7 +54,7 @@ module PuppetForgeServer::Backends
 
     private
     def read_metadata(archive_path)
-      metadata_file = read_entry(archive_path, %r[[^/]+/metadata\.json$])
+      metadata_file = read_from_archive(archive_path, %r[[^/]+/metadata\.json$])
       JSON.parse(metadata_file)
     rescue => error
       warn "Error reading from module archive #{archive_path}: #{error}"

data/lib/puppet_forge_server/http/http_client.rb

@@ -16,6 +16,7 @@
 
 require 'open-uri'
 require 'open_uri_redirections'
+require 'timeout'
 
 module PuppetForgeServer::Http
   class HttpClient
@@ -29,7 +30,9 @@ module PuppetForgeServer::Http
 
     private
     def open_uri(url)
-      open(url, 'User-Agent' => "Puppet-Forge-Server/#{PuppetForgeServer::VERSION}", :allow_redirections => :safe)
+      ::Timeout.timeout(10) do
+        open(url, 'User-Agent' => "Puppet-Forge-Server/#{PuppetForgeServer::VERSION}", :allow_redirections => :safe)
+      end
     end
   end
 end

data/lib/puppet_forge_server/patches/gem.rb

@@ -0,0 +1,21 @@
+# -*- 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.
+
+class Gem::Version
+  def initialize version
+    @version = self.class.correct?(version) ? version.to_s.strip.gsub('-', '.pre.') : '0'
+  end
+end

data/lib/puppet_forge_server/server.rb

@@ -92,21 +92,20 @@ module PuppetForgeServer
 
     private
     def backends(options)
-      options[:backend].map do |type, typed_backends|
+      # Add directory backend for serving cached modules in case proxy flips over
+      backends = options[:backend]['Proxy'] && ! options[:backend]['Proxy'].empty? ? [PuppetForgeServer::Backends.const_get('Directory').new(options[:cache_basedir])] : []
+      backends << options[:backend].map do |type, typed_backends|
         typed_backends.map do |url|
           case type
             when 'Proxy'
               @log.info "Detecting API version for #{url}..."
-              [
-                PuppetForgeServer::Backends.const_get("#{type}V#{get_api_version(url)}").new(url.chomp('/'), options[:cache_basedir]),
-                # Add directory backend for serving cached modules in case proxy flips over
-                PuppetForgeServer::Backends.const_get('Directory').new(options[:cache_basedir])
-              ]
+              PuppetForgeServer::Backends.const_get("#{type}V#{get_api_version(url)}").new(url.chomp('/'), options[:cache_basedir])
             else
               PuppetForgeServer::Backends.const_get(type).new(url)
           end
         end
-      end.flatten.sort_by { |backend| backend.PRIORITY }
+      end
+      backends.flatten.sort_by { |backend| backend.PRIORITY }
     end
   end
 end

data/lib/puppet_forge_server/utils/archiver.rb

@@ -19,11 +19,13 @@ require 'zlib'
 
 module PuppetForgeServer::Utils
   module Archiver
-    def read_entry(path, entry_name_regex)
-      tar = Gem::Package::TarReader.new(Zlib::GzipReader.open(path))
+    def read_from_archive(archive, name_regex)
+      tar = Gem::Package::TarReader.new(Zlib::GzipReader.open(archive))
       tar.rewind
-      entry = tar.find { |e| e.full_name =~ entry_name_regex } or raise "Couldn't find entry in archive matching #{entry_name_regex.inspect}"
-      entry.read
+      tar.each do |obj|
+        return obj.read if obj.full_name =~ name_regex
+      end
+      raise "Given name #{name_regex} not found in #{archive}"
     end
   end
 end

data/lib/puppet_forge_server/utils/option_parser.rb

@@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 #
-# Copyright 2014 drrb
-# 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.
@@ -17,10 +16,10 @@
 
 require 'optparse'
 require 'tmpdir'
+require 'uri'
 
 module PuppetForgeServer::Utils
   module OptionParser
-    include PuppetForgeServer::Utils::Url
 
     @@DEFAULT_DAEMONIZE = false
     @@DEFAULT_PORT = 8080
@@ -28,42 +27,43 @@ module PuppetForgeServer::Utils
     @@DEFAULT_CACHE_DIR = File.join(Dir.tmpdir.to_s, 'puppet-forge-server', 'cache')
     @@DEFAULT_LOG_DIR = File.join(Dir.tmpdir.to_s, 'puppet-forge-server', 'log')
     @@DEFAULT_WEBUI_ROOT = File.expand_path('../app', File.dirname(__FILE__))
+    @@DEFAULT_HOST = '0.0.0.0'
 
     def parse_options(args)
-      options = {:daemonize => @@DEFAULT_DAEMONIZE, :cache_basedir => @@DEFAULT_CACHE_DIR, :port => @@DEFAULT_PORT, :webui_root => @@DEFAULT_WEBUI_ROOT}
+      options = {:daemonize => @@DEFAULT_DAEMONIZE, :cache_basedir => @@DEFAULT_CACHE_DIR, :port => @@DEFAULT_PORT, :webui_root => @@DEFAULT_WEBUI_ROOT, :host => @@DEFAULT_HOST}
       option_parser = ::OptionParser.new do |opts|
         opts.banner = "Usage: #{File.basename $0} [options]"
         opts.version = PuppetForgeServer::VERSION
 
-        opts.on('-p', "--port PORT', 'Port to listen on (default: #{@@DEFAULT_PORT})") do |port|
+        opts.on('-p', '--port PORT', "Port number to bind to (default: #{@@DEFAULT_PORT})") do |port|
           options[:port] = port
         end
 
-        opts.on('-b', '--bind-host HOSTNAME', 'Host name to bind to (default: whatever Rack wants to use)') do |hostname|
-          options[:hostname] = hostname
+        opts.on('-b', '--bind HOST', "Host name or IP address to bind to (default: #{@@DEFAULT_HOST})") do |host|
+          options[:host] = host
         end
 
-        opts.on('-D', '--daemonize', "Run the server in the background (default: #{@@DEFAULT_DAEMONIZE})") do
+        opts.on('-D', '--daemonize', "Run server in the background (default: #{@@DEFAULT_DAEMONIZE})") do
           options[:daemonize] = true
         end
 
-        opts.on('--pidfile FILE', 'Write a pidfile to this location after starting') do |pidfile|
+        opts.on('--pidfile FILE', "Pid file location (default: #{@@DEFAULT_PID_FILE})") do |pidfile|
           options[:pidfile] = pidfile
         end
 
         options[:backend] = {'Directory' => [], 'Proxy' => [], 'Source' => []}
-        opts.on('-m', '--module-dir DIR', 'Directory containing packaged modules (can be specified multiple times)') do |module_dir|
+        opts.on('-m', '--module-dir DIR', 'Directory containing packaged modules (recursively searched)') do |module_dir|
           options[:backend]['Directory'] << module_dir
         end
-        opts.on('-x', '--proxy URL', 'Remote forge to proxy (can be specified multiple times)') do |url|
-          options[:backend]['Proxy'] << normalize_url(url)
+        opts.on('-x', '--proxy URL', 'Remote forge URL') do |url|
+          options[:backend]['Proxy'] << url
         end
 
-        opts.on('--cache-basedir DIR', "Cache all proxies' downloaded modules under this directory (default: #{@@DEFAULT_CACHE_DIR})") do |cache_basedir|
+        opts.on('--cache-basedir DIR', "Proxy module cache base directory (default: #{@@DEFAULT_CACHE_DIR})") do |cache_basedir|
           options[:cache_basedir] = cache_basedir
         end
 
-        opts.on('--log-dir DIR', "Directory containing all server logs (if daemonized default: #{@@DEFAULT_LOG_DIR})") do |log_dir|
+        opts.on('--log-dir DIR', "Log directory (default: #{@@DEFAULT_LOG_DIR})") do |log_dir|
           options[:log_dir] = log_dir
         end
 
@@ -96,4 +96,4 @@ module PuppetForgeServer::Utils
       return options
     end
   end
-end
+end

data/lib/puppet_forge_server/version.rb

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

data/puppet-forge-server.gemspec

@@ -42,6 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'open4', '~> 1.3'
   spec.add_dependency 'open_uri_redirections', '~> 0.1'
   spec.add_dependency 'haml', '~> 4.0'
+  spec.add_dependency 'deep_merge', '~> 1.0'
 
   spec.add_development_dependency 'rake', '~> 10.3'
   spec.add_development_dependency 'rspec', '~> 3.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-forge-server
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ilja Bobkevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -204,13 +218,12 @@ files:
 - 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/patches/gem.rb
 - lib/puppet_forge_server/server.rb
 - lib/puppet_forge_server/utils/archiver.rb
 - lib/puppet_forge_server/utils/buffer.rb
 - lib/puppet_forge_server/utils/http.rb
 - lib/puppet_forge_server/utils/option_parser.rb
-- lib/puppet_forge_server/utils/url.rb
 - lib/puppet_forge_server/version.rb
 - puppet-forge-server.gemspec
 - spec/spec_helper.rb

data/lib/puppet_forge_server/patches.rb

@@ -1,72 +0,0 @@
-# -*- encoding: utf-8 -*-
-#
-# Copyright 2014 drrb
-# Copyright 2014 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 'rubygems/package'
-
-module Gem
-  def Version.new(version)
-    super(version.to_s.gsub('-', '.pre.'))
-  rescue ArgumentError
-    if version =~ /^\d+(\.\d+)*/
-      super(version[/^\d+(\.\d+)*/])
-    else
-      super('0')
-    end
-  end
-end
-
-class Hash
-  def deep_merge(other)
-    merge(other) do |key, old_val, new_val|
-      if old_val.instance_of? Array
-        old_val + new_val
-      else
-        new_val
-      end
-    end
-  end
-
-  def deep_merge!(other)
-    replace(deep_merge(other))
-  end
-end
-
-class Array
-  def deep_merge
-    inject({}) do |merged, map|
-      merged.deep_merge(map)
-    end
-  end
-
-  def version_sort_by
-    sort_by do |element|
-      Gem::Version.new(yield(element))
-    end
-  end
-end
-
-# Used by PuppetForgeServer::Utils::Archiver
-class Gem::Package::TarReader
-  # Old versions of RubyGems don't include Enumerable in here
-  def find
-    each do |entry|
-      if yield(entry)
-        return entry
-      end
-    end
-  end
-end

data/lib/puppet_forge_server/utils/url.rb

@@ -1,36 +0,0 @@
-# -*- encoding: utf-8 -*-
-#
-# Copyright 2014 drrb
-# Copyright 2014 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 'uri'
-
-module PuppetForgeServer::Utils
-  module Url
-    def normalize_url(uri_string)
-      begin
-        url = URI.parse(uri_string)
-      rescue URI::InvalidURIError => e
-        raise PuppetForgeServer::Errors::Expected, "Invalid URL '#{uri_string}': #{e.message}"
-      end
-      if url.scheme
-        raise PuppetForgeServer::Errors::Expected, "Invalid URL '#{uri_string}': unsupported protocol '#{url.scheme}'" unless url.scheme =~ /^https?$/
-      else
-        uri_string = "http://#{uri_string}"
-      end
-      uri_string.sub /\/$/, ''
-    end
-  end
-end