batali-infuse 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17ef61f2e7578a35826f34fa210783553ca752dd
-  data.tar.gz: 5bfe4aef5b322a535359c459badd1a917c9be7ce
+  metadata.gz: 59918e5adeda33d08841221f5750403549e0425f
+  data.tar.gz: 36d3daafa2aed5c71e37c1fc09b37c10248e8580
 SHA512:
-  metadata.gz: 309df6df2f5637d9cf7d5e13e6142e512cf9352123ac74158211964f30756351d072f2c7bf0289286ac557ba3ba04f6ea8d91a8258ab61d4f3841754f7280d42
-  data.tar.gz: 474e691922cd655cee83842a0d5272e5e42686f75f5c9672cb8016a54574220028411dbf7c15eaa8c48a4ffd941eecb7172252d5f2088713850c5403fbb02b17
+  metadata.gz: 6d51ba9c9a7901bd01c2d366eeecc32e92b3226dfd37095dee597e645d7af46c5fc88d14f82b6112d2e6cfeff317b163feed790824c8dab7eaca3886b4b24c95
+  data.tar.gz: 21560ac59b8083e8298a9a3212ad145a9c4dcc0ac31c1e1278695ed016d84c896c92a84405e015842eaa959f72a507479b645e0ec58805f7ef283b99c63e1df2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.2
+* Use environment constraints to fully restrict units available for solution
+
 # v0.2.0
 * Rename to batali-infuse
 * Add support for least impact resolution

data/README.md

@@ -22,17 +22,17 @@ As it turns out, it can!
 
 ### Install
 
-This only supports 12.2.x versions of Chef. If Chef is running via
+This is tested for Chef versions '~> 12.2'. If Chef is running via
 the omnibus install the gem should be installed like so:
 
 ```
-$ /opt/chef/emebedded/bin/gem install batali-wedge --no-document
+$ /opt/chef/emebedded/bin/gem install batali-infuse --no-document
 ```
 
 If Chef is running via the system Ruby, just install the gem directly:
 
 ```
-$ gem install batali-wedge --no-document
+$ gem install batali-infuse --no-document
 ```
 
 ### Enable

data/batali-infuse.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = 'Infuse the Batali resolver into Chef client'
   s.require_path = 'lib'
   s.license = 'Apache 2.0'
-  s.add_runtime_dependency 'batali', '>= 0.2.9', '< 1.0.0'
-  s.add_runtime_dependency 'chef', '~> 12.2.0'
+  s.add_runtime_dependency 'batali', '>= 0.2.11', '< 1.0.0'
+  s.add_runtime_dependency 'chef', '~> 12.2'
   s.files = Dir['{lib}/**/**/*'] + %w(batali-infuse.gemspec README.md CHANGELOG.md LICENSE)
 end

data/lib/batali-infuse/sync.rb

@@ -40,35 +40,43 @@ class Chef::PolicyBuilder::ExpandNodeObject
     constraints = Smash[
       api_service.get_rest("environments/#{node.chef_environment}").cookbook_versions.to_a
     ]
-    @expanded_run_list_with_versions.each do |item|
-      c_name, c_version = item.split('@')
-      c_name = c_name.split('::').first
-      if(c_version)
-        constraints[c_name] = c_version
-      elsif(constraints[c_name].nil?)
-        constraints[c_name] = '> 0'
+    restrictions = api_service.get_rest("environments/#{node.chef_environment}").cookbook_versions.to_a
+    requirements = Array.new.tap do |reqs|
+      @expanded_run_list_with_versions.each do |item|
+        c_name, c_version = item.split('@')
+        c_name = c_name.split('::').first
+        reqs << [c_name, c_version ? c_version : '> 0']
       end
     end
-    requirements = Grimoire::RequirementList.new(
-      :name => :batali_resolv,
-      :requirements => constraints.to_a
-    )
-    solver = Grimoire::Solver.new(
-      :requirements => requirements,
-      :system => system,
-      :score_keeper => batali_build_score_keeper
-    )
-    results = solver.generate!
-    solution = results.pop
-    solution_output = solution.units.sort_by(&:name).map{|u| "#{u.name}<#{u.version}>"}.join(', ')
-    node.set[:batali] ||= Mash.new
-    node.set[:batali][:last_resolution] = Mash[solution.units.map{|u| [u.name, u.version]}]
-    Chef::Log.warn "Batali cookbook resolution: #{solution_output}"
-    Hash[
-      solution.units.map do |unit|
-        [unit.name, api_service.get_rest("cookbooks/#{unit.name}/#{unit.version}")]
-      end
-    ]
+    unless(requirements.empty?)
+      solver = Grimoire::Solver.new(
+        :requirements => Grimoire::RequirementList.new(
+          :name => 'requirements',
+          :requirements => requirements
+        ),
+        :restrictions => Grimoire::RequirementList.new(
+          :name => 'restrictions',
+          :requirements => restrictions
+        ),
+        :system => system,
+        :score_keeper => batali_build_score_keeper
+      )
+      results = solver.generate!
+      solution = results.pop
+      solution_output = solution.units.sort_by(&:name).map{|u| "#{u.name}<#{u.version}>"}.join(', ')
+      node.set[:batali] ||= Mash.new
+      node.set[:batali][:last_resolution] = Mash[solution.units.map{|u| [u.name, u.version]}]
+      Chef::Log.warn "Batali cookbook resolution: #{solution_output}"
+      Hash[
+        solution.units.map do |unit|
+          [unit.name, api_service.get_rest("cookbooks/#{unit.name}/#{unit.version}")]
+        end
+      ]
+    else
+      node.set[:batali][:last_resolution] = Mash.new
+      Chef::Log.warn 'Batali resolution not required. No cookbooks in run list!'
+      Hash.new
+    end
   end
 
   # Build the base system for generating solution
@@ -76,7 +84,7 @@ class Chef::PolicyBuilder::ExpandNodeObject
   # @return [Grimoire::System]
   def batali_build_system
     system = Grimoire::System.new
-    units = api_service.get_rest('cookbooks').map do |c_name, meta|
+    units = api_service.get_rest('cookbooks?num_versions=all').map do |c_name, meta|
       meta['versions'].map do |info|
         "#{c_name}/#{info['version']}"
       end

data/lib/batali-infuse/version.rb

@@ -1,3 +1,3 @@
 module BataliInfuse
-  VERSION = Gem::Version.new('0.2.0')
+  VERSION = Gem::Version.new('0.2.2')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali-infuse
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: batali
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.2.11
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.2.11
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.2.0
+        version: '12.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.2.0
+        version: '12.2'
 description: Infuse the Batali resolver into Chef client
 email: code@chrisroberts.org
 executables: []
@@ -82,4 +82,3 @@ signing_key:
 specification_version: 4
 summary: Batali infusion
 test_files: []
-has_rdoc: