librarian 0.0.7 → 0.0.8

data/CHANGELOG.md

@@ -0,0 +1,53 @@
+## 0.0.8
+
+* A `version` task.
+
+* A change log.
+
+* \#10 Fixes the problem with bouncing the lockfile when updating, when using a git source with the default ref.
+
+## 0.0.7
+
+* \#8 Add highline temporarily as a runtime dependency of `librarian` (@fnichol).
+  When the project is split into `librarian` and `librarian-chef`, the `chef` runtime dependency will
+    be moved to `librarian-chef`. If the project is further split into a knife plugin, the dependency
+    will be moved there.
+
+## 0.0.6
+
+* \#7 Show a better error message when a cookbook is missing the required metadata file.
+
+* Miscellaneous bugfixes.
+
+## 0.0.5
+
+* \#4 An `init` task for `librarian-chef`.
+  This task creates a nearly-blank `Cheffile` with just the default Opscode Community Site source.
+
+* Automatically create the `cookbooks` directory, if it's missing, when running the `install` task.
+
+* \#3 Add `chef` temporarily as a runtime dependency of `librarian` (@fnichol).
+  When the project is split into `librarian` and `librarian-chef`, the `chef` runtime dependency will
+    be moved to `librarian-chef`.
+
+## 0.0.4
+
+* A simple knife integration.
+  This integration allows you to specify a `librarian-chef`-managed tempdir as a `cookbook_path`.
+  This is useful to force knife only to upload the exact cookbooks that `librarian-chef` knows
+    about, rather than whatever happens to be found in the `cookbooks` directory.
+
+## 0.0.3
+
+* Miscellaneous bugfixes.
+
+## 0.0.2
+
+* An optional `:path` attribute for `:git` sources.
+  This allows you to specify exactly where within a git repository a given cookbook is to be found.
+
+* A full example of a Cheffile and its usage in the readme.
+
+## 0.0.1
+
+* Initial release.

data/lib/librarian.rb

@@ -76,6 +76,10 @@ module Librarian
     SpecChangeSet.new(self, spec, lock)
   end
 
+  def version
+    VERSION
+  end
+
   def ensure!
     unless project_path
       raise Error, "Cannot find #{specfile_name}!"
@@ -117,10 +121,6 @@ module Librarian
     end
     previous_resolution = lockfile.load(lockfile_path.read)
     partial_manifests = ManifestSet.deep_strip(previous_resolution.manifests, dependency_names)
-    debug { "Precaching Sources:" }
-    previous_resolution.sources.each do |source|
-      debug { "  #{source}" }
-    end
     spec = specfile.read(previous_resolution.sources)
     spec_changes = spec_change_set(spec, previous_resolution)
     raise Error, "Cannot update when the specfile has been changed." unless spec_changes.same?
@@ -146,10 +146,6 @@ module Librarian
       manifests = []
     else
       lock = lockfile.read
-      debug { "Precaching Sources:" }
-      lock.sources.each do |source|
-        debug { "  #{source}" }
-      end
       spec = specfile.read(lock.sources)
       changes = spec_change_set(spec, lock)
       if changes.same?

data/lib/librarian/chef/dsl.rb

@@ -1,9 +1,13 @@
 require 'librarian/dsl'
+require 'librarian/chef/particularity'
 require 'librarian/chef/source'
 
 module Librarian
   module Chef
     class Dsl < Librarian::Dsl
+
+      include Particularity
+
       dependency :cookbook
 
       source :site => Source::Site

data/lib/librarian/cli.rb

@@ -32,6 +32,11 @@ module Librarian
       root_module.ui.debug_line_numbers! if options["verbose"] && options["line-numbers"]
     end
 
+    desc "version", "Displays the version."
+    def version
+      say "librarian-#{root_module.version}"
+    end
+
     desc "clean", "Cleans out the cache and install paths."
     method_option "verbose"
     method_option "line-numbers"

data/lib/librarian/dsl.rb

@@ -1,10 +1,15 @@
 require 'librarian/dependency'
 require 'librarian/dsl/receiver'
 require 'librarian/dsl/target'
+require 'librarian/helpers/debug'
+require 'librarian/particularity'
 
 module Librarian
   class Dsl
 
+    include Particularity
+    include Helpers::Debug
+
     class Error < Exception
     end
 
@@ -63,14 +68,28 @@ module Librarian
     def run(specfile = nil, sources = [])
       Target.new(self).tap do |target|
         target.precache_sources(sources)
+        debug_named_source_cache("Pre-Cached Sources", target)
+
         receiver = Receiver.new(target)
         if block_given?
           receiver.run(&Proc.new)
         else
           receiver.run(specfile)
         end
+
+        debug_named_source_cache("Post-Cached Sources", target)
       end.to_spec
     end
 
