puppet-library 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dbf9bee6cd6735e0b70e07f1d99a6f2424100fe
-  data.tar.gz: 55bab3f751e5882efe31ee6e7b1470ae4478e1ed
+  metadata.gz: 68b80954c9df08f65a290c1ea3c5fd491372771d
+  data.tar.gz: c9d2efbad946d5782dfd672e4a7e88d930e4a414
 SHA512:
-  metadata.gz: 17ff1cb9f1b0eba72702b5e40b97d3c3384f6a33bd869d084615a5e6fbdf28a02e3c327e764d8221fbf7f893c6e9fbede7d62a1e02ddad70e0f045d8d4fffa5c
-  data.tar.gz: 5a63286451d1d0f39cf908725508610a0e26210ac437fc442eeeca1e840d164482b11ac83f59475b8fcc568f239ba1a5180797a97d811364f229234321f100ea
+  metadata.gz: 821e22e7ec9f3bcdf5a304a0d3a4664defe4b0d530dfd18dc818bd0c83f279b33ac74effe59e29e7c677da213c663c9505a45334dde397397e4e9849180fd310
+  data.tar.gz: b48d72e02f76e00795ff6cd228ab47cfce50b574e6d3be4ff6f59a9574fab4fbb654816c4d45aaeb8623a05374b33a1e63be92aabb8f7423ac8c6acdf9edefec

data/CHANGELOG.yml

@@ -100,4 +100,7 @@
 - tag: v0.16.0
   changes:
       - Fix dependency problems across multiple forges (#8)
+- tag: v0.17.0
+  changes:
+      - Fix Git repo forges serving empty modules (#11)
 

data/README.md

@@ -164,20 +164,10 @@ require "rubygems"
 require "puppet_library"
 
 # NB: this config API is not yet stable, and may change without notice.
-# The format shown is valid from Puppet Library v0.11.0
+# The format shown is valid from Puppet Library v0.11.0. See below for
+# all valid config items
 server = PuppetLibrary::Server.configure do
-    # Serve our private modules out of a directory on disk
-    forge :directory do
-        path = "/var/lib/modules"
-    end
-
-    # Serve the latest versions from GitHub
-    forge :git_repository do
-        source "http://github.com/example/puppetlabs-apache-fork.git"
-        include_tags /[0-9.]+/
-    end
-
-    # Download all other modules from the Puppet Forge
+    # Proxy the Puppet Forge
     forge :proxy do
         url "http://forge.puppetlabs.com"
     end
@@ -199,6 +189,37 @@ cat > /etc/httpd/conf.d/puppetlibrary.conf <<EOF
 EOF
 ```
 
+The following config items will currently work with the Rack config format (see above):
+
+```ruby
+# NB: this config API is not yet stable, and may change without notice.
+# The format shown is valid from Puppet Library v0.11.0
+server = PuppetLibrary::Server.configure do
+    # Serve modules from a directory on disk
+    forge :directory do
+        path = "/var/lib/modules"
+    end
+
+    # Serve module versions from a Git repository
+    forge :git_repository do
+        source "http://github.com/example/puppetlabs-apache-fork.git"
+        include_tags /[0-9.]+/
+    end
+
+    # Proxy a remote forge
+    forge :proxy do
+        url "http://forge.example.com"
+    end
+
+    # Proxy a remote forge, caching modules to disk
+    forge :cache do
+        url "http://forge.puppetlabs.com"
+        path "/var/puppet/modules/cache"
+    end
+end
+```
+
+
 ## Contributing
 
 1. Fork it

data/lib/puppet_library/util/git.rb

@@ -42,7 +42,7 @@ module PuppetLibrary::Util
         def with_tag(tag)
             update_cache!
             PuppetLibrary::Util::TempDir.use "git" do |path|
-                git "checkout #{tag}", path
+                git "checkout -f #{tag} .", path
                 yield(path)
             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.16.0"
+    VERSION = "0.17.0"
 end

data/puppet-library.gemspec

@@ -44,6 +44,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "rest-client", "~> 1.6.0"
   spec.add_development_dependency "gitsu"
   spec.add_development_dependency "librarian-puppet", "0.9.10" # 0.9.12 breaks on Ruby 1.8.7
   spec.add_development_dependency "mime-types", "< 2"

data/spec/spec_helper.rb

@@ -27,7 +27,9 @@ require 'fileutils'
 include FileUtils
 Tempdir = PuppetLibrary::Util::TempDir
 
-ENV["TESTING"] = "true"
+unless ENV["LOG"]
+    ENV["TESTING"] = "true"
+end
 
 class Tgz
     def initialize(buffer)

data/spec/util/git_spec.rb

@@ -71,6 +71,17 @@ module PuppetLibrary::Util
                     expect(File.read(modulefile)).to include "version '1.0.0'"
                 end
             end
+
+            context "when called twice" do
+                it "still works, and doesn't do funny stuff because the tag is already checked out in the cache" do
+                    git.with_tag("1.0.0") do |tag_path|
+                    end
+                    git.with_tag("1.0.0") do |tag_path|
+                        modulefile = File.join(tag_path, "Modulefile")
+                        expect(File.read(modulefile)).to include "version '1.0.0'"
+                    end
+                end
+            end
         end
 
         describe "#read_file" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-library
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - drrb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: gitsu
   requirement: !ruby/object:Gem::Requirement