librarian 0.1.0.beta.1 → 0.1.0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.1.0
+
+* Extract the chef adapter to its own gem.
+
 ## 0.0.26
 
 * \#112. Prevent the git source being confused in certain cases by colorized

data/lib/librarian/dsl.rb

@@ -68,21 +68,15 @@ module Librarian
     end
 
     def run(specfile = nil, sources = [])
+      specfile, sources = nil, specfile if specfile.kind_of?(Array) && sources.empty?
+
       Target.new(self).tap do |target|
         target.precache_sources(sources)
         debug_named_source_cache("Pre-Cached Sources", target)
 
+        specfile ||= Proc.new if block_given?
         receiver = Receiver.new(target)
-        if block_given?
-          receiver.run(&Proc.new)
-        else
-          case specfile
-          when Specfile, String, Proc
-            receiver.run(specfile)
-          else
-            raise ArgumentError, "specfile must be a #{Specfile}, #{String}, or #{Proc} if no block is given (it was #{specfile.inspect})"
-          end
-        end
+        receiver.run(specfile)
 
         debug_named_source_cache("Post-Cached Sources", target)
       end.to_spec

data/lib/librarian/dsl/receiver.rb

@@ -1,4 +1,4 @@
-require 'librarian/specfile'
+require "pathname"
 
 module Librarian
   class Dsl
@@ -26,21 +26,17 @@ module Librarian
         specfile = Proc.new if block_given?
 
         case specfile
-        when Specfile
-          eval(specfile.path.read, instance_binding, specfile.path.to_s, 1)
+        when Pathname
+          instance_eval(File.read(specfile), specfile.to_s, 1)
         when String
-          eval(specfile, instance_binding)
+          instance_eval(specfile)
         when Proc
           instance_eval(&specfile)
         else
-          raise ArgumentError, "specfile must be a #{Specfile}, #{String}, or #{Proc} if no block is given (it was #{specfile.inspect})"
+          raise ArgumentError, "specfile must be a #{Pathname}, #{String}, or #{Proc} if no block is given (it was #{specfile.inspect})"
         end
       end
 
-      def instance_binding
-        binding
-      end
-
     end
   end
 end

data/lib/librarian/specfile.rb

@@ -1,3 +1,5 @@
+require "pathname"
+
 module Librarian
   class Specfile
 
@@ -6,11 +8,11 @@ module Librarian
 
     def initialize(environment, path)
       self.environment = environment
-      self.path = path
+      self.path = Pathname(path)
     end
 
     def read(precache_sources = [])
-      environment.dsl(path.read, precache_sources)
+      environment.dsl(path, precache_sources)
     end
 
   end

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.1.0.beta.1"
+  VERSION = "0.1.0"
 end

data/librarian.gemspec

@@ -2,19 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name = "librarian"
-  s.version = "0.1.0.beta.1"
+  s.version = "0.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jay Feldblum"]
-  s.date = "2013-03-09"
+  s.date = "2013-04-03"
   s.description = "Librarian"
   s.email = ["y_feldblum@yahoo.com"]
