puppet-library 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd852d5afc9f767f3adbd20e96a3d6ba37fec092
-  data.tar.gz: 9030ad628af928e81289963f28e9df751a4240b6
+  metadata.gz: 6c1ea499735a82bacf4051bd1b4ea24f2003d613
+  data.tar.gz: ad4e79023760adaf7bc96becfa61d9403f2c60be
 SHA512:
-  metadata.gz: a168548b6050b5d34d121b1191f74dfe5a84e11024714f07d753828ef72894ef3b039ffbbd8c3c7a125179b29c4862ea8d4de17f2c45a3e0cf60527d48ae723a
-  data.tar.gz: 1c130b6732c99488fffc95442bca7b3604b0ae38213aba4415b185dd79514b705ee76cdc8710f1b53054f5428c54143b54ae80ec987c7a243888f51752602c5f
+  metadata.gz: ebe0288bdc97d3df601dc7f1d523d49d3884662af2b756aac2a7634219175a7b7f6035b3a3ffd0bafcfd87f0c9c3c5eb847ff12409a9aca7daf4de24da4b1141
+  data.tar.gz: 81466a2f9550252a75f7f6d98d941df618eb0b611a52a2d7df0fb30e85b825dcdd0399ed3876889189417e07e14b650cb219f31d0cdb2e33b8d22cf597ce32e5

data/.travis.yml

@@ -1,5 +1,5 @@
 # Puppet Library
-# Copyright (C) 2013 drrb
+# 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
@@ -19,6 +19,10 @@ before_install:
   - gem update --system 2.1.11
   - gem --version
 rvm:
-  - "1.8.7"
-  - "1.9.3"
-  - "2.0.0"
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+matrix:
+    allow_failures:
+      - rvm: 2.1.0

data/CHANGELOG.yml

@@ -0,0 +1,31 @@
+# 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/>.
+
+- tag: v0.0.1
+  changes:
+      - Support for serving modules from a directory on disk
+- tag: v0.0.2
+  changes:
+      - Support for serving multiple module sources
+      - Bug fixes for Ruby 1.8.7
+- tag: v0.1.0
+  changes:
+      - Support for proxying a remote forge
+- tag: v0.2.0
+  changes:
+      - Support more specific module version queries using 'version' parameter
+      - Fixed bug on older versions of RubyGems
+

data/Gemfile

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 # Puppet Library
-# Copyright (C) 2013 drrb
+# 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

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 drrb
+Copyright (c) 2014 drrb
 
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007

data/bin/puppet-library

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Puppet Library
-# Copyright (C) 2013 drrb
+# 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

data/lib/puppet_library.rb

@@ -19,10 +19,11 @@ require 'puppet_library/version'
 
 require 'puppet_library/puppet_library'
 require 'puppet_library/server'
-require 'puppet_library/http/cache'
+require 'puppet_library/module_metadata'
 require 'puppet_library/http/http_client'
 require 'puppet_library/http/url'
-require 'puppet_library/module_metadata'
+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'

data/lib/puppet_library/forge.rb

@@ -69,12 +69,24 @@ module PuppetLibrary
             module_infos.deep_merge
         end
 
-        def get_module_metadata_with_dependencies(author, name)
+        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?
 
-            collect_dependencies_versions(full_name).tap do |versions|
-                raise ModuleNotFound if versions[full_name].empty?
+            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 = {})

data/lib/puppet_library/http/{cache.rb → cache/in_memory.rb}

@@ -15,25 +15,37 @@
 # 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
-    class Cache
+module PuppetLibrary::Http::Cache
+    class InMemory
         ARBITRARY_CACHE_TTL_MILLIS = 10 * 1000
         def initialize(millis_to_live = ARBITRARY_CACHE_TTL_MILLIS)
             @reaper = Reaper.new(millis_to_live)
-            @cache = {}
         end
 
         def get(key)
