puppet-library 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5501e3e79913a9181ca6b829be328e8c6b3e3c64
-  data.tar.gz: 6625c303010b85e82a6f6d121379becb92634eff
+  metadata.gz: 318299128135093f04410ff8266b6b13276d1926
+  data.tar.gz: 1d1d6e3fa14700b925fc544ffad3bc8fda8140a1
 SHA512:
-  metadata.gz: 2cfa2f30bc16b177d5c272fa495b3d3b5f522959507faf17612b3234c2eb13fc19835b64d8703103692102e25a186188de8b977fd7764eb3c2083ab5e4ec0908
-  data.tar.gz: 4df43a457d93c2722154f295aeec9c43e250f4dba2ef7be9e881e2d56348c7adeafe88bd8c8186ee1cf171f844cb07865be2effb4a15258b1ecd1d55dc0e01a0
+  metadata.gz: 50528c35cf90a196f27fdb525e47cef146f3df818929b94350fe88b97c5d9ee8734d52d23ad4f9ddde937233fd73043712e20ced9f0b4cf0a0bca65a1a6d952b
+  data.tar.gz: be971c3867dfc917ebfa107526483c2a29011f02910cd749856fd689aac666e08b65c1c2f69a2d70173378ddecd775d839fdf16159dcf4a7aa6fb94664c01d8a

data/CHANGELOG.yml

@@ -75,3 +75,7 @@
       - Fixed issue with "Too many open files" caused by Git repo forges on Ruby 1.8
       - Fixed issue Git repo forges with tags without Modulefiles
       - Fixed issue Git repo forges with no description in Modulefile
+- tag: v0.12.0
+  changes:
+      - Load web UI asynchronously to improve performance
+      - Updated API documentation

data/TODO.yml

@@ -1,27 +1,25 @@
 features:
