Merge branch 'ui-upload'

Ilja Bobkevic · Ilja Bobkevic · commit dc228fafe7fe · 2015-09-02T14:29:16.000+02:00
* ui-upload:
  Add extra fields for metadata model
  Add private endorsement tag
  Copy over initial upload ui by Gerard Hickey
diff --git a/lib/puppet_forge_server.rb b/lib/puppet_forge_server.rb
@@ -51,6 +51,7 @@ module Backends
   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
 
diff --git a/lib/puppet_forge_server/api/v1/modules.rb b/lib/puppet_forge_server/api/v1/modules.rb
@@ -20,25 +20,26 @@ module Modules
     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
diff --git a/lib/puppet_forge_server/api/v1/releases.rb b/lib/puppet_forge_server/api/v1/releases.rb
@@ -19,9 +19,9 @@ module Releases
     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
diff --git a/lib/puppet_forge_server/api/v3/modules.rb b/lib/puppet_forge_server/api/v3/modules.rb
@@ -21,23 +21,24 @@ module Modules
     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
diff --git a/lib/puppet_forge_server/api/v3/releases.rb b/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
diff --git a/lib/puppet_forge_server/app/frontend.rb b/lib/puppet_forge_server/app/frontend.rb
@@ -47,6 +47,16 @@ def initialize(root, http_client = PuppetForgeServer::Http::HttpClient.new)
       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
diff --git a/lib/puppet_forge_server/app/public/css/puppetlabs.css b/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;
 }
diff --git a/lib/puppet_forge_server/app/public/img/endorsement-private.png b/lib/puppet_forge_server/app/public/img/endorsement-private.png
diff --git a/lib/puppet_forge_server/app/views/layout.haml b/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' }
diff --git a/lib/puppet_forge_server/app/views/modules.haml b/lib/puppet_forge_server/app/views/modules.haml
@@ -18,7 +18,10 @@
 .list-container
   %ul.list.modules
     - modules.each do |element|
-      %li.clearfix
+      - if element['private']
+        %li.clearfix.private
+      - else
+        %li.clearfix
         .col
           %h3= "#{element['owner']['username']}/#{element['name']}"
           %p= element['current_release']['metadata']['summary']
diff --git a/lib/puppet_forge_server/app/views/upload.haml b/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'}
diff --git a/lib/puppet_forge_server/backends/directory.rb b/lib/puppet_forge_server/backends/directory.rb
@@ -32,12 +32,12 @@ def initialize(url, readonly = false)
     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)
@@ -76,22 +76,24 @@ def parse_dependencies(metadata)
       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 => "/#{File.basename(path)}"
-          }
+            :path => "/#{File.basename(path)}",
+            :private => ! @readonly
+          })
         else
           @log.error "Failed reading metadata from #{path}"
         end
       end
-      file_metadata
+      modules
     end
   end
 end
diff --git a/lib/puppet_forge_server/backends/proxy_v1.rb b/lib/puppet_forge_server/backends/proxy_v1.rb
@@ -33,7 +33,7 @@ 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}")
@@ -44,7 +44,7 @@ def get_metadata(author, name, options = {})
     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}")
@@ -70,18 +70,18 @@ def parse_dependencies(metadata)
       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']}".gsub(/^#{@@FILE_PATH}/, ''),
-              :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
diff --git a/lib/puppet_forge_server/backends/proxy_v3.rb b/lib/puppet_forge_server/backends/proxy_v3.rb
@@ -31,7 +31,7 @@ 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}")
@@ -42,7 +42,7 @@ def get_metadata(author, name, options = {})
     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}")
@@ -73,15 +73,15 @@ def parse_dependencies(metadata)
       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'].gsub(/^#{@@FILE_PATH}/, ''),
-            :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
diff --git a/lib/puppet_forge_server/http/http_client.rb b/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
diff --git a/lib/puppet_forge_server/models/metadata.rb b/lib/puppet_forge_server/models/metadata.rb
@@ -20,7 +20,7 @@ class Metadata < Builder
 
     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)
diff --git a/lib/puppet_forge_server/models/module.rb b/lib/puppet_forge_server/models/module.rb
diff --git a/puppet-forge-server.gemspec b/puppet-forge-server.gemspec

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ module Releases`
`19`	`19`	`def get_releases(metadata)`
`20`	`20`	`metadata.map do \|element\|`
`21`	`21`	`{`
`22`		`- :file => "/api/v1/files#{element[:path]}",`
`23`		`- :version => element[:metadata].version,`
`24`		`- :dependencies => element[:metadata].dependencies.map {\|dep\| [dep.name, dep.version_requirement]}.compact`
	`22`	`+ :file => "/api/v1/files#{element.path}",`
	`23`	`+ :version => element.metadata.version,`
	`24`	`+ :dependencies => element.metadata.dependencies.map {\|dep\| [dep.name, dep.version_requirement]}.compact`
`25`	`25`	`}`
`26`	`26`	`end.uniq{\|r\| r[:version]}.sort_by {\|r\| Gem::Version.new(r[:version])}`
`27`	`27`	`end`
Original file line number	Diff line number	Diff line change
`@@ -244,6 +244,11 @@ span.release-info {`
`244`	`244`	`font-size: 0.9em;`
`245`	`245`	`color: #6c6d6d;`
`246`	`246`	`}`
	`247`	`+li.private {`
	`248`	`+ background-image: url("/img/endorsement-private.png");`
	`249`	`+ background-repeat: no-repeat;`
	`250`	`+ background-position: right top;`
	`251`	`+}`
`247`	`252`	`p {`
`248`	`253`	`margin: 0;`
`249`	`254`	`}`