-            entry = @cache[key]
+            entry = retrieve(key)
             if entry
                 return entry.value unless @reaper.wants_to_kill? entry
             end
 
             value = yield
-            @cache[key] = Entry.new(value)
+            save(key, Entry.new(value))
             return value
         end
 
+        def retrieve(key)
+            cache[key]
+        end
+
+        def save(key, entry)
+            cache[key] = entry
+        end
+
+        private
+        def cache
+            @cache ||= {}
+        end
+
         class Entry
             attr_accessor :value
 

data/lib/puppet_library/http/cache/noop.rb

@@ -0,0 +1,28 @@
+# -*- 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/>.
+
+require 'puppet_library/http/cache/in_memory'
+
+module PuppetLibrary::Http::Cache
+    class NoOp < PuppetLibrary::Http::Cache::InMemory
+        def save(key, entry)
+        end
+
+        def retrieve(key)
+        end
+    end
+end

data/lib/puppet_library/module_repo/directory.rb

@@ -1,5 +1,5 @@
 # Puppet Library
-# Copyright (C) 2013 drrb
+# 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

data/lib/puppet_library/module_repo/multi.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 # Puppet Library
-# Copyright (C) 2013 drrb
+# 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

data/lib/puppet_library/module_repo/proxy.rb

@@ -16,15 +16,21 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'puppet_library/http/http_client'
-require 'puppet_library/http/cache'
+require 'puppet_library/http/cache/in_memory'
+require 'puppet_library/http/cache/noop'
 require 'puppet_library/http/url'
 
 module PuppetLibrary::ModuleRepo
+    #include PuppetLibrary::Http
     class Proxy
-        def initialize(url, http_client = PuppetLibrary::Http::HttpClient.new, query_cache = PuppetLibrary::Http::Cache.new)
+        def initialize(url,
+                       query_cache = PuppetLibrary::Http::Cache::InMemory.new,
+                       download_cache = PuppetLibrary::Http::Cache::NoOp.new,
+                       http_client = PuppetLibrary::Http::HttpClient.new)
             @url = PuppetLibrary::Http::Url.normalize(url)
             @http_client = http_client
             @query_cache = query_cache
+            @download_cache = download_cache
         end
 
         def get_module(author, name, version)
@@ -71,7 +77,9 @@ module PuppetLibrary::ModuleRepo
         end
 
         def download_file(file)
-            @http_client.download(url(file))
+            @download_cache.get(file) do
+                @http_client.download(url(file))
+            end
         end
 
         def get(relative_url)

data/lib/puppet_library/server.rb

@@ -50,8 +50,9 @@ module PuppetLibrary
 
         get "/api/v1/releases.json" do
             author, module_name = params[:module].split "/"
+            version = params[:version]
             begin
-                @forge.get_module_metadata_with_dependencies(author, module_name).to_json
+                @forge.get_module_metadata_with_dependencies(author, module_name, version).to_json
             rescue ModuleNotFound
                 status 410
                 {"error" => "Module #{author}/#{module_name} not found"}.to_json

data/lib/puppet_library/util.rb

@@ -15,6 +15,8 @@
 # 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 'rubygems/package'
+
 class Array
     # Like 'uniq' with a block, but also works on Ruby < 1.9
     def unique_by
@@ -29,3 +31,14 @@ class Array
         end
     end
 end
+
+class Gem::Package::TarReader
+    # Old versions of RubyGems don't include Enumerable in here
+    def find
+        each do |entry|
+            if yield(entry)
+                return entry
+            end
+        end
+    end
+end

data/lib/puppet_library/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 # Puppet Library
-# Copyright (C) 2013 drrb
+# 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
@@ -16,5 +16,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module PuppetLibrary
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
 end

data/spec/forge_spec.rb

