puppet-forge-server 1.7.4 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 440d5f978fa23d38d711175c1ea1b66e2e65fa2f
-  data.tar.gz: d4caedbc827e188a129f0103825d8f57efadd1d3
+  metadata.gz: 520c95153ba62be7304bec30c3d12e4f560c84ba
+  data.tar.gz: 001d53cfa31b811b843b88c0f80174500822f383
 SHA512:
-  metadata.gz: 12f76a03a7e175854155b80f1d647e71ab9f4771df3a8e2efedff5527ca19658601afc1a2614bf49331e7e1430815ba6a6f247196a021b873717fddef2462221
-  data.tar.gz: fb9de32f3d6ac5df75146c14d992a6da2f1565b54edea0cc60a0ede50a5f5ce3b04e53aae9e7f81be0ec00760ac6805c2e34221f3e51a2908bf6d716dbb882ab
+  metadata.gz: 6c56267829a2b368b604178d383c78ea8860cc008e7182732db8e87b64fbbc3cc72259f07c8cc7becc69315bddf2ffb9b450456d9fec40ace00bd3a7a6d49b71
+  data.tar.gz: 9538e370e0c68fbb1f9179ee3781059a618f3e38f85e2d124bad82749b9ae6bbfa04d058cebe923589c06ffcd9adf5536359dcad5d73a19e613e61d0f060e6d9

data/lib/puppet_forge_server.rb

@@ -51,6 +51,7 @@ module PuppetForgeServer
   module Models
     autoload :Builder, 'puppet_forge_server/models/builder'
     autoload :Metadata, 'puppet_forge_server/models/metadata'
+    autoload :Module, 'puppet_forge_server/models/module'
     autoload :Dependency, 'puppet_forge_server/models/dependency'
   end
 

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

@@ -20,25 +20,26 @@ module PuppetForgeServer::Api::V1
     def get_modules(metadata)
       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
+        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
+          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 => element[:metadata].name.sub('-', '/'),
+          name = element.metadata.name.sub(/^[^-]+-/, '')
+          modules[element.metadata.name] = {
+            :author => element.metadata.author,
+            :full_name => element.metadata.name.sub('-', '/'),
             :name => name,
-            :desc => element[:metadata].description,
-            :version => element[:metadata].version,
-            :project_url => element[:metadata].project_page,
-            :releases => releases_version(element[:metadata]),
-            :tag_list =>  element[:tags] ? element[:tags] : [element[:metadata].author, name],
+            :desc => element.metadata.description,
+            :version => element.metadata.version,
+            :project_url => element.metadata.project_page,
+            :releases => releases_version(element.metadata),
+            :tag_list =>  element.tags ? element.tags : [element.metadata.author, name],
+            :private => element.private
           }
         end
       end

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

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

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

@@ -21,23 +21,24 @@ module PuppetForgeServer::Api::V3
     def get_modules(metadata)
       modules = {}
       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
+        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.compact
+            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.compact
           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][:releases] = (modules[element.metadata.name][:releases] + releases_version(element.metadata)).uniq.sort_by { |r| Gem::Version.new(r[:version]) }.reverse
         else
