puppet-library 0.2.0 → 0.3.0

data/lib/puppet_library/forge.rb

@@ -15,98 +15,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-class Array
-    def deep_merge
-        inject({}) do |merged, map|
-            merged.deep_merge(map)
-        end
-    end
-end
-
-class Hash
-    def deep_merge(other)
-        merge(other) do |key, old_val, new_val|
-            if old_val.instance_of? Array
-                old_val + new_val
-            else
-                new_val
-            end
-        end
-    end
-end
-
-module PuppetLibrary
+module PuppetLibrary::Forge
     class ModuleNotFound < Exception
     end
 
-    class Forge
-        class Config
-            def initialize(module_repo)
-                @module_repo = module_repo
-            end
-
-            def module_repo(repo)
-                @module_repo.add_repo repo
-            end
-        end
-
-        def self.configure(&config_block)
-            module_repo = ModuleRepo::Multi.new
-            yield(Config.new(module_repo))
-            Forge.new(module_repo)
-        end
-
-        def initialize(module_repo)
-            @repo = module_repo
-        end
-
-        def get_module_metadata(author, name)
-            modules = get_metadata(author, name)
-
-            raise ModuleNotFound if modules.empty?
-
-            module_infos = modules.map { |m| m.to_info }
-            module_infos.deep_merge
-        end
-
-        def get_module_metadata_with_dependencies(author, name, version)
-            raise ModuleNotFound if get_metadata(author, name).empty?
-
-            full_name = "#{author}/#{name}"
-            versions = collect_dependencies_versions(full_name)
-            return versions if version.nil?
-
-            versions[full_name] = versions[full_name].select do |v|
-                v["version"].start_with?(version)
-            end
-
-            dependencies = versions[full_name].map do |v|
-                v["dependencies"].map {|(name, spec)| name}
-            end.flatten
-            versions = Hash[versions.select do |name, info|
-                name == full_name || dependencies.include?(name)
-            end]
-            return versions
-        end
-
-        def collect_dependencies_versions(module_full_name, metadata = {})
-            author, module_name = module_full_name.split "/"
-            module_versions = get_metadata(author, module_name)
-            metadata[module_full_name] = module_versions.map {|v| v.to_version }
-
-            dependencies = module_versions.map {|v| v.dependency_names }.flatten
-            dependencies.each do |dependency|
-                collect_dependencies_versions(dependency, metadata) unless metadata.include? dependency
-            end
-            return metadata
-        end
-
-        def get_module_buffer(author, name, version)
-            @repo.get_module(author, name, version) or raise ModuleNotFound
-        end
-
-        def get_metadata(author, module_name)
-            @repo.get_metadata(author, module_name).map {|metadata| ModuleMetadata.new(metadata)}
-        end
-    end
+    require 'puppet_library/forge/abstract'
+    require 'puppet_library/forge/directory'
+    require 'puppet_library/forge/multi'
+    require 'puppet_library/forge/proxy'
+    require 'puppet_library/forge/search_result'
 end

data/lib/puppet_library/http/cache.rb

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+# Puppet Library
+# Copyright (C) 2014 drrb
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module PuppetLibrary::Http::Cache
+    require 'puppet_library/http/cache/in_memory'
+    require 'puppet_library/http/cache/noop'
+end

data/lib/puppet_library/http.rb

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+# Puppet Library
+# Copyright (C) 2014 drrb
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module PuppetLibrary::Http
+    require 'puppet_library/http/cache'
+    require 'puppet_library/http/http_client'
+    require 'puppet_library/http/url'
+end

data/lib/puppet_library/puppet_library.rb

@@ -16,9 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'rack'
-require 'puppet_library/forge'
-require 'puppet_library/module_repo/directory'
-require 'puppet_library/module_repo/multi'
+require 'puppet_library/forge/directory'
+require 'puppet_library/forge/multi'
 
 module PuppetLibrary
     class PuppetLibrary
@@ -54,12 +53,12 @@ module PuppetLibrary
                     options[:hostname] = hostname
                 end
 
-                options[:repositories] = []
+                options[:forges] = []
                 opts.on("-m", "--module-dir [DIR]", "Directory containing the modules (can be specified multiple times. Defaults to './modules')") do |module_dir|