-  s.files = [".gitignore", ".rspec", ".travis.yml", "CHANGELOG.md", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "lib/librarian.rb", "lib/librarian/action.rb", "lib/librarian/action/base.rb", "lib/librarian/action/clean.rb", "lib/librarian/action/ensure.rb", "lib/librarian/action/install.rb", "lib/librarian/action/persist_resolution_mixin.rb", "lib/librarian/action/resolve.rb", "lib/librarian/action/update.rb", "lib/librarian/chef/version.rb", "lib/librarian/cli.rb", "lib/librarian/cli/manifest_presenter.rb", "lib/librarian/config.rb", "lib/librarian/config/database.rb", "lib/librarian/config/file_source.rb", "lib/librarian/config/hash_source.rb", "lib/librarian/config/source.rb", "lib/librarian/dependency.rb", "lib/librarian/dsl.rb", "lib/librarian/dsl/receiver.rb", "lib/librarian/dsl/target.rb", "lib/librarian/environment.rb", "lib/librarian/error.rb", "lib/librarian/helpers.rb", "lib/librarian/linter/source_linter.rb", "lib/librarian/lockfile.rb", "lib/librarian/lockfile/compiler.rb", "lib/librarian/lockfile/parser.rb", "lib/librarian/logger.rb", "lib/librarian/manifest.rb", "lib/librarian/manifest_set.rb", "lib/librarian/mock.rb", "lib/librarian/mock/cli.rb", "lib/librarian/mock/dsl.rb", "lib/librarian/mock/environment.rb", "lib/librarian/mock/extension.rb", "lib/librarian/mock/source.rb", "lib/librarian/mock/source/mock.rb", "lib/librarian/mock/source/mock/registry.rb", "lib/librarian/mock/version.rb", "lib/librarian/resolution.rb", "lib/librarian/resolver.rb", "lib/librarian/resolver/implementation.rb", "lib/librarian/rspec/support/cli_macro.rb", "lib/librarian/source.rb", "lib/librarian/source/basic_api.rb", "lib/librarian/source/git.rb", "lib/librarian/source/git/repository.rb", "lib/librarian/source/local.rb", "lib/librarian/source/path.rb", "lib/librarian/spec.rb", "lib/librarian/spec_change_set.rb", "lib/librarian/specfile.rb", "lib/librarian/support/abstract_method.rb", "lib/librarian/ui.rb", "lib/librarian/version.rb", "librarian.gemspec", "spec/functional/cli_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/support/method_patch_macro.rb", "spec/support/with_env_macro.rb", "spec/unit/action/base_spec.rb", "spec/unit/action/clean_spec.rb", "spec/unit/action/ensure_spec.rb", "spec/unit/action/install_spec.rb", "spec/unit/config/database_spec.rb", "spec/unit/dependency_spec.rb", "spec/unit/dsl_spec.rb", "spec/unit/environment_spec.rb", "spec/unit/lockfile/parser_spec.rb", "spec/unit/lockfile_spec.rb", "spec/unit/manifest_set_spec.rb", "spec/unit/manifest_spec.rb", "spec/unit/mock/source/mock_spec.rb", "spec/unit/resolver_spec.rb", "spec/unit/source/git_spec.rb", "spec/unit/spec_change_set_spec.rb"]
+  s.files = [".gitignore", ".rspec", ".travis.yml", "CHANGELOG.md", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "lib/librarian.rb", "lib/librarian/action.rb", "lib/librarian/action/base.rb", "lib/librarian/action/clean.rb", "lib/librarian/action/ensure.rb", "lib/librarian/action/install.rb", "lib/librarian/action/persist_resolution_mixin.rb", "lib/librarian/action/resolve.rb", "lib/librarian/action/update.rb", "lib/librarian/cli.rb", "lib/librarian/cli/manifest_presenter.rb", "lib/librarian/config.rb", "lib/librarian/config/database.rb", "lib/librarian/config/file_source.rb", "lib/librarian/config/hash_source.rb", "lib/librarian/config/source.rb", "lib/librarian/dependency.rb", "lib/librarian/dsl.rb", "lib/librarian/dsl/receiver.rb", "lib/librarian/dsl/target.rb", "lib/librarian/environment.rb", "lib/librarian/error.rb", "lib/librarian/helpers.rb", "lib/librarian/linter/source_linter.rb", "lib/librarian/lockfile.rb", "lib/librarian/lockfile/compiler.rb", "lib/librarian/lockfile/parser.rb", "lib/librarian/logger.rb", "lib/librarian/manifest.rb", "lib/librarian/manifest_set.rb", "lib/librarian/mock.rb", "lib/librarian/mock/cli.rb", "lib/librarian/mock/dsl.rb", "lib/librarian/mock/environment.rb", "lib/librarian/mock/extension.rb", "lib/librarian/mock/source.rb", "lib/librarian/mock/source/mock.rb", "lib/librarian/mock/source/mock/registry.rb", "lib/librarian/mock/version.rb", "lib/librarian/resolution.rb", "lib/librarian/resolver.rb", "lib/librarian/resolver/implementation.rb", "lib/librarian/rspec/support/cli_macro.rb", "lib/librarian/source.rb", "lib/librarian/source/basic_api.rb", "lib/librarian/source/git.rb", "lib/librarian/source/git/repository.rb", "lib/librarian/source/local.rb", "lib/librarian/source/path.rb", "lib/librarian/spec.rb", "lib/librarian/spec_change_set.rb", "lib/librarian/specfile.rb", "lib/librarian/support/abstract_method.rb", "lib/librarian/ui.rb", "lib/librarian/version.rb", "librarian.gemspec", "spec/functional/cli_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/support/fakefs.rb", "spec/support/method_patch_macro.rb", "spec/support/with_env_macro.rb", "spec/unit/action/base_spec.rb", "spec/unit/action/clean_spec.rb", "spec/unit/action/ensure_spec.rb", "spec/unit/action/install_spec.rb", "spec/unit/config/database_spec.rb", "spec/unit/dependency_spec.rb", "spec/unit/dsl_spec.rb", "spec/unit/environment_spec.rb", "spec/unit/lockfile/parser_spec.rb", "spec/unit/lockfile_spec.rb", "spec/unit/manifest_set_spec.rb", "spec/unit/manifest_spec.rb", "spec/unit/mock/source/mock_spec.rb", "spec/unit/resolver_spec.rb", "spec/unit/source/git_spec.rb", "spec/unit/spec_change_set_spec.rb"]
   s.homepage = ""
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.25"
   s.summary = "Librarian"
