librarian 0.0.16 → 0.0.17

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## 0.0.17
+
+* Use a pure-Ruby implementation of tar/gz. Helps with Windows support, since
+  Windows boxes are less likely than *NIX boxes to have the `tar` executable.
+
+* Fix an issue where the chef site source considers uncached manifests to be
+  cached, and skips caching them, causing the install action to fail.
+
+* Fail fast if the resolver produces an inconsistent resolution. It is a known
+  issue that the resolver will sometimes (deterministically, not randomly)
+  produce an inconsistent resolution when performing an update action (#57).
+  Start debugging this by failing fast at this point and spitting out gobs of
+  debug-level log details.
+
 ## 0.0.16
 
 * Recache site-sourced dependency metadata per each run.

data/README.md

@@ -258,8 +258,39 @@ When you use this integration, any changes you make to anything in the
 `cookbooks/` directory will be ignored by Knife, because Knife won't look in
 that directory for your cookbooks.
 
-Reporting Issues
-----------------
+How to Contribute
+-----------------
+
+### Running the tests
+
+    # Either
+    $ rspec spec
+    $ cucumber
+
+    # Or
+    $ rake
+
+You will probably need some way to isolate gems. Librarian provides a `Gemfile`,
+so if you want to use bundler, you can prepare the directory with the usual
+`bundle install` and run each command prefixed with the usual `bundle exec`, as:
+
+    $ bundle install
+    $ bundle exec rspec spec
+    $ bundle exec cucumber
+    $ bundle exec rake
+
+### Installing locally
+
+    $ rake install
+
+You should typically not need to install locally, if you are simply trying to
+patch a bug and test the result on a test case. Instead of installing locally,
+you are probably better served by:
+
+    $ cd $PATH_TO_INFRASTRUCTURE_REPO
+    $ $PATH_TO_LIBRARIAN_CHECKOUT/bin/librarian-chef install [--verbose]
+
+### Reporting Issues
 
 Please include relevant `Cheffile` and `Cheffile.lock` files. Please run the
 `librarian-chef` commands in verbose mode by using the `--verbose` flag, and

data/lib/librarian/chef/source/site.rb

@@ -4,6 +4,8 @@ require 'uri'
 require 'net/http'
 require 'json'
 require 'digest'
+require 'zlib'
+require 'archive/tar/minitar'
 
 require 'librarian/helpers/debug'
 
@@ -30,10 +32,14 @@ module Librarian
         private :environment=
         attr_reader :uri
 
+        attr_accessor :_metadata_cache
+        private :_metadata_cache, :_metadata_cache=
+
         def initialize(environment, uri, options = {})
           self.environment = environment
           @uri = uri
           @cache_path = nil
+          self._metadata_cache = { }
         end
 
         def to_s
@@ -145,7 +151,7 @@ module Librarian
           dependency_cache_path.mkpath
           metadata_cache_path = metadata_cache_path(dependency)
 
-          caching_metadata do
+          caching_metadata(dependency.name) do
             dep_uri = URI.parse(dependency_uri(dependency))
             debug { "Caching #{dep_uri}" }
             http = Net::HTTP.new(dep_uri.host, dep_uri.port)
@@ -162,11 +168,9 @@ module Librarian
           end
         end
 
-        def caching_metadata
-          return if @_metadata_cached
-          result = yield
-          @_metadata_cached = true
-          result
+        def caching_metadata(name)
+          _metadata_cache[name] = yield unless _metadata_cache.include?(name)
+          _metadata_cache[name]
         end
 
         def cache_version_metadata!(dependency, version_uri)
@@ -192,16 +196,11 @@ module Librarian
           version_package_cache_path = version_package_cache_path(dependency, version_uri)
           unless version_package_cache_path.exist?
             dependency_cache_path = dependency_cache_path(dependency)
-            Process.waitpid2(fork do
-              $stdin.reopen("/dev/null")
-              $stdout.reopen("/dev/null")
-              $stderr.reopen("/dev/null")
-              Dir.chdir(dependency_cache_path)
-              exec("tar", "-xzf", version_archive_cache_path.to_s)
-            end)
-            raise StandardError, "Caching #{version_uri} failed with #{$?.inspect}!" unless $?.success?
             version_unpacked_temp_path = dependency_cache_path.join(dependency.name)
-            FileUtils.move(version_unpacked_temp_path, version_package_cache_path)
+            Zlib::GzipReader.open(version_archive_cache_path) do |input|
+              Archive::Tar::Minitar.unpack(input, version_unpacked_temp_path.to_s)
+            end
+            FileUtils.move(version_unpacked_temp_path.join(dependency.name), version_package_cache_path)
           end
         end
 

data/lib/librarian/resolver.rb

@@ -4,6 +4,7 @@ require 'librarian/resolution'
 
 module Librarian
   class Resolver
+    include Helpers::Debug
 
     attr_accessor :environment
     private :environment=
@@ -16,10 +17,35 @@ module Librarian
       implementation = Implementation.new(self, spec)
       partial_manifests_index = Hash[partial_manifests.map{|m| [m.name, m]}]
       manifests = implementation.resolve(spec.dependencies, partial_manifests_index)
+      enforce_consistency!(manifests) if manifests
       manifests = sort(manifests) if manifests
       Resolution.new(spec.dependencies, manifests)
     end
 
+    def enforce_consistency!(manifests)
+      return if ManifestSet.new(manifests).consistent?
+
+      debug { "Resolver Malfunctioned!" }
+      manifests.values.sort_by(&:name).each do |manifest|
+        errors = []
+        manifest.dependencies.sort_by(&:name).each do |d|
+          if !manifests[d]
+            errors << ["Depends on: #{d}", "Missing!"]
+          elsif !manifests[d].satisfies?(d)
+            errors << ["Depends on: #{d}", "Found: #{manifests[d]}"]
+          end
+        end
+        unless errors.empty?
+          debug { "  #{manifest}" }
+          errors.each do |a, b|
+            debug { "    #{a}" }
+            debug { "      #{b}" }
+          end
+        end
+      end
+      raise Error, "Resolver Malfunctioned!"
+    end
+
     def sort(manifests)
       ManifestSet.sort(manifests)
     end

data/lib/librarian/resolver/implementation.rb

@@ -52,28 +52,28 @@ module Librarian
                 debug { "Checking manifests" }
                 scope do
                   dependency.manifests.each do |manifest|
-                    unless resolution
-                      debug { "Checking #{manifest}" }
-                      scope do
-                        if related_dependencies.all?{|d| d.satisfied_by?(manifest)}
-                          m = manifests.merge(dependency.name => manifest)
-                          a = manifest.dependencies.map { |d|
-                            d.source ? d :
-                            !dependency_source_map.key?(d.name) ?
-                            Dependency.new(d.name, d.requirement, source) :
-                            Dependency.new(d.name, d.requirement, dependency_source_map[d.name])
-                          }
-                          a.each do |d|
-                            debug { "Scheduling #{d}" }
-                          end
-                          q = queue + a
-                          resolution = recursive_resolve(dependencies.dup, m, q)
-                        end
-                        if resolution
-                          debug { "Resolved #{dependency} at #{manifest}" }
-                        else
-                          debug { "Backtracking from #{manifest}" }
+                    break if resolution
+
+                    debug { "Checking #{manifest}" }
+                    scope do
+                      if related_dependencies.all?{|d| d.satisfied_by?(manifest)}
+                        m = manifests.merge(dependency.name => manifest)
+                        a = manifest.dependencies.map { |d|
+                          d.source ? d :
+                          !dependency_source_map.key?(d.name) ?
+                          Dependency.new(d.name, d.requirement, source) :
+                          Dependency.new(d.name, d.requirement, dependency_source_map[d.name])
+                        }
+                        a.each do |d|
+                          debug { "Scheduling #{d}" }
                         end
+                        q = queue + a
+                        resolution = recursive_resolve(dependencies.dup, m, q)
+                      end
+                      if resolution
+                        debug { "Resolved #{dependency} at #{manifest}" }
+                      else
+                        debug { "Backtracking from #{manifest}" }
                       end
                     end
                   end

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/librarian.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency "chef", ">= 0.10"
   s.add_dependency "highline"
+  s.add_dependency "archive-tar-minitar", ">= 0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &13668800 !ruby/object:Gem::Requirement
+  requirement: &7439800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13668800
+  version_requirements: *7439800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13668380 !ruby/object:Gem::Requirement
+  requirement: &7439140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13668380
+  version_requirements: *7439140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13667960 !ruby/object:Gem::Requirement
+  requirement: &7438460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13667960
+  version_requirements: *7438460
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &13667540 !ruby/object:Gem::Requirement
+  requirement: &7471000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13667540
+  version_requirements: *7471000
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &13667120 !ruby/object:Gem::Requirement
+  requirement: &7470560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13667120
+  version_requirements: *7470560
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &13666700 !ruby/object:Gem::Requirement
+  requirement: &7470120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13666700
+  version_requirements: *7470120
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &13666200 !ruby/object:Gem::Requirement
+  requirement: &7469600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *13666200
+  version_requirements: *7469600
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &13665780 !ruby/object:Gem::Requirement
+  requirement: &7469180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13665780
+  version_requirements: *7469180
+- !ruby/object:Gem::Dependency
+  name: archive-tar-minitar
+  requirement: &7468640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *7468640
 description: Librarian
 email:
 - y_feldblum@yahoo.com