-                    options[:repositories] << [ModuleRepo::Directory, module_dir]
+                    options[:forges] << [Forge::Directory, module_dir]
                 end
                 opts.on("-x", "--proxy [URL]", "Remote forge to proxy (can be specified multiple times)") do |url|
-                    options[:repositories] << [ModuleRepo::Proxy, url]
+                    options[:forges] << [Forge::Proxy, url]
                 end
             end
             begin
@@ -72,14 +71,14 @@ module PuppetLibrary
         end
 
         def build_server(options)
-            if options[:repositories].empty?
-                options[:repositories] << [ ModuleRepo::Proxy, "http://forge.puppetlabs.com" ]
+            if options[:forges].empty?
+                options[:forges] << [ Forge::Proxy, "http://forge.puppetlabs.com" ]
             end
 
             Server.set_up do |server|
-                options[:repositories].each do |(repo_type, config)|
-                    subrepo = repo_type.new(config)
-                    server.module_repo subrepo
+                options[:forges].each do |(forge_type, config)|
+                    subforge = forge_type.new(config)
+                    server.forge subforge
                 end
             end
         end
@@ -91,9 +90,9 @@ module PuppetLibrary
             @log.puts " |- Port: #{options[:port]}"
             @log.puts " |- Host: #{options[:hostname]}"
             @log.puts " |- Server: #{options[:server]}"
-            @log.puts " `- Repositories:"
-            options[:repositories].each do |(repo_type, config)|
-                @log.puts "    - #{repo_type}: #{config}"
+            @log.puts " `- Forges:"
+            options[:forges].each do |(forge_type, config)|
+                @log.puts "    - #{forge_type}: #{config}"
             end
         end
 

data/lib/puppet_library/server.rb

@@ -17,14 +17,24 @@
 
 require 'sinatra/base'
 
-require 'puppet_library/forge'
-require 'puppet_library/module_metadata'
-require 'puppet_library/module_repo/multi'
+require 'puppet_library/forge/multi'
 
 module PuppetLibrary
     class Server < Sinatra::Base
+        class Config
+            def initialize(forge)
+                @forge = forge
+            end
+
+            def forge(forge)
+                @forge.add_forge forge
+            end
+        end
+
         def self.set_up(&config_block)
-            Server.new(Forge.configure(&config_block))
+            forge = Forge::Multi.new
+            yield(Config.new(forge))
+            Server.new(forge)
         end
 
         def initialize(forge)
@@ -36,13 +46,18 @@ module PuppetLibrary
             enable :logging
         end
 
+        get "/modules.json" do
+            search_term = params[:q]
+            @forge.search_modules(search_term).to_json
+        end
+
         get "/:author/:module.json" do
             author = params[:author]
             module_name = params[:module]
 
             begin
                 @forge.get_module_metadata(author, module_name).to_json
-            rescue ModuleNotFound
+            rescue Forge::ModuleNotFound
                 status 410
                 {"error" => "Could not find module \"#{module_name}\""}.to_json
             end
@@ -53,7 +68,7 @@ module PuppetLibrary
             version = params[:version]
             begin
                 @forge.get_module_metadata_with_dependencies(author, module_name, version).to_json
-            rescue ModuleNotFound
+            rescue Forge::ModuleNotFound
                 status 410
                 {"error" => "Module #{author}/#{module_name} not found"}.to_json
             end
@@ -70,7 +85,7 @@ module PuppetLibrary
                 @forge.get_module_buffer(author, name, version).tap do
                     attachment "#{author}-#{name}-#{version}.tar.gz"
                 end
-            rescue ModuleNotFound
+            rescue Forge::ModuleNotFound
                 status 404
             end
         end

data/lib/puppet_library/util.rb

@@ -30,6 +30,31 @@ class Array
             !is_duplicate
         end
     end
+
+    def version_sort_by
+        sort_by do |element|
+            version = yield(element)
+            Gem::Version.new(version)
+        end
+    end
+
+    def deep_merge
+        inject({}) do |merged, map|
+            merged.deep_merge(map)
+        end
+    end
+end
+
+class Hash
+    def deep_merge(other)
+        merge(other) do |key, old_val, new_val|
+            if old_val.instance_of? Array
+                old_val + new_val
+            else
+                new_val
+            end
+        end
+    end
 end
 
 class Gem::Package::TarReader

