puppet-library 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d87d552d8e6d73a785d1619b51b13a5945c2895
-  data.tar.gz: 74aebbf4aaa5fcbbd38be6305196871622af6c79
+  metadata.gz: 038f863a597766d136e7db4d8f71245844334d7c
+  data.tar.gz: 0f98e71f5110f3875d4c03a401446bf400faa0bc
 SHA512:
-  metadata.gz: 80b23c9e84ceb508d0fb04978f107848a1bcaf499f8f094e82e9cca9b7fac7a6d18c79dfa952508db5e59c8bd2a86ffed20aec69cc094743adca2d8154a82d8d
-  data.tar.gz: 599abb2bb5d26aa47060f2fe43b7138893343ffbfc2ccc4aa3ff4476e2d1ce70cb745dc88b9a9a500e1287d54967a5a1e78a123747d76ce744babb970a7eacf0
+  metadata.gz: 210fbe7f939854063796aacf44bcdd00da819f3ce97ede62ed58d00ad8c7cd787630aba645bbd460064a5f142da86613b65c920f7995bade1ded406fa049d6b6
+  data.tar.gz: 4978484237188df4973d38aa8880dbfe3829d17753714f8f20cbb29bf85fbbb6426facb137fb71aefe4125e34dcf690142adf45747c5bffc869009abdb825458

data/.licenseignore

@@ -1 +1,2 @@
 .gitignore
+TODO.yml

data/Rakefile

@@ -48,3 +48,15 @@ task "version" do
     puts PuppetLibrary::VERSION
 end
 
+desc "Release Puppet Library"
+task "push-release" => ["check-license", :verify] do
+    puts "Releasing #{PuppetLibrary::VERSION}"
+    Rake::Task[:release].invoke
+
+    major, minor, patch = PuppetLibrary::VERSION.split(".").map {|n| n.to_i}
+    new_version = "#{major}.#{minor + 1}.0"
+    puts "Updating version number to #{new_version}"
+    system(%q[sed -i '' -E 's/VERSION = ".*"/VERSION = "] + new_version + %q["/' lib/puppet_library/version.rb]) or fail "Couldn't update version"
+    PuppetLibrary::VERSION.replace new_version
+    system "git commit lib/puppet_library/version.rb --message='[release] Incremented version number'" or fail "Couldn't commit new version number"
+end

data/TODO.yml

@@ -0,0 +1,5 @@
+Features:
+    - Configure embedded server (currently uses the default Rack server)
+    - Proxy another repository
+    - Use config from a config file
+    - Document usage with Passenger

data/bin/puppet-library

@@ -22,37 +22,5 @@ require "puppet_library"
 require 'optparse'
 
 module PuppetLibrary
-    options = {}
-    OptionParser.new do |opts|
-        opts.banner = "Usage: #{File.basename $0} [options]"
-
-        options[:port] = "9292"
-        opts.on("-p", "--port [PORT]", "Port to listen on (defaults to #{options[:port]}") do |port|
-            options[:port] = port
-        end
-
-        options[:hostname] = "0.0.0.0"
-        opts.on("-b", "--bind-host [HOSTNAME]", "Host name to bind to (defaults to #{options[:hostname]}") do |hostname|
-            options[:hostname] = hostname
-        end
-
-        options[:module_dir] = "./modules"
-        opts.on("-m", "--module-dir [DIR]", "Directory containing the modules (defaults to #{options[:module_dir]})") do |module_dir|
-            options[:module_dir] = module_dir
-        end
-    end.parse!
-
-    server = Server.new(ModuleRepo.new(options[:module_dir]))
-
-    dispatch = Rack::Builder.app do
-        map '/' do
-            run Server.new
-        end
-    end
-
-    Rack::Server.start({
-        app: dispatch,
-        Host: options[:hostname],
-        Port: options[:port]
-    })
+    PuppetLibrary.new.go(ARGV)
 end

data/config.ru

@@ -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'
 require 'puppet_library'
 
