puppet-library 0.7.0 → 0.8.0

checksums.yaml

@@ -1,15 +1,7 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWU3ZDcxMTYwNTRlYzU4MmI0M2UxN2Y1NWJjZDBmZTdmNjEzNTQzMg==
-  data.tar.gz: !binary |-
-    Yzc2ZGY1NDNmZGRiYzI5ZjBjYzRkZDhlNmI4YmMyNmEwYThlZWM5Zg==
-SHA512:
-  metadata.gz: !binary |-
-    OTBlNjVhZjI2ZGVlZDUyMDllNGNhODkxODQ4NzVlYmY2MjM0YmNmMGJlNzMy
-    MTBlMjFjOTZkYjM0MjcwY2UxNjllN2U2ZDg2MTliYjEwYzc5NWQxMzRiZjUw
-    MDg1YzMwMzEzZTJmYzY2ZTBjYjllYmM3ZTc1MzkxYzliMTFmZGI=
-  data.tar.gz: !binary |-
-    MmE5MjdiYjViMDYxYTU1ZTY5MDIwYzdhZDBkZGI5MmRlYTIyYzIwMDFmZjc4
-    OTY0ZmFkNGUyODE0ZDdjNzI0YzVjNzU4MWQ5NzE0OWE2MDEyMDY1YzA1ZDcy
-    YzlhOWY3NDhmZDIzN2Q0YjJmNTc1ZGQ2YmQyZTIyNWM0ZWY0ZTg=
+--- 
+SHA512: 
+  metadata.gz: 2353481213ea28760a1aae078b39ba27620b720127d3be2e8a5cf340981fc348e68830f9e0cfc35f7e8d9134f3d2e9475782c500d96439ba14d3b3b4a2ebe5ea
+  data.tar.gz: 36ca9d425a611179a3f7195a27ba5741071e3b5d287c2375b48b39481804711749b8d269a2f27727117823d3b6125ef2551f796462e37baad8e17c455b2fe5b6
+SHA1: 
+  metadata.gz: a16e24fc8143344b487a3fa0dc2470585e372515
+  data.tar.gz: c8539df4b07cd7b1839f4bf8ed94aa0ba99296ed

data/CHANGELOG.yml

