puppet-library 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDc4NjNkZDQyZTlhNWMzZWIwZDhmMTM1MzY1ZTg4NzUyNWQyYzY2OQ==
+    ZTgwMTJmOWUxMDllNDMyMjFjNTgyZmI2ZmQ2NDc0NmM0NDEwYjRlNQ==
   data.tar.gz: !binary |-
-    MzA4N2JiOGU0MTkzMTBmZGUyYzhhOTFiNWQxZGViOGU0YTY5ODk3OA==
+    MmYzYzNiN2MxMTBhYTc1NzRlZGQ4OTExN2QyNzhmY2RhYjBlZDcyMw==
 SHA512:
   metadata.gz: !binary |-
-    NWUzMTQ5MDM2ZWEwOWY4MzcwYTI1NGRkNjJiNWI3ZDJiN2I0OTg5MGMwMWEz
-    MmY0ZmRhNTQ4ZWI5YWQ2ZWUxMGUxNDQ0YjhjYzMzMmJmMTBjNWRmMTlkM2M3
-    M2Y4YTU0NzQwOThjM2E0YTU2MzIzYWM2M2U4YmFmNDkyYzBkMDY=
+    Njk2ZmJmM2JmNDlhNzRmYzA3NDcyYWFmNjAwYTBmODQ2MzFmYmIxZmZmMGVh
+    MWFiNGRiOTM1NGYyMjQzY2NjNGFhMDdmOWUxNmM1YWVkOTRjMzhjNzVkMmE5
+    ZTA3ZWU0NDZiNTVlMjZjYzYzMjI5MDU2YzcxYmRmMzI5YmYwZDg=
   data.tar.gz: !binary |-
-    MDBmNzBkZDYzZWZkZWU5YWE0ODhkZDNmMDQ5ZmRkODMxNjJjYTQ4Y2Q2M2U3
-    Njc3M2E3Zjk1NGE4MGM2ZWJmMDllMThiM2IwMDE3M2EzYjAxNDg2OTNlOGM0
-    ZGYyNGNhNjJlOWI5MTRlY2QzMjk0YzY5NmU1ZmFlNTNjNTg0ZDc=
+    ZWUzODAwZTRmOTNlY2U1MjRkZGI5NGY2YzAyOTJhMTFhNTc1N2U0MjJlMGUy
+    Yjc0MzQyN2FkNTRmOWY2ZTBlNmRmODhlY2ExMjk4MDIzYjJjNWFkMTJiZGI1
+    YWY1MTYxZTQ1ZmJhOWQ1NWZmOGU3YWVlZGM5MTJhNDUxODUxYjU=

data/.travis.yml

@@ -25,7 +25,8 @@ rvm:
   - 2.1.0
 env:
   - RUBYGEMS_VERSION=2.1.11
-  - RUBYGEMS_VERSION=1.8.24
+  #- RUBYGEMS_VERSION=1.8.5 # What Ubuntu 12.4 has
+  - RUBYGEMS_VERSION=1.8.28 # Earlier versions of Rubygems 1.8.x, when used with Ruby 2.0 fail to install nokogiri properly (Seen on R 2.0.0 / RG 1.8.24)
 #matrix:
 #    allow_failures:
 #      - rvm: 2.1.0

data/CHANGELOG.yml

@@ -32,4 +32,9 @@
   changes:
       - Added module search
       - Improved performance of proxy
+- tag: v0.4.0
+  changes:
+      - Added '--version' option to CLI
+      - Added option to daemonize server (with optional pidfile)
+      - Added web UI to browse modules
 

data/README.md

