puppet-library 0.10.0 → 0.11.0

data/lib/puppet_library/util/git.rb

@@ -17,16 +17,20 @@
 require 'fileutils'
 require 'monitor'
 require 'time'
+require 'open4'
+require 'puppet_library/util/logging'
 require 'puppet_library/util/temp_dir'
 
 module PuppetLibrary::Util
     class Git
+        include Logging
+
         DEFAULT_CACHE_TTL_SECONDS = 60
-        def initialize(source, cache_path, cache_ttl_seconds = DEFAULT_CACHE_TTL_SECONDS)
+        def initialize(source, cache_dir, cache_ttl_seconds = DEFAULT_CACHE_TTL_SECONDS)
             @source = source
-            @cache_path = File.expand_path(cache_path)
+            @cache_dir = cache_dir
             @cache_ttl_seconds = cache_ttl_seconds
-            @git_dir = File.join(@cache_path, ".git")
+            @git_dir = File.join(@cache_dir.path, ".git")
             @mutex = Monitor.new
         end
 
@@ -48,9 +52,17 @@ module PuppetLibrary::Util
             git "show refs/tags/#{tag}:#{path}"
         end
 
+        def file_exists?(path, tag)
+            read_file(path, tag)
+            true
+        rescue GitCommandError
+            false
+        end
+
         def clear_cache!
             @mutex.synchronize do
-                FileUtils.rm_rf @cache_path
+                info "Clearing cache for Git repository #{@source} from #{@git_dir}"
+                FileUtils.rm_rf @cache_dir.path
             end
         end
 
@@ -62,7 +74,8 @@ module PuppetLibrary::Util
         private
         def create_cache
             @mutex.synchronize do
-                git "clone --bare #{@source} #{@git_dir}" unless cache_exists?
+                info "Cloning Git repository from #{@source} to #{@git_dir}"
+                git "clone --bare #{@source} #{@git_dir}"
                 FileUtils.touch fetch_file
             end
         end
@@ -94,10 +107,25 @@ module PuppetLibrary::Util
         end
 
         def git(command, work_tree = nil)
-            work_tree = @cache_path unless work_tree
-            Open3.popen3("git --git-dir=#{@git_dir} --work-tree=#{work_tree} #{command}") do |stdin, stdout, stderr, thread|
-                stdout.read
+            work_tree = @cache_dir.path unless work_tree
+            run "git --git-dir=#{@git_dir} --work-tree=#{work_tree} #{command}"
+        end
+
+        def run(command)
+            debug command
+            pid, stdin, stdout, stderr = Open4.popen4(command)
+            ignored, status = Process::waitpid2 pid
+            unless status.success?
+                raise GitCommandError, "Error running Git command: #{command}\n#{stdout.read}\n#{stderr.read}"
             end
+            stdout.read
+        ensure
+            stdin.close
+            stdout.close
+            stderr.close
+        end
+
+        class GitCommandError < StandardError
         end
     end
 end

data/lib/puppet_library/util/logging.rb

@@ -0,0 +1,49 @@
+# 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 'logger'
+
+module PuppetLibrary::Util
+    module Logging
+        def log_io
+            @log_io ||= StringIO.new
+        end
+
+        def logger
+            destination = ENV["TESTING"] ? log_io : STDERR
+            @logger ||= Logger.new(destination).tap do |logger|
+                logger.progname = self.class.name
+                logger.level = Logger::DEBUG
+            end
+        end
+
+        def debug(message)
+            logger.debug message
+        end
+
+        def info(message)
+            logger.info message
+        end
+
+        def warn(message)
+            logger.warn message
+        end
+
+        #def error(message)
+        #    logger.error message
+        #end
+    end
+end

data/lib/puppet_library/util/patches.rb

@@ -78,6 +78,15 @@ class Array
             merged.deep_merge(map)
         end
     end
+
+    def each_in_parallel
+        threads = map do |element|
+            Thread.new do
+                yield(element)
+            end
+        end
+        threads.each &:join
+    end
 end
 
 class Hash
@@ -92,6 +101,12 @@ class Hash
     end
 end
 
+class String
+    def snake_case_to_camel_case
+        split("_").map(&:capitalize).join
+    end
+end
+
 class Gem::Package::TarReader
     # Old versions of RubyGems don't include Enumerable in here
     def find
@@ -102,3 +117,9 @@ class Gem::Package::TarReader
         end
     end
 end
+
+class Dir
+    def to_str
+        path
+    end
+end

data/lib/puppet_library/util/temp_dir.rb

@@ -29,14 +29,29 @@ module PuppetLibrary::Util
         end
 
         def self.create(name)
-            TempDir.new(name).path
+            file = Tempfile.new(name)
+            path = file.path
+            file.unlink
+            FileUtils.mkdir path
+            path
         end
 
         def initialize(name)