@@ -50,3 +50,6 @@
       - Added new proxy forge that caches downloaded modules on disk
       - Added `--cache-basedir` CLI option to make proxies cache downloaded modules on disk
       - Fixed issue with forge proxying (#1)
+- tag: v0.8.0
+  changes:
+      - Fixed issue with directory-based forges on Ruby 1.8 (#3)

data/README.md

@@ -14,6 +14,7 @@ Puppet Library serves Puppet modules in the same format as [the Puppet Forge](ht
 Plugins can be created to serve modules from arbitrary sources. Puppet Library contains built-in support for:
  - serving packaged (`.tar.gz`) modules from a directory (or directories) of your choosing
  - proxying a remote forge (or forges)
+ - caching proxied forges to disk
 
 ## Installation
 

data/Rakefile

@@ -24,7 +24,7 @@ require 'net/http'
 
 SUPPORTED_RUBY_VERSIONS = %w[1.8 1.9 2.0 2.1 system]
 # The integration test doesn't work on Ruby 1.8, and Puppet doesn't work on 2.1
-INTEGRATION_TEST_INCOMPATIBLE_RUBY_VERSIONS = %w[1.8 2.1]
+INTEGRATION_TEST_INCOMPATIBLE_RUBY_VERSIONS = %w[2.1]
 # Capybara needs Nokogiri, which needs 1.9+
 ACCEPTANCE_TEST_INCOMPATIBLE_RUBY_VERSIONS = %w[1.8 system]
 
@@ -85,7 +85,12 @@ if ruby_version_supports_integration_test?
     desc "Run the integration tests"
     RSpec::Core::RakeTask.new(:integration_test) do |rspec|
         rspec.pattern = "test/**/*_integration_test.rb"
-        rspec.rspec_opts = "--tag ~online" if offline?
+        tags = []
+        tags << "~online" if offline?
+        tags << "~no_1_8" if RUBY_VERSION.start_with? "1.8"
+        unless tags.empty?
+            rspec.rspec_opts = tags.map { |tag| "--tag #{tag}" }.join(" ")
+        end
     end
 else
     task :integration_test do
@@ -102,19 +107,19 @@ task :verify do
     puts "\nRunning Specs".green
     spec_results = versions.map do |ruby_version|
         puts "\n- Ruby #{ruby_version}".green
-        system "rvm #{ruby_version} do rake spec"
+        system "rvm #{ruby_version} do bundle exec rake spec"
     end
 
     puts "\nRunning Integration Tests".green
     integration_test_results = versions.map do |ruby_version|
         puts "\n- Ruby  #{ruby_version}".green
-        system "rvm #{ruby_version} do rake integration_test"
+        system "rvm #{ruby_version} do bundle exec 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"
+        system "rvm #{ruby_version} do bundle exec rake features"
     end
 
     puts "\nResults:\n".green

data/TODO.yml

@@ -1,10 +1,7 @@
 features:
-    - disk cache:
-        - use disk cache to respond to queries if remote API calls fail
-        - |
-            Accept --cache-dir option to specify a parent cache directory (people
-            will need to embed the server or use a config file for more control)
-    - Web UI: asynchronous (index page loads too slowly)
+    - Web UI:
+        - asynchronous (index page loads too slowly)
+    - Proxy a git repository
     - Named subforges:
         - per-subforge queries
         - upload modules (web form and API)

data/lib/puppet_library/server.rb

@@ -98,7 +98,12 @@ module PuppetLibrary
                 buffer = @forge.get_module_buffer(author, name, version).tap do
                     attachment "#{author}-#{name}-#{version}.tar.gz"
                 end
-                [ 200, { "Content-Length" => buffer.size.to_s }, buffer ]
+                if buffer.respond_to?(:size)
+                    headers = { "Content-Length" => buffer.size.to_s }
+                else
+                    headers = {}
+                end
+                [ 200, headers, buffer ]
             rescue Forge::ModuleNotFound
                 halt 404
             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.7.0"
+    VERSION = "0.8.0"
 end

data/test/librarian_puppet_integration_test.rb

@@ -38,7 +38,79 @@ def write_puppetfile(content)
 end
 
 module PuppetLibrary
-    describe "offline proxy" do
+    describe "directory forge" do
+        include ModuleSpecHelper
+
+        let(:module_dir) { Tempdir.create("module_dir") }
+        let(:project_dir) { Tempdir.create("project_dir") }
+        let(:start_dir) { pwd }
+        let(:disk_forge) { Forge::Directory.new(module_dir) }
+        let(:disk_server) do
+            Server.set_up do |server|
+                server.forge disk_forge
+            end
+        end
+        let(:disk_rack_server) do
+            Rack::Server.new(
+                :app => disk_server,
+                :Host => "localhost",
+                :Port => 9004,
+                :server => "webrick"
+            )
+        end
+        let(:disk_server_runner) do
+            Thread.new do
+                disk_rack_server.start
+            end
+        end
+
+        before do
+            # Initialize to catch wiring errors
+            disk_rack_server
+
+            # Start the servers
+            disk_server_runner
+            start_dir
+            cd project_dir
+        end
+
+        after do
+            rm_rf module_dir
+            rm_rf project_dir
+            cd start_dir
+        end
+
+        it "queries, downloads and searches from a directory" do
+            add_module("puppetlabs", "apache", "1.0.0") do |metadata|
+                metadata["dependencies"] << { "name" => "puppetlabs/concat", "version_requirement" => ">= 2.0.0" }
+                metadata["dependencies"] << { "name" => "puppetlabs/stdlib", "version_requirement" => "~> 3.0.0" }
+            end
+            add_module("puppetlabs", "concat", "2.0.0")
+            add_module("puppetlabs", "stdlib", "3.0.0")
+
+            write_puppetfile <<-EOF
+                forge 'http://localhost:9004'
+                mod 'puppetlabs/apache'
+            EOF
+
+            # Install modules through the proxy
+            system "librarian-puppet install" or fail "call to puppet-library failed"
+            expect("apache").to be_installed
+            expect("concat").to be_installed
+            expect("stdlib").to be_installed
+
+            # Search through the proxy
+            search_results = JSON.parse(open("http://localhost:9004/modules.json").read)
+            found_modules = Hash[search_results.map do |result|
+                [ result["full_name"], result["version"] ]
+            end]
+            expect(found_modules["puppetlabs/apache"]).to eq "1.0.0"
+            expect(found_modules["puppetlabs/concat"]).to eq "2.0.0"
+            expect(found_modules["puppetlabs/stdlib"]).to eq "3.0.0"
+        end
+    end
+
+    describe "offline proxy", :no_1_8 => true do
         include ModuleSpecHelper
 
         let(:module_dir) { Tempdir.create("module_dir") }

metadata

@@ -1,303 +1,147 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: puppet-library
-version: !ruby/object:Gem::Version
-  version: 0.7.0
+version: !ruby/object:Gem::Version 
+  version: 0.8.0
 platform: ruby
-authors:
+authors: 
 - drrb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-02-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id002 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  prerelease: false
+  requirement: *id001
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id003
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  name: haml
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id004
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+      - !ruby/object:Gem::Version 
+        version: "1.3"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id005
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: coveralls
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gitsu
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id006
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: gitsu
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: librarian-puppet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id007
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: librarian-puppet
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: *id008
+  type: :development
+- !ruby/object:Gem::Dependency 
   name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
     - - <
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
+      - !ruby/object:Gem::Version 
+        version: "2"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id009
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: pry
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: puppet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.3.0
+  requirement: *id010
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+- !ruby/object:Gem::Dependency 
+  name: puppet
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 3.3.0
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id011
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: terminal-notifier-guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id012
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: rake
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id013
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id014
   type: :development
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id015
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A Puppet module server
-email:
+email: 
 - drrrrrrrrrrrb@gmail.com
-executables:
+executables: 
 - puppet-library
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .licenseignore
 - .simplecov
@@ -357,30 +201,29 @@ files:
 - spec/util_spec.rb
 - test/librarian_puppet_integration_test.rb
 homepage: https://github.com/drrb/puppet-library
-licenses:
+licenses: 
 - GPL-3
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Puppet Library is a private Puppet module server that's compatible with librarian-puppet.
-test_files:
+test_files: 
 - features/module_list.feature
 - features/module_page.feature
 - features/module_search.feature