@@ -89,6 +89,48 @@ Puppet Library currently supports:
 - dependency resolution and installation with [librarian-puppet](http://librarian-puppet.com)
 - installation with [r10k](https://github.com/adrienthebo/r10k)
 
+Puppet Library is tested against Ruby versions:
+- 1.8.7
+- 1.9.3
+- 2.0.0
+- 2.1.0
+
+## Running with Phusion Passenger
+
+To run Puppet Library with [Phusion Passenger](https://www.phusionpassenger.com):
+
+```sh
+# Create a Passenger-compatible directory structure
+mkdir -p /webapps/puppet-library/{public,tmp}
+
+# Create a Rack config file to point Puppet Library to your modules
+cat > /webapps/puppet-library/config.ru <<EOF
+require "rubygems"
+require "puppet_library"
+
+server = PuppetLibrary::Server.set_up do |library|
+    # Serve our private modules
+    library.forge PuppetLibrary::Forge::Directory.new("/var/lib/modules")
+    # Download all other moduls from the Puppet Forge
+    library.forge PuppetLibrary::Forge::Proxy.new("http://forge.puppetlabs.com")
+end
+
+run server
+EOF
+
+# Create an Apache virtual host pointing at Puppet Library
+cat > /etc/httpd/conf.d/puppetlibrary.conf <<EOF
+<VirtualHost *:80>
+    ServerName privateforge.example.com
+    DocumentRoot /webapps/puppet-library/public
+    <Directory /webapps/puppet-library/public>
+        Allow from all
+        Options -MultiViews
+    </Directory>
+</VirtualHost>
+EOF
+```
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -19,6 +19,12 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'coveralls/rake/task'
 
+SUPPORTED_VERSIONS = %w[1.8 1.9 2.0 2.1]
+# The integration test doesn't work on Ruby 1.8, and Puppet doesn't work on 2.1
+INTEGRATION_TEST_INCOMPATIBLE_VERSIONS = %w[1.8 2.1]
+# Capybara needs Nokogiri, which needs 1.9+
+ACCEPTANCE_TEST_INCOMPATIBLE_VERSIONS = %w[1.8]
+
 class String
     def green
         "\e[32m#{self}\e[0m"
@@ -27,17 +33,22 @@ class String
     def red
         "\e[31m#{self}\e[0m"
     end
+
+    def yellow
+        "\e[33m#{self}\e[0m"
+    end
 end
 
 def ruby_version_supports_integration_test?(version = RUBY_VERSION)
-    # The integration test doesn't work on Ruby 1.8, and Puppet doesn't work on 2.1
-    ! /^(1\.8|2\.1)/.match(version)
+    ! INTEGRATION_TEST_INCOMPATIBLE_VERSIONS.find do |bad_version|
+        version.start_with? bad_version
+    end
 end
 
-if ruby_version_supports_integration_test?
-    DEFAULT_TEST_TASK = :test
-else
-    DEFAULT_TEST_TASK = :spec
+def ruby_version_supports_acceptance_tests?(version = RUBY_VERSION)
+    ! ACCEPTANCE_TEST_INCOMPATIBLE_VERSIONS.find do |bad_version|
+        version.start_with? bad_version
+    end
 end
 
 Coveralls::RakeTask.new
@@ -45,17 +56,34 @@ Coveralls::RakeTask.new
 desc "Run the specs"
 RSpec::Core::RakeTask.new(:spec)
 
-desc "Run the integration tests"
-RSpec::Core::RakeTask.new(:integration_test) do |rspec|
-    rspec.pattern = "test/**/*_integration_test.rb"
+if ruby_version_supports_acceptance_tests?
+    require 'cucumber/rake/task'
+    Cucumber::Rake::Task.new(:features)
+else
+    task :features do
+        puts "Skipping acceptance tests because this version of Ruby doesn't support them"
+    end
 end
 
-desc "Run all the tests"
-RSpec::Core::RakeTask.new(:test) do |rspec|
-    rspec.pattern = "{spec,test}/**/*_{spec,integration_test}.rb"
+if ruby_version_supports_integration_test?
+    desc "Run all the tests"
+    RSpec::Core::RakeTask.new(:test) do |rspec|
+        rspec.pattern = "{spec,test}/**/*_{spec,integration_test}.rb"
+    end
+    task :test => :features
+
+    desc "Run the integration tests"
+    RSpec::Core::RakeTask.new(:integration_test) do |rspec|
+        rspec.pattern = "test/**/*_integration_test.rb"
+    end
+else
+    task :integration_test do
+        puts "Skipping integration tests because this version of Ruby doesn't support them"
+    end
+    task :test => [:features, :spec]
 end
 
-task :default => [DEFAULT_TEST_TASK, 'coveralls:push']
+task :default => [:test, 'coveralls:push']
 
 desc "Check it works on all local rubies"
 task :verify do
@@ -72,18 +100,34 @@ task :verify do
         system "rvm #{ruby_version} do rake integration_test"
     end
 
+    puts "\nRunning Acceptance Tests".green
+    acceptance_test_results = versions.map do |ruby_version|
+        puts "\n- Ruby  #{ruby_version}".green
+        system "rvm #{ruby_version} do rake features"
+    end
+
     puts "\nResults:\n".green
-    results = spec_results.zip(integration_test_results)
-    puts "+---------+-------+-------+"
-    puts "| Version | Specs | Tests |"
-    puts "+---------+-------+-------+"
-    versions.zip(results).each do |(version, (spec_result, integration_test_result))|
+    results = [ spec_results, integration_test_results, acceptance_test_results ].transpose
+    puts "+---------+-------+-------+-------+"
+    puts "| Version | Specs |  ITs  |  ATs  |"
+    puts "+---------+-------+-------+-------+"
+    versions.zip(results).each do |(version, (spec_result, integration_test_result, acceptance_test_result))|
         v = version
         s = spec_result ? "pass".green : "fail".red
-        i = integration_test_result ? "pass".green : "fail".red
-        puts "| #{v}     | #{s}  | #{i}  |"
+        if ruby_version_supports_integration_test? version
+            i = integration_test_result ? "pass".green : "fail".red
+        else
+            i = "skip".yellow
+        end
+
+        if ruby_version_supports_acceptance_tests? version
+            a = acceptance_test_result ? "pass".green : "fail".red
+        else
+            a = "skip".yellow
+        end
+        puts "| #{v}     | #{s}  | #{i}  | #{a}  |"
     end
-    puts "+---------+-------+-------+"
+    puts "+---------+-------+-------+-------+"
 
     versions.zip(results).each do |(version, (spec_result, integration_test_result))|
         unless spec_result

data/TODO.yml

@@ -1,3 +1,5 @@
+bugs:
+    - Using captialised Author name to create full module name
 features:
     - Use config from a config file
     - Allow proxy to cache downloaded modules/API calls on disk
@@ -6,8 +8,7 @@ features:
         will need to embed the server or use a config file for more control)
     - Validate repo dirs (make sure they're readable)
     - Allow failover between module repositories
-    - Document usage with Passenger
-    - Web UI
+    - Web UI: asynchronous
     - Authentication
 
 dubious_features:

data/features/module_list.feature

@@ -0,0 +1,38 @@
+# -*- 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/>.
+
+Feature: Module list page
+    As a user
+    I want to see a list of available modules
+    So that I can quickly tell what's on the server
+
+    Scenario: Visit the module list page
+        When I visit the module list page
+        Then I should see "Modules"
+
+    Scenario: See module versions
+        Given the "puppetlabs/apache" module is available at version "1.0.0"
+        And the "puppetlabs/apache" module is available at version "1.1.0"
+        When I visit the module list page
+        Then I should see module "puppetlabs/apache" with versions 1.0.0 and 1.1.0
+
+    Scenario: Follow link to module page
+        Given the "puppetlabs/apache" module is available at version "1.0.0"
+        And the "puppetlabs/apache" module is available at version "1.1.0"
+        When I visit the module list page
+        And I click on "puppetlabs/apache"
+        Then I should be on the module page for "puppetlabs/apache"

data/features/module_page.feature

@@ -0,0 +1,35 @@
+# -*- 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/>.
+
+Feature: Module page
+    As a user
+    I want to see a list of available modules
+    So that I can quickly tell what's on the server
+
+    Scenario: Visit the module page
+        Given the "puppetlabs/apache" module is available at version "1.0.0"
+        And the "puppetlabs/apache" module is available at version "1.1.0"
+        When I visit the module page for "puppetlabs/apache"
+        Then I should see "Author: puppetlabs"
+        Then I should see "Name: apache"
+        And I should see "1.0.0"
+        And I should see "1.1.0"
+        And I should see "puppetlabs/apache module, version 1.1.0"
+
+    Scenario: Visit a nonexistant module page
+        When I visit the module page for "nonexistant/nonexistant"
+        Then I should see 'Module "nonexistant/nonexistant" not found'

data/features/step_definitions/sinatra_steps.rb

@@ -0,0 +1,82 @@
+# -*- 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/>.
+
+spec_path = File.expand_path("../../spec", File.dirname(__FILE__))
+$LOAD_PATH.unshift spec_path unless $LOAD_PATH.include? spec_path
+
+require 'module_spec_helper'
+require 'fileutils'
+
+include FileUtils
+
+def module_dir
+    unless @module_dir
+        file = Tempfile.new("module_dir")
+        @module_dir = file.path
+        file.delete
+    end
+    @module_dir
+end
+
+def module_writer
+    @module_writer ||= ModuleSpecHelper::ModuleWriter.new(module_dir)
+end
+
+Before do
+    mkdir_p module_dir
+    forge.add_forge PuppetLibrary::Forge::Directory.new(module_dir)
+end
+
+After do
+    rm_rf module_dir
+end
+
+Given /^the "(.*?)" module is available at version "(.*?)"$/ do |full_name, version|
+    author, name = full_name.split "/"
+    module_writer.write_module(author, name, version)
+end
+
+When /^I visit the module list page$/ do
+    visit "/"
+end
+
+When /^I visit the module page for "(.*?)"$/ do |module_name|
+    visit "/#{module_name}"
+end
+
+When /^I click on "(.*?)"$/ do |link_text|
+    click_link link_text
+end
+
+Then /^I should be on the module page for "(.*?)"$/ do |module_name|
+    expect(URI.parse(current_url).path).to eq "/#{module_name}"
+end
+
+Then /^I should see "(.*?)"$/ do |text|
+    expect(page).to have_content text
+end
+
+Then /^I should see '(.*?)'$/ do |text|
+    expect(page).to have_content text
+end
+
+Then /^I should see module "(.*?)" with versions? (.*)$/ do |full_name, versions|
+    versions = versions.split /\s*,\s*|\s*,?\s*and\s*/
+    versions.each do |version|
+        find(:xpath, "//li[contains(.,'#{full_name}')]").should have_content version
+    end
+end

data/features/support/env.rb

@@ -0,0 +1,37 @@
+# -*- 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'
+require 'capybara/cucumber'
+
+class ServerWorld
+    def server
+        @server ||= PuppetLibrary::Server.new(forge)
+    end
+
+    def forge
+        @forge ||= PuppetLibrary::Forge::Multi.new
+    end
+end
+
+world = ServerWorld.new
+Capybara.app = world.server
+
+World do
+    world
+end
+

data/lib/puppet_library/app/views/index.haml

@@ -0,0 +1,26 @@
+-# -*- 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/>.
+
+%h1 Modules
+%ul
+  - modules.each do |mod|
+    %li
+      %b
+        %a{:href => mod["full_name"]}= mod["full_name"]
+      %ul
+        - mod["releases"].each do |release|
+          %li= release["version"]

data/lib/puppet_library/app/views/layout.haml

@@ -0,0 +1,54 @@
+-# -*- 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/>.
+!!!
+%html
+  %head
+    %meta{ :charset => "utf-8" }
+    %title Puppet Library
+    %link{ :href => "https://netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css", :type => "text/css", :rel => "stylesheet" }
+    /[if lt IE 9]
+      %script{:src => "https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"}
+      %script{:src => "https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"}
+    %style
+      :plain
+        body {
+          padding-top: 50px;
+        }
+        .starter-template {
+          padding: 40px 15px;
+          text-align: center;
+        }
+  %body
+    .navbar.navbar-inverse.navbar-fixed-top{ :role => "navigation" }
+      .container
+        .navbar-header
+          %button.navbar-toggle{ :type => "button", "data-toggle" => "collapse", "data-target" => ".navbar-collapse"}
+            %span.sr-only Toggle Navigation
+            %span.icon-bar
+            %span.icon-bar
+            %span.icon-bar
+          %a.navbar-brand{:href => '/'} Puppet Library
+        .collapse.navbar-collapse
+          %ul.nav.navbar-nav
+            %li.active
+              %a{:href => '/'} Modules
+            %li
+              %a{:href => 'https://github.com/drrb/puppet-library', :target => "puppet-library"} Help
+    .container
+      = yield
+    %script{ :src => "https://code.jquery.com/jquery-2.1.0.min.js" }
+    %script{ :src => "https://netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js" }

data/lib/puppet_library/app/views/module.haml

@@ -0,0 +1,25 @@
+-# -*- 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/>.
+
+%h1= "Module #{metadata["full_name"]}"
+%div= "Author: #{metadata["author"]}"
+%div= "Name: #{metadata["name"]}"
+%div= "Description: #{metadata["desc"]}"
+%div= "Versions:"
+%ul
+  - metadata["releases"].each do |release|
+    %li= release["version"]

data/lib/puppet_library/app/views/module_not_found.haml

@@ -0,0 +1,19 @@
+-# -*- 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/>.
+
+%h1 Not Found
+%div= "Module \"#{author}/#{name}\" not found"

data/lib/puppet_library/forge/abstract.rb

@@ -44,6 +44,7 @@ module PuppetLibrary::Forge
 
             raise ModuleNotFound if modules.empty?
 
+            modules = modules.version_sort_by { |m| m.version }
             module_infos = modules.map { |m| m.to_info }
             module_infos.deep_merge
         end

data/lib/puppet_library/puppet_library.rb

@@ -18,6 +18,7 @@
 require 'rack'
 require 'puppet_library/forge/directory'
 require 'puppet_library/forge/multi'
+require 'puppet_library/version'
 
 module PuppetLibrary
     class PuppetLibrary
@@ -41,23 +42,34 @@ module PuppetLibrary
             option_parser = OptionParser.new do |opts|
                 opts.banner = "Usage: #{File.basename $0} [options]"
 
-                opts.on("-p", "--port [PORT]", "Port to listen on (defaults to whatever Rack wants to use)") do |port|
+                opts.on("-p", "--port PORT", "Port to listen on (defaults to whatever Rack wants to use)") do |port|
                     options[:port] = port
                 end
 
-                opts.on("-s", "--server [SERVER]", "Server to use (defaults to whatever Rack wants to use)") do |server|
+                opts.on("-s", "--server SERVER", "Server to use (defaults to whatever Rack wants to use)") do |server|
                     options[:server] = server
                 end
 
-                opts.on("-b", "--bind-host [HOSTNAME]", "Host name to bind to (defaults to whatever Rack wants to use)") do |hostname|
+                opts.on("-b", "--bind-host HOSTNAME", "Host name to bind to (defaults to whatever Rack wants to use)") do |hostname|
                     options[:hostname] = hostname
                 end
 
+                options[:daemonize] = false
+                opts.on("--daemonize", "Run the server in the background") do
+                    options[:daemonize] = true
+                end
+
+                options[:pidfile] = nil
+                opts.on("--pidfile FILE", "Write a pidfile to this location after starting (implies --daemonize)") do |pidfile|
+                    options[:daemonize] = true
+                    options[:pidfile] = File.expand_path pidfile
+                end
+
                 options[:forges] = []
-                opts.on("-m", "--module-dir [DIR]", "Directory containing the modules (can be specified multiple times. Defaults to './modules')") do |module_dir|
+                opts.on("-m", "--module-dir DIR", "Directory containing the modules (can be specified multiple times)") do |module_dir|
                     options[:forges] << [Forge::Directory, module_dir]
                 end
-                opts.on("-x", "--proxy [URL]", "Remote forge to proxy (can be specified multiple times)") do |url|
+                opts.on("-x", "--proxy URL", "Remote forge to proxy (can be specified multiple times)") do |url|
                     options[:forges] << [Forge::Proxy, url]
                 end
             end
@@ -86,9 +98,11 @@ module PuppetLibrary
         def announce_server_start(options)
             options = options.clone
             options.default = "default"
-            @log.puts "Starting Puppet Library server:"
+            action = options[:daemonize] ? "Daemonizing" : "Starting"
+            @log.puts "#{action} Puppet Library server:"
             @log.puts " |- Port: #{options[:port]}"
             @log.puts " |- Host: #{options[:hostname]}"
+            @log.puts " |- Pidfile: #{options[:pidfile]}" if options[:pidfile]
             @log.puts " |- Server: #{options[:server]}"
             @log.puts " `- Forges:"
             options[:forges].each do |(forge_type, config)|
@@ -101,7 +115,9 @@ module PuppetLibrary
                 :app => server,
                 :Host => options[:hostname],
                 :Port => options[:port],
-                :server => options[:server]
+                :server => options[:server],
+                :daemonize => options[:daemonize],
+                :pid => options[:pidfile]
             )
         end
     end

data/lib/puppet_library/server.rb

@@ -16,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'sinatra/base'
+require 'haml'
 
 require 'puppet_library/forge/multi'
 
@@ -44,6 +45,14 @@ module PuppetLibrary
 
         configure do
             enable :logging
+            set :haml, :format => :html5
+            set :root, File.expand_path("app", File.dirname(__FILE__))
+        end
+
+        get "/" do
+            modules = @forge.search_modules(nil)
+
+            haml :index, { :locals => { "modules" => modules } }
         end
 
         get "/modules.json" do
@@ -89,5 +98,18 @@ module PuppetLibrary
                 status 404
             end
         end
+
+        get "/:author/:module" do
+            author = params[:author]
+            module_name = params[:module]
+
+            begin
+                metadata = @forge.get_module_metadata(author, module_name)
+                haml :module, { :locals => { "metadata" => metadata } }
+            rescue Forge::ModuleNotFound
+                status 404
+                haml :module_not_found, { :locals => { "author" => author, "name" => module_name } }
+            end
+        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.3.0"
+    VERSION = "0.4.0"
 end

data/puppet-library.gemspec

@@ -38,9 +38,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "sinatra"
   spec.add_dependency "json"
+  spec.add_dependency "haml"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "gitsu"
   spec.add_development_dependency "librarian-puppet"
   spec.add_development_dependency "mime-types", "< 2"
   spec.add_development_dependency "pry"
@@ -55,5 +57,10 @@ Gem::Specification.new do |spec|
       spec.add_development_dependency "guard"
       spec.add_development_dependency "guard-rspec"
       spec.add_development_dependency "terminal-notifier-guard"
+
+      # Capybara needs Nokogiri, which needs 1.9+
+      spec.add_development_dependency "capybara"
+      spec.add_development_dependency "nokogiri" # Rubygems 1.8 fails to resolve this on Ruby 2.0.0
+      spec.add_development_dependency "cucumber"
   end
 end

data/spec/forge/abstract_spec.rb

@@ -178,12 +178,12 @@ module PuppetLibrary::Forge
                         "author" => "puppetlabs",
                         "name" => "puppetlabs-apache",
                         "description" => "Apache module",
-                        "version" => "1.0.0"
+                        "version" => "1.1.0"
                     }, {
                         "author" => "puppetlabs",
                         "name" => "puppetlabs-apache",
-                        "description" => "Apache module",
-                        "version" => "1.1.0"
+                        "description" => "Old Apache module",
+                        "version" => "1.0.0"
                     } ]
                     expect(module_repo).to receive(:get_metadata).with("puppetlabs", "apache").and_return(metadata)
 

