puppet-library 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 957de9eb484e3ec881a524fe467b6ceab2575f34
-  data.tar.gz: b3a3dbc2610ec8fcdc1064f9b745ea5ba9539e3d
-SHA512:
-  metadata.gz: 9c8bf309ca1363ea52d83d144a1aea682c236c10a00ee7520a62608771f37d2cbfb7d16eb9f1267fd06ad4127aae612b2b1c0d042532a64999bfae8d27d69040
-  data.tar.gz: 965b766bcc9d58bc6939ba454a937469a5db4fc9f23b82a2dfbce089bc5b3c4817583379a2444131b94a44506b74de66e2ba9bf2a53a2627639ceb18eef1093c
+--- 
+SHA1: 
+  metadata.gz: 280994b916da7d8f05ba4cf98828e6459d6fdea4
+  data.tar.gz: d1654492cdb5e30855c62b5fbabf08d7c1cb38a5
+SHA512: 
+  metadata.gz: d518cbe064ed9c664fd2198d070ce7db2576c761d9526a52c3ee577d8f067c0183462027dd78420810f82c1262f8fa8d9ac5e39c64b93e6a70e19baa8aff4022
+  data.tar.gz: 28e347c2c9ed7215a6c2f2915264e463580d337e596464a6d5afddcb64d35bfec27b6a9be176712cb939f455f10b4694eea55adca0e98a90cb9d5f7337c953cc

data/CHANGELOG.yml

@@ -57,3 +57,9 @@
 - tag: v0.9.0
   changes:
       - Added new source forge that serves modules from directories on disk
+- tag: v0.9.1
+  changes:
+      - Fixed source forge bug that generated metadata incorrectly
+- tag: v0.10.0
+  changes:
+      - Fixed imports to enable easier embedding of Puppet Library

data/Rakefile

@@ -102,7 +102,7 @@ end
 task :default => [:test, 'coveralls:push']
 
 desc "Check it works on all local rubies"
-task :verify do
+task :verify => 'test-imports' do
     versions = SUPPORTED_RUBY_VERSIONS
     puts "\nRunning Specs".green
     spec_results = versions.map do |ruby_version|
@@ -185,6 +185,7 @@ task "push-release" => ["check-license", :verify] do
     upload_release_notes(PuppetLibrary::VERSION)
 
     increment_version
+    git_push
 end
 
 desc "Increment version number and commit it"
@@ -197,6 +198,39 @@ task "register-release", [:version] do |task, args|
     upload_release_notes(args[:version])
 end
 
+desc "Import files individually to make sure they can be imported externally"
+task "test-imports" do
+    puts "Testing imports"
+    puts
+    Dir.chdir "lib"
+
+    paths = Dir["**/*.rb"].map {|f| f.sub /\.rb$/, "" }
+    paths = paths.sort_by {|p| p.count "/"}
+    errors = []
+    paths.each do |path|
+        print "importing #{path}..."
+        output = `ruby -e '$LOAD_PATH.unshift(File.expand_path(".")); require "#{path}"' 2>&1`
+        print " ["
+        if $?.success?
+            print "OK".green
+        else
+            print "FAIL".red
+            errors << "#{path}: #{output.red}"
+        end
+        puts "]"
+    end
+
+    unless errors.empty?
+        puts
+        puts
+        fail <<-EOFAILURE
+Failed to import some files:
+
+#{errors.join "\n\n"}
+        EOFAILURE
+    end
+end
+
 def upload_release_notes(version)
     puts "Registering release notes for #{version}"
     github = Github.new
@@ -232,6 +266,10 @@ def upload_release_notes(version)
     puts "Done"
 end
 
+def git_push
+    system "git push" or fail "Couldn't push release"
+end
+
 def increment_version
     major, minor, patch = PuppetLibrary::VERSION.split(".").map {|n| n.to_i}
     new_version = "#{major}.#{minor + 1}.0"

data/TODO.yml

@@ -1,7 +1,13 @@
 features:
     - Web UI:
         - asynchronous (index page loads too slowly)