+PuppetLibrary::Server.set :module_repo, ModuleRepo::Directory.new("/var/puppet-library/modules")
 run PuppetLibrary::Server

data/lib/puppet_library.rb

@@ -15,5 +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/server"
-require "puppet_library/version"
+require 'puppet_library/version'
+
+require 'puppet_library/puppet_library'
+require 'puppet_library/server'
+require 'puppet_library/module_metadata'
+require 'puppet_library/module_repo/directory'
+require 'puppet_library/module_repo/multi'
+require 'puppet_library/util'

data/lib/puppet_library/module_metadata.rb

@@ -0,0 +1,67 @@
+# -*- encoding: utf-8 -*-
+# Puppet Library
+# Copyright (C) 2013 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
+    class ModuleMetadata
+
+        def initialize(metadata)
+            @metadata = metadata
+        end
+
+        def author
+            @metadata["name"][/^[^-]+/]
+        end
+
+        def name
+            @metadata["name"].sub(/^[^-]+-/, "")
+        end
+
+        def full_name
+            @metadata["name"].sub("-", "/")
+        end
+
+        def version
+            @metadata["version"]
+        end
+
+        def dependencies
+            @metadata["dependencies"]
+        end
+
+        def dependency_names
+            dependencies.map {|d| d["name"]}
+        end
+
+        def to_info
+            {
+                "author" => author,
+                "full_name" => full_name,
+                "name" => name,
+                "desc" => @metadata["description"],
+                "releases" => [ { "version" => version } ]
+            }
+        end
+
+        def to_version
+            {
+                "file" => "/modules/#{author}-#{name}-#{version}.tar.gz",
+                "version" => version,
+                    "dependencies" => dependencies.map {|m| [ m["name"], m["version_requirement"] ]}
+            }
+        end
+    end
+end

data/lib/puppet_library/{module_repo.rb → module_repo/directory.rb}

@@ -13,11 +13,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/>.
+
+require 'json'
 require 'rubygems/package'
 require 'zlib'
 
-module PuppetLibrary
-    class ModuleRepo
+module PuppetLibrary::ModuleRepo
+    class Directory
         def initialize(module_dir)
             @module_dir = module_dir
         end

data/lib/puppet_library/module_repo/multi.rb

@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+# Puppet Library
+# Copyright (C) 2013 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::ModuleRepo
+    class Multi
+        def repos
+            @repos ||= []
+        end
+
+        def add_repo(repo)
+            repos << repo
+        end
+
+        def get_module(author, name, version)
+            repos.each do |repo|
+                mod = repo.get_module(author, name, version)
+                return mod unless mod.nil?
+            end
+            return nil
+        end
+
+        def get_metadata(author, name)
+            metadata_list = repos.inject([]) do |metadata_list, repo|
+                metadata_list + repo.get_metadata(author, name)
+            end
+            metadata_list.unique_by { |metadata| metadata["version"] }
+        end
+    end
+end

data/lib/puppet_library/puppet_library.rb

