librarian 0.0.17 → 0.0.18

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.0.18
+
+* \#57. Include existing manifests' dependencies in resolution.
+
+* Permit the update action even with a changed specfile.
+
 ## 0.0.17
 
 * Use a pure-Ruby implementation of tar/gz. Helps with Windows support, since

data/lib/librarian/action/update.rb

@@ -13,10 +13,10 @@ module Librarian
           raise Error, "Lockfile missing!"
         end
         previous_resolution = lockfile.load(lockfile_path.read)
-        partial_manifests = ManifestSet.deep_strip(previous_resolution.manifests, dependency_names)
         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?
+        changes = spec_change_set(spec, previous_resolution)
+        manifests = changes.same? ? previous_resolution.manifests : changes.analyze
+        partial_manifests = ManifestSet.deep_strip(manifests, dependency_names)
         unpinnable_sources = previous_resolution.sources - partial_manifests.map(&:source)
         unpinnable_sources.each(&:unpin!)
         resolution = resolver.resolve(spec, partial_manifests)

data/lib/librarian/resolver.rb

@@ -17,22 +17,41 @@ 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
+      enforce_consistency!(spec.dependencies, manifests) if manifests
       manifests = sort(manifests) if manifests
       Resolution.new(spec.dependencies, manifests)
     end
 
-    def enforce_consistency!(manifests)
-      return if ManifestSet.new(manifests).consistent?
+    def enforce_consistency!(dependencies, manifests)
+      return if dependencies.all?{|d|
+        m = manifests[d.name]
+        m && d.satisfied_by?(m)
+      } && ManifestSet.new(manifests).consistent?
 
       debug { "Resolver Malfunctioned!" }
+      errors = []
+      dependencies.sort_by(&:name).each do |d|
+        m = manifests[d.name]
+        if !m
+          errors << ["Depends on #{d}", "Missing!"]
+        elsif !d.satisfied_by?(m)
+          errors << ["Depends on #{d}", "Found: #{m}"]
+        end
+      end
+      unless errors.empty?
+        errors.each do |a, b|
+          debug { "  #{a}" }
+          debug { "    #{b}" }
+        end
+      end
       manifests.values.sort_by(&:name).each do |manifest|
         errors = []
         manifest.dependencies.sort_by(&:name).each do |d|
-          if !manifests[d]
+          m = manifests[d.name]
+          if !m
             errors << ["Depends on: #{d}", "Missing!"]
-          elsif !manifests[d].satisfies?(d)
-            errors << ["Depends on: #{d}", "Found: #{manifests[d]}"]
+          elsif !d.satisfied_by?(m)
+            errors << ["Depends on: #{d}", "Found: #{m}"]
           end
         end
         unless errors.empty?

data/lib/librarian/resolver/implementation.rb

@@ -18,10 +18,20 @@ module Librarian
       end
 
       def resolve(dependencies, manifests = {})
-        resolution = recursive_resolve([], manifests, dependencies.dup)
+        dependencies += manifests.values.flat_map { |m|
+          m.dependencies.map { |d| sourced_dependency_for(d) }
+        }
+        resolution = recursive_resolve([], manifests, dependencies)
         resolution ? resolution[1] : nil
       end
 
+      def sourced_dependency_for(dependency)
+        return dependency if dependency.source
+
+        s = dependency_source_map[dependency.name] || source
+        Dependency.new(dependency.name, dependency.requirement, s)
+      end
+
       def recursive_resolve(dependencies, manifests, queue)
         if dependencies.empty?
           queue.each do |dependency|
@@ -58,12 +68,7 @@ module Librarian
                     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 = manifest.dependencies.map { |d| sourced_dependency_for(d) }
                         a.each do |d|
                           debug { "Scheduling #{d}" }
                         end

data/lib/librarian/version.rb

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

metadata

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