@@ -90,56 +90,129 @@ module PuppetLibrary
                     expect(module_repo).to receive(:get_metadata).with("nonexistant", "nonexistant").and_return([])
 
                     expect {
-                        forge.get_module_metadata_with_dependencies("nonexistant", "nonexistant")
+                        forge.get_module_metadata_with_dependencies("nonexistant", "nonexistant", "1.0.0")
                     }.to raise_error ModuleNotFound
                 end
             end
 
-            context "when module versions found" do
-                it "returns metadata for module and dependencies" do
-                    apache_metadata = [ {
+            context "when only different module versions found" do
+                it "returns an empty array" do
+                    metadata = [ {
                         "author" => "puppetlabs",
                         "name" => "puppetlabs-apache",
                         "description" => "Apache module",
                         "version" => "1.0.0",
-                        "dependencies" => [
-                            { "name" => "puppetlabs/stdlib", "version_requirement" => ">= 2.4.0" },
-                            { "name" => "puppetlabs/concat", "version_requirement" => ">= 1.0.0" }
-                        ]
-                    }, {
-                        "author" => "puppetlabs",
-                        "name" => "puppetlabs-apache",
-                        "description" => "Apache module",
-                        "version" => "1.1.0",
-                        "dependencies" => [
-                            { "name" => "puppetlabs/stdlib", "version_requirement" => ">= 2.4.0" },
-                            { "name" => "puppetlabs/concat", "version_requirement" => ">= 1.0.0" }
-                        ]
-                    } ]
-                    stdlib_metadata = [ {
-                        "author" => "puppetlabs",
-                        "name" => "puppetlabs-stdlib",
-                        "description" => "Stdlib module",
-                        "version" => "2.0.0",
-                        "dependencies" => [ ]
+                        "dependencies" => []
                     } ]
-                    concat_metadata = [ {
-                        "author" => "puppetlabs",
-                        "name" => "puppetlabs-concat",
-                        "description" => "Concat module",
-                        "version" => "1.0.0",
-                        "dependencies" => [ ]
-                    } ]
-                    expect(module_repo).to receive(:get_metadata).with("puppetlabs", "apache").and_return(apache_metadata)
-                    expect(module_repo).to receive(:get_metadata).with("puppetlabs", "stdlib").and_return(stdlib_metadata)
-                    expect(module_repo).to receive(:get_metadata).with("puppetlabs", "concat").and_return(concat_metadata)
-
-                    result = forge.get_module_metadata_with_dependencies("puppetlabs", "apache")
-                    expect(result.keys.sort).to eq(["puppetlabs/apache", "puppetlabs/concat", "puppetlabs/stdlib"])
-                    expect(result["puppetlabs/apache"].size).to eq(2)
-                    expect(result["puppetlabs/apache"][0]["file"]).to eq("/modules/puppetlabs-apache-1.0.0.tar.gz")
-                    expect(result["puppetlabs/apache"][0]["version"]).to eq("1.0.0")
-                    expect(result["puppetlabs/apache"][0]["version"]).to eq("1.0.0")
+                    expect(module_repo).to receive(:get_metadata).with("puppetlabs", "apache").at_least(:once).and_return(metadata)
+
+                    result = forge.get_module_metadata_with_dependencies("puppetlabs", "apache", "2.0.0")
+                    expect(result).to eq({"puppetlabs/apache" => []})
+                end
+            end
+
+            context "when module versions found" do
+                context "when a version specified" do
+                    it "returns metadata for that module version and its dependencies" do
+                        apache_metadata = [ {
+                            "author" => "puppetlabs",
+                            "name" => "puppetlabs-apache",
+                            "description" => "Apache module",
+                            "version" => "1.0.0",
+                            "dependencies" => [
+                                { "name" => "puppetlabs/stdlib", "version_requirement" => ">= 2.4.0" },
+                                { "name" => "puppetlabs/concat", "version_requirement" => ">= 1.0.0" }
+                            ]
+                        }, {
+                            "author" => "puppetlabs",
+                            "name" => "puppetlabs-apache",
+                            "description" => "Apache module",
+                            "version" => "1.1.0",
+                            "dependencies" => [
+                                { "name" => "puppetlabs/stdlib", "version_requirement" => ">= 2.4.0" },
+                                { "name" => "puppetlabs/newthing", "version_requirement" => ">= 1.0.0" }
+                            ]
+                        } ]
+                        stdlib_metadata = [ {
+                            "author" => "puppetlabs",
+                            "name" => "puppetlabs-stdlib",
+                            "description" => "Stdlib module",
+                            "version" => "2.4.0",
+                            "dependencies" => [ ]
+                        } ]
+                        concat_metadata = [ {
+                            "author" => "puppetlabs",
+                            "name" => "puppetlabs-concat",
+                            "description" => "Concat module",
+                            "version" => "1.0.0",
+                            "dependencies" => [ ]
+                        } ]
+                        newthing_metadata = [ {
+                            "author" => "puppetlabs",
+                            "name" => "puppetlabs-newthing",
+                            "description" => "New module",
+                            "version" => "1.0.0",
+                            "dependencies" => [ ]
+                        } ]
+                        expect(module_repo).to receive(:get_metadata).with("puppetlabs", "apache").at_least(:once).and_return(apache_metadata)
+                        expect(module_repo).to receive(:get_metadata).with("puppetlabs", "stdlib").and_return(stdlib_metadata)
+                        expect(module_repo).to receive(:get_metadata).with("puppetlabs", "concat").and_return(concat_metadata)
+                        expect(module_repo).to receive(:get_metadata).with("puppetlabs", "newthing").and_return(newthing_metadata)
+
+                        result = forge.get_module_metadata_with_dependencies("puppetlabs", "apache", "1.0.0")
+                        expect(result.keys.sort).to eq(["puppetlabs/apache", "puppetlabs/concat", "puppetlabs/stdlib"])
+                        expect(result["puppetlabs/apache"].size).to eq(1)
+                        expect(result["puppetlabs/apache"][0]["file"]).to eq("/modules/puppetlabs-apache-1.0.0.tar.gz")
+                        expect(result["puppetlabs/apache"][0]["version"]).to eq("1.0.0")
+                        expect(result["puppetlabs/apache"][0]["version"]).to eq("1.0.0")
+                    end
+                end
+                context "when no version specified" do
+                    it "returns metadata for all module versions and their dependencies" do
+                        apache_metadata = [ {
+                            "author" => "puppetlabs",
+                            "name" => "puppetlabs-apache",
+                            "description" => "Apache module",
+                            "version" => "1.0.0",
+                            "dependencies" => [
+                                { "name" => "puppetlabs/stdlib", "version_requirement" => ">= 2.4.0" },
+                                { "name" => "puppetlabs/concat", "version_requirement" => ">= 1.0.0" }
+                            ]
+                        }, {
+                            "author" => "puppetlabs",
+                            "name" => "puppetlabs-apache",
+                            "description" => "Apache module",
+                            "version" => "1.1.0",
+                            "dependencies" => [
+                                { "name" => "puppetlabs/stdlib", "version_requirement" => ">= 2.4.0" },
+                                { "name" => "puppetlabs/concat", "version_requirement" => ">= 1.0.0" }
+                            ]
+                        } ]
+                        stdlib_metadata = [ {
+                            "author" => "puppetlabs",
+                            "name" => "puppetlabs-stdlib",
+                            "description" => "Stdlib module",
+                            "version" => "2.0.0",
+                            "dependencies" => [ ]
+                        } ]
+                        concat_metadata = [ {
+                            "author" => "puppetlabs",
+                            "name" => "puppetlabs-concat",
+                            "description" => "Concat module",
+                            "version" => "1.0.0",
+                            "dependencies" => [ ]
+                        } ]
+                        expect(module_repo).to receive(:get_metadata).with("puppetlabs", "apache").at_least(:once).and_return(apache_metadata)
+                        expect(module_repo).to receive(:get_metadata).with("puppetlabs", "stdlib").and_return(stdlib_metadata)
+                        expect(module_repo).to receive(:get_metadata).with("puppetlabs", "concat").and_return(concat_metadata)
+
+                        result = forge.get_module_metadata_with_dependencies("puppetlabs", "apache", nil)
+                        expect(result.keys.sort).to eq(["puppetlabs/apache", "puppetlabs/concat", "puppetlabs/stdlib"])
+                        expect(result["puppetlabs/apache"].size).to eq(2)
+                        expect(result["puppetlabs/apache"][0]["file"]).to eq("/modules/puppetlabs-apache-1.0.0.tar.gz")
+                        expect(result["puppetlabs/apache"][0]["version"]).to eq("1.0.0")
+                        expect(result["puppetlabs/apache"][0]["version"]).to eq("1.0.0")
+                    end
                 end
             end
         end

data/spec/http/{cache_spec.rb → cache/in_memory_spec.rb}

@@ -17,10 +17,10 @@
 
 require 'spec_helper'
 
-module PuppetLibrary::Http
-    describe Cache do
+module PuppetLibrary::Http::Cache
+    describe InMemory do
 
-        let(:cache) { Cache.new }
+        let(:cache) { InMemory.new }
 
         describe "#get" do
             context "the first time it's called" do
@@ -51,7 +51,7 @@ module PuppetLibrary::Http
 
             context "when the time limit has expired" do
                 it "looks up the value again" do
-                    cache = Cache.new(0)
+                    cache = InMemory.new(0)
 
                     greeting = cache.get("greeting") { "hi" }
                     greeting = cache.get("greeting") { "bye" }

data/spec/http/cache/noop_spec.rb

@@ -0,0 +1,32 @@
+# -*- 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/>.
+
+require 'spec_helper'
+
+module PuppetLibrary::Http::Cache
+    describe NoOp do
+        let(:cache) { NoOp.new }
+
+        describe "#get" do
+            it "never caches the content" do
+                name = cache.get("name") { "joe" }
+                name = cache.get("name") { "james" }
+                expect(name).to eq "james"
+            end
+        end
+    end
+end

data/spec/module_repo/directory_spec.rb

@@ -1,5 +1,5 @@
 # Puppet Library
-# Copyright (C) 2013 drrb
+# 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

data/spec/module_repo/multi_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 # Puppet Library
-# Copyright (C) 2013 drrb
+# 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

data/spec/module_repo/proxy_spec.rb

@@ -20,11 +20,13 @@ require 'spec_helper'
 module PuppetLibrary::ModuleRepo
     describe Proxy do
         let(:http_client) { double('http_client') }
-        let(:repo) { Proxy.new("http://puppetforge.example.com", http_client) }
+        let(:query_cache) { PuppetLibrary::Http::Cache::InMemory.new }
+        let(:download_cache) { PuppetLibrary::Http::Cache::InMemory.new }
+        let(:repo) { Proxy.new("http://puppetforge.example.com", query_cache, download_cache, http_client) }
 
         describe "url" do
             it "defaults to HTTP, when protocol not specified" do
-                repo = Proxy.new("forge.puppetlabs.com", http_client)
+                repo = Proxy.new("forge.puppetlabs.com", query_cache, download_cache, http_client) 
 
                 expect(http_client).to receive(:get).with(/http:\/\/forge.puppetlabs.com/).and_return('{"puppetlabs/apache":[]}')
 
@@ -32,7 +34,7 @@ module PuppetLibrary::ModuleRepo
             end
 
             it "copes with a trailing slash" do
-                repo = Proxy.new("forge.puppetlabs.com/", http_client)
+                repo = Proxy.new("forge.puppetlabs.com/", query_cache, download_cache, http_client) 
 
                 expect(http_client).to receive(:get).with(/http:\/\/forge.puppetlabs.com\/api/).and_return('{"puppetlabs/apache":[]}')
 
@@ -53,6 +55,14 @@ module PuppetLibrary::ModuleRepo
                     module_buffer = repo.get_module("puppetlabs", "apache", "1.2.3")
                     expect(module_buffer).to eq "module buffer"
                 end
+
+                it "caches the download" do
+                    expect(http_client).to receive(:get).at_least(1).times.and_return('{"puppetlabs/apache":[{"version": "1", "file":"/module.tar.gz"}]}')
+                    expect(http_client).to receive(:download).once
+
+                    repo.get_module("puppetlabs", "apache", "1")
+                    repo.get_module("puppetlabs", "apache", "1")
+                end
             end
 
             context "when the module doesn't exist" do

data/spec/module_spec_helper.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 # Puppet Library
-# Copyright (C) 2013 drrb
+# 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

data/spec/server_spec.rb

@@ -115,7 +115,7 @@ module PuppetLibrary
                         }
                     ]
                 }
-                expect(forge).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "apache").and_return(metadata)
+                expect(forge).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "apache", nil).and_return(metadata)
 
                 get "/api/v1/releases.json?module=puppetlabs/apache"
 
@@ -125,7 +125,7 @@ module PuppetLibrary
 
             context "when the module can't be found" do
                 it "returns an error" do
-                    expect(forge).to receive(:get_module_metadata_with_dependencies).with("nonexistant", "nonexistant").and_raise(ModuleNotFound)
+                    expect(forge).to receive(:get_module_metadata_with_dependencies).with("nonexistant", "nonexistant", nil).and_raise(ModuleNotFound)
 
                     get "/api/v1/releases.json?module=nonexistant/nonexistant"
 
@@ -133,6 +133,14 @@ module PuppetLibrary
                     expect(last_response.status).to eq(410)
                 end
             end
+
+            context "when a version is specified" do
+                it "looks up the specified version" do
+                    expect(forge).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "apache", "1.0.0")
+
+                    get "/api/v1/releases.json?module=puppetlabs/apache&version=1.0.0"
+                end
+            end
         end
     end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 # Puppet Library
-# Copyright (C) 2013 drrb
+# 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

data/spec/util_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 # Puppet Library
-# Copyright (C) 2013 drrb
+# 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-library
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - drrb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -190,6 +190,7 @@ files:
 - .licenseignore
 - .simplecov
 - .travis.yml