-    - Proxy a git repository
+    - Proxy a git repository:
+        - make it threadsafe (checkouts into temp dirs)
+        - make the specs fast
+        - add an integration test
+        - make it work with remote forges (clone and fetch on query/download)
+        - make it fast (pre-clone repos on startup (maybe just warn if they can't be found). Maybe cache artifacts?)
+    - logging
     - Named subforges:
         - per-subforge queries
         - upload modules (web form and API)

data/lib/puppet_library/forge/abstract.rb

@@ -20,6 +20,10 @@ require 'puppet_library/util'
 
 module PuppetLibrary::Forge
 
+    # An abstract forge implementation that makes it easier to create new forge
+    # types.
+    #
+    # See PuppetLibrary::Forge::Directory for an example
     class Abstract
         def initialize(module_repo)
             @repo = module_repo

data/lib/puppet_library/forge/cache.rb

@@ -17,9 +17,14 @@
 
 require 'puppet_library/forge/proxy'
 require 'puppet_library/http/http_client'
-
 module PuppetLibrary::Forge
+
+    # A forge that proxies a remote forge. All module archives downloaded from the
+    # remote forged are cached to disk.
     class Cache < Proxy
+
+        # * <tt>:url</tt> - The URL of the remote forge.
+        # * <tt>:cache_dir</tt> - The directory in which to cache the downloaded artifacts.
         def initialize(url, cache_dir, http_client = PuppetLibrary::Http::HttpClient.new)
             super(url, PuppetLibrary::Http::Cache::InMemory.new, PuppetLibrary::Http::Cache::Disk.new(cache_dir), http_client)
         end

data/lib/puppet_library/forge/directory.rb

@@ -19,7 +19,17 @@ require 'puppet_library/forge/abstract'
 require 'puppet_library/archive/archive_reader'
 
 module PuppetLibrary::Forge
+
+    # A forge that serves modules from a directory on disk.
+    #
+    # <b>Note:</b>
+    # * The modules must be packaged in +.tar.gz+ format
+    # * The modules must be named in the format <tt>author-modulename-version.tar.gz</tt>
+    # * The modules must contain a +metadata.json+ file
+    # That is, the format must be the same as what is produced by <tt>puppet module build</tt>
     class Directory < PuppetLibrary::Forge::Abstract
+
+        # * <tt>:module_dir</tt> - The directory containing the packaged modules.
         def initialize(module_dir)
             super(self)
             raise "Module directory '#{module_dir}' doesn't exist" unless File.directory? module_dir

data/lib/puppet_library/forge/git_repository.rb

@@ -0,0 +1,106 @@
+# 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 'json'
+require 'rubygems/package'
+require 'zlib'
+require 'puppet_library/forge/abstract'
+
+module PuppetLibrary::Forge
+    class GitRepository < PuppetLibrary::Forge::Abstract
+        def initialize(author, name, version_tag_regex, git_path)
+            super(self)
+            @author = author
+            @name = name
+            @path = File.expand_path(git_path)
+            @version_tag_regex = version_tag_regex
+        end
+
+        def get_module(author, name, version)
+            unless author == @author && name == @name
+                return nil
+            end
+            unless tags.include? tag_name(version)
+                return nil
+            end
+            on_tag_for(version) do
+                PuppetLibrary::Archive::Archiver.archive_dir(@path, "#{@author}-#{@name}-#{version}") do |archive|
+                    archive.add_file("metadata.json", 0644) do |entry|
+                        entry.write modulefile.to_metadata.to_json
+                    end
+                end
+            end
+        end
+
+        def get_metadata(author, module_name)
+            unless author == @author && module_name == @name
+                return []
+            end
+            tags.map do |tag|
+                modulefile_for_tag(tag).to_metadata
+            end
+        end
+
+        def get_all_metadata
+            get_metadata(@author, @name)
+        end
+
+        private
+        def tags
+            git("tag").split.select {|tag| tag =~ @version_tag_regex }
+        end
+
+        def modulefile_for_tag(tag)
+            modulefile_source = git("show refs/tags/#{tag}:Modulefile")
+            PuppetLibrary::PuppetModule::Modulefile.parse(modulefile_source)
+        end
+
+        def modulefile
+            modulefile_path = File.join(@path, "Modulefile")
+            PuppetLibrary::PuppetModule::Modulefile.read(modulefile_path)
+        end
+
+        def package_name(version)
+            "#{@author}-#{@name}-#{version}.tar.gz"
+        end
+
+        def tag_name(version)
+            version
+        end
+
+        def on_tag_for(version, &block)
+            on_tag(tag_name(version), &block)
+        end
+
+        def on_tag(tag, &block)
+            git "checkout #{tag}"
+            in_dir(@path, &block)
+        end
+
+        def in_dir(dir)
+            origin = Dir.pwd
+            Dir.chdir dir
+            yield
+        ensure
+            Dir.chdir origin
+        end
+
+        def git(command)
+            #TODO: redirection will fail on windows. How do we properly discard stderr?
+            IO.popen("git --git-dir=#{@path}/.git --work-tree=#{@path} #{command} 2>/dev/null").read
+        end
+    end
+end

data/lib/puppet_library/forge/multi.rb

@@ -18,11 +18,29 @@
 require 'puppet_library/forge/search_result'
 
 module PuppetLibrary::Forge
+
+    # A forge that delegates to multiple other forges.
+    #
+    # For queries, all subforges are queried. The results are merged, giving
+    # preference to earlier ones. That is, if the same version of a module is
+    # found in two different subforges, the one contained in the earlier
+    # subforge is kept in the query results.
+    #
+    # For downloads, subforges are queried sequentially. The first module found
+    # is returned.
+    #
+    # <b>Usage:</b>
+    #
+    #     # A forge that serves modules from disk, and proxies a remote forge
+    #     multi_forge = Multi.new
+    #     multi_forge.add_forge(Directory.new("/var/modules"))
+    #     multi_forge.add_forge(Proxy.new("http://forge.puppetlabs.com"))
     class Multi
         def initialize
             @forges = []
         end
 
+        # Add another forge to delegate to.
         def add_forge(forge)
             @forges << forge
         end

data/lib/puppet_library/forge/proxy.rb

@@ -20,12 +20,16 @@ require 'puppet_library/http/cache/in_memory'
 require 'puppet_library/http/cache/noop'
 
 module PuppetLibrary::Forge
+
+    # A forge that proxies a remote forge.
     class Proxy
+
+        # * <tt>:url</tt> - The URL of the remote forge.
         def initialize(url,
                        query_cache = PuppetLibrary::Http::Cache::InMemory.new,
                        download_cache = PuppetLibrary::Http::Cache::NoOp.new,
                        http_client = PuppetLibrary::Http::HttpClient.new)
-            @url = url
+            @url = PuppetLibrary::Http::Url.normalize(url)
             @http_client = http_client
             @query_cache = query_cache
             @download_cache = download_cache

data/lib/puppet_library/forge/search_result.rb

@@ -17,34 +17,36 @@
 
 require 'puppet_library/util'
 
-module PuppetLibrary::Forge::SearchResult
-    def self.merge_by_full_name(results)
-        results_by_module = results.group_by do |result|
-            result["full_name"]
+module PuppetLibrary::Forge
+    module SearchResult
+        def self.merge_by_full_name(results)
+            results_by_module = results.group_by do |result|
+                result["full_name"]
+            end
+
+            results_by_module.values.map do |module_results|
+                combine_search_results(module_results)
+            end.flatten
         end
 
-        results_by_module.values.map do |module_results|
-            combine_search_results(module_results)
-        end.flatten
-    end
+        def self.combine_search_results(search_results)
+            highest_version, tags, releases = search_results.inject([nil, [], []]) do |(highest_version, tags, releases), result|
+                [
+                    max_version(highest_version, result["version"]),
+                    tags + (result["tag_list"] || []),
+                    releases + (result["releases"] || [])
+                ]
+            end
 
-    def self.combine_search_results(search_results)
-        highest_version, tags, releases = search_results.inject([nil, [], []]) do |(highest_version, tags, releases), result|
-            [
-                max_version(highest_version, result["version"]),
-                tags + (result["tag_list"] || []),
-                releases + (result["releases"] || [])
-            ]
+            combined_result = search_results.first.tap do |result|
+                result["version"] = highest_version
+                result["tag_list"] = tags.uniq
+                result["releases"] = releases.uniq.version_sort_by {|r| r["version"]}.reverse
+            end
         end
 
-        combined_result = search_results.first.tap do |result|
-            result["version"] = highest_version
-            result["tag_list"] = tags.uniq
-            result["releases"] = releases.uniq.version_sort_by {|r| r["version"]}.reverse
+        def self.max_version(left, right)
+            [Gem::Version.new(left), Gem::Version.new(right)].max.version
         end
     end
-
-    def self.max_version(left, right)
-        [Gem::Version.new(left), Gem::Version.new(right)].max.version
-    end
 end

data/lib/puppet_library/forge/source.rb

@@ -15,12 +15,21 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'puppet_library/archive/archiver'
+require 'puppet_library/forge/abstract'
 require 'puppet_library/puppet_module/modulefile'
 require 'json'
 
 module PuppetLibrary::Forge
+
+    # A forge that serves a module from its source on disk.
+    # Metadata (+metadata.json+) is generated on the fly.
+    #
+    # <b>Note:</b>
+    # The module directory must have a +Modulefile+.
     class Source < PuppetLibrary::Forge::Abstract
         CACHE_TTL_MILLIS = 500
+
+        # * <tt>:module_dir</tt> - The directory containing the module's source.
         def initialize(module_dir)
             super(self)
             module_dir = File.expand_path(module_dir)
@@ -34,7 +43,7 @@ module PuppetLibrary::Forge
             return nil unless this_module?(author, name, version)
             PuppetLibrary::Archive::Archiver.archive_dir(@module_dir, "#{author}-#{name}-#{version}") do |archive|
                 archive.add_file("metadata.json", 0644) do |entry|
-                    entry.write modulefile.to_metadata
+                    entry.write modulefile.to_metadata.to_json
                 end
             end
         end

data/lib/puppet_library/forge.rb

@@ -22,6 +22,7 @@ module PuppetLibrary::Forge
     require 'puppet_library/forge/abstract'
     require 'puppet_library/forge/cache'
     require 'puppet_library/forge/directory'
+    require 'puppet_library/forge/git_repository'
     require 'puppet_library/forge/multi'
     require 'puppet_library/forge/proxy'
     require 'puppet_library/forge/search_result'

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

@@ -15,39 +15,41 @@
 # 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
-    class Disk
-        def initialize(directory)
-            @directory = directory
-        end
+module PuppetLibrary::Http
+    module Cache
+        class Disk
+            def initialize(directory)
+                @directory = directory
+            end
 
-        def get(path)
-            unless include? path
-                buffer = yield
-                save(path, buffer)
+            def get(path)
+                unless include? path
+                    buffer = yield
+                    save(path, buffer)
+                end
+                retrieve(path)
             end
-            retrieve(path)
-        end
 
-        private
-        def include?(path)
-            File.exist? entry_path(path)
-        end
+            private
+            def include?(path)
+                File.exist? entry_path(path)
+            end
 
-        def save(path, buffer)
-            file_path = entry_path(path)
-            FileUtils.mkdir_p File.dirname(file_path)
-            File.open(file_path, "w") do |file|
-                file.write buffer.read
+            def save(path, buffer)
+                file_path = entry_path(path)
+                FileUtils.mkdir_p File.dirname(file_path)
+                File.open(file_path, "w") do |file|
+                    file.write buffer.read
+                end
             end
-        end
 
-        def retrieve(path)
-            File.open(entry_path(path))
-        end
+            def retrieve(path)
+                File.open(entry_path(path))
+            end
 
-        def entry_path(path)
-            File.join(@directory, path)
+            def entry_path(path)
+                File.join(@directory, path)
+            end
         end
     end
 end

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

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

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

@@ -17,10 +17,12 @@
 
 require 'puppet_library/http/cache/in_memory'
 
-module PuppetLibrary::Http::Cache
-    class NoOp
-        def get(path)
-            yield
+module PuppetLibrary::Http
+    module Cache
+        class NoOp
+            def get(path)
+                yield
+            end
         end
     end
 end

data/lib/puppet_library/http/cache.rb

@@ -15,8 +15,10 @@
 # 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/disk'
-    require 'puppet_library/http/cache/in_memory'
-    require 'puppet_library/http/cache/noop'
+module PuppetLibrary::Http
+    module Cache
+        require 'puppet_library/http/cache/disk'
+        require 'puppet_library/http/cache/in_memory'
+        require 'puppet_library/http/cache/noop'
+    end
 end

data/lib/puppet_library/puppet_module/modulefile.rb

@@ -17,8 +17,12 @@
 module PuppetLibrary::PuppetModule
     class Modulefile
         def self.read(modulefile_path)
+            parse(File.read(modulefile_path))
+        end
+
+        def self.parse(modulefile_source)
             Modulefile.new.tap do |modulefile|
-                modulefile.instance_eval(File.read(modulefile_path))
+                modulefile.instance_eval(modulefile_source)
             end
         end
 

data/lib/puppet_library/server.rb

@@ -21,6 +21,19 @@ require 'haml'
 require 'puppet_library/forge/multi'
 
 module PuppetLibrary
+    # The Puppet Library server
+    #
+    # A Rack application that can be configured as follows:
+    #
+    #    server = PuppetLibrary::Server.set_up do |library|
+    #        # Look for my modules locally
+    #        library.forge PuppetLibrary::Forge::Directory.new("/var/lib/modules")
+    #
+    #        # Get everything else from the Puppet Forge
+    #        library.forge PuppetLibrary::Forge::Proxy.new("http://forge.puppetlabs.com")
+    #    end
+    #
+    #    run server
     class Server < Sinatra::Base
         class Config
             def initialize(forge)

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.9.0"
+    VERSION = "0.9.1"
 end

data/spec/forge/git_repository_spec.rb

@@ -0,0 +1,125 @@
+# 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::Forge
+    describe GitRepository do
+        @@repo_path = Tempdir.create("git-repo")
+        @@versions = [ "0.9.0", "1.0.0-rc1", "1.0.0" ]
+        @@tags = @@versions + [ "xxx" ]
+
+        before :all do
+            def git(command)
+                git_command = "git --git-dir=#{@@repo_path}/.git --work-tree=#{@@repo_path} #{command}"
+                `#{git_command}`
+                unless $?.success?
+                    raise "Failed to run command: \"#{git_command}\""
+                end
+            end
+
+            git "init"
+            git "config user.name tester"
+            git "config user.email tester@example.com"
+            @@versions.zip(@@tags).each do |(version, tag)|
+                File.open(File.join(@@repo_path, "Modulefile"), "w") do |modulefile|
+                    modulefile.write <<-MODULEFILE
+                    name 'puppetlabs-apache'
+                    version '#{version}'
+                    author 'puppetlabs'
+                    MODULEFILE
+                end
+                git "add ."
+                git "commit --message='Version #{version}'"
+                git "tag #{tag}"
+            end
+        end
+
+        after :all do
+            rm_rf @@repo_path
+        end
+
+        let(:forge) { GitRepository.new("puppetlabs", "apache", /[0-9.]+/, @@repo_path) }
+
+        describe "#get_module" do
+            context "when the requested author is different from the configured author" do
+                it "returns nil" do
+                    buffer = forge.get_module("dodgybrothers", "apache", "1.0.0")
+                    expect(buffer).to be_nil
+                end
+            end
+
+            context "when the requested module name is different from the configured name" do
+                it "returns nil" do
+                    buffer = forge.get_module("puppetlabs", "stdlib", "1.0.0")
+                    expect(buffer).to be_nil
+                end
+            end
+
+            context "when the tag for the requested version doesn't exist" do
+                it "returns nil" do
+                    buffer = forge.get_module("puppetlabs", "apache", "9.9.9")
+                    expect(buffer).to be_nil
+                end
+            end
+
+            context "when the module is requested" do
+                it "returns an archive of the module" do
+                    buffer = forge.get_module("puppetlabs", "apache", "1.0.0")
+                    expect(buffer).to be_tgz_with "puppetlabs-apache-1.0.0/Modulefile", /version '1.0.0'/
+                end
+                it "generates the metadata file and includes it in the archive" do
+                    buffer = forge.get_module("puppetlabs", "apache", "1.0.0")
+                    expect(buffer).to be_tgz_with "puppetlabs-apache-1.0.0/metadata.json", /"version":"1.0.0"/
+                end
+            end
+        end
+
+        describe "#get_metadata" do
+            context "when the requested author is different from the configured author" do
+                it "returns nil" do
+                    metadata = forge.get_metadata("dodgybrothers", "apache")
+                    expect(metadata).to be_empty
+                end
+            end
+
+            context "when the requested module name is different from the configured name" do
+                it "returns an empty array" do
+                    metadata = forge.get_metadata("puppetlabs", "stdlib")
+                    expect(metadata).to be_empty
+                end
+            end
+
+            context "when the module is requested" do
+                it "generates the metadata for the each version" do
+                    metadata = forge.get_metadata("puppetlabs", "apache")
+                    expect(metadata).to have(3).versions
+                    expect(metadata.first["name"]).to eq "puppetlabs-apache"
+                    expect(metadata.first["version"]).to eq "0.9.0"
+                end
+            end
+        end
+
+        describe "#get_all_metadata" do
+            it "generates the metadata for the each version" do
+                metadata = forge.get_metadata("puppetlabs", "apache")
+                expect(metadata).to have(3).versions
+                expect(metadata.first["name"]).to eq "puppetlabs-apache"
+                expect(metadata.first["version"]).to eq "0.9.0"
+            end
+        end
+    end
+end

data/spec/forge/source_spec.rb

@@ -95,7 +95,7 @@ module PuppetLibrary::Forge
                 it "generates a metadata file in the packaged application" do
                     buffer = forge.get_module("puppetlabs", "apache", "1.0.0")
 
-                    expect(buffer).to be_tgz_with(/metadata.json/, /puppetlabs-apache/)
+                    expect(buffer).to be_tgz_with(/metadata.json/, /"name":"puppetlabs-apache"/)
                 end
             end
         end

data/spec/puppet_module/modulefile_spec.rb

@@ -101,6 +101,13 @@ module PuppetLibrary::PuppetModule
                 end
             end
         end
+
+        describe "#parse" do
+            it "works like #read, but with a string" do
+                metadata = Modulefile.parse("version '1.0.0'")
+                expect(metadata.get_version).to eq "1.0.0"
+            end
+        end
     end
 end
 

metadata

@@ -1,303 +1,149 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: puppet-library
-version: !ruby/object:Gem::Version
-  version: 0.9.0
+version: !ruby/object:Gem::Version 
+  version: 0.9.1
 platform: ruby
-authors:
+authors: 
 - drrb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-02-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id002 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id001
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  name: json
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id003
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  name: haml
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id004
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+      - !ruby/object:Gem::Version 
+        version: "1.3"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id005
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: coveralls
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gitsu
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id006
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: gitsu
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id007
+  type: :development
+- !ruby/object:Gem::Dependency 
   name: librarian-puppet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
         version: 0.9.10
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.10
-- !ruby/object:Gem::Dependency
+  requirement: *id008
+  type: :development
+- !ruby/object:Gem::Dependency 
   name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
     - - <
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
+      - !ruby/object:Gem::Version 
+        version: "2"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id009
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: pry
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: puppet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.3.0
+  requirement: *id010
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+- !ruby/object:Gem::Dependency 
+  name: puppet
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 3.3.0
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id011
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: terminal-notifier-guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id012
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: rake
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id013
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id014
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id015
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A private Puppet forge
-email:
+email: 
 - drrrrrrrrrrrb@gmail.com
-executables:
+executables: 
 - puppet-library
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .licenseignore
 - .simplecov
@@ -328,6 +174,7 @@ files:
 - lib/puppet_library/forge/abstract.rb
 - lib/puppet_library/forge/cache.rb
 - lib/puppet_library/forge/directory.rb
+- lib/puppet_library/forge/git_repository.rb
 - lib/puppet_library/forge/multi.rb
 - lib/puppet_library/forge/proxy.rb
 - lib/puppet_library/forge/search_result.rb
@@ -351,6 +198,7 @@ files:
 - spec/forge/abstract_spec.rb
 - spec/forge/cache_spec.rb
 - spec/forge/directory_spec.rb
+- spec/forge/git_repository_spec.rb
 - spec/forge/multi_spec.rb
 - spec/forge/proxy_spec.rb
 - spec/forge/source_spec.rb
@@ -367,30 +215,29 @@ files:
 - spec/util_spec.rb
 - test/librarian_puppet_integration_test.rb
 homepage: https://github.com/drrb/puppet-library
-licenses:
+licenses: 
 - GPL-3
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Puppet Library is a private Puppet module server that's compatible with librarian-puppet.
-test_files:
+test_files: 
 - features/module_list.feature
 - features/module_page.feature
 - features/module_search.feature
@@ -401,6 +248,7 @@ test_files:
 - spec/forge/abstract_spec.rb
 - spec/forge/cache_spec.rb
 - spec/forge/directory_spec.rb
+- spec/forge/git_repository_spec.rb
 - spec/forge/multi_spec.rb
 - spec/forge/proxy_spec.rb
 - spec/forge/source_spec.rb