@@ -0,0 +1,102 @@
+# -*- encoding: utf-8 -*-
+# Puppet Library
+# Copyright (C) 2013 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 'rack'
+require 'puppet_library/module_repo/directory'
+require 'puppet_library/module_repo/multi'
+
+module PuppetLibrary
+    class PuppetLibrary
+        def initialize(log = STDERR)
+            @log = log
+        end
+
+        def go(args)
+            options = parse_options(args)
+            server = build_server(options)
+            announce_server_start(options)
+
+            start_server(server, options)
+        rescue ExpectedError => error
+            @log.puts "Error: #{error}"
+        end
+
+        private
+        def parse_options(args)
+            options = {}
+            option_parser = OptionParser.new do |opts|
+                opts.banner = "Usage: #{File.basename $0} [options]"
+
+                options[:port] = "9292"
+                opts.on("-p", "--port [PORT]", "Port to listen on (defaults to #{options[:port]})") do |port|
+                    options[:port] = port
+                end
+
+                options[:hostname] = "0.0.0.0"
+                opts.on("-b", "--bind-host [HOSTNAME]", "Host name to bind to (defaults to #{options[:hostname]})") do |hostname|
+                    options[:hostname] = hostname
+                end
+
+                options[:module_dirs] = []
+                opts.on("-m", "--module-dir [DIR]", "Directory containing the modules (can be specified multiple times. Defaults to './modules')") do |module_dir|
+                    options[:module_dirs] << module_dir
+                end
+            end
+            begin
+                option_parser.parse(args)
+            rescue OptionParser::InvalidOption => parse_error
+                raise ExpectedError, parse_error.message + "\n" + option_parser.help
+            end
+
+            if options[:module_dirs].empty?
+                options[:module_dirs] << "./modules"
+            end
+
+            return options
+        end
+
+        def build_server(options)
+            module_repo = ModuleRepo::Multi.new
+            options[:module_dirs].each do |dir|
+                subrepo = ModuleRepo::Directory.new(dir)
+                module_repo.add_repo(subrepo)
+            end
+            Server.new(module_repo)
+        end
+
+        def announce_server_start(options)
+            @log.puts "Starting Puppet Library server:"
+            @log.puts " |- Port: #{options[:port]}"
+            @log.puts " |- Host: #{options[:hostname]}"
+            @log.puts " `- Module dirs:"
+            options[:module_dirs].each do |dir|
+                @log.puts "    - #{dir}"
+            end
+        end
+
+        def start_server(server, options)
+            Rack::Server.start(
+                :app => server,
+                :Host => options[:hostname],
+                :Port => options[:port]
+            )
+        end
+    end
+
+    class ExpectedError < StandardError
+    end
+end

data/lib/puppet_library/server.rb

@@ -14,10 +14,19 @@
 #
 # 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 'sinatra/base'
-require 'json'
 
-require 'puppet_library/module_repo'
+require 'puppet_library/module_metadata'
+require 'puppet_library/module_repo/multi'
+
+class Array
+    def deep_merge
+        inject({}) do |merged, map|
+            merged.deep_merge(map)
+        end
+    end
+end
 
 class Hash
     def deep_merge(other)
@@ -32,61 +41,11 @@ class Hash
 end
 
 module PuppetLibrary
-
-    class ModuleMetadata
-
-        def initialize(metadata)
-            @metadata = metadata
-        end
-
-        def author
-            @metadata["name"][/^[^-]+/]
-        end
-
-        def name
-            @metadata["name"].sub(/^[^-]+-/, "")
-        end
-
-        def full_name
-            @metadata["name"].sub("-", "/")
-        end
-
-        def version
-            @metadata["version"]
-        end
-
-        def dependencies
-            @metadata["dependencies"]
-        end
-
-        def dependency_names
-            dependencies.map {|d| d["name"]}
-        end
-
-        def to_info
-            {
-                "author" => author,
-                "full_name" => full_name,
-                "name" => name,
-                "desc" => @metadata["description"],
-                "releases" => [ { "version" => version } ]
-            }
-        end
-
-        def to_version
-            {
-                "file" => "/modules/#{author}-#{name}-#{version}.tar.gz",
-                "version" => version,
-                "dependencies" => dependencies.map {|m| [ m["name"], m["version_requirement"] ]}
-            }
-        end
-    end
-
     class Server < Sinatra::Base
 
-        def initialize(module_repo = ModuleRepo.new("modules"))
+        def initialize(module_repo = ModuleRepo::Multi.new)
             super(nil)
-            @repo = module_repo
+            @repo = settings.respond_to?(:module_repo) ? settings.module_repo : module_repo
         end
 
         configure do
@@ -96,37 +55,22 @@ module PuppetLibrary
         get "/:author/:module.json" do
             author = params[:author]
             module_name = params[:module]
