puppet-forge-server 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 973bfb424267e3db596e1568f4781d7ef102e46a
-  data.tar.gz: aaaba8e6de5e1a55e7842e92b28caab624df37c1
+  metadata.gz: d43c453a3985b2f4f66fd7198884c4399ab3a2d7
+  data.tar.gz: 8799890fdd90141a7c0451376ebe7e41fe41511b
 SHA512:
-  metadata.gz: e01143d845d1c664ff7490ac231cae20e0616de8dcad0ccd745695c04279384763433b3b998bba6546dc57e634d0dcf6f9bb98d045704f55d1f6ec982bac7a09
-  data.tar.gz: be411f8e681736089b3026ba66f1a7c132b75f338f8dd02fca8fa5c8c831af3a404461ef66c99ff12826c72134165fa091ce29c4c2e95e2fc06c7f8b75ce4e5c
+  metadata.gz: 601977f75107f924d31a14f74b820236a6ef3e29c05a4b00f8b6125838515d223dac4566ada0f43b5ab42247fe0f1929134f18e68b96cc85b3d23917482533c9
+  data.tar.gz: 0260ec708cad578c3c5a4b80d9d345e3d24e91fe51b26dd04762cd7da39279f7b71b29e6579ac5ec58fba64d44fe5d3f269ffc1badbe82a28b46712fe901e001

data/README.md

@@ -90,6 +90,23 @@ Run librarian-puppet with *--no-use-v1-api* option to instruct it to use v3 API
 ```
 librarian-puppet install --no-use-v1-api
 ```
+
+### Daemon
+
+Normally one would want to run server as a deamon:
+
+```
+# Assuming puppet-forge-server gem was installed
+# Create deamon user
+sudo adduser forge -d /opt/forge -s /bin/false
+# Create log, cache and modules directories
+sudo -u forge mkdir -p /opt/forge/log /opt/forge/modules /opt/forge/cache
+# Start the server
+sudo -u forge puppet-forge-server -D -m /opt/forge/modules -x https://forgeapi.puppetlabs.com --log-dir /opt/forge/log --cache-basedir /opt/forge/cache --pidfile /opt/forge/server.pid
+```
+
+You are done. Now go install some puppet modules.
+
 ## Architecture
 
 Code is structured with MVC in mind to allow easier  maintenance and readability

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

@@ -41,7 +41,7 @@ module PuppetForgeServer::Api::V3
         end
       end
 
-      STDERR.puts 'WARNING: Requested module count is more than 1' unless modules.values.count == 1
+      PuppetForge::Logger.get.error 'WARNING: Requested module count is more than 1' unless modules.values.count == 1
       modules.values.first
     end
 

data/lib/puppet_forge_server/app/version1.rb

@@ -24,6 +24,7 @@ module PuppetForgeServer::App
     include PuppetForgeServer::Utils::Buffer
 
     configure do
+      enable :logging
       use ::Rack::CommonLogger, PuppetForgeServer::Logger.get(:access)
     end
 
@@ -46,7 +47,7 @@ module PuppetForgeServer::App
 
       metadata = @backends.map do |backend|
         backend.get_metadata(author, name, {:version => version, :with_checksum => false})
-      end.flatten.uniq
+      end.flatten.compact.uniq
 
       halt 400, {'errors' => ["'#{params[:module]}' is not a valid module slug"]}.to_json if metadata.empty?
 
@@ -68,7 +69,7 @@ module PuppetForgeServer::App
       query = params[:q]
       metadata = @backends.map do |backend|
         backend.query_metadata(query, {:with_checksum => false})
-      end.flatten.uniq
+      end.flatten.compact.uniq
       get_modules(metadata).to_json
     end
   end

data/lib/puppet_forge_server/app/version3.rb

@@ -23,6 +23,7 @@ module PuppetForgeServer::App
     include PuppetForgeServer::Utils::Buffer
 
     configure do
+      enable :logging
       use ::Rack::CommonLogger, PuppetForgeServer::Logger.get(:access)
     end
 
@@ -41,7 +42,7 @@ module PuppetForgeServer::App
       author, name, version = params[:module].split '-'
       metadata = @backends.map do |backend|
         backend.get_metadata(author, name, {:version => version})
-      end.flatten.uniq
+      end.flatten.compact.uniq
 
       halt 404, {'pagination' => {'next' => false}, 'results' => []}.to_json if metadata.empty?
 
@@ -68,7 +69,7 @@ module PuppetForgeServer::App
 
       metadata = @backends.map do |backend|
         backend.get_metadata(author, name)
-      end.flatten.uniq
+      end.flatten.compact.uniq
 
       halt 404, {'errors' => ['404 Not found']}.to_json if metadata.empty?
 

data/lib/puppet_forge_server/backends/directory.rb

@@ -55,13 +55,12 @@ module PuppetForgeServer::Backends
     def get_file_metadata(file_name, options)
       options = ({:with_checksum => true}).merge(options)
       Dir["#{@module_dir}/**/#{file_name}"].map do |path|
-        checksum = Digest::MD5.hexdigest(File.read(path)) if options[:with_checksum] == true
         {
             :metadata => PuppetForgeServer::Models::Metadata.new(read_metadata(path)),
-            :checksum => checksum,
+            :checksum => options[:with_checksum] == true ? Digest::MD5.hexdigest(File.read(path)) : nil,
             :path => "/#{Pathname.new(path).relative_path_from(Pathname.new(@module_dir))}"
         }
-      end.compact
+      end
     end
   end
 end

data/lib/puppet_forge_server/backends/proxy_v1.rb

@@ -71,7 +71,7 @@ module PuppetForgeServer::Backends
               :tags => tags
           }
         end
-      end.compact
+      end
     end
   end
 end

data/lib/puppet_forge_server/backends/proxy_v3.rb

@@ -65,7 +65,7 @@ module PuppetForgeServer::Backends
             :path => element['file_uri'],
             :tags => (element['tags'] + (element['metadata']['tags'] ? element['metadata']['tags'] : [])).flatten.uniq
         }
-      end.compact
+      end
     end
   end
 end

data/lib/puppet_forge_server/logger.rb

@@ -35,10 +35,19 @@ module PuppetForgeServer
     end
 
     def method_missing (method_name, *args, &block)
-      method_name = method_name == :write ? :'<<' : method_name
+      method_name = case method_name
+                      when :write, :puts
+                        '<<'
+                      else
+                        method_name
+                    end
       @loggers.each { |logger| logger.send(method_name, args.first) }
     end
 
+    def respond_to?(method_name, include_private = false)
+      @loggers.each { |logger| false unless logger.respond_to? method_name }
+    end
+
     class << self
       def get(type = :server)
         set unless @static_loggers[type]

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 "ERROR: Method #{method_name} with args #{args} not found in #{self.class.to_s}" unless method_name == :to_ary
+      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

data/lib/puppet_forge_server/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-forge-server
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ilja Bobkevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra