puppet-library 0.4.0 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTgwMTJmOWUxMDllNDMyMjFjNTgyZmI2ZmQ2NDc0NmM0NDEwYjRlNQ==
+    MzE2OGYxMDE4NjM3NTVkMDFmOGFjYTcwMmM3Y2YwYTg0ZmE1MzIxYg==
   data.tar.gz: !binary |-
-    MmYzYzNiN2MxMTBhYTc1NzRlZGQ4OTExN2QyNzhmY2RhYjBlZDcyMw==
+    NGE3YWE2MWUwZGFiZjBhZDVhZjA2NzZkNDg3YmUyNDk1MThiYTk1Nw==
 SHA512:
   metadata.gz: !binary |-
-    Njk2ZmJmM2JmNDlhNzRmYzA3NDcyYWFmNjAwYTBmODQ2MzFmYmIxZmZmMGVh
-    MWFiNGRiOTM1NGYyMjQzY2NjNGFhMDdmOWUxNmM1YWVkOTRjMzhjNzVkMmE5
-    ZTA3ZWU0NDZiNTVlMjZjYzYzMjI5MDU2YzcxYmRmMzI5YmYwZDg=
+    MmI3ZTljMjZmNjYxMWM2ODEwZjY5ZDJjODJiMzEyZGE3OTNmOTI2NzJhOTM2
+    NjNjNzQ1YWVhMmJkZGNiOGQyNTAxNGJlN2Y0ZDAyM2U3OWEwZjMzNzg5Nzkw
+    NGMzNDc2YmM3YjFmMjQwN2ZlMGEyNTUxMGM3M2IyZGJjOWJkMmM=
   data.tar.gz: !binary |-
-    ZWUzODAwZTRmOTNlY2U1MjRkZGI5NGY2YzAyOTJhMTFhNTc1N2U0MjJlMGUy
-    Yjc0MzQyN2FkNTRmOWY2ZTBlNmRmODhlY2ExMjk4MDIzYjJjNWFkMTJiZGI1
-    YWY1MTYxZTQ1ZmJhOWQ1NWZmOGU3YWVlZGM5MTJhNDUxODUxYjU=
+    ZTkzNjBmN2UwMjlmZTkwNWQ3OGQ4OTM1MGU5OTQzZmNiYTNkZWZlZmY1ODg4
+    MGQ2ZGExZmIzM2U0ZDEzZGViMmYyMzBkZWVkY2U5ZDEyYmQ0NzE5ZTlmYWQx
+    ZTdkNGZkYTdiNzAwNzg3ODQ5ZDQ2NGViMmYyOTBhYmM0NTE0MzM=

data/CHANGELOG.yml

@@ -34,7 +34,10 @@
       - Improved performance of proxy
 - tag: v0.4.0
   changes:
-      - Added '--version' option to CLI
+      - Added `--version` option to CLI
       - Added option to daemonize server (with optional pidfile)
       - Added web UI to browse modules
+- tag: v0.5.0
+  changes:
+      - Added module search field to web UI
 

data/Rakefile

@@ -18,6 +18,9 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'coveralls/rake/task'
+require 'json'
+require 'yaml'
+require 'net/http'
 
 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
@@ -166,6 +169,9 @@ task "push-release" => ["check-license", :verify] do
     puts "Releasing #{PuppetLibrary::VERSION}"
     Rake::Task[:release].invoke
 
+    puts "Registering release notes for #{PuppetLibrary::VERSION}"
+    Rake::Task["register-release[#{PuppetLibrary::VERSION}]"].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}"
@@ -173,3 +179,87 @@ task "push-release" => ["check-license", :verify] do
     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