+    def debug_named_source_cache(name, target)
+      source_cache = target.source_cache
+      debug { "#{name}:" }
+      source_cache.each do |key, value|
+        type = key[0]
+        attributes = key[1...key.size]
+        debug { "  #{key.inspect}" }
+      end
+    end
+
   end
 end

data/lib/librarian/mock/dsl.rb

@@ -1,9 +1,13 @@
 require 'librarian/dsl'
+require 'librarian/mock/particularity'
 require 'librarian/mock/source'
 
 module Librarian
   module Mock
     class Dsl < Librarian::Dsl
+
+      include Particularity
+
       dependency :dep
 
       source :src => Source::Mock

data/lib/librarian/mock/particularity.rb

@@ -1,7 +1,9 @@
 module Librarian
-  module Particularity
-    def root_module
-      Mock
+  module Mock
+    module Particularity
+      def root_module
+        Mock
+      end
     end
   end
 end

data/lib/librarian/source/git.rb

@@ -52,7 +52,8 @@ module Librarian
       end
 
       def to_spec_args
-        options = {:ref => ref}
+        options = {}
+        options.merge!(:ref => ref) if ref != DEFAULTS[:ref]
         options.merge!(:path => path) if path
         [uri, options]
       end

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/chef/git_source_spec.rb

@@ -14,6 +14,8 @@ module Librarian
         project_path = project_path.dirname until project_path.join("Rakefile").exist?
         tmp_path = project_path.join("tmp/spec/chef/git-source")
 
+        cookbooks_path = tmp_path.join('cookbooks')
+
         context "a single dependency with a git source" do
 
           sample_path = tmp_path.join('sample')
@@ -21,6 +23,16 @@ module Librarian
             version '0.6.5'
           METADATA
 
+          first_sample_path = cookbooks_path.join('first-sample')
+          first_sample_metadata = Helpers.strip_heredoc(<<-METADATA)
+            version '3.2.1'
+          METADATA
+
+          second_sample_path = cookbooks_path.join('second-sample')
+          second_sample_metadata = Helpers.strip_heredoc(<<-METADATA)
+            version '4.3.2'
+          METADATA
+
           before :all do
             sample_path.rmtree if sample_path.exist?
             sample_path.mkpath
@@ -30,6 +42,18 @@ module Librarian
               `git add metadata.rb`
               `git commit -m "Initial commit."`
             end
+
+            cookbooks_path.rmtree if cookbooks_path.exist?
+            cookbooks_path.mkpath
+            first_sample_path.mkpath
+            first_sample_path.join('metadata.rb').open('wb') { |f| f.write(first_sample_metadata) }
+            second_sample_path.mkpath
+            second_sample_path.join('metadata.rb').open('wb') { |f| f.write(second_sample_metadata) }
+            Dir.chdir(cookbooks_path) do
+              `git init`
+              `git add .`
+              `git commit -m "Initial commit."`
+            end
           end
 
           it "should resolve" do
@@ -86,6 +110,30 @@ module Librarian
             repo_path.join('cookbooks/sample/metadata.rb').should be_exist
           end
 
+          it "should resolve, change, and resolve" do
+            repo_path = tmp_path.join('repo/resolve-update')
+            repo_path.rmtree if repo_path.exist?
+            repo_path.mkpath
+            repo_path.join('cookbooks').mkpath
+            cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
+              git #{cookbooks_path.to_s.inspect}
+              cookbook "first-sample"
+            CHEFFILE
+            repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+            Chef.stub!(:project_path) { repo_path }
+            Chef.resolve!
+            repo_path.join('Cheffile.lock').should exist
+
+            cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
+              git #{cookbooks_path.to_s.inspect}
+              cookbook "first-sample"
+              cookbook "second-sample"
+            CHEFFILE
+            repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+            Chef.stub!(:project_path) { repo_path }
+            Chef.resolve!
+          end
+
         end
 
         context "with a path" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-18 00:00:00.000000000Z
+date: 2011-10-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &19020680 !ruby/object:Gem::Requirement
+  requirement: &34375080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19020680
+  version_requirements: *34375080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19020240 !ruby/object:Gem::Requirement
+  requirement: &34374660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19020240
+  version_requirements: *34374660
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &19019780 !ruby/object:Gem::Requirement
+  requirement: &34374240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19019780
+  version_requirements: *34374240
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &19019300 !ruby/object:Gem::Requirement
+  requirement: &34373820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19019300
+  version_requirements: *34373820
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &18979780 !ruby/object:Gem::Requirement
+  requirement: &34373400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18979780
+  version_requirements: *34373400
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &18979280 !ruby/object:Gem::Requirement
+  requirement: &34372900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *18979280
+  version_requirements: *34372900
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &18978860 !ruby/object:Gem::Requirement
+  requirement: &34372480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18978860
+  version_requirements: *34372480
 description: Librarian
 email:
 - y_feldblum@yahoo.com
@@ -99,6 +99,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -185,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: librarian
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Librarian