librarian 0.0.3 → 0.0.4

data/README.md

@@ -75,6 +75,19 @@ If you are manually tracking/vendoring outside cookbooks within the repository,
   put them in another directory such as `./cookbooks-sources` and use the `:path` source.
   You should typically not need to do this.
 
+You can integrate your `knife.rb` with Librarian. Stick the following in your `knife.rb`:
+
+    require 'librarian/chef/integration/knife'
+    cookbook_path Librarian::Chef.install_path, "chef-repo/site-cookbooks"
+
+In the above, make sure *not* to include the path to your `chef-repo/cookbooks`. If you
+  have additional cookbooks directories in your chef-repo that you use for `:path`-sourced
+  cookbooks in your `Cheffile`, make sure *not* to include the paths to those additional
+  cookbooks directories either in your chef-repo. Since your `chef-repo/site-cookbooks`
+  directory is for overrides (monkey-patches) to external cookbooks, and since you should
+  not have any `:path`-sourced cookbooks in your `Cheffile` sourced from that directory,
+  you still need to include your `chef-repo/site-cookbooks` directory in the above list.
+
 License
 -------
 

data/lib/librarian/chef/integration/knife.rb

@@ -0,0 +1,48 @@
+require 'securerandom'
+
+require 'librarian'
+require 'librarian/chef'
+
+module Librarian
+  module Chef
+
+    module KnifeIntegration
+      def install_path
+        @install_path ||= begin
+          has_home = ENV["HOME"] && File.directory?(ENV["HOME"])
+          tmp_dir = Pathname.new(has_home ? "~/.librarian/tmp" : "/tmp/librarian").expand_path
+          enclosing = tmp_dir.join("chef/integration/knife/install")
+          enclosing.mkpath unless enclosing.exist?
+          dir = enclosing.join(SecureRandom.hex(16))
+          dir.mkpath
+          at_exit { dir.rmtree }
+          dir
+        end
+      end
+    end
+
+    extend KnifeIntegration
+
+    def install_consistent_resolution!
+      raise Error, "#{specfile_name} missing!" unless specfile_path.exist?
+      raise Error, "#{lockfile_name} missing!" unless lockfile_path.exist?
+
+      previous_resolution = lockfile.load(lockfile_path.read)
+      spec = specfile.read(previous_resolution.sources)
+      spec_changes = spec_change_set(spec, previous_resolution)
+      raise Error, "#{specfile_name} and #{lockfile_name} are out of sync!" unless spec_changes.same?
+
+      previous_resolution.manifests.each do |manifest|
+        manifest.install!
+      end
+    rescue Error => e
+      hl = HighLine.new
+      message = hl.color(e.message, HighLine::RED)
+      hl.say(message)
+      Process.exit!(1)
+    end
+
+    install_consistent_resolution!
+
+  end
+end

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-25 00:00:00.000000000Z
+date: 2011-08-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &14553540 !ruby/object:Gem::Requirement
+  requirement: &18652040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14553540
+  version_requirements: *18652040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14551080 !ruby/object:Gem::Requirement
+  requirement: &18651500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14551080
+  version_requirements: *18651500
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &14238840 !ruby/object:Gem::Requirement
+  requirement: &18651020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14238840
+  version_requirements: *18651020
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &14237000 !ruby/object:Gem::Requirement
+  requirement: &18650380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14237000
+  version_requirements: *18650380
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &14235300 !ruby/object:Gem::Requirement
+  requirement: &18649560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14235300
+  version_requirements: *18649560
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &14233080 !ruby/object:Gem::Requirement
+  requirement: &18647940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *14233080
+  version_requirements: *18647940
 description: Librarian
 email:
 - y_feldblum@yahoo.com
@@ -102,6 +102,7 @@ files:
 - lib/librarian/chef/cli.rb
 - lib/librarian/chef/dsl.rb
 - lib/librarian/chef/extension.rb
+- lib/librarian/chef/integration/knife.rb
 - lib/librarian/chef/manifest.rb
 - lib/librarian/chef/particularity.rb
 - lib/librarian/chef/source.rb
@@ -163,21 +164,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 434978619910249069
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 434978619910249069
 requirements: []
 rubyforge_project: librarian
-rubygems_version: 1.7.1
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Librarian