-            file = Tempfile.new(name)
-            @path = file.path
-            file.unlink
-            FileUtils.mkdir @path
+            @path = TempDir.create(name)
+            @remover = Remover.new(@path)
+            ObjectSpace.define_finalizer(self, @remover)
+        end
+
+        class Remover
+            def initialize(path)
+                @path = path
+            end
+
+            def call(*args)
+                if File.directory? @path
+                    FileUtils.rm_rf @path
+                end
+            end
         end
     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.10.0"
+    VERSION = "0.11.0"
 end

data/puppet-library.gemspec

@@ -39,6 +39,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sinatra"
   spec.add_dependency "json"
   spec.add_dependency "haml"
+  spec.add_dependency "docile", ">= 1.0.0"
+  spec.add_dependency "open4"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "coveralls"

data/spec/archive/archive_reader_spec.rb

@@ -23,11 +23,11 @@ module PuppetLibrary::Archive
         end
 
         let :source_dir do
-            Tempdir.create("zipping")
+            Tempdir.new("zipping")
         end
 
         let :archive do
-            archive = File.join(source_dir, "archive.tgz")
+            archive = File.join(source_dir.path, "archive.tgz")
             write_tar_gzip!(archive) do |zip|
                 zip.add_file("arrive.txt", 0644) { |entry| entry.write "say hello" }
                 zip.add_file("later/depart.txt", 0644) { |entry| entry.write "say bye" }
@@ -35,10 +35,6 @@ module PuppetLibrary::Archive
             archive
         end
 
-        after do
-            rm_rf source_dir
-        end
-
         def write_tar_gzip!(file_name)
             tar = StringIO.new
 

data/spec/archive/archiver_spec.rb

@@ -19,10 +19,10 @@ require 'spec_helper'
 module PuppetLibrary::Archive
     describe Archiver do
         describe "#archive_dir" do
-            let(:dir) { Tempdir.create("tozip") }
+            let(:dir) { Tempdir.new("tozip") }
 
             def write_file!(filename, content)
-                path = File.join(dir, filename)
+                path = File.join(dir.path, filename)
                 FileUtils.mkdir_p(File.dirname(path))
                 File.open(path, "w") do |file|
                     file.write content
@@ -34,19 +34,15 @@ module PuppetLibrary::Archive
                 write_file! "later/depart.txt", "say bye"
             end
 
-            after do
-                rm_rf dir
-            end
-
             it "tars and gzips a directory and its contents" do
-                buffer = Archiver.archive_dir(dir, "todo")
+                buffer = Archiver.archive_dir(dir.path, "todo")
 
                 expect(buffer).to be_tgz_with "todo/arrive.txt", "say hello"
                 expect(buffer).to be_tgz_with "todo/later/depart.txt", "say bye"
             end
 
             it "allows you to inject files from a block" do
-                buffer = Archiver.archive_dir(dir, "todo") do |archive|
+                buffer = Archiver.archive_dir(dir.path, "todo") do |archive|
                     archive.add_file("later/return.txt", 0644) do |entry|
                        entry.write "say hi again"
                     end
@@ -56,7 +52,7 @@ module PuppetLibrary::Archive
             end
 
             it "fixes leading slash for adding files" do
-                buffer = Archiver.archive_dir(dir, "todo") do |archive|
+                buffer = Archiver.archive_dir(dir.path, "todo") do |archive|
                     archive.add_file("/later/return.txt", 0644) do |entry|
                        entry.write "say hi again"
                     end

data/spec/forge/cache_spec.rb

@@ -19,18 +19,24 @@ require 'spec_helper'
 
 module PuppetLibrary::Forge
     describe Cache do
-        let(:cache_dir) { Tempdir.create("module-cache") }
+        let(:cache_dir) { Tempdir.new("module-cache") }
         let(:http_client) { double(PuppetLibrary::Http::HttpClient) }
         let(:forge) { Cache.new("http://forge.example.com", cache_dir, http_client) }
 
-        after do
-            rm_rf cache_dir
-        end
-
         it "is a proxy" do
             expect(forge).to be_a Proxy
         end
 
+        describe "#configure" do
+            it "exposes a configuration API" do
+                forge = Cache.configure do
+                    url "http://example.com"
+                    path cache_dir.path
+                end
+                expect(forge.instance_eval "@url").to eq "http://example.com"
+            end
+        end
+
         describe "#get_module_buffer" do
             before do
                 allow(http_client).to receive(:get).
@@ -47,7 +53,7 @@ module PuppetLibrary::Forge
 
                     buffer = forge.get_module_buffer("puppetlabs", "apache", "1.0.0")
 
-                    downloaded_file = File.join(cache_dir, "puppetlabs-apache-1.0.0.tar.gz")
+                    downloaded_file = File.join(cache_dir.path, "puppetlabs-apache-1.0.0.tar.gz")
                     expect(File.read downloaded_file).to eq "apache module"
                     expect(buffer.read).to eq "apache module"
                 end