data/lib/puppet_library/version.rb

@@ -16,5 +16,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module PuppetLibrary
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
 end

data/lib/puppet_library.rb

@@ -15,16 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'puppet_library/version'
-
-require 'puppet_library/puppet_library'
-require 'puppet_library/server'
-require 'puppet_library/module_metadata'
-require 'puppet_library/http/http_client'
-require 'puppet_library/http/url'
-require 'puppet_library/http/cache/in_memory'
-require 'puppet_library/http/cache/noop'
-require 'puppet_library/module_repo/directory'
-require 'puppet_library/module_repo/multi'
-require 'puppet_library/module_repo/proxy'
-require 'puppet_library/util'
+module PuppetLibrary
+    require 'puppet_library/forge'
+    require 'puppet_library/http'
+    require 'puppet_library/puppet_library'
+    require 'puppet_library/server'
+    require 'puppet_library/util'
+    require 'puppet_library/version'
+end

data/puppet-library.gemspec

@@ -49,4 +49,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
+
+  # Guard has dependencies that don't work with Ruby < 1.9
+  unless RUBY_VERSION.start_with? "1.8"
+      spec.add_development_dependency "guard"
+      spec.add_development_dependency "guard-rspec"
+      spec.add_development_dependency "terminal-notifier-guard"
+  end
 end

data/spec/{forge_spec.rb → forge/abstract_spec.rb}

@@ -17,9 +17,9 @@
 
 require 'spec_helper'
 
-module PuppetLibrary
-    describe Forge do
-        let(:forge) { Forge.new(module_repo) }
+module PuppetLibrary::Forge
+    describe Abstract do
+        let(:forge) { Abstract.new(module_repo) }
         let(:module_repo) { double('module_repo') }
 
         describe "#get_module_buffer" do
@@ -44,6 +44,123 @@ module PuppetLibrary
             end
         end
 
+        describe "#search_modules" do
+            before do
+                all_metadata = [{
+                    "name"=>"puppetlabs-apache",
+                    "version"=>"0.10.0",
+                    "source"=>"git://github.com/puppetlabs/puppetlabs-apache.git",
+                    "author"=>"puppetlabs",
+                    "license"=>"Apache 2.0",
+                    "summary"=>"Puppet module for Apache",
+                    "description"=>"Module for Apache configuration",
+                    "project_page"=>"https://github.com/puppetlabs/puppetlabs-apache"
+                },{
+                    "name"=>"dodgybrothers-ntp",
+                    "version"=>"1.0.0",
+                    "source"=>"git://github.com/dodgybrothers/puppet-ntp.git",
+                    "author"=>"dodgybrothers",
+                    "license"=>"Apache 2.0",
+                    "summary"=>"Puppet module for NTP",
+                    "description"=>"Module for NTP configuration",
+                    "project_page"=>"https://github.com/dodgybrothers/puppet-ntp"
+                }]
+                allow(module_repo).to receive(:get_all_metadata).and_return(all_metadata)
+            end
+
+            it "matches by name" do
+                search_results = forge.search_modules("apache")
+                expect(search_results).to eq [{
+                    "author"=>"puppetlabs",
+                    "full_name"=>"puppetlabs/apache",
+                    "name"=>"apache",
+                    "desc"=>"Puppet module for Apache",
+                    "project_url"=>"https://github.com/puppetlabs/puppetlabs-apache",
+                    "releases"=>[{"version"=>"0.10.0"}],
+                    "version"=>"0.10.0",
+                    "tag_list"=>["puppetlabs", "apache"]
+                }]
+            end
+
+            it "matches by author" do
+                search_results = forge.search_modules("dodgybrothers")
+                expect(search_results).to eq [{
+                    "author"=>"dodgybrothers",
+                    "full_name"=>"dodgybrothers/ntp",
+                    "name"=>"ntp",
+                    "desc"=>"Puppet module for NTP",
+                    "project_url"=>"https://github.com/dodgybrothers/puppet-ntp",
+                    "releases"=>[{"version"=>"1.0.0"}],
+                    "version"=>"1.0.0",
+                    "tag_list"=>["dodgybrothers", "ntp"]
+                }]
+            end
+
+            context "when multiple versions of a module exist" do
+                it "retuns merges the metadata, favoring the most recent one" do
+                    all_metadata = [{
+                        "name"=>"puppetlabs-apache",
+                        "version"=>"0.10.0",
+                        "source"=>"git://github.com/puppetlabs/puppetlabs-apache.git",
+                        "author"=>"puppetlabs",
+                        "license"=>"Apache 2.0",
+                        "summary"=>"Puppet module for Apache",
+                        "description"=>"Module for Apache configuration",
+                        "project_page"=>"https://github.com/puppetlabs/puppetlabs-apache"
+                    },{
+                        "name"=>"puppetlabs-apache",
+                        "version"=>"1.0.0",
+                        "source"=>"git://github.com/puppetlabs/puppetlabs-apache-new.git",
+                        "author"=>"puppetlabs",
+                        "license"=>"GPL",
+                        "summary"=>"New Puppet module for Apache",
+                        "description"=>"New module for Apache configuration",
+                        "project_page"=>"https://github.com/puppetlabs/puppetlabs-apache-new"
+                    }]
+                    expect(module_repo).to receive(:get_all_metadata).and_return(all_metadata)
+
+                    search_results = forge.search_modules("apache")
+                    expect(search_results).to eq [{
+                        "author"=>"puppetlabs",
+                        "full_name"=>"puppetlabs/apache",
+                        "name"=>"apache",
+                        "desc"=>"New Puppet module for Apache",
+                        "project_url"=>"https://github.com/puppetlabs/puppetlabs-apache-new",
+                        "releases"=>[{"version"=>"1.0.0"},{"version"=>"0.10.0"}],
+                        "version"=>"1.0.0",
+                        "tag_list"=>["puppetlabs", "apache"]
+                    }]
+                end
+            end
+
+            context "with no query" do
+                it "retuns all metadata" do
+                    search_results = forge.search_modules(nil)
+
+                    search_results = search_results.sort_by {|r| r["name"]}
+                    expect(search_results).to eq [{
+                        "author"=>"puppetlabs",
+                        "full_name"=>"puppetlabs/apache",
+                        "name"=>"apache",
+                        "desc"=>"Puppet module for Apache",
+                        "project_url"=>"https://github.com/puppetlabs/puppetlabs-apache",
+                        "releases"=>[{"version"=>"0.10.0"}],
+                        "version"=>"0.10.0",
+                        "tag_list"=>["puppetlabs", "apache"]
+                    },{
+                        "author"=>"dodgybrothers",
+                        "full_name"=>"dodgybrothers/ntp",
+                        "name"=>"ntp",
+                        "desc"=>"Puppet module for NTP",
+                        "project_url"=>"https://github.com/dodgybrothers/puppet-ntp",
+                        "releases"=>[{"version"=>"1.0.0"}],
+                        "version"=>"1.0.0",
+                        "tag_list"=>["dodgybrothers", "ntp"]
+                    }]
+                end
+            end
+        end
+
         describe "#get_module_metadata" do
             context "when no modules found" do
                 it "raises an error" do

data/spec/{module_repo → forge}/directory_spec.rb

@@ -16,7 +16,7 @@
 
 require 'spec_helper'
 
-module PuppetLibrary::ModuleRepo
+module PuppetLibrary::Forge
     describe Directory do
         include ModuleSpecHelper
         include FileUtils
@@ -55,6 +55,32 @@ module PuppetLibrary::ModuleRepo
             end
         end
 
+        describe "#get_all_metadata" do
+            context "when modules exist" do
+                before do
+                    add_module("puppetlabs", "apache", "1.0.0")
+                    add_module("puppetlabs", "apache", "2.0.0")
+                end
+
+                it "returns a the module archive as a file buffer" do
+                    metadata = module_repo.get_all_metadata
+
+                    v1 = metadata.find {|m| m["version"] == "1.0.0" }
+                    v2 = metadata.find {|m| m["version"] == "2.0.0" }
+                    expect(v1).not_to be_nil
+                    expect(v2).not_to be_nil
+                end
+            end
+
+            context "when no modules exist" do
+                it "returns an empty array" do
+                    result = module_repo.get_all_metadata
+
+                    expect(result).to be_empty
+                end
+            end
+        end
+
         describe "#get_metadata" do
             context "when the module directory is empty" do
                 it "returns an empty array" do