librarian-puppet 0.9.1 → 0.9.2.pre

data/vendor/librarian/lib/librarian/logger.rb

@@ -0,0 +1,46 @@
+module Librarian
+  class Logger
+
+    librarian_path = Pathname(__FILE__)
+    librarian_path = librarian_path.dirname until librarian_path.join("lib").directory?
+    LIBRARIAN_PATH = librarian_path
+
+    attr_accessor :environment
+    private :environment=
+
+    def initialize(environment)
+      self.environment = environment
+    end
+
+    def info(string = nil, &block)
+      return unless ui
+
+      ui.info(string || yield)
+    end
+
+    def debug(string = nil, &block)
+      return unless ui
+
+      if ui.respond_to?(:debug_line_numbers) && ui.debug_line_numbers
+        loc = caller.find{|l| !(l =~ /in `debug'$/)}
+        if loc =~ /^(.+):(\d+):in `(.+)'$/
+          loc = "#{Pathname.new($1).relative_path_from(LIBRARIAN_PATH)}:#{$2}:in `#{$3}'"
+        end
+        ui.debug { "[Librarian] #{string || yield} [#{loc}]" }
+      else
+        ui.debug { "[Librarian] #{string || yield}" }
+      end
+    end
+
+    def relative_path_to(path)
+      environment.project_relative_path_to(path)
+    end
+
+    private
+
+    def ui
+      environment.ui
+    end
+
+  end
+end

data/vendor/librarian/lib/librarian/manifest.rb

@@ -1,8 +1,5 @@
 require 'rubygems'
 
-require 'librarian/helpers/debug'
-require 'librarian/support/abstract_method'
-
 module Librarian
   class Manifest
 
@@ -39,14 +36,9 @@ module Librarian
       attr_accessor :backing
     end
 
-    include Support::AbstractMethod
-    include Helpers::Debug
-
     attr_accessor :source, :name, :extra
     private :source=, :name=, :extra=
 
-    abstract_method :fetch_version!, :fetch_dependencies!
-
     def initialize(source, name, extra = nil)
       assert_name_valid! name
 
@@ -133,7 +125,7 @@ module Librarian
     end
 
     def assert_name_valid!(name)
-      raise ArgumentError, "name (#{name.inspect}) must be sensible" unless name =~ /^\S.*\S$/
+      raise ArgumentError, "name (#{name.inspect}) must be sensible" unless name =~ /\A\S(?:.*\S)?\z/
     end
 
   end

data/vendor/librarian/lib/librarian/resolver.rb

@@ -4,7 +4,6 @@ require 'librarian/resolution'
 
 module Librarian
   class Resolver
-    include Helpers::Debug
 
     attr_accessor :environment
     private :environment=
@@ -69,5 +68,11 @@ module Librarian
       ManifestSet.sort(manifests)
     end
 
+  private
+
+    def debug(*args, &block)
+      environment.logger.debug(*args, &block)
+    end
+
   end
 end

data/vendor/librarian/lib/librarian/resolver/implementation.rb

@@ -1,13 +1,9 @@
-require 'librarian/helpers/debug'
-
 require 'librarian/dependency'
 
 module Librarian
   class Resolver
     class Implementation
 
-      include Helpers::Debug
-
       attr_reader :resolver, :source, :dependency_source_map
 
       def initialize(resolver, spec)
@@ -110,7 +106,7 @@ module Librarian
       end
 
       def debug
-        super { '  ' * @level + yield }
+        environment.logger.debug { '  ' * @level + yield }
       end
 
       def environment

data/vendor/librarian/lib/librarian/source/git/repository.rb

@@ -1,7 +1,5 @@
 require 'open3'
 
-require 'librarian/helpers/debug'
-
 module Librarian
   module Source
     class Git
@@ -34,15 +32,13 @@ module Librarian
               path = File.expand_path(path)
               exts.each do |ext|
                 exe = File.join(path, cmd + ext)
-                return exe if File.executable?(exe)
+                return exe if File.file?(exe) && File.executable?(exe)
               end
             end
             nil
           end
         end
 
-        include Helpers::Debug
-
         attr_accessor :environment, :path
         private :environment=, :path=
 
@@ -127,7 +123,7 @@ module Librarian
             reference = "#{remote}/#{reference}"
           end
 
-          command = %W(rev-parse #{reference} --quiet)
+          command = %W(rev-list #{reference} -1)
           run!(command, :chdir => true).strip
         end
 
@@ -207,6 +203,14 @@ module Librarian
           end
         end
 
+        def debug(*args, &block)
+          environment.logger.debug(*args, &block)
+        end
+
+        def relative_path_to(path)
+          environment.logger.relative_path_to(path)
+        end
+
       end
     end
   end

data/vendor/librarian/lib/librarian/source/local.rb

@@ -1,4 +1,3 @@
-require 'librarian/helpers/debug'
 require 'librarian/support/abstract_method'
 
 module Librarian
@@ -8,7 +7,6 @@ module Librarian
     #   #environment
     module Local
 
-      include Helpers::Debug
       include Support::AbstractMethod
 
       abstract_method :path, :fetch_version, :fetch_dependencies
@@ -46,6 +44,18 @@ module Librarian
 
       abstract_method :manifest? # (name, path) -> boolean
 
+      def info(*args, &block)
+        environment.logger.info(*args, &block)
+      end
+
+      def debug(*args, &block)
+        environment.logger.debug(*args, &block)
+      end
+
+      def relative_path_to(path)
+        environment.logger.relative_path_to(path)
+      end
+
     end
   end
 end

data/vendor/librarian/lib/librarian/spec_change_set.rb

@@ -1,5 +1,4 @@
 require 'librarian/helpers'
-require 'librarian/helpers/debug'
 
 require 'librarian/manifest_set'
 require 'librarian/resolution'
@@ -8,8 +7,6 @@ require 'librarian/spec'
 module Librarian
   class SpecChangeSet
 
-    include Helpers::Debug
-
     attr_accessor :environment
     private :environment=
     attr_reader :spec, :lock
@@ -166,5 +163,11 @@ module Librarian
       end
     end
 
+  private
+
+    def debug(*args, &block)
+      environment.logger.debug(*args, &block)
+    end
+
   end
 end

data/vendor/librarian/lib/librarian/specfile.rb

@@ -1,10 +1,6 @@
-require 'librarian/helpers/debug'
-
 module Librarian
   class Specfile
 
-    include Helpers::Debug
-
     attr_accessor :environment
     private :environment=
     attr_reader :path, :dependencies, :source

data/vendor/librarian/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

data/vendor/librarian/librarian.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "cucumber"
   s.add_development_dependency "aruba"
   s.add_development_dependency "webmock"
+  s.add_development_dependency "fakefs"
 
   s.add_dependency "chef", ">= 0.10"
   s.add_dependency "highline"

data/vendor/librarian/spec/functional/source/git/repository_spec.rb

@@ -0,0 +1,149 @@
+require "fileutils"
+require "pathname"
+require "securerandom"
+
+require "librarian/source/git/repository"
+
+describe Librarian::Source::Git::Repository do
+
+  let(:env) do
+    double(:ui => nil, :logger => double(:debug => nil, :info => nil))
+  end
+
+  let(:project_path) do
+    project_path = Pathname.new(__FILE__).expand_path
+    project_path = project_path.dirname until project_path.join("Rakefile").exist?
+    project_path
+  end
+  let(:tmp_path) { project_path + "tmp/spec/unit/source/git/repository-spec" }
+  let(:git_source_path) { tmp_path + SecureRandom.hex(16) }
+  let(:branch) { "the-branch" }
+  let(:tag) { "the-tag" }
+  let(:atag) { "the-atag" }
+
+  before do
+    git_source_path.mkpath
+    Dir.chdir(git_source_path) do
+      `git init`
+
+      # master
+      `touch butter.txt`
+      `git add butter.txt`
+      `git commit -m "Initial Commit"`
+
+      # branch
+      `git checkout -b #{branch} --quiet`
+      `touch jam.txt`
+      `git add jam.txt`
+      `git commit -m "Branch Commit"`
+      `git checkout master --quiet`
+
+      # tag
+      `git checkout -b deletable --quiet`
+      `touch jelly.txt`
+      `git add jelly.txt`
+      `git commit -m "Tag Commit"`
+      `git tag #{tag}`
+      `git checkout master --quiet`
+      `git branch -D deletable`
+
+      # annotated tag
+      `git checkout -b deletable --quiet`
+      `touch jelly.txt`
+      `git add jelly.txt`
+      `git commit -m "Tag Commit"`
+      `git tag -am "Annotated Tag Commit" #{atag}`
+      `git checkout master --quiet`
+      `git branch -D deletable`
+    end
+  end
+
+  context "the original" do
+    subject { described_class.new(env, git_source_path) }
+
+    it "should recognize it" do
+      subject.should be_git
+    end
+
+    it "should not list any remotes for it" do
+      subject.remote_names.should be_empty
+    end
+
+    it "should not list any remote branches for it" do
+      subject.remote_branch_names.should be_empty
+    end
+  end
+
+  context "a clone" do
+    let(:git_clone_path) { tmp_path + SecureRandom.hex(16) }
+    subject { described_class.clone!(env, git_clone_path, git_source_path) }
+
+    let(:master_sha) { subject.hash_from("origin", "master") }
+    let(:branch_sha) { subject.hash_from("origin", branch) }
+    let(:tag_sha) { subject.hash_from("origin", tag) }
+    let(:atag_sha) { subject.hash_from("origin", atag) }
+
+    it "should recognize it" do
+      subject.should be_git
+    end
+
+    it "should have a single remote for it" do
+      subject.should have(1).remote_names
+    end
+
+    it "should have a remote with the expected name" do
+      subject.remote_names.first.should == "origin"
+    end
+
+    it "should have the remote branch" do
+      subject.remote_branch_names["origin"].should include branch
+    end
+
+    it "should be checked out on the master" do
+      subject.should be_checked_out(master_sha)
+    end
+
+    context "checking out the branch" do
+      before do
+        subject.checkout! branch
+      end
+
+      it "should be checked out on the branch" do
+        subject.should be_checked_out(branch_sha)
+      end
+
+      it "should not be checked out on the master" do
+        subject.should_not be_checked_out(master_sha)
+      end
+    end
+
+    context "checking out the tag" do
+      before do
+        subject.checkout! tag
+      end
+
+      it "should be checked out on the tag" do
+        subject.should be_checked_out(tag_sha)
+      end
+
+      it "should not be checked out on the master" do
+        subject.should_not be_checked_out(master_sha)
+      end
+    end
+
+    context "checking out the annotated tag" do
+      before do
+        subject.checkout! atag
+      end
+
+      it "should be checked out on the annotated tag" do
+        subject.should be_checked_out(atag_sha)
+      end
+
+      it "should not be checked out on the master" do
+        subject.should_not be_checked_out(master_sha)
+      end
+    end
+  end
+
+end

data/vendor/librarian/spec/unit/config/database_spec.rb

@@ -0,0 +1,319 @@
+require "fileutils"
+require "pathname"
+require "yaml"
+
+require "fakefs/spec_helpers"
+
+require "librarian/config/database"
+
+describe Librarian::Config::Database do
+  include FakeFS::SpecHelpers
+
+  def write_yaml!(path, *yamlables)
+    dir = File.dirname(path)
+    FileUtils.mkpath(dir) unless File.directory?(dir)
+    File.open(path, "wb"){|f| yamlables.each{|y| YAML.dump(y, f)}}
+  end
+
+  let(:adapter_name) { "gem" }
+
+  let(:env) { { } }
+  let(:pwd) { Pathname("/tmp") }
+  let(:home) { Pathname("~").expand_path }
+  let(:project_path) { nil }
+  let(:specfile_name) { nil }
+  let(:global) { home.join(".librarian/gem/config") }
+  let(:local) { pwd.join(".librarian/gem/config") }
+  let(:specfile) { pwd.join("Gemfile") }
+
+  before do
+    FileUtils.mkpath(pwd)
+    FileUtils.touch(specfile)
+  end
+
+  let(:database) do
+    described_class.new(adapter_name,
+      :env => env,
+      :pwd => pwd.to_s,
+      :home => home.to_s,
+      :project_path => project_path,
+      :specfile_name => specfile_name
+    )
+  end
+
+  context "when a key is given globally" do
+    let(:key) { "jam" }
+    let(:value) { "jelly" }
+    let(:raw_key) { "LIBRARIAN_GEM_JAM" }
+
+    before do
+      write_yaml! global, raw_key => value
+    end
+
+    it "should have the key globally" do
+      database.global[key].should == value
+    end
+
+    it "should not have the key in the env" do
+      database.env[key].should be_nil
+    end
+
+    it "should not have the key locally" do
+      database.local[key].should be_nil
+    end
+
+    it "should have the key generally" do
+      database[key].should == value
+    end
+  end
+
+  context "when a key is set globally" do
+    let(:key) { "jam" }
+    let(:value) { "jelly" }
+    let(:raw_key) { "LIBRARIAN_GEM_JAM" }
+
+    before do
+      database.global[key] = value
+    end
+
+    it "should have the key globally" do
+      database.global[key].should == value
+    end
+
+    it "should not have the key in the env" do
+      database.env[key].should be_nil
+    end
+
+    it "should not have the key locally" do
+      database.local[key].should be_nil
+    end
+
+    it "should have the key generally" do
+      database[key].should == value
+    end
+
+    it "should persist the key" do
+      data = YAML.load_file(global)
+
+      data.should == {raw_key => value}
+    end
+  end
+
+  context "when the key is set and unset globally" do
+    let(:key) { "jam" }
+    let(:value) { "jelly" }
+    let(:raw_key) { "LIBRARIAN_GEM_JAM" }
+
+    before do
+      database.global[key] = value
+      database.global[key] = nil
+    end
+
+    it "should not have the key globally" do
+      database.global[key].should be_nil
+    end
+
+    it "should not have the key in the env" do
+      database.env[key].should be_nil
+    end
+
+    it "should not have the key locally" do
+      database.local[key].should be_nil
+    end
+
+    it "should not have the key generally" do
+      database[key].should be_nil
+    end
+
+    it "should unpersist the key" do
+      File.should_not exist global
+    end
+  end
+
+  context "when a key is given in the env" do
+    let(:key) { "jam" }
+    let(:value) { "jelly" }
+    let(:raw_key) { "LIBRARIAN_GEM_JAM" }
+
+    #override
+    let(:env) { {raw_key => value} }
+
+    it "should not have the key globally" do
+      database.global[key].should be_nil
+    end
+
+    it "should have the key in the env" do
+      database.env[key].should == value
+    end
+
+    it "should not have the key locally" do
+      database.local[key].should be_nil
+    end
+
+    it "should have the key generally" do
+      database[key].should == value
+    end
+  end
+
+  context "when a key is given locally" do
+    let(:key) { "jam" }
+    let(:value) { "jelly" }
+    let(:raw_key) { "LIBRARIAN_GEM_JAM" }
+
+    before do
+      write_yaml! local, raw_key => value
+    end
+
+    it "should not have the key globally" do
+      database.global[key].should be_nil
+    end
+
+    it "should not have the key in the env" do
+      database.env[key].should be_nil
+    end
+
+    it "should have the key locally" do
+      database.local[key].should == value
+    end
+
+    it "should have the key generally" do
+      database[key].should == value
+    end
+  end
+
+  context "when a key is set locally" do
+    let(:key) { "jam" }
+    let(:value) { "jelly" }
+    let(:raw_key) { "LIBRARIAN_GEM_JAM" }
+
+    before do
+      database.local[key] = value
+    end
+
+    it "should not have the key globally" do
+      database.global[key].should be_nil
+    end
+
+    it "should not have the key in the env" do
+      database.env[key].should be_nil
+    end
+
+    it "should have the key locally" do
+      database.local[key].should == value
+    end
+
+    it "should have the key generally" do
+      database[key].should == value
+    end
+
+    it "should persist the key" do
+      data = YAML.load_file(local)
+
+      data.should == {raw_key => value}
+    end
+  end
+
+  context "when the key is set and unset locally" do
+    let(:key) { "jam" }
+    let(:value) { "jelly" }
+    let(:raw_key) { "LIBRARIAN_GEM_JAM" }
+
+    before do
+      database.local[key] = value
+      database.local[key] = nil
+    end
+
+    it "should not have the key globally" do
+      database.global[key].should be_nil
+    end
+
+    it "should not have the key in the env" do
+      database.env[key].should be_nil
+    end
+
+    it "should not have the key locally" do
+      database.local[key].should be_nil
+    end
+
+    it "should not have the key generally" do
+      database[key].should be_nil
+    end
+
+    it "should unpersist the key" do
+      File.should_not exist local
+    end
+  end
+
+  context "setting malformatted keys" do
+    it "should ban caps" do
+      expect { database.global["JAM"] = "jelly" }.
+        to raise_error Librarian::Error, %[key not permitted: "JAM"]
+    end
+
+    it "should ban double dots" do
+      expect { database.global["jam..jam"] = "jelly" }.
+        to raise_error Librarian::Error, %[key not permitted: "jam..jam"]
+    end
+  end
+
+  context "setting banned keys" do
+    it  "should ban the specfile key" do
+      expect { database.global["gemfile"] = "jelly" }.
+        to raise_error Librarian::Error, %[key not permitted: "gemfile"]
+    end
+
+    it  "should ban the global-config key" do
+      expect { database.global["config"] = "jelly" }.
+        to raise_error Librarian::Error, %[key not permitted: "config"]
+    end
+  end
+
+  context "project_path" do
+    context "by default" do
+      it "should give the default project path" do
+        database.project_path.should == Pathname("/tmp")
+      end
+    end
+
+    context "when the specfile is set in the env" do
+      let(:env) { {"LIBRARIAN_GEM_GEMFILE" => "/non/sense/path/to/Sillyfile"} }
+
+      it "should give the project path from the env-set specfile" do
+        database.project_path.should == Pathname("/non/sense/path/to")
+      end
+    end
+  end
+
+  context "specfile_path" do
+    context "by default" do
+      it "should give the default specfile path" do
+        database.specfile_path.should == specfile
+      end
+    end
+
+    context "when set in the env" do
+      let(:env) { {"LIBRARIAN_GEM_GEMFILE" => "/non/sense/path/to/Sillyfile"} }
+
+      it "should give the given specfile path" do
+        database.specfile_path.should == Pathname("/non/sense/path/to/Sillyfile")
+      end
+    end
+
+    context "when the project_path is assigned" do
+      let(:project_path) { "/non/sense/path/to" }
+
+      it "should give the assigned specfile path" do
+        database.specfile_path.should == Pathname("/non/sense/path/to/Gemfile")
+      end
+    end
+
+    context "when the specfile_name is assigned" do
+      let(:specfile_name) { "Sillyfile" }
+
+      it "should give the assigned specfile path" do
+        database.specfile_path.should == Pathname("/tmp/Sillyfile")
+      end
+    end
+  end
+
+end