puppet-forge-server 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50dd26198a713585d3ff7bc041d02c6d51f3db2c
-  data.tar.gz: 6d2c8cdda16ba2f5fcd003b93d455737b49d89c4
+  metadata.gz: 7534f17808255a66c9f45677758540784f88dd49
+  data.tar.gz: 45e2900ea2f35918116c89b813dfa7465a713f41
 SHA512:
-  metadata.gz: 6f1231fe9ecb57b1f9a478a4d9b3ed951a6b8c6887728600278a338841ce56fca69dae6a1736251811c7fa5dc4dcc966ca5d45aeb956639c95a533817351140a
-  data.tar.gz: 99947b8750cfc37c4e58da45fc68e51d44de742b67e36da7aa4e111d58984871fc7560092ad1822f7e0923eeda5074bcbaca154837b09bf33c180007b09a68c4
+  metadata.gz: 4edc8df5081d8244aac83af9a3064a8787ce1d57b023a8b5f90125e440407e3650f2010fa560caabcb46dacce974abb56dde156ae348b792d959cb1b6a7dce1e
+  data.tar.gz: 995943485154d7772395495fcb91b162629491e4ba0e7f98a429847f9fe2ae5eaeef8d68170e6318dc23074eaee805f0d1c94be6faca8457a4f5032671e49087

data/README.md

@@ -15,7 +15,7 @@ Install the gem
 gem install puppet-forge-server
 puppet-forge-server --help
 ```
-or get the latest source 
+or get the latest source
 ```
 git clone https://github.com/unibet/puppet-forge-server
 cd puppet-forge-server

data/lib/puppet_forge_server/app/version3.rb

@@ -36,7 +36,9 @@ module PuppetForgeServer::App
       end.flatten.uniq
 
       halt 404, {'pagination' => {'next' => false}, 'results' => []}.to_json if metadata.empty?
-      {'pagination' => {'next' => false}, 'results' => get_releases(metadata)}.to_json
+
+      releases = get_releases(metadata)
+      {'pagination' => {'next' => false, 'total' => releases.count}, 'results' => releases}.to_json
     end
 
     get '/v3/files/*' do

data/lib/puppet_forge_server/backends/proxy_v1.rb

@@ -31,12 +31,20 @@ module PuppetForgeServer::Backends
     def get_metadata(author, name, options = {})
       options = ({:with_checksum => true}).merge(options)
       query ="#{author}/#{name}"
-      get_module_metadata(JSON.parse(get("/modules.json?q=#{query}")).select { |e| e['full_name'].match("#{query}") }, options)
+      begin
+        get_module_metadata(JSON.parse(get("/modules.json?q=#{query}")).select { |e| e['full_name'].match("#{query}") }, options)
+      rescue OpenURI::HTTPError
+        #ignore
+      end
     end
 
     def query_metadata(query, options = {})
       options = ({:with_checksum => true}).merge(options)
-      get_module_metadata(JSON.parse(get("/modules.json?q=#{query}")).select { |e| e['full_name'].match("*#{query}*") }, options)
+      begin
+        get_module_metadata(JSON.parse(get("/modules.json?q=#{query}")).select { |e| e['full_name'].match("*#{query}*") }, options)
+      rescue OpenURI::HTTPError
+        #ignore
+      end
     end
 
     private

data/lib/puppet_forge_server/backends/proxy_v3.rb

@@ -29,13 +29,21 @@ module PuppetForgeServer::Backends
     def get_metadata(author, name, options = {})
       options = ({:with_checksum => true}).merge(options)
       query ="#{author}-#{name}"
-      releases = options[:version] ? [JSON.parse(get("/v3/releases/#{query}-#{options[:version]}"))] : get_all_release_pages("/v3/releases?module=#{query}")
-      get_release_metadata(releases)
+      begin
+        releases = options[:version] ? [JSON.parse(get("/v3/releases/#{query}-#{options[:version]}"))] : get_all_release_pages("/v3/releases?module=#{query}")
+        get_release_metadata(releases)
+      rescue OpenURI::HTTPError
+        #ignore
+      end
     end
 
     def query_metadata(query, options = {})
       author, name = query.split('-')