@@ -55,7 +61,7 @@ module PuppetLibrary::Forge
 
             context "the second time it's called" do
                 it "serves the cached module from the disk" do
-                    cached_module = File.join(cache_dir, "puppetlabs-apache-1.0.0.tar.gz")
+                    cached_module = File.join(cache_dir.path, "puppetlabs-apache-1.0.0.tar.gz")
                     File.open(cached_module, "w") do |file|
                         file.write "apache module"
                     end

data/spec/forge/directory_spec.rb

@@ -20,43 +20,56 @@ module PuppetLibrary::Forge
     describe Directory do
         include ModuleSpecHelper
 
-        let(:module_dir) { Tempdir.create("module_dir") }
-        let(:module_repo) { Directory.new(module_dir) }
+        let(:module_dir) { Tempdir.new("module_dir") }
+        let(:forge) { Directory.new(module_dir) }
 
-        after do
-            rm_rf module_dir
-        end
+        describe "#configure" do
+            it "exposes a configuration API" do
+                forge = Directory.configure do
+                    path "."
+                end
+                expect(forge.instance_eval "@module_dir.path").to eq Dir.pwd
+            end
 
-        describe "#initialize" do
             context "when the module directory doesn't exist" do
                 before do
-                    rm_rf module_dir
+                    rm_rf module_dir.path
                 end
 
                 it "raises an error" do
                     expect {
-                        Directory.new(module_dir)
-                    }.to raise_error /Module directory .* doesn't exist/
+                        Directory.configure do
+                            path module_dir.path
+                        end
+                    }.to raise_error /No such file/
                 end
             end
 
             context "when the module directory isn't readable" do
                 before do
-                    chmod 0400, module_dir
+                    chmod 0400, module_dir.path
                 end
 
                 after do
-                    chmod 0777, module_dir
+                    chmod 0777, module_dir.path
                 end
 
                 it "raises an error" do
                     expect {
-                        Directory.new(module_dir)
+                        Directory.configure do
+                            path module_dir.path
+                        end
                     }.to raise_error /Module directory .* isn't readable/
                 end
             end
         end
 
+        describe "#prime" do
+            it "does nothing" do
+                forge.prime
+            end
+        end
+
         describe "#get_module" do
             context "when the module archive exists" do
                 before do
@@ -64,7 +77,7 @@ module PuppetLibrary::Forge
                 end
 
                 it "returns a the module archive as a file buffer" do
-                    buffer = module_repo.get_module("puppetlabs", "apache", "1.0.0")
+                    buffer = forge.get_module("puppetlabs", "apache", "1.0.0")
 
                     expect(buffer.path).to end_with("puppetlabs-apache-1.0.0.tar.gz")
                 end
@@ -72,7 +85,7 @@ module PuppetLibrary::Forge
 
             context "when the module file doesn't exist" do
                 it "returns nil" do
-                    buffer = module_repo.get_module("puppetlabs", "noneixstant", "1.0.0")
+                    buffer = forge.get_module("puppetlabs", "noneixstant", "1.0.0")
 
                     expect(buffer).to be_nil
                 end
@@ -87,7 +100,7 @@ module PuppetLibrary::Forge
                 end
 
                 it "returns a the module archive as a file buffer" do
-                    metadata = module_repo.get_all_metadata
+                    metadata = forge.get_all_metadata
 
                     v1 = metadata.find {|m| m["version"] == "1.0.0" }
                     v2 = metadata.find {|m| m["version"] == "2.0.0" }
@@ -98,7 +111,7 @@ module PuppetLibrary::Forge
 
             context "when no modules exist" do
                 it "returns an empty array" do
-                    result = module_repo.get_all_metadata
+                    result = forge.get_all_metadata
 
                     expect(result).to be_empty
                 end
@@ -108,7 +121,7 @@ module PuppetLibrary::Forge
         describe "#get_metadata" do
             context "when the module directory is empty" do
                 it "returns an empty array" do
-                    metadata_list = module_repo.get_metadata("puppetlabs", "apache")
+                    metadata_list = forge.get_metadata("puppetlabs", "apache")
                     expect(metadata_list).to be_empty
                 end
             end
@@ -120,7 +133,7 @@ module PuppetLibrary::Forge
                 end
 
                 it "returns an array containing the module's versions' metadata" do
-                    metadata_list = module_repo.get_metadata("puppetlabs", "apache")
+                    metadata_list = forge.get_metadata("puppetlabs", "apache")
                     expect(metadata_list.size).to eq 2
                     metadata_list = metadata_list.sort_by {|m| m["version"] }
                     expect(metadata_list[0]["name"]).to eq "puppetlabs-apache"