puppet-library 0.10.0 → 0.11.0

data/spec/server_spec.rb

@@ -24,10 +24,29 @@ module PuppetLibrary
         include Rack::Test::Methods
 
         let(:forge) { double(Forge) }
-        let(:app) do
+        let :app do
+            allow(forge).to receive(:prime)
             Server.new(forge)
         end
 
+        describe "#new" do
+            it "primes the repositories" do
+                expect(forge).to receive(:prime)
+                app
+            end
+        end
+
+        describe "#configure" do
+            it "exposes a configuration API" do
+                repo_path = "."
+                Server.configure do
+                    forge :directory do
+                        path repo_path # make sure our API keeps the block's scope
+                    end
+                end
+            end
+        end
+
         describe "GET /" do
             it "lists all the modules" do
                 modules = [
@@ -78,6 +97,14 @@ module PuppetLibrary
             end
         end
 
+        describe "POST /api/forge/clear-cache" do
+            it "clears the forges' caches" do
+                expect(forge).to receive(:clear_cache)
+
+                post "/api/forge/clear-cache"
+            end
+        end
+
         describe "GET /modules.json" do
             it "renders the search result as JSON" do
                 search_results = [

data/spec/spec_helper.rb

@@ -24,21 +24,9 @@ require 'tempfile'
 require 'fileutils'
 
 include FileUtils
+Tempdir = PuppetLibrary::Util::TempDir
 
-class Tempdir
-    attr_reader :path
-
-    def self.create(name)
-        Tempdir.new(name).path
-    end
-
-    def initialize(name)
-        file = Tempfile.new(name)
-        @path = file.path
-        file.unlink
-        FileUtils.mkdir @path
-    end
-end
+ENV["TESTING"] = "true"
 
 class Tgz
     def initialize(buffer)

data/spec/util/config_api_spec.rb

@@ -0,0 +1,77 @@
+# 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 'spec_helper'
+
+module PuppetLibrary::Util
+    describe ConfigApi do
+        describe "#for" do
+            it "creates a config API" do
+                api = ConfigApi.for(self.class) do
+                    required :name, "String"
+                end
+
+                config = api.configure do
+                    name "Dave"
+                end
+
+                expect(config.get_name).to eq "Dave"
+            end
+
+            it "sees the block's scope" do
+                api = ConfigApi.for(self.class) do
+                    required :name, "String"
+                end
+
+                daves_name = "Dave"
+                config = api.configure do
+                    name daves_name
+                end
+
+                expect(config.get_name).to eq "Dave"
+            end
+
+            context "when a required parameter is missing" do
+                it "throws an exception" do
+                    api = ConfigApi.for(self.class) do
+                        required :name, "String"
+                    end
+
+                    expect {
+                        api.configure do
+                        end
+                    }.to raise_error /name/
+                end
+            end
+
+            context "when a parameter isn't valid, according to its validator" do
+                it "throws an exception" do
+                    api = ConfigApi.for(self.class) do
+                        required :name, "String" do |value|
+                            raise "Invalid!"
+                        end
+                    end
+
+                    expect {
+                        api.configure do
+                            name "Dave"
+                        end
+                    }.to raise_error /Invalid!/
+                end
+            end
+        end
+    end
+end

data/spec/util/git_spec.rb

@@ -18,12 +18,12 @@ require 'spec_helper'
 
 module PuppetLibrary::Util
     describe Git do
-        @@repo_path = Tempdir.create("git-repo")
+        @@repo_dir = Tempdir.new("git-repo")
         @@tags = [ "0.9.0", "1.0.0-rc1", "1.0.0", "xxx" ]
 
         before :all do
             def git(command)
-                git_command = "git --git-dir=#{@@repo_path}/.git --work-tree=#{@@repo_path} #{command}"
+                git_command = "git --git-dir=#{@@repo_dir.path}/.git --work-tree=#{@@repo_dir.path} #{command}"
                 `#{git_command}`
                 unless $?.success?
                     raise "Failed to run command: \"#{git_command}\""
@@ -34,7 +34,7 @@ module PuppetLibrary::Util
             git "config user.name tester"
             git "config user.email tester@example.com"
             @@tags.each do |tag|
-                File.open(File.join(@@repo_path, "Modulefile"), "w") do |modulefile|
+                File.open(File.join(@@repo_dir.path, "Modulefile"), "w") do |modulefile|
                     modulefile.write <<-MODULEFILE
                     name 'puppetlabs-apache'
                     version '#{tag}'
@@ -47,15 +47,15 @@ module PuppetLibrary::Util
             end
         end
 
-        after :all do
-            rm_rf @@repo_path
-        end
-
-        let(:git) { Git.new(@@repo_path, cache_path) }
-        let(:cache_path) { Tempdir.create("git-cache") }
+        let(:git) { Git.new(@@repo_dir.path, cache_dir) }
+        let(:cache_dir) { Tempdir.new("git-cache") }
 
-        after do
-            git.clear_cache!
+        context "when a git command returns nonzero" do
+            it "raises an error" do
+                expect {
+                    git.read_file("nonexistant.file", "0.9.0")
+                }.to raise_error /Error running Git command/
+            end
         end
 
         describe "#tags" do
@@ -82,17 +82,17 @@ module PuppetLibrary::Util
             it "clones the git repository to the cache directory" do
                 git.update_cache!
 
-                expect(`git --git-dir #{cache_path}/.git remote -v`).to include @@repo_path
+                expect(`git --git-dir #{cache_dir.path}/.git remote -v`).to include @@repo_dir.path
             end
 
             it "creates Git's .git/FETCH_HEAD file so that we know that the cache was recently created" do
                 git.update_cache!
 
-                expect(File.exist?(File.join(cache_path, ".git", "FETCH_HEAD"))).to be_true
+                expect(File.exist?(File.join(cache_dir.path, ".git", "FETCH_HEAD"))).to be_true
             end
 
             it "copes with a missing .git/FETCH_HEAD file" do
-                fetch_file = File.join(cache_path, ".git", "FETCH_HEAD")
+                fetch_file = File.join(cache_dir.path, ".git", "FETCH_HEAD")
                 git.update_cache!
                 rm fetch_file
 
@@ -103,7 +103,7 @@ module PuppetLibrary::Util
 
             it "doesn't update the cache if it was recently updated" do
                 git.update_cache!
-                new_head = Dir.chdir(@@repo_path) do
+                new_head = Dir.chdir(@@repo_dir.path) do
                     touch "xxx"
                     `git add xxx`
                     `git commit --message='Added file'`
@@ -112,13 +112,13 @@ module PuppetLibrary::Util
 
                 git.update_cache!
 
-                expect(`git --git-dir #{cache_path}/.git rev-parse HEAD`).not_to eq new_head
+                expect(`git --git-dir #{cache_dir.path}/.git rev-parse HEAD`).not_to eq new_head
             end
 
             it "updates the cache if it's been long enough" do
                 git.update_cache!
-                git = Git.new(@@repo_path, cache_path, 0) # zero second cache TTL
-                new_head = Dir.chdir(@@repo_path) do
+                git = Git.new(@@repo_dir.path, cache_dir, 0) # zero second cache TTL
+                new_head = Dir.chdir(@@repo_dir.path) do
                     touch "xxx"
                     `git add xxx`
                     `git commit --message='Added file'`
@@ -127,7 +127,7 @@ module PuppetLibrary::Util
 
                 git.update_cache!
 
-                expect(`git --git-dir #{cache_path}/.git rev-parse HEAD`).to eq new_head
+                expect(`git --git-dir #{cache_dir.path}/.git rev-parse HEAD`).to eq new_head
             end
         end
 
@@ -136,7 +136,7 @@ module PuppetLibrary::Util
                 git.update_cache!
                 git.clear_cache!
 
-                expect(File.exist? cache_path).to be_false
+                expect(File.exist? cache_dir.path).to be_false
             end
         end
     end

data/spec/util/patches_spec.rb

@@ -82,5 +82,23 @@ describe 'patches' do
                 expect(["1.10.0-badprerelease", "1.3", "1.10.0", "xxx", "1.10.0.rc1", "1.2.0"].version_sort).to eq ["xxx", "1.2.0", "1.3", "1.10.0-badprerelease", "1.10.0.rc1", "1.10.0"]
             end
         end
+
+        describe "#each_in_parallel" do
+            it "does something to each in parallel" do
+                array = [ "a", "b", "c" ]
+                array.each_in_parallel &:upcase!
+
+                expect(array).to eq [ "A", "B", "C" ]
+            end
+        end
+    end
+
+    describe String do
+        describe "#snake_case_to_camel_case" do
+            it "converts snake case to camel case" do
+                camelized = "my_variable_name".snake_case_to_camel_case
+                expect(camelized).to eq "MyVariableName"
+            end
+        end
     end
 end

data/test/directory_forge_integration_test.rb

@@ -24,13 +24,13 @@ module PuppetLibrary
         include ModuleSpecHelper
 
         let(:port) { Ports.next! }
-        let(:module_dir) { Tempdir.create("module_dir") }
-        let(:project_dir) { Tempdir.create("project_dir") }
+        let(:module_dir) { Tempdir.new("module_dir") }
+        let(:project_dir) { Tempdir.new("project_dir") }
         let(:start_dir) { pwd }
         let(:disk_server) do
-            Server.configure do |server|
-                server.forge Forge::Directory do |forge|
-                    forge.path = module_dir
+            Server.configure do
+                forge :directory do
+                    path module_dir.path
                 end
             end
         end
@@ -55,12 +55,10 @@ module PuppetLibrary
             # Start the servers
             disk_server_runner
             start_dir
-            cd project_dir
+            cd project_dir.path
         end
 
         after do
-            rm_rf module_dir
-            rm_rf project_dir
             cd start_dir
         end
 

data/test/offline_git_repo_forge_integration_test.rb

@@ -21,13 +21,13 @@ require 'open-uri'
 
 module PuppetLibrary
     describe "offline git repo forge" do
-        @@repo_path = Tempdir.create("git-repo")
+        @@repo_dir = Tempdir.new("git-repo")
         @@versions = [ "0.9.0", "1.0.0-rc1", "1.0.0" ]
         @@tags = @@versions + [ "xxx" ]
 
         before :all do
             def git(command)
-                git_command = "git --git-dir=#{@@repo_path}/.git --work-tree=#{@@repo_path} #{command}"
+                git_command = "git --git-dir=#{@@repo_dir.path}/.git --work-tree=#{@@repo_dir.path} #{command}"
                 `#{git_command}`
                 unless $?.success?
                     raise "Failed to run command: \"#{git_command}\""
@@ -38,7 +38,7 @@ module PuppetLibrary
             git "config user.name tester"
             git "config user.email tester@example.com"
             @@versions.zip(@@tags).each do |(version, tag)|
-                File.open(File.join(@@repo_path, "Modulefile"), "w") do |modulefile|
+                File.open(File.join(@@repo_dir.path, "Modulefile"), "w") do |modulefile|
                     modulefile.write <<-MODULEFILE
                     name 'puppetlabs-apache'
                     version '#{version}'
@@ -51,20 +51,16 @@ module PuppetLibrary
             end
         end
 
-        after :all do
-            rm_rf @@repo_path
-        end
-
         include ModuleSpecHelper
 
         let(:port) { Ports.next! }
-        let(:project_dir) { Tempdir.create("project_dir") }
+        let(:project_dir) { Tempdir.new("project_dir") }
         let(:start_dir) { pwd }
         let(:git_server) do
-            Server.configure do |server|
-                server.forge Forge::GitRepository do |forge|
-                    forge.source = @@repo_path
-                    forge.include_tags = /^[0-9.]+/
+            Server.configure do
+                forge :git_repository do
+                    source @@repo_dir.path
+                    include_tags /^[0-9.]+/
                 end
             end
         end
@@ -89,11 +85,10 @@ module PuppetLibrary
             # Start the servers
             git_server_runner
             start_dir
-            cd project_dir
+            cd project_dir.path
         end
 
         after do
-            rm_rf project_dir
             cd start_dir
         end
 

data/test/offline_proxy_forge_integration_test.rb

@@ -25,14 +25,14 @@ module PuppetLibrary
 
         let(:proxy_port) { Ports.next! }
         let(:disk_port) { Ports.next! }
-        let(:module_dir) { Tempdir.create("module_dir") }
-        let(:project_dir) { Tempdir.create("project_dir") }
-        let(:cache_dir) { Tempdir.create("cache_dir") }
+        let(:module_dir) { Tempdir.new("module_dir") }
+        let(:project_dir) { Tempdir.new("project_dir") }
+        let(:cache_dir) { Tempdir.new("cache_dir") }
         let(:start_dir) { pwd }
         let(:disk_server) do
-            Server.configure do |server|
-                server.forge Forge::Directory do |forge|
-                    forge.path = module_dir
+            Server.configure do
+                forge :directory do
+                    path module_dir.path
                 end
             end
         end
@@ -50,10 +50,10 @@ module PuppetLibrary
             end
         end
         let(:proxy_server) do
-            Server.configure do |server|
-                server.forge Forge::Cache do |forge|
-                    forge.url = "http://localhost:#{disk_port}"
-                    forge.path = cache_dir
+            Server.configure do
+                forge :cache do
+                    url "http://localhost:#{disk_port}"
+                    path cache_dir.path
                 end
             end
         end
@@ -80,13 +80,10 @@ module PuppetLibrary
             disk_server_runner
             proxy_server_runner
             start_dir
-            cd project_dir
+            cd project_dir.path
         end
 
         after do
-            rm_rf module_dir
-            rm_rf project_dir
-            rm_rf cache_dir
             cd start_dir
         end
 

data/test/online_git_repo_forge_integration_test.rb

@@ -25,13 +25,13 @@ module PuppetLibrary
         include ModuleSpecHelper
 
         let(:port) { Ports.next! }
-        let(:project_dir) { Tempdir.create("project_dir") }
+        let(:project_dir) { Tempdir.new("project_dir") }
         let(:start_dir) { pwd }
         let(:git_server) do
-            Server.configure do |server|
-                server.forge Forge::GitRepository do |forge|
-                    forge.source = "https://github.com/puppetlabs/puppetlabs-stdlib.git"
-                    forge.include_tags = /^[0-9.]+/
+            Server.configure do
+                forge :git_repository do
+                    source "https://github.com/puppetlabs/puppetlabs-stdlib.git"
+                    include_tags /^[0-9.]+/
                 end
             end
         end
@@ -56,11 +56,10 @@ module PuppetLibrary
             # Start the servers
             git_server_runner
             start_dir
-            cd project_dir
+            cd project_dir.path
         end
 
         after do
-            rm_rf project_dir
             cd start_dir
         end
 
@@ -71,7 +70,7 @@ module PuppetLibrary
             EOF
 
             # Install modules
-            system "librarian-puppet install" or fail "call to puppet-library failed"
+            system "librarian-puppet install --verbose" or fail "call to puppet-library failed"
             expect("stdlib").to be_installed
 
             # Search