-            modules = get_metadata(author, module_name)
-            if modules.empty?
+
+            begin
+                get_module_metadata(author, module_name).to_json
+            rescue ModuleNotFound
                 status 410
                 {"error" => "Could not find module \"#{module_name}\""}.to_json
-            else
-                modules.map do |metadata|
-                    metadata.to_info
-                end.inject({}) do |merged, map|
-                    merged.deep_merge(map)
-                end.to_json
             end
         end
 
         get "/api/v1/releases.json" do
-            full_name = params[:module]
-            module_queue = [full_name]
-            modules_versions = {}
-            while module_full_name = module_queue.shift
-                next if modules_versions[module_full_name]
-                author, module_name = module_full_name.split "/"
-                module_versions = get_metadata(author, module_name)
-                dependencies = module_versions.map {|v| v.dependency_names }.flatten
-                module_queue += dependencies
-                modules_versions[module_full_name] = module_versions.map { |v| v.to_version }
-            end
-
-            if modules_versions.values == [[]]
+            author, module_name = params[:module].split "/"
+            begin
+                get_module_metadata_with_dependencies(author, module_name).to_json
+            rescue ModuleNotFound
                 status 410
-                {"error" => "Module #{full_name} not found"}.to_json
-            else
-                modules_versions.to_json
+                {"error" => "Module #{author}/#{module_name} not found"}.to_json
             end
         end
 
@@ -134,18 +78,57 @@ module PuppetLibrary
             author = params[:author]
             name = params[:module]
             version = params[:version]
-            buffer = @repo.get_module(author, name, version)
+
             content_type "application/octet-stream"
-            if buffer.nil?
+
+            begin
+                get_module_buffer(author, name, version).tap do
+                    attachment "#{author}-#{name}-#{version}.tar.gz"
+                end
+            rescue ModuleNotFound
                 status 404
-            else
-                attachment "#{author}-#{name}-#{version}.tar.gz"
-                buffer
             end
         end
 
+        private
+        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)
+            full_name = "#{author}/#{name}"
+
+            module_queue = []
+            modules_versions = {}
+            module_queue << full_name
+            until module_queue.empty?
+                module_full_name = module_queue.shift
+                already_added = modules_versions.include? module_full_name
+                unless already_added
+                    author, module_name = module_full_name.split "/"
+                    module_versions = get_metadata(author, module_name)
+                    dependencies = module_versions.map {|v| v.dependency_names }.flatten
+                    module_queue += dependencies
+                    modules_versions[module_full_name] = module_versions.map { |v| v.to_version }
+                end
+            end
+            raise ModuleNotFound if modules_versions.values == [[]]
+            modules_versions
+        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
 end
+
+class ModuleNotFound < Exception
+end

data/lib/puppet_library/util.rb

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+# Puppet Library
+# Copyright (C) 2013 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/>.
+
+class Array
+    # Like 'uniq' with a block, but also works on Ruby < 1.9
+    def unique_by
+        attr_to_element = {}
+        select do |element|
+            attribute = yield(element)
+            is_duplicate = attr_to_element.include? attribute
+            unless is_duplicate
+                attr_to_element[yield(element)] = element
+            end
+            !is_duplicate
+        end
+    end
+end

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.0.1"
+    VERSION = "0.0.2"
 end

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

@@ -16,12 +16,12 @@
 
 require 'spec_helper'
 
-module PuppetLibrary
-    describe ModuleRepo do
+module PuppetLibrary::ModuleRepo
+    describe Directory do
         include ModuleSpecHelper
 
         let(:module_dir) { "/tmp/#{$$}" }
-        let(:module_repo) { ModuleRepo.new(module_dir) }
+        let(:module_repo) { Directory.new(module_dir) }
 
         before do
             FileUtils.mkdir_p module_dir

data/spec/module_repo/multi_spec.rb