data/spec/module_spec_helper.rb

@@ -19,35 +19,47 @@ require 'zlib'
 require 'rubygems/package'
 
 module ModuleSpecHelper
-    def write_tar_gzip(file_name)
-        tar = StringIO.new
+    class ModuleWriter
+        def initialize(module_dir)
+            @module_dir = module_dir
+        end
+
+        def write_module(author, name, version)
+            full_name = "#{author}-#{name}"
+            fqn = "#{full_name}-#{version}"
+            module_file = File.join(@module_dir, "#{fqn}.tar.gz")
 
-        Gem::Package::TarWriter.new(tar) do |writer|
-            yield(writer)
+            write_tar_gzip(module_file) do |archive|
+                archive.add_file("#{fqn}/metadata.json", 0644) do |file|
+                    content = {
+                        "name" => full_name,
+                        "version" => version,
+                        "description" => "#{author}/#{name} module, version #{version}",
+                        "dependencies" => []
+                    }
+                    yield(content) if block_given?
+                    file.write content.to_json
+                end
+            end
         end
-        tar.seek(0)
 
-        gz = Zlib::GzipWriter.new(File.new(file_name, 'wb'))
-        gz.write(tar.read)
-        tar.close
-        gz.close
-    end
+        def write_tar_gzip(file_name)
+            tar = StringIO.new
 
