batali 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c69ca3a698a94a1797c499c491e9a50f69bc8d3b
-  data.tar.gz: 781d13d797963bdb886c0a22f219bee3e161bd2b
+  metadata.gz: af52638ac3a1721abd7bb9615d6807ed37d9eea4
+  data.tar.gz: 2dbcf019a32eb2c3da9def2faafdeb5157488811
 SHA512:
-  metadata.gz: 2c56fcd91bb80bcafdc94f5a5b13ff3db00f32066e754ec92a249f7d488b4da23a97bb0d2662fee2feab71408493d88289e7f06209545d68baac704c43f3ad69
-  data.tar.gz: 1c171c5155f4ce221809273e899a6daa8a551aabc7fdfb25a14ae48617bc5e114fa5dabedc5e6f87431c00dab6a5e8093d2e27cac25fc0a9e57bd84076c928b1
+  metadata.gz: 0cc681411a0120068b946ee946763de6a0cbadad3bd8193242b86beab9c19f2c59e66ad006dfd87d3f1ef60d430c8e046d2e992c92f29608386d485b10a8a534
+  data.tar.gz: 553311a853ae125722fd8f78b97b745753a373e468992680c19bcf8f9a56027e8bf28ff7c1e615c15b6206aab7631c0694ba905049c61000557ca4514494e7cc

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.1.18
+* Update restriction key from :to -> :source (#7)
+* Show unit removals on single path resolution output
+* Complete unit scoring implementation (#11)
+
 # v0.1.16
 * Include cookbook removals on resolve output
 * Add initial infrastructure resolve output to show cookbooks + versions

data/README.md

@@ -89,7 +89,63 @@ $ batali resolve example
 ```
 
 This will only update the version of the example cookbook, and any dependency cookbooks
-that _must_ be updated to provide resolution. Multiple cookbooks can be listed:
+that _must_ be updated to provide resolution. Dependency cookbooks that require an upgrade
+based on constraints will attempt to upgrade with the _least impact possible_ by attempting
+to satisfy constraints within the minimum version segement possible. For example, if our
+Batali file contains the following:
+
+```ruby
+Batali.define do
+  source 'https://example.com'
+  cookbook 'soup'
+end
+```
+
+and after resolving we have two cookbooks in our manifest:
+
+```
+soup <1.0.0>
+salad <0.1.4>
+```
+
+Some time passes and a new version of `soup` is released, version 1.0.2. In that time
+multiple new versions of the `salad` cookbook have been released, with new features and
+with some breaking changes. For this example, lets assume available versions of the `salad`
+cookbook are:
+
+```
+<0.1.4>
+<0.1.6>
+<0.1.8>
+<0.2.0>
+<0.2.2>
+<0.3.0>
+<1.0.0>
+```
+
+and the `soup` cookbook has updated its `salad` dependency:
+
+```ruby
+# soup metadata.rb
+depends 'salad', '> 0.2'
+```
+
+Due to the behavior of existing solvers, we may expect the resolved manifest to include
+`salad` at the latest possible version: `1.0.0`. This is a valid solution, since the
+dependency is simply stating the constraint requires `salad` be _greater_ than `0.2` and
+nothing more. However, this is a very large jump from what we currently have defined
+within our manifest, and jumps a major and minor version. The possibility of breaking
+changes being introduced is extremely high.
+
+Since Batali has the **least impact** feature enabled by default, it will only upgrade
+`salad` to the `0.2.2` version. This is due to the fact that the **least impact** feature
+prefers the _latest_ cookbook available within the _closest_ version segement of the cookbook
+version currently defined within the manifest. Since thew new `soup` dependency contraint
+requires versions `> 0.2`, no `> 0.1` versions are acceptable. Batali then looks to the
+next available segment `0.2` and attempts to use the latest version: `0.2.2`. This solves the
+constraint, and is used for the new solution.
+
+Multiple cookbooks can be listed for upgrade:
 
 ```
 $ batali resolve example ipsum lorem

data/batali.gemspec

@@ -10,12 +10,12 @@ Gem::Specification.new do |s|
   s.description = 'Magic'
   s.require_path = 'lib'
   s.license = 'Apache 2.0'
-  s.add_runtime_dependency 'attribute_struct', '>= 0.2.14'
-  s.add_runtime_dependency 'grimoire', '> 0.1.4'
-  s.add_runtime_dependency 'bogo', '>= 0.1.12'
-  s.add_runtime_dependency 'bogo-cli', '> 0.1.8'
-  s.add_runtime_dependency 'bogo-config', '>= 0.1.10'
-  s.add_runtime_dependency 'bogo-ui', '> 0.1.6'
+  s.add_runtime_dependency 'attribute_struct', '~> 0.2.14'
+  s.add_runtime_dependency 'grimoire', '~> 0.2.0'
+  s.add_runtime_dependency 'bogo', '~> 0.1.18'
+  s.add_runtime_dependency 'bogo-cli', '~> 0.1.8'
+  s.add_runtime_dependency 'bogo-config', '~> 0.1.10'
+  s.add_runtime_dependency 'bogo-ui', '~> 0.1.6'
   s.add_runtime_dependency 'git'
   s.add_runtime_dependency 'http'
   s.add_development_dependency 'minitest'

data/lib/batali/score_keeper.rb

@@ -6,12 +6,67 @@ module Batali
 
     attribute :manifest, Manifest, :required => true
 
+    # Always prefer higher scoring units
+    #
+    # @return [Symbol] :highscore
+    def preferred_score
+      :highscore
+    end
+
     # Provide score for given unit
     #
-    # @param unit [Unit]
+    # @param unit [Unit] unit to score
+    # @param idx [Integer] current index location
     # @return [Numeric, NilClass]
-    def score_for(unit)
-      manifest.include?(unit) ? 0 : nil
+    def score_for(unit, idx)
+      multiplier = 1
+      manifest_unit = manifest.cookbook.detect do |m_unit|
+        m_unit.name == unit.name
+      end
+      if(manifest_unit)
+        # If the unit version matches the manifest version, this
+        # should be _the_ preferred version
+        if(manifest_unit.version == unit.version)
+          multiplier = 10000000
+        else
+          # If the unit version satisfies within the patch segment of
+          # the manifest version score those versions highest for upgrade
+          if(UnitRequirement.new("~> #{manifest_unit.version}").satisfied_by?(unit.version))
+            multiplier = 1000000
+          else
+            # If the unit version satisfies within the minor or major
+            # version segments of the manifest version, bump score
+            # value up (with satisfaction within minor segment being
+            # worth more than satisfaction within major segment)
+            pos = UnitRequirement.new("~> #{manifest_unit.version.segments.slice(0,2).join('.')}").satisfied_by?(unit.version) ? 1 : 0
+            multi_val = pos == 1 ? 1000 : 100
+            distance = (manifest_unit.version.segments[pos] - unit.version.segments[pos])
+            if(distance > 0)
+              distance = 1.0 / distance
+            else
+              distance = 0
+            end
+            multiplier = multi_val + (multi_val * distance)
+          end
+        end
+      end
+      score = []
+      # Generate a "value" for each segment of the version with
+      # growing importance (major > minor > patch)
+      unit.version.segments.reverse.each_with_index.map do |val, pos|
+        if(val == 0)
+          score.push 0
+        else
+          score.push (2 - (1.0 / val)) * ((pos + 1)**10)
+        end
+      end
+      # Sum the score for each segment to provide the score for the
+      # version and multiply by defined multiplier to force higher
+      # score when manifest drives desire for versions closer to
+      # version defined within manifest
+      score = score.inject(&:+) * multiplier
+      debug "Score <#{unit.name}:#{unit.version}>: #{score}"
+      score
     end
 
   end

data/lib/batali/version.rb

@@ -1,4 +1,4 @@
 module Batali
   # Current version
-  VERSION = Gem::Version.new('0.1.16')
+  VERSION = Gem::Version.new('0.1.18')
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.18
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.14
 - !ruby/object:Gem::Dependency
   name: grimoire
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bogo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.18
 - !ruby/object:Gem::Dependency
   name: bogo-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: bogo-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.10
 - !ruby/object:Gem::Dependency
   name: bogo-ui
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.6
 - !ruby/object:Gem::Dependency