@@ -0,0 +1,97 @@
+# -*- encoding: utf-8 -*-
+# Puppet Library
+# Copyright (C) 2013 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::ModuleRepo
+    describe Multi do
+        let(:subrepo_one) { double('subrepo_one').as_null_object }
+        let(:subrepo_two) { double('subrepo_two').as_null_object }
+        let(:multi_repo) do
+            repo = Multi.new
+            repo.add_repo(subrepo_one)
+            repo.add_repo(subrepo_two)
+            return repo
+        end
+
+        describe "#get_module" do
+            before do
+            end
+
+            context "when the module is found in a subrepository" do
+                it "returns the module from the first subrepo it's found in" do
+                    expect(subrepo_one).to receive(:get_module).with("puppetlabs", "apache", "1.0.0").and_return("puppetlabs/apache module: 1.0.0")
+                    expect(subrepo_two).not_to receive(:get_module)
+
+                    mod = multi_repo.get_module("puppetlabs", "apache", "1.0.0") 
+
+                    expect(mod).to eq "puppetlabs/apache module: 1.0.0"
+                end
+            end
+
+            context "when the module is not found in any subrepository" do
+                it "returns nil" do
+                    expect(subrepo_one).to receive(:get_module).with("puppetlabs", "nonexistant", "1.0.0").and_return(nil)
+                    expect(subrepo_two).to receive(:get_module).with("puppetlabs", "nonexistant", "1.0.0").and_return(nil)
+
+                    mod = multi_repo.get_module("puppetlabs", "nonexistant", "1.0.0") 
+
+                    expect(mod).to be_nil
+                end
+            end
+        end
+
+        describe "#get_metadata" do
+            context "when versions of the module are found in subrepositories" do
+                it "returns the metadata in an array" do
+                    apache_module_metadata_one = { "name" => "apache", "version" => "1.0.0" }
+                    apache_module_metadata_two = { "name" => "apache", "version" => "2.0.0" }
+                    expect(subrepo_one).to receive(:get_metadata).with("puppetlabs", "apache").and_return([apache_module_metadata_one])
+                    expect(subrepo_two).to receive(:get_metadata).with("puppetlabs", "apache").and_return([apache_module_metadata_two])
+
+                    metadata_list = multi_repo.get_metadata("puppetlabs", "apache") 
+
+                    expect(metadata_list).to eq [ apache_module_metadata_one, apache_module_metadata_two ]
+                end
+            end
+
+            context "when no versions of the module are found in any subrepository" do
+                it "returns an empty array" do
+                    expect(subrepo_one).to receive(:get_metadata).with("puppetlabs", "apache").and_return([])
+                    expect(subrepo_two).to receive(:get_metadata).with("puppetlabs", "apache").and_return([])
+
+                    metadata_list = multi_repo.get_metadata("puppetlabs", "apache") 
+
+                    expect(metadata_list).to be_empty
+                end
+            end
+
+            context "when the same version of a module is found in multiple repositories" do
+                it "returns the one from the first repository it appears in" do
+                    apache_module_metadata_one = { "name" => "apache", "version" => "1.0.0", "repo" => "one" }
+                    apache_module_metadata_two = { "name" => "apache", "version" => "1.0.0", "repo" => "two" }
+                    expect(subrepo_one).to receive(:get_metadata).with("puppetlabs", "apache").and_return([apache_module_metadata_one])
+                    expect(subrepo_two).to receive(:get_metadata).with("puppetlabs", "apache").and_return([apache_module_metadata_two])
+
+                    metadata_list = multi_repo.get_metadata("puppetlabs", "apache") 
+
+                    expect(metadata_list).to eq [ apache_module_metadata_one ]
+                end
+            end
+        end
+    end
+end

data/spec/puppet_library_spec.rb