-    def add_module(author, name, version)
-        full_name = "#{author}-#{name}"
-        fqn = "#{full_name}-#{version}"
-        module_file = File.join(module_dir, "#{fqn}.tar.gz")
-
-        write_tar_gzip(module_file) do |archive|
-            archive.add_file("#{fqn}/metadata.json", 0644) do |file|
-                content = {
-                    "name" => full_name,
-                    "version" => version,
-                    "dependencies" => []
-                }
-                yield(content) if block_given?
-                file.write content.to_json
+            Gem::Package::TarWriter.new(tar) do |writer|
+                yield(writer)
             end
+            tar.seek(0)
+
+            gz = Zlib::GzipWriter.new(File.new(file_name, 'wb'))
+            gz.write(tar.read)
+            tar.close
+            gz.close
         end
     end
+
+    def add_module(author, name, version, &block)
+        writer = ModuleWriter.new(module_dir)
+        writer.write_module(author, name, version, &block)
+    end
 end

data/spec/puppet_library_spec.rb

@@ -31,7 +31,8 @@ module PuppetLibrary
         end
         let(:log) { double('log').as_null_object }
         let(:library) { PuppetLibrary.new(log) }
-        let(:default_options) {{ :app => server, :Host => nil, :Port => nil, :server => nil }}
+        let(:default_options) {{ :app => server, :Host => nil, :Port => nil, :server => nil, :daemonize => false, :pid => nil }}
+
         before do
             allow(Rack::Server).to receive(:start)
         end