-    - Web UI:
-        - asynchronous (index page loads too slowly)
-    - Git repo forge:
-        - make it more flexible:
-            - fail gracefully if we can't contact the remote repo
-    - Performance:
-        - cache stuff so it's faster
-    - logging:
-        - use Ruby logging
-        - include some verbose logging
-        - improve error messages (e.g. for when a module can't be untarred)
-    - Named subforges:
-        - per-subforge queries
-        - upload modules (web form and API)
-        - browse proxy cache
-        - clear proxy cache (web form and API)
-        - delete modules from disk (web form)
-    - Authentication
-    - Config APIs:
-        - documentation
+  - Git repo forge:
+    - make it more flexible:
+      - fail gracefully if we can't contact the remote repo
+  - Performance:
+    - cache stuff so it's faster
+  - logging:
+    - use Ruby logging
+    - include some verbose logging
+    - improve error messages (e.g. for when a module can't be untarred)
+  - Named subforges:
+    - per-subforge queries
+    - upload modules (web form and API)
+    - browse proxy cache
+    - clear proxy cache (web form and API)
+    - delete modules from disk (web form)
+  - Authentication
+  - Config APIs:
+    - documentation
 
 dubious_features:
-    - Proxy modules' source in a directory (supported individually for now: should we just leave it that way?)
-    - Make proxy cache TTL configurable
-    - Allow failover between module repositories
-    - Look in /etc/puppet-library.yml for config by default
+  - Proxy modules' source in a directory (supported individually for now: should we just leave it that way?)
+  - Make proxy cache TTL configurable
+  - Allow failover between module repositories
+  - Look in /etc/puppet-library.yml for config by default

data/features/module_list.feature

@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+@javascript
 Feature: Module list page
     As a user
     I want to see a list of available modules

data/features/module_search.feature

@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+@javascript
 Feature: Module search
     As a user
     I want to search the modules

data/features/support/env.rb

@@ -17,6 +17,7 @@
 
 require 'puppet_library'
 require 'capybara/cucumber'
+require 'capybara/poltergeist'
 
 class ServerWorld
     def server
@@ -30,6 +31,7 @@ end
 
 world = ServerWorld.new
 Capybara.app = world.server
+Capybara.javascript_driver = :poltergeist
 
 World do
     world

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

@@ -16,11 +16,25 @@
 -# 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"]
+.loading
+  Loding module list...
+%ul.modules
+
+:javascript
+  $(document).ready(function() {
+    $.getJSON("modules.json?q=#{query}", function(modules) {
+      $.each(modules, function(index, module) {
+        var item = $("<li/>");
+        item.append($("<b/>").append($("<a/>").attr("href", module.full_name).text(module.full_name)));
+
+        var versionList = $("<ul/>");
+        $.each(module.releases, function(index, release) {
+            versionList.append($("<li>").text(release.version));
+        });
+
+        item.append(versionList);
+        item.appendTo(".modules");
+      });
+      $(".loading").hide();
+    });
+  });

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

@@ -69,7 +69,7 @@
               %input.form-control.search-query{ :name => "search", :type => "search", :placeholder => "Search modules" }
               %span.input-group-btn
                 %button.btn.btn-primary{ :type => "submit" } Search
+    %script{ :src => "https://code.jquery.com/jquery-2.1.0.min.js" }
     .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/forge/cache.rb

@@ -26,12 +26,12 @@ module PuppetLibrary::Forge
     #
     # <b>Usage:</b>
     #
-    #    forge = PuppetLibrary::Forge::Cache.configure do |repo|
+    #    forge = PuppetLibrary::Forge::Cache.configure do
     #        # The URL of the remote forge
-    #        repo.url = "http://forge.example.com
+    #        url "http://forge.example.com"
     #
     #        # The path to cache the files to on disk
-    #        repo.path = "/var/modules/cache
+    #        path "/var/modules/cache"
     #    end
     class Cache < Proxy
 

data/lib/puppet_library/forge/directory.rb

@@ -31,9 +31,9 @@ module PuppetLibrary::Forge
     #
     # <b>Usage:</b>
     #
-    #    forge = PuppetLibrary::Forge::Directory.configure do |repo|
+    #    forge = PuppetLibrary::Forge::Directory.configure do
     #        # The path to serve the modules from
-    #        repo.path = "/var/modules/cache
+    #        path "/var/modules/cache"
     #    end
     class Directory < PuppetLibrary::Forge::Abstract
 

data/lib/puppet_library/forge/git_repository.rb

@@ -29,12 +29,12 @@ module PuppetLibrary::Forge
     #
     # <b>Usage:</b>
     #
-    #    forge = PuppetLibrary::Forge::GitRepository.configure do |repo|
+    #    forge = PuppetLibrary::Forge::GitRepository.configure do
     #        # The location of the git repository
-    #        repo.source = "http://example.com/mymodule.git
+    #        source "http://example.com/mymodule.git"
     #
     #        # A regular expression describing which tags to serve
-    #        repo.include_tags = /[0-9.]+/
+    #        include_tags /[0-9.]+/
     #    end
     class GitRepository < PuppetLibrary::Forge::Abstract
 

data/lib/puppet_library/forge/proxy.rb

@@ -27,9 +27,9 @@ module PuppetLibrary::Forge
     #
     # <b>Usage:</b>
     #
-    #    forge = PuppetLibrary::Forge::Proxy.configure do |repo|
+    #    forge = PuppetLibrary::Forge::Proxy.configure do
     #        # The URL of the remote forge
-    #        repo.url = "http://forge.example.com
+    #        url "http://forge.example.com"
     #    end
     class Proxy < Forge
 

data/lib/puppet_library/forge/source.rb

@@ -26,6 +26,13 @@ module PuppetLibrary::Forge
     #
     # <b>Note:</b>
     # The module directory must have a +Modulefile+.
+    #
+    # <b>Usage:</b>
+    #
+    #    forge = PuppetLibrary::Forge::Source.configure do
+    #        # The path of the module's source
+    #        path "/var/modules/mymodulesource"
+    #    end
     class Source < PuppetLibrary::Forge::Abstract
         def self.configure(&block)
             config_api = PuppetLibrary::Util::ConfigApi.for(Source) do

data/lib/puppet_library/server.rb

@@ -27,12 +27,16 @@ module PuppetLibrary
     #
     # A Rack application that can be configured as follows:
     #
-    #    server = PuppetLibrary::Server.configure do |library|
+    #    server = PuppetLibrary::Server.configure
     #        # Look for my modules locally
-    #        library.forge PuppetLibrary::Forge::Directory.new("/var/lib/modules")
+    #        forge :directory do
+    #            path "/var/lib/modules"
+    #        end
     #
     #        # Get everything else from the Puppet Forge
-    #        library.forge PuppetLibrary::Forge::Proxy.new("http://forge.puppetlabs.com")
+    #        forge :proxy do
+    #            url "http://forge.puppetlabs.com"
+    #        end
     #    end
     #
     #    run server
@@ -73,9 +77,7 @@ module PuppetLibrary
 
         get "/" do
             query = params[:search]
-            modules = @forge.search_modules(query)
-
-            haml :index, { :locals => { "modules" => modules } }
+            haml :index, { :locals => { "query" => query } }
         end
 
         get "/modules.json" do

data/lib/puppet_library/util/config_api.rb

@@ -58,19 +58,26 @@ module PuppetLibrary::Util
             config_class = Class.new(Config) do
                 define_method(:params) { params }
                 params.each do |param|
-                    define_method(param.name.to_sym) do |new_value|
-                        set(param, new_value)
-                    end
-
-                    define_method("get_#{param.name}".to_sym) do
-                        get(param)
-                    end
+                    define_getter(param)
+                    define_setter(param)
                 end
             end
             PuppetLibrary.const_set(class_name, config_class)
         end
 
         class Config
+            def self.define_getter(param)
+                define_method("get_#{param.name}".to_sym) do
+                    get(param)
+                end
+            end
+
+            def self.define_setter(param)
+                define_method(param.name.to_sym) do |new_value|
+                    set(param, new_value)
+                end
+            end
+
             def initialize
                 @values = {}
             end

data/lib/puppet_library/util/patches.rb

@@ -35,7 +35,7 @@ module Gem
         end
     end
 
-    def Dependency.new(name, spec)
+    def Dependency.new(name, spec = ">=0")
         super(name, spec.to_s.gsub("-", ".pre."))
     rescue ArgumentError
         # If it starts with numbers, use those

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.11.0"
+    VERSION = "0.12.0"
 end

data/puppet-library.gemspec

@@ -64,5 +64,7 @@ Gem::Specification.new do |spec|
       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"
+      spec.add_development_dependency "selenium-webdriver"
+      spec.add_development_dependency "poltergeist"
   end
 end

data/spec/server_spec.rb

@@ -61,14 +61,10 @@ module PuppetLibrary
                         "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"
+                expect(last_response.body).to include '"modules.json?q="'
             end
 
             context "when a search term is provided" do
@@ -85,14 +81,10 @@ module PuppetLibrary
                             "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"
+                    expect(last_response.body).to include "modules.json?q=apache"
                 end
             end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-library
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - drrb
@@ -318,6 +318,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  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: poltergeist
+  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 private Puppet forge
 email:
 - drrrrrrrrrrrb@gmail.com
@@ -431,7 +459,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Puppet Library is a private Puppet module server that's compatible with librarian-puppet.