@@ -0,0 +1,95 @@
+# -*- encoding: utf-8 -*-
+# Puppet Library
+# Copyright (C) 2013 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
+    describe PuppetLibrary do
+        let(:module_repo) do
+            module_repo = double(ModuleRepo::Multi)
+            allow(ModuleRepo::Multi).to receive(:new).and_return(module_repo)
+            return module_repo
+        end
+        let(:server) do
+            server = double(Server)
+            allow(Server).to receive(:new).and_return(server)
+            return server
+        end
+        let(:log) { double('log').as_null_object }
+        let(:library) { PuppetLibrary.new(log) }
+        let(:default_options) {{ :app => server, :Host => "0.0.0.0", :Port => "9292"}}
+        before do
+            allow(Rack::Server).to receive(:start)
+        end
+
+        def default_options_with(substitutions)
+            default_options.clone.tap do |options|
+                substitutions.each do |k, v|
+                    options[k] = v
+                end
+            end
+        end
+
+        describe "#go" do
+            context "when specifying a bad option" do
+                it "prints the usage" do
+                    expect(log).to receive(:puts).with(/invalid option: --die\nUsage:/)
+
+                    library.go(["--die"])
+                end
+            end
+
+            context "when specifying no options" do
+                it "runs the server with the default options" do
+                    expect(Rack::Server).to receive(:start).with(default_options)
+
+                    library.go([])
+                end
+            end
+
+            context "when specifying --port option" do
+                it "runs the server with the specified port" do
+                    expect(Rack::Server).to receive(:start).with(default_options_with(:Port => "8080"))
+
+                    library.go(["--port", "8080"])
+                end
+            end
+
+            context "when specifying --bind-host option" do
+                it "runs the server with the specified bind host" do
+                    expect(Rack::Server).to receive(:start).with(default_options_with(:Host => "localhost"))
+
+                    library.go(["--bind-host", "localhost"])
+                end
+            end
+
+            it "adds a module repository to the server for each module directory" do
+                expect(Server).to receive(:new).with(module_repo).and_return(server)
+                expect(module_repo).to receive(:add_repo).twice
+                expect(Rack::Server).to receive(:start).with(default_options)
+
+                library.go(["--module-dir", "dir1", "--module-dir", "dir2"])
+            end
+
+            it "logs the server options" do
+                expect(log).to receive(:puts).with(/Port: 9292/)
+                expect(log).to receive(:puts).with(/Host: 0\.0\.0\.0/)
+                library.go([])
+            end
+        end
+    end
+end

data/spec/util_spec.rb

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+# Puppet Library
+# Copyright (C) 2013 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'
+
+describe 'util' do
+    describe Array do
+        describe "#unique_by" do
+            it "behaves like #uniq with a block, but works with Ruby < 1.9" do
+                son = { "name" => "john", "age" => 10 }
+                dad = { "name" => "john", "age" => 40 }
+                mom = { "name" => "jane", "age" => 40 }
+
+                family = [son, dad, mom]
+                expect(family.unique_by {|p| p["name"]}).to eq [son, mom]
+            end
+        end
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-library
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - drrb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -166,17 +166,25 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO.yml
 - bin/puppet-library
 - config.ru
 - lib/puppet_library.rb
-- lib/puppet_library/module_repo.rb
+- lib/puppet_library/module_metadata.rb
+- lib/puppet_library/module_repo/directory.rb
+- lib/puppet_library/module_repo/multi.rb
+- lib/puppet_library/puppet_library.rb
 - lib/puppet_library/server.rb
+- lib/puppet_library/util.rb
 - lib/puppet_library/version.rb
 - puppet-library.gemspec
-- spec/module_repo_spec.rb
+- spec/module_repo/directory_spec.rb
+- spec/module_repo/multi_spec.rb
 - spec/module_spec_helper.rb
+- spec/puppet_library_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
+- spec/util_spec.rb
 homepage: https://github.com/drrb/puppet-library
 licenses:
 - GPL-3
@@ -202,7 +210,10 @@ signing_key:
 specification_version: 4
 summary: Puppet Library is a private Puppet module server that's compatible with librarian-puppet.
 test_files:
-- spec/module_repo_spec.rb
+- spec/module_repo/directory_spec.rb
+- spec/module_repo/multi_spec.rb
 - spec/module_spec_helper.rb
+- spec/puppet_library_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
+- spec/util_spec.rb