puppet-forge-server 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6279979716a9261c09909f80bd59649b5b04def2
-  data.tar.gz: 8da95e7e628926a35427ca5839c75ba7a63bea2b
+  metadata.gz: a52acbf7c0c982ac11d22101fad03ebfc4b013e2
+  data.tar.gz: 3893b0a073c6122880c9488dcbf1f24a056c43bd
 SHA512:
-  metadata.gz: 3223227aa9392bb6ceb29195c90c9724cf2e27803cd0cb67e669c04c787fd323f556d1f52bb860be6050aefbcc18cc58de1e0ec7078a01b7cfb130efb27b858c
-  data.tar.gz: 86efd6a5dfdb66720097eca9b662b07c6be609d464acd564abcf56d942d7266cd179156c4a1b4ece36cd1ced0fe23587d382f5d8ebb7a71b41666f722ebd4e3a
+  metadata.gz: 4603163ac0d1c51a41beaa6f6b3c118b2c90c80590af9afb10a57f831d8a27aabb548673a2c479aaba34c3a312539f46e4c534f9b14acce4ab0ed89f50db6a1c
+  data.tar.gz: 59725a047ab27ff5dfea353fb0d3801d336cb47034f66a9d165ef623e686513520982080afa25d32c2aea2ab22c758d8a3c0645a9be572d9f30271adc8269cb8

data/lib/puppet_forge_server/backends/directory.rb

@@ -44,7 +44,9 @@ module PuppetForgeServer::Backends
     end
 
     def upload(file_data)
-      File.open(File.join(@module_dir, file_data[:filename]), 'w') do |f|
+      filename = File.join(@module_dir, file_data[:filename])
+      return false if File.exist?(filename)
+      File.open(filename, 'w') do |f|
         f.write(file_data[:tempfile].read)
       end
       true

data/lib/puppet_forge_server/logger.rb

@@ -38,6 +38,8 @@ module PuppetForgeServer
       method_name = case method_name
                       when :write, :puts
                         '<<'
+                      when :flush
+                        ''
                       else
                         method_name
                     end
@@ -45,7 +47,11 @@ module PuppetForgeServer
     end
 
     def respond_to?(method_name, include_private = false)
-      @loggers.each { |logger| return false unless (logger.respond_to?(method_name) || %w(write puts).include?(method_name.to_s)) }
+      @loggers.each { |logger| return false unless (logger.respond_to?(method_name) || %w(write puts flush).include?(method_name.to_s)) }
+    end
+
+    def flush
+      # ignore
     end
 
     class << self

data/lib/puppet_forge_server/version.rb

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

data/spec/unit/app/version2_spec.rb

@@ -0,0 +1,43 @@
+# -*- 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::App
+  describe Version2 do
+    let(:directory) { double() }
+    let(:app) { PuppetForgeServer::App::Version2.new([directory]) }
+    let(:file_name_true) { 'bogus_file_true' }
+    let(:file_name_false) { 'bogus_file_false' }
+
+    before(:each) do
+      allow(directory).to receive(:upload).with(file_name_true) { true }
+      allow(directory).to receive(:upload).with(file_name_false) { false }
+    end
+
+    describe '#post /v2/releases' do
+      it 'file upload should succeed' do
+        post '/v2/releases', params={ :file => file_name_true }
+        expect(last_response).to be_ok
+      end
+
+      it 'file upload should fail' do
+        post '/v2/releases', params={ :file => file_name_false }
+        expect(last_response.status).to eq(412)
+      end
+    end
+  end
+end

data/spec/unit/backends/directory_spec.rb

@@ -0,0 +1,64 @@
+# -*- 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::Backends
+  describe Directory do
+    let(:url) { 'bogus_url' }
+    let(:name) { 'bogus_name' }
+    let(:author) { 'bogus_author' }
+    let(:version) { 'bogus_version' }
+    let(:directory) { PuppetForgeServer::Backends::Directory.new(url) }
+    let(:file_metadata) { { :metadata => nil, :checksum => nil, :path => nil} }
+    let(:file_data) { { :filename => 'bogus_filename' } }
+
+    before(:each) do
+      allow(directory).to receive(:get_file_metadata).with("*#{name}*.tar.gz", {}) { file_metadata }
+      allow(directory).to receive(:get_file_metadata).with("#{author}-#{name}-*.tar.gz", {}) { file_metadata }
+      allow(directory).to receive(:get_file_metadata).with("#{author}-#{name}-#{version}.tar.gz", {:version => version}) { file_metadata }
+      allow(File).to receive(:open).with("#{url}/#{file_data[:filename]}", 'w')
+    end
+
+    describe '#query_metadata' do
+      it 'query metadata should return file metadata array' do
+        expect(directory.query_metadata(name)).to eq(file_metadata)
+      end
+    end
+
+    describe '#get_metadata' do
+      it 'get_metadata without version should return file metadata array' do
+        expect(directory.get_metadata(author, name)).to eq(file_metadata)
+      end
+
+      it 'get_metadata with version should return file metadata array' do
+        expect(directory.get_metadata(author, name, {:version => version})).to eq(file_metadata)
+      end
+    end
+
+    describe '#upload' do
+      it 'upload when file does not exist should return true' do
+        allow(File).to receive(:exist?).with("#{url}/#{file_data[:filename]}") { false }
+        expect(directory.upload(file_data)).to be
+      end
+
+      it 'upload when file exists should return false' do
+        allow(File).to receive(:exist?).with("#{url}/#{file_data[:filename]}") { true }
+        expect(directory.upload(file_data)).not_to be
+      end
+    end
+  end
+end

data/spec/unit/logger_spec.rb

@@ -70,6 +70,12 @@ module PuppetForgeServer
       end
     end
 
+    describe '#flush' do
+      it 'should respond to flush' do
+        expect(logger).to respond_to('flush')
+      end
+    end
+
     describe '#non_existing' do
       it 'should fail on non existing method' do
         expect { logger.non_existing }.to raise_error(NoMethodError)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-forge-server
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Ilja Bobkevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -199,6 +199,8 @@ files:
 - lib/puppet_forge_server/version.rb
 - puppet-forge-server.gemspec
 - spec/spec_helper.rb
+- spec/unit/app/version2_spec.rb
+- spec/unit/backends/directory_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/models/metadata_spec.rb
 - spec/unit/server_spec.rb
@@ -228,6 +230,8 @@ specification_version: 4
 summary: Private Puppet forge server
 test_files:
 - spec/spec_helper.rb
+- spec/unit/app/version2_spec.rb
+- spec/unit/backends/directory_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/models/metadata_spec.rb
 - spec/unit/server_spec.rb