-          modules[element[:metadata].name] = {
-              :uri => "/v3/modules/#{element[:metadata].name}",
-              :name => element[:metadata].name.sub(/^[^-]+-/, ''),
-              :homepage_url => element[:metadata].project_page,
-              :issues_url => element[:metadata].issues_url,
-              :releases => releases_version(element[:metadata]),
+          modules[element.metadata.name] = {
+              :uri => "/v3/modules/#{element.metadata.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 => element[:metadata].author, :uri => "/v3/users/#{element[:metadata].author}"}
+              :owner => {:username => element.metadata.author, :uri => "/v3/users/#{element.metadata.author}"},
+              :private => element.private
           }
         end
       end

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

@@ -18,21 +18,21 @@ module PuppetForgeServer::Api::V3
   module Releases
     def get_releases(metadata)
       metadata.map do |element|
-        name = element[:metadata].name.sub(/^[^-]+-/, '')
-        author = element[:metadata].name.split('-')[0]
+        name = element.metadata.name.sub(/^[^-]+-/, '')
+        author = element.metadata.name.split('-')[0]
         {
-            :uri => "/v3/releases/#{element[:metadata].name}-#{element[:metadata].version}",
+            :uri => "/v3/releases/#{element.metadata.name}-#{element.metadata.version}",
             :module => {
-                :uri => "/v3/modules/#{element[:metadata].name}",
+                :uri => "/v3/modules/#{element.metadata.name}",
                 :name => name,
                 :owner => {:username => author, :uri => "/v3/users/#{author}"}
             },
-            :metadata => element[:metadata].to_hash,
-            :version => element[:metadata].version,
-            :tags => element[:tags] ? element[:tags] : [element[:metadata].author, name],
-            :file_uri => "/v3/files#{element[:path]}",
-            :file_md5 => element[:checksum],
-            :deleted_at => element[:deleted_at]
+            :metadata => element.metadata.to_hash,
+            :version => element.metadata.version,
+            :tags => element.tags ? element.tags : [element.metadata.author, name],
+            :file_uri => "/v3/files#{element.path}",
+            :file_md5 => element.checksum,
+            :deleted_at => element.deleted_at
         }
       end.uniq{|r| r[:version]}.sort_by { |r| Gem::Version.new(r[:version]) }
     end

data/lib/puppet_forge_server/app/frontend.rb

@@ -47,6 +47,16 @@ module PuppetForgeServer::App
       haml :modules, :locals => {:query => query, :modules => modules}
     end
 
+    get '/upload' do
+      haml :upload, :locals => {:upload_status => ''}
+    end
+
+    post '/upload' do
+      halt(200, haml(:upload, :locals => {:upload_status => 'No file selected'})) unless params[:file]
+      response = @http_client.post_file("#{request.base_url}/v2/releases", params[:file])
+      haml :upload, :locals => {:upload_status => response.code}
+    end
+
     private
     def get(relative_url)
       begin

data/lib/puppet_forge_server/app/public/css/puppetlabs.css

@@ -244,6 +244,11 @@ span.release-info {
   font-size: 0.9em;
   color: #6c6d6d;
 }
+li.private {
+  background-image: url("/img/endorsement-private.png");
+  background-repeat: no-repeat;
+  background-position: right top;
+}
 p {
   margin: 0;
 }

data/lib/puppet_forge_server/app/views/layout.haml

@@ -39,6 +39,9 @@
           %ul.nav.navbar-nav.navbar-right
             %li.active
               %a{:href => 'https://forge.puppetlabs.com/', :target => 'official-puppet-forge'} Official Puppet Forge
+            %li
+              %a{:href => '/upload'}
+                Upload Puppet Module
             %li
               %a{:href => 'https://github.com/unibet/puppet-forge-server', :target => 'puppet-forge-server-github'} Help
     %script{ :src => 'https://code.jquery.com/jquery-2.1.3.min.js' }

data/lib/puppet_forge_server/app/views/modules.haml

@@ -18,7 +18,7 @@
 .list-container
   %ul.list.modules
     - modules.each do |element|
-      %li.clearfix
+      %li{:class => element['private'] ? 'clearfix private' : 'clearfix'}
         .col
           %h3= "#{element['owner']['username']}/#{element['name']}"
           %p= element['current_release']['metadata']['summary']

data/lib/puppet_forge_server/app/views/upload.haml

@@ -0,0 +1,45 @@
+-# -*- encoding: utf-8 -*-
+-#
+-# Copyright 2015 North Development AB
+-#
+-# Author: Gerard Hickey
+-#
+-# 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.
+
+/ TODO Need better formatting
+/ TODO Better error notification
+/ TODO Information on programatic uploads
+%h3 Upload Puppet Module
+
+Specify below the location of the Puppet module .tar.gz file that you wish to publish.
+
+The Puppet module .tar.gz file should be generated by executing
+
+%div
+  %pre
+    puppet module build
+
+The result will be a pkg directory at the top level of the module with the .tag.gz within it.
+
+%span.search_error
+  -if upload_status
+    -case upload_status
+    -when '200'
+      File has been uploaded
+    -when ''
+    -else
+      Upload has failed. #{upload_status}
+
+%form{:action => '/upload', :method=>'post', :enctype=>'multipart/form-data' }
+  %input{ :type => 'file', :name=>'file'}
+  %input{ :type=>'submit', :value=>'Upload'}

data/lib/puppet_forge_server/backends/directory.rb

@@ -25,26 +25,28 @@ module PuppetForgeServer::Backends
     @@PRIORITY = 0
     attr_reader :PRIORITY
 
-    def initialize(url)
+    def initialize(url, readonly = false)
       @module_dir = url
       @log = PuppetForgeServer::Logger.get
+      @readonly = readonly
     end
 
     def query_metadata(query, options = {})
-      get_file_metadata("*#{query}*.tar.gz", options)
+      get_modules("*#{query}*.tar.gz", options)
     end
 
     def get_metadata(author, name, options = {})
       version = options[:version] ? options[:version] : '*'
-      get_file_metadata("#{author}-#{name}-#{version}.tar.gz", options)
+      get_modules("#{author}-#{name}-#{version}.tar.gz", options)
     end
 
     def get_file_buffer(relative_path)
-      path = File.join(File.expand_path(@module_dir), relative_path)
-      File.open(path, 'r') if File.exist?(path)
+      path = Dir["#{@module_dir}/**/#{relative_path}"].first
+      File.open(path, 'r') if path
     end
 
     def upload(file_data)
+      return false if @readonly
       filename = File.join(@module_dir, file_data[:filename])
       return false if File.exist?(filename)
       File.open(filename, 'w') do |f|
@@ -74,22 +76,24 @@ module PuppetForgeServer::Backends
       metadata
     end
 
-    def get_file_metadata(file_name, options)
+   def get_modules(file_name, options)
       options = ({:with_checksum => true}).merge(options)
-      file_metadata = []
+      modules = []
       Dir["#{@module_dir}/**/#{file_name}"].each do |path|
         metadata_raw = read_metadata(path)
         if metadata_raw
-          file_metadata << {
+          modules <<
+            PuppetForgeServer::Models::Module.new({
             :metadata => parse_dependencies(PuppetForgeServer::Models::Metadata.new(normalize_metadata(metadata_raw))),
             :checksum => options[:with_checksum] == true ? Digest::MD5.file(path).hexdigest : nil,
-            :path => "/#{Pathname.new(path).relative_path_from(Pathname.new(@module_dir))}"
-          }
+            :path => "/#{File.basename(path)}",
+            :private => ! @readonly
+          })
         else
           @log.error "Failed reading metadata from #{path}"
         end
       end
-      file_metadata
+      modules
     end
   end
 end

data/lib/puppet_forge_server/backends/proxy.rb

@@ -20,11 +20,12 @@ require 'digest/sha1'
 module PuppetForgeServer::Backends
   class Proxy
 
-    def initialize(url, cache_dir, http_client)
+    def initialize(url, cache_dir, http_client, file_path)
       @url = url
       @cache_dir = File.join(cache_dir, Digest::SHA1.hexdigest(@url))
       @http_client = http_client
       @log = PuppetForgeServer::Logger.get
+      @file_path = file_path
 
       # Create directory structure for all alphabetic letters
       (10...36).each do |i|
@@ -37,7 +38,7 @@ module PuppetForgeServer::Backends
       File.join(@cache_dir, file_name[0].downcase, file_name)
       path = Dir["#{@cache_dir}/**/#{file_name}"].first
       unless File.exist?("#{path}")
-        buffer = download("/#{relative_path}")
+        buffer = download("#{@file_path.chomp('/')}/#{relative_path}")
         File.open(File.join(@cache_dir, file_name[0].downcase, file_name), 'wb') do |file|
           file.write(buffer.read)
         end

data/lib/puppet_forge_server/backends/proxy_v1.rb

@@ -22,17 +22,18 @@ module PuppetForgeServer::Backends
 
     # Priority should be lower than v3 API proxies as v3 requires less API calls
     @@PRIORITY = 15
+    @@FILE_PATH = '/api/v1/files'
     attr_reader :PRIORITY
 
     def initialize(url, cache_dir, http_client = PuppetForgeServer::Http::HttpClient.new)
-      super(url, cache_dir, http_client)
+      super(url, cache_dir, http_client, @@FILE_PATH)
     end
 
     def get_metadata(author, name, options = {})
       options = ({:with_checksum => true}).merge(options)
       query ="#{author}/#{name}"
       begin
-        get_module_metadata(JSON.parse(get("/modules.json?q=#{query}")).select { |e| e['full_name'].match("#{query}") }, options)
+        get_modules(JSON.parse(get("/modules.json?q=#{query}")).select { |e| e['full_name'].match("#{query}") }, options)
       rescue => e
         @log.debug("#{self.class.name} failed querying metadata for '#{query}' with options #{options}")
         @log.debug("Error: #{e}")
@@ -43,7 +44,7 @@ module PuppetForgeServer::Backends
     def query_metadata(query, options = {})
       options = ({:with_checksum => true}).merge(options)
       begin
-        get_module_metadata(JSON.parse(get("/modules.json?q=#{query}")).select { |e| e['full_name'].match("*#{query}*") }, options)
+        get_modules(JSON.parse(get("/modules.json?q=#{query}")).select { |e| e['full_name'].match("*#{query}*") }, options)
       rescue => e
         @log.debug("#{self.class.name} failed querying metadata for '#{query}' with options #{options}")
         @log.debug("Error: #{e}")
@@ -69,18 +70,18 @@ module PuppetForgeServer::Backends
       metadata
     end
 
-    def get_module_metadata(modules, options)
+    def get_modules(modules, options)
       modules.map do |element|
         version = options['version'] ? "&version=#{options['version']}" : ''
         JSON.parse(get("/api/v1/releases.json?module=#{element['author']}/#{element['name']}#{version}")).values.first.map do |release|
           tags = element['tag_list'] ? element['tag_list'] : nil
           raw_metadata = read_metadata(element, release)
-          {
-              :metadata => parse_dependencies(PuppetForgeServer::Models::Metadata.new(raw_metadata)),
-              :checksum => options[:with_checksum] ? Digest::MD5.hexdigest(File.read(get_file_buffer(release['file']))) : nil,
-              :path => "#{release['file']}",
-              :tags => tags
-          }
+          PuppetForgeServer::Models::Module.new({
+            :metadata => parse_dependencies(PuppetForgeServer::Models::Metadata.new(raw_metadata)),
+            :checksum => options[:with_checksum] ? Digest::MD5.hexdigest(File.read(get_file_buffer(release['file']))) : nil,
+            :path => "#{release['file']}".gsub(/^#{@@FILE_PATH}/, ''),
+            :tags => tags
+          })
         end
       end
     end

data/lib/puppet_forge_server/backends/proxy_v3.rb

@@ -20,17 +20,18 @@ module PuppetForgeServer::Backends
   class ProxyV3 < PuppetForgeServer::Backends::Proxy
 
     @@PRIORITY = 10
+    @@FILE_PATH = '/v3/files'
     attr_reader :PRIORITY
 
     def initialize(url, cache_dir, http_client = PuppetForgeServer::Http::HttpClient.new)
-      super(url, cache_dir, http_client)
+      super(url, cache_dir, http_client, @@FILE_PATH)
     end
 
     def get_metadata(author, name, options = {})
       query ="#{author}-#{name}"
       begin
         releases = options[:version] ? [JSON.parse(get("/v3/releases/#{query}-#{options[:version]}"))] : get_all_result_pages("/v3/releases?module=#{query}")
-        get_release_metadata(releases)
+        get_modules(releases)
       rescue => e
         @log.debug("#{self.class.name} failed querying metadata for '#{query}' with options #{options}")
         @log.debug("Error: #{e}")
@@ -41,7 +42,7 @@ module PuppetForgeServer::Backends
     def query_metadata(query, options = {})
       begin
         releases = get_all_result_pages("/v3/modules?query=#{query}").map {|element| element['current_release']}
-        get_release_metadata(releases)
+        get_modules(releases)
       rescue => e
         @log.debug("#{self.class.name} failed querying metadata for '#{query}' with options #{options}")
         @log.debug("Error: #{e}")
@@ -72,15 +73,15 @@ module PuppetForgeServer::Backends
       metadata
     end
 
-    def get_release_metadata(releases)
+    def get_modules(releases)
       releases.map do |element|
-        {
-            :metadata => parse_dependencies(PuppetForgeServer::Models::Metadata.new(normalize_metadata(element['metadata']))),
-            :checksum => element['file_md5'],
-            :path => element['file_uri'],
-            :tags => (element['tags'] + (element['metadata']['tags'] ? element['metadata']['tags'] : [])).flatten.uniq,
-            :deleted_at => element['deleted_at']
-        }
+        PuppetForgeServer::Models::Module.new({
+          :metadata => parse_dependencies(PuppetForgeServer::Models::Metadata.new(normalize_metadata(element['metadata']))),
+          :checksum => element['file_md5'],
+          :path => element['file_uri'].gsub(/^#{@@FILE_PATH}/, ''),
+          :tags => (element['tags'] + (element['metadata']['tags'] ? element['metadata']['tags'] : [])).flatten.uniq,
+          :deleted_at => element['deleted_at']
+        })
       end
     end
   end

data/lib/puppet_forge_server/http/http_client.rb

@@ -17,9 +17,26 @@
 require 'open-uri'
 require 'open_uri_redirections'
 require 'timeout'
+require 'net/http'
+require 'net/http/post/multipart'
+
 
 module PuppetForgeServer::Http
   class HttpClient
+
+    def post_file(url, file_hash, options = {})
+      options = { :http => {}, :headers => {}}.merge(options)
+
+      uri = URI.parse(url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      options[:http].each {|k,v| http.call(k, v) }
+
+      req = Net::HTTP::Post::Multipart.new uri.path, "file" => UploadIO.new(File.open(file_hash[:tempfile]), file_hash[:type], file_hash[:filename])
+      options[:headers].each {|k,v| req[k] = v }
+
+      http.request(req)
+    end
+
     def get(url)
       open_uri(url).read
     end

data/lib/puppet_forge_server/models/metadata.rb

@@ -20,7 +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
+    attr_accessor :puppet_version, :tags, :mail, :classes, :definitions
 
     def initialize(attributes)
       super(attributes)

data/lib/puppet_forge_server/models/module.rb

@@ -0,0 +1,29 @@
+# -*- 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.
+
+
+module PuppetForgeServer::Models
+  class Module < Builder
+
+    attr_accessor :metadata, :checksum, :path, :private, :deleted_at, :tags
+
+    def initialize(attributes)
+      super(attributes)
+      @private  = @private.nil? ? false : @private
+    end
+
+  end
+end

data/lib/puppet_forge_server/server.rb

@@ -93,7 +93,7 @@ module PuppetForgeServer
     private
     def backends(options)
       # 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]['Proxy'] && ! options[:backend]['Proxy'].empty? ? [PuppetForgeServer::Backends.const_get('Directory').new(options[:cache_basedir], true)] : []
       backends << options[:backend].map do |type, typed_backends|
         typed_backends.map do |url|
           case type

data/lib/puppet_forge_server/version.rb

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

data/puppet-forge-server.gemspec

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

data/spec/unit/app/version1_spec.rb

@@ -0,0 +1,58 @@
+# -*- 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 Version1 do
+    let(:backend) { double() }
+    let(:app) { PuppetForgeServer::App::Version1.new([backend]) }
+    let(:module_author) { 'bogus_author' }
+    let(:module_name) { 'bogus_name' }
+    let(:module_string) { "#{module_author}/#{module_name}" }
+    let(:module_deps) { [ PuppetForgeServer::Models::Dependency.new({:name => 'bogus_dep1'})] }
+    let(:module_metadata) { PuppetForgeServer::Models::Metadata.new({:author => module_author, :name => module_name, :dependencies => module_deps}) }
+    let(:module_hash) { { :metadata => module_metadata, :checksum => nil, :path => nil} }
+    let(:backend_module) { PuppetForgeServer::Models::Module.new(module_hash) }
+
+    before(:each) do
+      allow(backend).to receive(:get_metadata).with(module_author, module_name, {:version => nil, :with_checksum => false}) { backend_module }
+      allow(backend).to receive(:query_metadata).with(module_string, {:with_checksum => false}) { backend_module }
+    end
+
+    describe '#get /api/v1/releases.json' do
+      it 'should get bogus release json' do
+        get '/api/v1/releases.json', params={ :module => module_string }
+        expect(last_response).to be_ok
+        expect(JSON.parse(last_response.body).keys.first).to eq(module_string)
+      end
+    end
+
+    describe '#get /modules.json' do
+      it 'should get bogus modules json' do
+        get '/modules.json', params={ :q => module_string }
+        expect(last_response).to be_ok
+        module_hash = JSON.parse(last_response.body).first
+
+        expect(module_hash['author']).to eq(module_author)
+        expect(module_hash['full_name']).to eq(module_name)
+        expect(module_hash['name']).to eq(module_name)
+        expect(module_hash['tag_list']).to eq([module_author, module_name])
+        expect(module_hash['private']).not_to be
+      end
+    end
+  end
+end

data/spec/unit/backends/directory_spec.rb

@@ -24,28 +24,29 @@ module PuppetForgeServer::Backends
     let(:version) { 'bogus_version' }
     let(:directory) { PuppetForgeServer::Backends::Directory.new(url) }
     let(:file_metadata) { { :metadata => nil, :checksum => nil, :path => nil} }
+    let(:backend_module) { PuppetForgeServer::Models::Module.new(file_metadata) }
     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(directory).to receive(:get_modules).with("*#{name}*.tar.gz", {}) { backend_module }
+      allow(directory).to receive(:get_modules).with("#{author}-#{name}-*.tar.gz", {}) { backend_module }
+      allow(directory).to receive(:get_modules).with("#{author}-#{name}-#{version}.tar.gz", {:version => version}) { backend_module }
       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)
+        expect(directory.query_metadata(name)).to eq(backend_module)
       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)
+        expect(directory.get_metadata(author, name)).to eq(backend_module)
       end
 
       it 'get_metadata with version should return file metadata array' do
-        expect(directory.get_metadata(author, name, {:version => version})).to eq(file_metadata)
+        expect(directory.get_metadata(author, name, {:version => version})).to eq(backend_module)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-forge-server
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.8.0
 platform: ruby
 authors:
 - Ilja Bobkevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +214,7 @@ files:
 - lib/puppet_forge_server/app/frontend.rb
 - lib/puppet_forge_server/app/generic.rb
 - lib/puppet_forge_server/app/public/css/puppetlabs.css
+- lib/puppet_forge_server/app/public/img/endorsement-private.png
 - lib/puppet_forge_server/app/public/img/forge-logo.png
 - lib/puppet_forge_server/app/public/js/internal.js
 - lib/puppet_forge_server/app/version1.rb
@@ -208,6 +223,7 @@ files:
 - lib/puppet_forge_server/app/views/index.haml
 - lib/puppet_forge_server/app/views/layout.haml
 - lib/puppet_forge_server/app/views/modules.haml
+- lib/puppet_forge_server/app/views/upload.haml
 - lib/puppet_forge_server/backends/directory.rb
 - lib/puppet_forge_server/backends/proxy.rb
 - lib/puppet_forge_server/backends/proxy_v1.rb
@@ -218,6 +234,7 @@ 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/models/module.rb
 - lib/puppet_forge_server/patches/gem.rb
 - lib/puppet_forge_server/server.rb
 - lib/puppet_forge_server/utils/archiver.rb
@@ -227,6 +244,7 @@ files:
 - lib/puppet_forge_server/version.rb
 - puppet-forge-server.gemspec
 - spec/spec_helper.rb
+- spec/unit/app/version1_spec.rb
 - spec/unit/app/version2_spec.rb
 - spec/unit/backends/directory_spec.rb
 - spec/unit/logger_spec.rb
@@ -259,6 +277,7 @@ specification_version: 4
 summary: Private Puppet forge server
 test_files:
 - spec/spec_helper.rb
+- spec/unit/app/version1_spec.rb
 - spec/unit/app/version2_spec.rb
 - spec/unit/backends/directory_spec.rb
 - spec/unit/logger_spec.rb