Support v3 API

README.md

@@ -9,7 +9,7 @@ A private Puppet Forge. Compatible with [librarian-puppet](http://librarian-pupp
 [![Gem Version](https://badge.fury.io/rb/puppet-library.svg)](http://badge.fury.io/rb/puppet-library)
 [![Dependency Status](https://gemnasium.com/drrb/puppet-library.svg)](https://gemnasium.com/drrb/puppet-library)
 
-Puppet Library serves Puppet modules in the same format as [the Puppet Forge](http://forge.puppetlabs.com). This allows you to create a private Puppet Forge and manage all the modules you use completely within your infrastructure.
+Puppet Library serves Puppet modules in the same format as [the Puppet Forge](https://forge.puppetlabs.com). This allows you to create a private Puppet Forge and manage all the modules you use completely within your infrastructure.
 
 Plugins can be created to serve modules from arbitrary sources. Puppet Library contains built-in support for:
  - serving packaged (`.tar.gz`) modules from a directory (or directories) of your choosing
@@ -71,11 +71,11 @@ Serve modules from a specific directory
 
 Serve modules from a remote forge as a proxy
 
-    $ puppet-library --proxy http://forge.puppetlabs.com
+    $ puppet-library --proxy https://forgeapi.puppetlabs.com
 
 Proxy a remote forge, caching downloaded modules on disk
 
-    $ puppet-library --proxy http://forge.puppetlabs.com --cache-basedir
+    $ puppet-library --proxy https://forgeapi.puppetlabs.com --cache-basedir
 
 Serve a module from source
 
@@ -145,7 +145,7 @@ forges:
     - Directory: /var/lib/modules
     - Directory: /var/lib/other-modules
     - Source: /var/code/puppetlabs-apache
-    - Proxy: http://forge.puppetlabs.com
+    - Proxy: https://forgeapi.puppetlabs.com
 ```
 
 ## Running with Phusion Passenger (EXPERIMENTAL)
@@ -170,7 +170,7 @@ require "puppet_library"
 server = PuppetLibrary::Server.configure do
     # Proxy the Puppet Forge
     forge :proxy do
-        url "http://forge.puppetlabs.com"
+        url "https://forgeapi.puppetlabs.com"
     end
 end
 
@@ -214,7 +214,7 @@ server = PuppetLibrary::Server.configure do
 
     # Proxy a remote forge, caching modules to disk
     forge :cache do
-        url "http://forge.puppetlabs.com"
+        url "https://forgeapi.puppetlabs.com"
         path "/var/puppet/modules/cache"
     end
 end

Rakefile

@@ -22,8 +22,6 @@ require 'yaml'
 require 'net/http'
 
 SUPPORTED_RUBY_VERSIONS = %w[1.8 1.9 2.0 2.1 system]
-# Puppet doesn't work on 2.1
-INTEGRATION_TEST_INCOMPATIBLE_RUBY_VERSIONS = %w[2.1]
 # Capybara needs Nokogiri, which needs 1.9+
 ACCEPTANCE_TEST_INCOMPATIBLE_RUBY_VERSIONS = %w[1.8]
 
@@ -41,20 +39,14 @@ class String
     end
 end
 
-def ruby_version_supports_integration_test?(version = RUBY_VERSION)
-    ! INTEGRATION_TEST_INCOMPATIBLE_RUBY_VERSIONS.find do |bad_version|
-        version.start_with? bad_version
-    end
-end
-
 def ruby_version_supports_acceptance_tests?(version = RUBY_VERSION)
     ! ACCEPTANCE_TEST_INCOMPATIBLE_RUBY_VERSIONS.find do |bad_version|
         version.start_with? bad_version
     end
 end
 
 def offline?
-    Net::HTTP.get_response(URI.parse("http://forge.puppetlabs.com"))
+    Net::HTTP.get_response(URI.parse("https://forgeapi.puppetlabs.com"))
     return false
 rescue
     return true
@@ -83,28 +75,21 @@ else
     end
 end
 
-if ruby_version_supports_integration_test?
-    desc "Run all the tests"
-    RSpec::Core::RakeTask.new(:test) do |rspec|
-        rspec.pattern = "{spec,test}/**/*_{spec,integration_test}.rb"
-    end
-    task :test => :features
-
-    desc "Run the integration tests"
-    RSpec::Core::RakeTask.new(:integration_test) do |rspec|
-        rspec.pattern = "test/**/*_integration_test.rb"
-        tags = []
-        tags << "~online" if offline?
-        tags << "~no_1_8" if RUBY_VERSION.start_with? "1.8"
-        unless tags.empty?
-            rspec.rspec_opts = tags.map { |tag| "--tag #{tag}" }.join(" ")
-        end
-    end
-else
-    task :integration_test do
-        puts "Skipping integration tests because this version of Ruby doesn't support them"
+desc "Run all the tests"
+RSpec::Core::RakeTask.new(:test) do |rspec|
+    rspec.pattern = "{spec,test}/**/*_{spec,integration_test}.rb"
+end
+task :test => :features
+
+desc "Run the integration tests"
+RSpec::Core::RakeTask.new(:integration_test) do |rspec|
+    rspec.pattern = "test/**/*_integration_test.rb"
+    tags = []
+    tags << "~online" if offline?
+    tags << "~no_1_8" if RUBY_VERSION.start_with? "1.8"
+    unless tags.empty?
+        rspec.rspec_opts = tags.map { |tag| "--tag #{tag}" }.join(" ")
     end
-    task :test => [:features, :spec]
 end
 
 task :default => [:test, 'coveralls:push']
@@ -143,11 +128,7 @@ task :verify => [ 'check-license', 'test-imports' ] do
         v = version.ljust(7)
         g = gem_version.ljust(8)
         s = spec_result ? "pass".green : "fail".red
-        if ruby_version_supports_integration_test? version
-            i = integration_test_result ? "pass".green : "fail".red
-        else
-            i = "skip".yellow
-        end
+        i = integration_test_result ? "pass".green : "fail".red
 
         if ruby_version_supports_acceptance_tests? version
             a = acceptance_test_result ? "pass".green : "fail".red

config.ru

@@ -42,7 +42,7 @@ server = PuppetLibrary::Server.configure do
 
     # Everything from The Forge
     forge :proxy do
-        url "http://forge.puppetlabs.com"
+        url "https://forgeapi.puppetlabs.com"
     end
 end
 

features/module_list.feature

@@ -26,14 +26,14 @@ Feature: Module list page
         Then I should see "Modules"
 
     Scenario: See module versions
-        Given the "puppetlabs/apache" module is available at version "1.0.0"
-        And the "puppetlabs/apache" module is available at version "1.1.0"
+        Given the "puppetlabs-apache" module is available at version "1.0.0"
+        And the "puppetlabs-apache" module is available at version "1.1.0"
         When I visit the module list page
-        Then I should see module "puppetlabs/apache" with versions 1.0.0 and 1.1.0
+        Then I should see module "puppetlabs-apache" with versions 1.0.0 and 1.1.0
 
     Scenario: Follow link to module page
-        Given the "puppetlabs/apache" module is available at version "1.0.0"
-        And the "puppetlabs/apache" module is available at version "1.1.0"
+        Given the "puppetlabs-apache" module is available at version "1.0.0"
+        And the "puppetlabs-apache" module is available at version "1.1.0"
         When I visit the module list page
-        And I click on "puppetlabs/apache"
-        Then I should be on the module page for "puppetlabs/apache"
+        And I click on "puppetlabs-apache"
+        Then I should be on the module page for "puppetlabs-apache"

features/module_page.feature

@@ -21,15 +21,15 @@ Feature: Module page
     So that I can tell exactly what's on the server
 
     Scenario: Visit the module page
-        Given the "puppetlabs/apache" module is available at version "1.0.0"
-        And the "puppetlabs/apache" module is available at version "1.1.0"
-        When I visit the module page for "puppetlabs/apache"
+        Given the "puppetlabs-apache" module is available at version "1.0.0"
+        And the "puppetlabs-apache" module is available at version "1.1.0"
+        When I visit the module page for "puppetlabs-apache"
         Then I should see "Author: puppetlabs"
         Then I should see "Name: apache"
         And I should see "1.0.0"
         And I should see "1.1.0"
-        And I should see "puppetlabs/apache module, version 1.1.0"
+        And I should see "puppetlabs-apache module, version 1.1.0"
 
     Scenario: Visit a nonexistant module page
-        When I visit the module page for "nonexistant/nonexistant"
-        Then I should see 'Module "nonexistant/nonexistant" not found'
+        When I visit the module page for "nonexistant-nonexistant"
+        Then I should see 'Module "nonexistant-nonexistant" not found'

features/module_search.feature

@@ -22,9 +22,9 @@ Feature: Module search
     So that I can find details about specific modules
 
     Scenario: Visit the module list page
-        Given the "puppetlabs/apache" module is available at version "1.0.0"
-        And the "puppetlabs/stdlib" module is available at version "1.0.0"
+        Given the "puppetlabs-apache" module is available at version "1.0.0"
+        And the "puppetlabs-stdlib" module is available at version "1.0.0"
         When I visit the module list page
         And I search for "apache"
-        Then I should see "puppetlabs/apache"
-        And I should not see "puppetlabs/stdlib"
+        Then I should see "puppetlabs-apache"
+        And I should not see "puppetlabs-stdlib"

features/step_definitions/sinatra_steps.rb

@@ -37,7 +37,7 @@ def module_writer
 end
 
 Given /^the "(.*?)" module is available at version "(.*?)"$/ do |full_name, version|
-    author, name = full_name.split "/"
+    author, name = full_name.split "-"
     module_writer.write_module(author, name, version)
 end
 

lib/puppet_library/app/views/module.haml

@@ -18,7 +18,7 @@
 %h1= "Module #{metadata["full_name"]}"
 %div= "Author: #{metadata["author"]}"
 %div= "Name: #{metadata["name"]}"
-%div= "Description: #{metadata["desc"]}"
+%div= "Description: #{metadata["summary"]}"
 %div= "Versions:"
 %ul
   - metadata["releases"].each do |release|

lib/puppet_library/app/views/module_not_found.haml

@@ -16,4 +16,4 @@
 -# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 %h1 Not Found
-%div= "Module \"#{author}/#{name}\" not found"
+%div= "Module \"#{author}-#{name}\" not found"

lib/puppet_library/forge/abstract.rb

@@ -75,6 +75,55 @@ def get_module_metadata_with_dependencies(author, name, version)
             return versions
         end
 
+        def get_modules(query)
+            search = Search.new(query)
+
+            search_results = retrieve_all_metadata.select do |result|
+                search.matches? result
+            end.map do |result|
+                result.to_search_result
+            end.group_by do |result|
+                result["name"]
+            end
+
+            search_results.values.map do |module_results|
+              current = module_results.sort do |a,b|
+                Gem::Version.new(a['version']) <=> Gem::Version.new(b['version'])
+              end.last
+              {
+                'uri' => '/v3/modules/' + current['full_name'],
+                'name' => current['name'],
+                'owner' => {
+                  'username' => current['author']
+                 },
+                'current_release' => {
+                  'uri' => "/v3/releases/#{current['full_name']}-#{current['version']}" ,
+                  'module' => {
+                    'uri' => '/v3/modules/' + current['full_name'],
+                    'name' => current['name'],
+                    'owner' => {
+                      'username' => current['author']
+                     },
+                  },
+                  'version' => current['version'],
+                  'metadata' => current,
+                  'tags' => current['tag_list']
+                },
+                'releases' => module_results.collect{ |h| { "version" => h["version"] , "uri" => "/v3/releases/#{current['full_name']}-#{current['version']}" } }
+              }
+            end
+        end
+
+        def get_releases(module_name)
+            author, name = module_name.split "-"
+            retrieve_metadata(author, name).map{ |m| m.to_release }
+        end
+
+        def get_module_v3(module_name, version)
+            author, name = module_name.split "-"
+            @repo.get_module(author, name, version) or raise ModuleNotFound
+        end
+
         def collect_dependencies_versions(module_full_name, metadata = {})
             author, module_name = module_full_name.split "/"
             module_versions = retrieve_metadata(author, module_name)
@@ -87,16 +136,20 @@ def collect_dependencies_versions(module_full_name, metadata = {})
             return metadata
         end
 
+        def get_md5(author, name, version)
+            "00000000000000000000000000000000"
+        end
+
         def get_module_buffer(author, name, version)
             @repo.get_module(author, name, version) or raise ModuleNotFound
         end
 
         def retrieve_metadata(author, module_name)
-            @repo.get_metadata(author, module_name).map {|metadata| ModuleMetadata.new(metadata)}
+            @repo.get_metadata(author, module_name).map {|metadata| ModuleMetadata.new(metadata, @repo)}
         end
 
         def retrieve_all_metadata
-            @repo.get_all_metadata.map {|metadata| ModuleMetadata.new(metadata)}
+            @repo.get_all_metadata.map {|metadata| ModuleMetadata.new(metadata, @repo)}
         end
     end
 
@@ -114,20 +167,27 @@ def matches?(metadata)
     end
 
     class ModuleMetadata
-        def initialize(metadata)
+        attr_reader :md5
+
+        def initialize(metadata, repo)
             @metadata = metadata
+            @md5 = repo.get_md5(author, name, version)
         end
 
         def author
-            @metadata["name"][/^[^-]+/]
+            @metadata["author"]
         end
 
         def name
             @metadata["name"].sub(/^[^-]+-/, "")
         end
 
         def full_name
-            @metadata["name"].sub("-", "/")
+            @metadata["name"].sub("/", "-")
+        end
+
+        def classname
+             name.sub(/^[^-]+-/, "")
         end
 
         def version
@@ -142,10 +202,6 @@ def summary
             @metadata["summary"]
         end
 
-        def description
-            @metadata["description"]
-        end
-
         def project_page
             @metadata["project_page"]
         end
@@ -159,14 +215,14 @@ def to_info
                 "author" => author,
                 "full_name" => full_name,
                 "name" => name,
-                "desc" => description,
+                "summary" => summary,
                 "releases" => [ { "version" => version } ]
             }
         end
 
         def to_version
             {
-                "file" => "/modules/#{author}-#{name}-#{version}.tar.gz",
+                "file" => "/modules/#{full_name}-#{version}.tar.gz",
                 "version" => version,
                 "dependencies" => dependencies.map do |dependency|
                     [ dependency["name"], dependency["version_requirement"] ]
@@ -179,12 +235,30 @@ def to_search_result
                 "author" => author,
                 "full_name" => full_name,
                 "name" => name,
-                "desc" => summary,
-                "project_url" => project_page,
+                "summary" => summary,
+                "project_page" => project_page,
                 "releases" => [{ "version" => version}],
                 "version" => version,
                 "tag_list" => [author, name]
             }
         end
+
+        def to_release
+            {
+                "uri" => "/v3/releases/#{full_name}-#{version}" ,
+                "module" => {
+                  "uri" => "/v3/modules/#{full_name}",
+                  "name" => name,
+                  "owner" => {
+                    "username" => author
+                   },
+                },
+                "version" => version,
+                "metadata" => @metadata,
+                "file_md5" => md5,
+                "file_uri" => "/modules/#{full_name}-#{version}.tar.gz"
+            }
+        end
+
     end
 end