-      get_metadata(author, name, options) if author && name
+      begin
+        get_metadata(author, name, options) if author && name
+      rescue OpenURI::HTTPError
+        #ignore
+      end
     end
 
     private
@@ -55,7 +63,7 @@ module PuppetForgeServer::Backends
             :metadata => PuppetForgeServer::Models::Metadata.new(element['metadata']),
             :checksum => element['file_md5'],
             :path => element['file_uri'],
-            :tags => element['tags']
+            :tags => (element['tags'] + (element['metadata']['tags'] ? element['metadata']['tags'] : [])).flatten.uniq
         }
       end.compact
     end

data/lib/puppet_forge_server/models/builder.rb

@@ -23,7 +23,7 @@ module PuppetForgeServer::Models
     end
 
     def method_missing (method_name, *args, &block)
-      STDERR.puts "Method #{method_name} with args #{args} not found in #{self.class.to_s}" unless method_name == :to_ary
+      STDERR.puts "ERROR: Method #{method_name} with args #{args} not found in #{self.class.to_s}" unless method_name == :to_ary
     end
 
     def to_hash

data/lib/puppet_forge_server/models/metadata.rb

@@ -20,6 +20,7 @@ module PuppetForgeServer::Models
 
     attr_accessor :author, :name, :version, :dependencies, :summary, :description, :project_page, :types
     attr_accessor :checksums, :source, :license, :issues_url, :operatingsystem_support, :requirements
+    attr_accessor :puppet_version, :tags
 
     def initialize(attributes)
       super(attributes)

data/lib/puppet_forge_server/patches.rb

@@ -42,7 +42,7 @@ class Array
 
   def version_sort_by
     sort_by do |element|
-      version = yield(element)
+      version = yield(element).gsub('-', '.pre.')
       Gem::Version.new(version)
     end
   end

data/lib/puppet_forge_server/utils/option_parser.rb

@@ -33,15 +33,15 @@ module PuppetForgeServer::Utils
         opts.banner = "Usage: #{File.basename $0} [options]"
         opts.version = PuppetForgeServer::VERSION
 
-        opts.on('-p', '--port PORT', 'Port to listen on (defaults to whatever Rack wants to use)') do |port|
+        opts.on('-p', "--port PORT', 'Port to listen on (default: #{@@DEFAULT_PORT})") do |port|
           options[:port] = port
         end
 
-        opts.on('-b', '--bind-host HOSTNAME', 'Host name to bind to (defaults to whatever Rack wants to use)') do |hostname|
+        opts.on('-b', '--bind-host HOSTNAME', 'Host name to bind to (default: whatever Rack wants to use)') do |hostname|
           options[:hostname] = hostname
         end
 
-        opts.on('--daemonize', 'Run the server in the background') do
+        opts.on('-D', '--daemonize', "Run the server in the background (default: #{@@DEFAULT_DAEMONIZE})") do
           options[:daemonize] = true
           options[:pidfile] = @@DEFAULT_PID_FILE unless options[:pidfile]
         end
@@ -57,11 +57,8 @@ module PuppetForgeServer::Utils
         opts.on('-x', '--proxy URL', 'Remote forge to proxy (can be specified multiple times)') do |url|
           options[:backend]['Proxy'] << normalize_url(url)
         end
-        opts.on('--source-dir DIR', "Directory containing a module's source (can be specified multiple times)") do |module_dir|
-          options[:backend]['Source'] << module_dir
-        end
 
-        opts.on('--cache-basedir DIR', "Cache all proxies' downloaded modules under this directory") do |cache_basedir|
+        opts.on('--cache-basedir DIR', "Cache all proxies' downloaded modules under this directory (default: #{@@DEFAULT_CACHE_DIR})") do |cache_basedir|
           options[:cache_basedir] = cache_basedir
         end
       end

data/lib/puppet_forge_server/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-forge-server
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ilja Bobkevic