+
+desc "Register release with Github"
+task "register-release", [:version] do |task, args|
+    github = Github.new
+
+    version = args[:version]
+    unless version =~ /\d+\.\d+\.\d+/
+        raise "Bad version: '#{version}'"
+    end
+    unless system("git tag | grep v#{version} > /dev/null")
+        raise "Couldn't find tag 'v#{version}'"
+    end
+
+    tag = "v#{version}"
+    changelog = YAML.load_file("CHANGELOG.yml")
+    release_notes = changelog.find {|release| release["tag"] == tag}
+    changes = release_notes ? release_notes["changes"] : []
+    description = changes.map { |change| "- #{change}" }.join("\n")
+    data = {
+        "tag_name" => tag,
+        "target_commitish" => "master",
+        "name" => "Version #{version}",
+        "body" => description,
+        "draft" => false,
+        "prerelease" => false
+    }
+    release = github.get("/repos/drrb/puppet-library/releases").find {|release| release["tag_name"] == tag}
+    if release
+        puts "Release #{tag} exists. Updating it..."
+        github.patch("/repos/drrb/puppet-library/releases/#{release['id']}", data)
+    else
+        puts "Creating release #{tag}..."
+        github.post("/repos/drrb/puppet-library/releases", data)
+    end
+    puts "Done"
+end
+
+class Github
+    def initialize
+        @base_url = "https://api.github.com"
+        api_key_file = File.expand_path("~/.github/release.apikey")
+        raise "Put your github credentials in ~/.github/release.apikey as 'username:key'" unless File.exist? api_key_file
+        @username, @key = File.read(api_key_file).strip.split ":"
+    end
+
+    def post(path, data, &block)
+        puts "POST #{path}"
+        request = Net::HTTP::Post.new(path)
+        request.body = data.to_json
+        send request
+    end
+
+    def patch(path, data, &block)
+        puts "PATCH #{path}"
+        request = Net::HTTP::Patch.new(path)
+        request.body = data.to_json
+        response = send(request, &block)
+    end
+
+    def get(path, &block)
+        puts "GET #{path}"
+        request = Net::HTTP::Get.new(path)
+        send request
+    end
+
+    def send(request)
+        request.add_field('Content-Type', 'application/json')
+        request.basic_auth @username, @key
+
+        uri = URI.parse(@base_url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        response = http.request(request)
+        puts response.code
+        if block_given?
+            yield(response)
+        else
+            unless response.code =~ /^2../
+                raise "Request returned non-success:\n#{response.body}"
+            end
+            JSON.parse(response.body)
+        end
+    end
+end

data/features/module_page.feature

@@ -17,8 +17,8 @@
 
 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
+    I want to see the details of a module
+    So that I can tell exactly what's on the server
 
     Scenario: Visit the module page
         Given the "puppetlabs/apache" module is available at version "1.0.0"

data/features/module_search.feature

@@ -0,0 +1,29 @@
+# -*- 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 search
+    As a user
+    I want to search the modules
+    So that I can find details about specific modules
+
+    Scenario: Visit the module list page
+        Given the "puppetlabs/apache" module is available at version "1.0.0"
+        And the "puppetlabs/stdlib" module is available at version "1.0.0"
+        When I visit the module list page
+        And I search for "apache"
+        Then I should see "puppetlabs/apache"
+        And I should not see "puppetlabs/stdlib"

data/features/step_definitions/sinatra_steps.rb

@@ -62,6 +62,13 @@ When /^I click on "(.*?)"$/ do |link_text|
     click_link link_text
 end
 
+When /^I search for "(.*?)"$/  do |term|
+    within("form#module-search") do
+        fill_in 'search', :with => term
+        click_button "Search"
+    end
+end
+
 Then /^I should be on the module page for "(.*?)"$/ do |module_name|
     expect(URI.parse(current_url).path).to eq "/#{module_name}"
 end
@@ -70,6 +77,10 @@ Then /^I should see "(.*?)"$/ do |text|
     expect(page).to have_content text
 end
 
+Then /^I should not see "(.*?)"$/ do |text|
+    expect(page).not_to have_content text
+end
+
 Then /^I should see '(.*?)'$/ do |text|
     expect(page).to have_content text
 end

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

@@ -20,6 +20,7 @@
     %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" }
+    -#%link{ :href => "https://netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap-theme.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"}
@@ -28,9 +29,24 @@
         body {
           padding-top: 50px;
         }
-        .starter-template {
-          padding: 40px 15px;
-          text-align: center;
+        input.search-query {
+            padding-left:32px;
+        }
+        form.form-search {
+            position: relative;
+        }
+        form.form-search:before {
+            content:'';
+            display: block;
+            width: 14px;
+            height: 14px;
+            background-image: url(http://getbootstrap.com/2.3.2/assets/img/glyphicons-halflings.png);
+            background-position: -48px 0;
+            position: absolute;
+            top:10px;
+            left:26px;
+            opacity: .5;
+            z-index: 1000;
         }
   %body
     .navbar.navbar-inverse.navbar-fixed-top{ :role => "navigation" }
@@ -48,6 +64,11 @@
               %a{:href => '/'} Modules
             %li
               %a{:href => 'https://github.com/drrb/puppet-library', :target => "puppet-library"} Help
+          %form#module-search.navbar-form.navbar-right.form-search{ :action => "/", :method => "get", :role => "form" }
+            .input-group
+              %input.form-control.search-query{ :name => "search", :type => "search", :placeholder => "Search modules" }
+              %span.input-group-btn
+                %button.btn.btn-primary{ :type => "submit" } Search
     .container
       = yield
     %script{ :src => "https://code.jquery.com/jquery-2.1.0.min.js" }

data/lib/puppet_library/server.rb

@@ -50,7 +50,8 @@ module PuppetLibrary
         end
 
         get "/" do
-            modules = @forge.search_modules(nil)
+            query = params[:search]
+            modules = @forge.search_modules(query)
 
             haml :index, { :locals => { "modules" => modules } }
         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.4.0"
+    VERSION = "0.5.0"
 end

data/puppet-library.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "librarian-puppet"
   spec.add_development_dependency "mime-types", "< 2"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "puppet"
+  spec.add_development_dependency "puppet", "~> 3.3.0"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/spec/server_spec.rb

@@ -51,6 +51,31 @@ module PuppetLibrary
                 expect(last_response.body).to include "0.0.1"
                 expect(last_response.body).to include "0.0.2"
             end
+
+            context "when a search term is provided" do
+                it "lists matching 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("apache").and_return(modules)
+
+                    get "/?search=apache"
+
+                    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
         end
 
         describe "GET /modules.json" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-library
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - drrb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -140,16 +140,16 @@ dependencies:
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -313,6 +313,7 @@ files:
 - config.ru
 - features/module_list.feature
 - features/module_page.feature
+- features/module_search.feature
 - features/step_definitions/sinatra_steps.rb
 - features/support/env.rb
 - lib/puppet_library.rb
@@ -378,6 +379,7 @@ summary: Puppet Library is a private Puppet module server that's compatible with
 test_files:
 - features/module_list.feature
 - features/module_page.feature
+- features/module_search.feature
 - features/step_definitions/sinatra_steps.rb
 - features/support/env.rb
 - spec/forge/abstract_spec.rb