@@ -85,6 +86,25 @@ module PuppetLibrary
                 end
             end
 
+            context "when using --daemonize option" do
+                it "daemonizes the server" do
+                    expect(Rack::Server).to receive(:start).with(default_options_with(:daemonize => true))
+                    expect(log).to receive(:puts).with(/Daemonizing/)
+
+                    library.go(["--daemonize"])
+                end
+            end
+
+            context "when using --pidfile option" do
+                it "daemonizes and writes a pidfile to the specified location" do
+                    expect(Rack::Server).to receive(:start).with(default_options_with(:daemonize => true, :pid => "/var/run/puppet-library.pid"))
+                    expect(log).to receive(:puts).with(/Daemonizing/)
+                    expect(log).to receive(:puts).with(/Pidfile: \/var\/run\/puppet-library.pid/)
+
+                    library.go(["--pidfile", "/var/run/puppet-library.pid"])
+                end
+            end
+
             context "when using --proxy option" do
                 it "adds a proxy module forge for each option specified" do
                     proxy1 = double('proxy1')

data/spec/server_spec.rb

@@ -28,6 +28,31 @@ module PuppetLibrary
             Server.new(forge)
         end
 
+        describe "GET /" do
+            it "lists all the modules" do
+                modules = [
+                    {
+                        "author" => "puppetlabs",
+                        "name" => "apache",
+                        "tag_list" => ["apache", "httpd"],
+                        "releases" => [{"version"=>"0.0.1"}, {"version"=>"0.0.2"}],
+                        "full_name" => "puppetlabs/apache",
+                        "version" => "0.0.2",
+                        "project_url" => "http://github.com/puppetlabs/puppetlabs-apache",
+                        "desc" => "Puppet module for Apache"
+                    }
+                ]
+                expect(forge).to receive(:search_modules).with(nil).and_return(modules)
+
+                get "/"
+
+                expect(last_response.body).to include "Modules"
+                expect(last_response.body).to include "puppetlabs/apache"
+                expect(last_response.body).to include "0.0.1"
+                expect(last_response.body).to include "0.0.2"
+            end
+        end
+
         describe "GET /modules.json" do
             it "renders the search result as JSON" do
                 search_results = [
@@ -78,6 +103,41 @@ module PuppetLibrary
             end
         end
 
+        describe "GET /<author>/<module>" do
+            it "displays module metadata" do
+                metadata = {
+                    "author" => "puppetlabs",
+                    "full_name" => "puppetlabs/apache",
+                    "name" => "apache",
+                    "desc" => "Puppet module for Apache",
+                    "releases" => [
+                        { "version" => "0.10.0" },
+                        { "version" => "0.9.0" },
+                    ]
+                }
+                expect(forge).to receive(:get_module_metadata).with("puppetlabs", "apache").and_return(metadata)
+
+                get "/puppetlabs/apache"
+
+                expect(last_response.body).to include "Author: puppetlabs"
+                expect(last_response.body).to include "Name: apache"
+                expect(last_response.body).to include "0.10.0"
+                expect(last_response.body).to include "0.9.0"
+                expect(last_response).to be_ok
+            end
+
+            context "when no modules found" do
+                it "returns an error" do
+                    expect(forge).to receive(:get_module_metadata).with("nonexistant", "nonexistant").and_raise(Forge::ModuleNotFound)
+
+                    get "/nonexistant/nonexistant"
+
+                    expect(last_response.body).to include 'Module "nonexistant/nonexistant" not found'
+                    expect(last_response.status).to eq(404)
+                end
+            end
+        end
+
         describe "GET /<author>/<module>.json" do
             it "gets module metadata for all versions" do
                 metadata = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-library
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - drrb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -38,6 +38,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gitsu
+  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: librarian-puppet
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +248,48 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  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: nokogiri
+  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: cucumber
+  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'
 description: A Puppet module server
 email:
 - drrrrrrrrrrrb@gmail.com
@@ -241,7 +311,15 @@ files:
 - TODO.yml
 - bin/puppet-library
 - config.ru
+- features/module_list.feature
+- features/module_page.feature
+- features/step_definitions/sinatra_steps.rb
+- features/support/env.rb
 - lib/puppet_library.rb
+- lib/puppet_library/app/views/index.haml
+- lib/puppet_library/app/views/layout.haml
+- lib/puppet_library/app/views/module.haml
+- lib/puppet_library/app/views/module_not_found.haml
 - lib/puppet_library/forge.rb
 - lib/puppet_library/forge/abstract.rb
 - lib/puppet_library/forge/directory.rb
@@ -298,6 +376,10 @@ signing_key:
 specification_version: 4
 summary: Puppet Library is a private Puppet module server that's compatible with librarian-puppet.
 test_files:
+- features/module_list.feature
+- features/module_page.feature
+- features/step_definitions/sinatra_steps.rb
+- features/support/env.rb
 - spec/forge/abstract_spec.rb
 - spec/forge/directory_spec.rb
 - spec/forge/multi_spec.rb