-  s.test_files = ["spec/functional/cli_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/support/method_patch_macro.rb", "spec/support/with_env_macro.rb", "spec/unit/action/base_spec.rb", "spec/unit/action/clean_spec.rb", "spec/unit/action/ensure_spec.rb", "spec/unit/action/install_spec.rb", "spec/unit/config/database_spec.rb", "spec/unit/dependency_spec.rb", "spec/unit/dsl_spec.rb", "spec/unit/environment_spec.rb", "spec/unit/lockfile/parser_spec.rb", "spec/unit/lockfile_spec.rb", "spec/unit/manifest_set_spec.rb", "spec/unit/manifest_spec.rb", "spec/unit/mock/source/mock_spec.rb", "spec/unit/resolver_spec.rb", "spec/unit/source/git_spec.rb", "spec/unit/spec_change_set_spec.rb"]
+  s.test_files = ["spec/functional/cli_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/support/fakefs.rb", "spec/support/method_patch_macro.rb", "spec/support/with_env_macro.rb", "spec/unit/action/base_spec.rb", "spec/unit/action/clean_spec.rb", "spec/unit/action/ensure_spec.rb", "spec/unit/action/install_spec.rb", "spec/unit/config/database_spec.rb", "spec/unit/dependency_spec.rb", "spec/unit/dsl_spec.rb", "spec/unit/environment_spec.rb", "spec/unit/lockfile/parser_spec.rb", "spec/unit/lockfile_spec.rb", "spec/unit/manifest_set_spec.rb", "spec/unit/manifest_spec.rb", "spec/unit/mock/source/mock_spec.rb", "spec/unit/resolver_spec.rb", "spec/unit/source/git_spec.rb", "spec/unit/spec_change_set_spec.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/support/fakefs.rb

@@ -0,0 +1,24 @@
+require "fakefs/safe"
+require "fakefs/spec_helpers"
+require "support/method_patch_macro"
+
+module Support
+  module FakeFS
+
+    def self.included(base)
+      base.module_exec do
+        include ::FakeFS::SpecHelpers
+      end
+
+      # Since ruby-1.9.3-p286, Kernel#Pathname was changed in a way that broke
+      # FakeFS's assumptions. It used to lookup the Pathname constant (which is
+      # where FakeFS hooks) and send it #new, but now it keeps a reference to
+      # the Pathname constant (breaking the FakeFS hook).
+      base.module_exec do
+        include MethodPatchMacro
+        with_module_method(Kernel, :Pathname){|s| Pathname.new(s)}
+      end
+    end
+
+  end
+end

data/spec/support/method_patch_macro.rb

@@ -1,23 +1,23 @@
 require "securerandom"
 
-module MethodPatchMacro
+module Support
+  module MethodPatchMacro
 
-  def self.included(base)
-    base.extend ClassMethods
-  end
+    def self.included(base)
+      base.extend ClassMethods
+    end
 
-  module ClassMethods
-    def with_module_method(mod, meth, &block)
-      tag = SecureRandom.hex(8)
-      orig_meth = "_#{tag}_#{meth}".to_sym
-      around do |example|
-        mod.module_eval do
-          alias_method orig_meth, meth
-          define_method meth, &block
+    module ClassMethods
+      def with_module_method(mod, meth, &block)
+        tag = SecureRandom.hex(8)
+        orig_meth = "_#{tag}_#{meth}".to_sym
+        before do
+          mod.module_eval do
+            alias_method orig_meth, meth
+            define_method meth, &block
+          end
         end
-        begin
-          example.run
-        ensure
+        after do
           mod.module_eval do
             alias_method meth, orig_meth
             remove_method orig_meth
@@ -25,6 +25,6 @@ module MethodPatchMacro
         end
       end
     end
-  end
 
+  end
 end

data/spec/support/with_env_macro.rb

@@ -1,20 +1,22 @@
-module WithEnvMacro
+module Support
+  module WithEnvMacro
 
-  module ClassMethods
+    module ClassMethods
 
-    def with_env(new)
-      old = Hash[new.map{|k, v| [k, ENV[k]]}]
+      def with_env(new)
+        old = Hash[new.map{|k, v| [k, ENV[k]]}]
+
+        before { ENV.update(new) }
+        after  { ENV.update(old) }
+      end
 
-      before { ENV.update(new) }
-      after  { ENV.update(old) }
     end
 
-  end
+    private
 
-  private
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
 
-  def self.included(base)
-    base.extend(ClassMethods)
   end
-
 end

data/spec/unit/config/database_spec.rb

@@ -1,21 +1,14 @@
 require "fileutils"
 require "pathname"
+require "tmpdir"
 require "yaml"
 
-require "fakefs/spec_helpers"
-
-require "support/method_patch_macro"
+require "support/fakefs"
 
 require "librarian/config/database"
 
 describe Librarian::Config::Database do
-  include FakeFS::SpecHelpers
-  include MethodPatchMacro
-
-  # FakeFS seems to need this because Kernel#Pathname was changed in 1.9.3-p286.
-  # It used to indicate the Pathname class by name, but now it references the
-  # Pathname class directly by object. FakeFS relies on the old behavior.
-  with_module_method(Kernel, :Pathname){|s| Pathname.new(s)}
+  include ::Support::FakeFS
 
   def write_yaml!(path, *yamlables)
     path = Pathname(path)
@@ -26,7 +19,7 @@ describe Librarian::Config::Database do
   let(:adapter_name) { "gem" }
 
   let(:env) { { } }
-  let(:pwd) { Pathname("/tmp") }
+  let(:pwd) { Pathname(Dir.tmpdir) }
   let(:home) { Pathname("~").expand_path }
   let(:project_path) { nil }
   let(:specfile_name) { nil }

data/spec/unit/environment_spec.rb

@@ -4,7 +4,7 @@ require "support/with_env_macro"
 
 module Librarian
   describe Environment do
-    include WithEnvMacro
+    include ::Support::WithEnvMacro
 
     let(:env) { described_class.new }
 

data/spec/unit/resolver_spec.rb

@@ -1,9 +1,15 @@
+require "pathname"
+require "tmpdir"
+
+require "support/fakefs"
+
 require 'librarian/resolver'
 require 'librarian/spec_change_set'
 require 'librarian/mock'
 
 module Librarian
   describe Resolver do
+    include ::Support::FakeFS
 
     let(:env) { Mock::Environment.new }
     let(:resolver) { env.resolver }
@@ -229,5 +235,24 @@ module Librarian
 
     end
 
+    context "a pathname to a simple specfile" do
+      let(:pwd) { Pathname(Dir.tmpdir) }
+      let(:specfile_path) { pwd + "Mockfile" }
+      before { FileUtils.mkpath(pwd) }
+
+      def write!(path, text)
+        Pathname(path).open("wb"){|f| f.write(text)}
+      end
+
+      it "loads the specfile with the __FILE__" do
+        write! specfile_path, "src __FILE__"
+        spec = env.dsl(specfile_path)
+        spec.sources.should have(1).item
+        source = spec.sources.first
+        source.name.should == specfile_path.to_s
+      end
+
+    end
+
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  prerelease: 6
-  version: 0.1.0.beta.1
+  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Jay Feldblum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -131,7 +131,6 @@ files:
 - lib/librarian/action/persist_resolution_mixin.rb
 - lib/librarian/action/resolve.rb
 - lib/librarian/action/update.rb
-- lib/librarian/chef/version.rb
 - lib/librarian/cli.rb
 - lib/librarian/cli/manifest_presenter.rb
 - lib/librarian/config.rb
@@ -181,6 +180,7 @@ files:
 - librarian.gemspec
 - spec/functional/cli_spec.rb
 - spec/functional/source/git/repository_spec.rb
+- spec/support/fakefs.rb
 - spec/support/method_patch_macro.rb
 - spec/support/with_env_macro.rb
 - spec/unit/action/base_spec.rb
@@ -212,14 +212,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 3722250136317234111
+      hash: -845093804329551248
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -229,6 +229,7 @@ summary: Librarian
 test_files:
 - spec/functional/cli_spec.rb
 - spec/functional/source/git/repository_spec.rb
+- spec/support/fakefs.rb
 - spec/support/method_patch_macro.rb
 - spec/support/with_env_macro.rb
 - spec/unit/action/base_spec.rb

data/lib/librarian/chef/version.rb

@@ -1,5 +0,0 @@
-module Librarian
-  module Chef
-    VERSION = "0.0.1"
-  end
-end