+- CHANGELOG.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -199,7 +200,8 @@ files:
 - config.ru
 - lib/puppet_library.rb
 - lib/puppet_library/forge.rb
-- lib/puppet_library/http/cache.rb
+- lib/puppet_library/http/cache/in_memory.rb
+- lib/puppet_library/http/cache/noop.rb
 - lib/puppet_library/http/http_client.rb
 - lib/puppet_library/http/url.rb
 - lib/puppet_library/module_metadata.rb
@@ -212,7 +214,8 @@ files:
 - lib/puppet_library/version.rb
 - puppet-library.gemspec
 - spec/forge_spec.rb
-- spec/http/cache_spec.rb
+- spec/http/cache/in_memory_spec.rb
+- spec/http/cache/noop_spec.rb
 - spec/http/http_client_spec.rb
 - spec/http/url_spec.rb
 - spec/module_repo/directory_spec.rb
@@ -250,7 +253,8 @@ specification_version: 4
 summary: Puppet Library is a private Puppet module server that's compatible with librarian-puppet.
 test_files:
 - spec/forge_spec.rb
-- spec/http/cache_spec.rb
+- spec/http/cache/in_memory_spec.rb
+- spec/http/cache/noop_spec.rb
 - spec/http/http_client_spec.rb
 - spec/http/url_spec.rb
 - spec/module_repo/directory_spec.rb