puppet-forge-server 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d43c453a3985b2f4f66fd7198884c4399ab3a2d7
-  data.tar.gz: 8799890fdd90141a7c0451376ebe7e41fe41511b
+  metadata.gz: 09cee1cf77d66c2acd95ccc0aade3298b17ae53b
+  data.tar.gz: d969e171c8534cfa3abea2a67117592dabd31395
 SHA512:
-  metadata.gz: 601977f75107f924d31a14f74b820236a6ef3e29c05a4b00f8b6125838515d223dac4566ada0f43b5ab42247fe0f1929134f18e68b96cc85b3d23917482533c9
-  data.tar.gz: 0260ec708cad578c3c5a4b80d9d345e3d24e91fe51b26dd04762cd7da39279f7b71b29e6579ac5ec58fba64d44fe5d3f269ffc1badbe82a28b46712fe901e001
+  metadata.gz: fdc51ac20f18d854801f3bd5da30a8b2edeb1e8aee7e98a0be82386c5713a179941d288d7662609046fcdfacb301577ee7973cb20b89a6a82bfc6dc61a01d6c1
+  data.tar.gz: 5c3de75a5a9f187a01bdce013fe6c649379eaf98cdd1f4094c55302dced5c55255ceaa738efff87e9f08e4af95d94399a1526b96263dfd1fceb52404a534edca

data/lib/puppet_forge_server.rb

@@ -34,7 +34,9 @@ module PuppetForgeServer
   end
 
   module App
+    autoload :Generic, 'puppet_forge_server/app/generic'
     autoload :Version1, 'puppet_forge_server/app/version1'
+    autoload :Version2, 'puppet_forge_server/app/version2'
     autoload :Version3, 'puppet_forge_server/app/version3'
   end
 

data/lib/puppet_forge_server/app/generic.rb

@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+#
+# 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 'sinatra/base'
+
+module PuppetForgeServer::App
+  class Generic < Sinatra::Base
+
+    configure do
+      enable :logging
+      use ::Rack::CommonLogger, PuppetForgeServer::Logger.get(:access)
+    end
+
+    before {
+      env['rack.errors'] =  PuppetForgeServer::Logger.get(:server)
+    }
+
+    def initialize
+      super(nil)
+    end
+
+    #
+    # Debug log the received call parameters and return the bogus access token
+    #
+    post '/oauth/token' do
+      PuppetForgeServer::Logger.get(:server).debug "Params: #{params}"
+      {'access_token' => 'BOGUS_ACCESS_TOKEN'}.to_json
+    end
+
+  end
+end

data/lib/puppet_forge_server/app/version2.rb

@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+#
+# 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 'sinatra/base'
+
+module PuppetForgeServer::App
+  class Version2 < Sinatra::Base
+
+    configure do
+      enable :logging
+      use ::Rack::CommonLogger, PuppetForgeServer::Logger.get(:access)
+    end
+
+    before {
+      env['rack.errors'] =  PuppetForgeServer::Logger.get(:server)
+    }
+
+    def initialize(backends)
+      super(nil)
+      @backends = backends
+    end
+
+    post '/v2/releases' do
+      halt 410, {'errors' => ['File not provided']}.to_json unless params['file']
+      states = @backends.map do |backend|
+        backend.upload(params['file'])
+      end.compact
+      status (states.include?(true) ? 200 : 412)
+    end
+  end
+end

data/lib/puppet_forge_server/backends/directory.rb

@@ -43,6 +43,13 @@ module PuppetForgeServer::Backends
       File.open(path, 'r') if File.exist?(path)
     end
 
+    def upload(file_data)
+      File.open(File.join(@module_dir, file_data[:filename]), 'w') do |f|
+        f.write(file_data[:tempfile].read)
+      end
+      true
+    end
+
     private
     def read_metadata(archive_path)
       metadata_file = read_entry(archive_path, %r[[^/]+/metadata\.json$])

data/lib/puppet_forge_server/backends/proxy.rb

@@ -47,6 +47,11 @@ module PuppetForgeServer::Backends
       # ignore
     end
 
+    def upload(file_data)
+      PuppetForgeServer::Logger.get(:server).debug 'File upload is not supported by the proxy backends'
+      false
+    end
+
     protected
     def get(relative_url)
       @http_client.get(url(relative_url))

data/lib/puppet_forge_server/server.rb

@@ -48,7 +48,9 @@ module PuppetForgeServer
 
     def build(backends)
       Rack::Mount::RouteSet.new do |set|
+        set.add_route PuppetForgeServer::App::Generic.new
         set.add_route PuppetForgeServer::App::Version1.new(backends)
+        set.add_route PuppetForgeServer::App::Version2.new(backends)
         set.add_route PuppetForgeServer::App::Version3.new(backends)
       end
     end

data/lib/puppet_forge_server/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-forge-server
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Ilja Bobkevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -126,7 +126,9 @@ files:
 - lib/puppet_forge_server/api/v1/releases.rb
 - lib/puppet_forge_server/api/v3/modules.rb
 - lib/puppet_forge_server/api/v3/releases.rb
+- lib/puppet_forge_server/app/generic.rb
 - lib/puppet_forge_server/app/version1.rb
+- lib/puppet_forge_server/app/version2.rb
 - lib/puppet_forge_server/app/version3.rb
 - lib/puppet_forge_server/backends/directory.rb
 - lib/puppet_forge_server/backends/proxy.rb