batali-wedge 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46ed9b345a1867c08fdc12e4cdd669c8d34bfbfa
-  data.tar.gz: db30d18b5ec9ca2baad55d4a19846165ed2cc535
+  metadata.gz: ef69a6b06a756322f8df232ffc6a9c81333e1b09
+  data.tar.gz: 8303ac1dd941339ae34de7211a73e81cf4ba1f92
 SHA512:
-  metadata.gz: c836e221969b0014ecf1df910dc6517cbfca54598125ed9797c931113060a29bed3dfa45387153f46ad899ffd45071bca8d76900785a515a7629cae6fc0fe7ba
-  data.tar.gz: 4088261f00526d61d37760e2eb9063f3e45c1beb99121270630cb60662a6071df7e595800de646246489a6a1099c18d14f4b3d8233e7d78b818017642c62842e
+  metadata.gz: 6398b9b1a45bf3f9973dc210d22a66452fafc89157b9363e7d3aed6d187bdd395da49f4e2e96baa6d1c813af02c1a464248082e7b5fa63e87858d66f45e179b3
+  data.tar.gz: f096fde169e4dec00a989c1ee39f9d6e1fa970472117de11d64b4edb57de8bc6cbba54c7aeb20629738afac7f74afb2bed9c3db7ab814f55c52a9fac3d35ad38

data/batali-wedge.gemspec

@@ -11,5 +11,6 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.license = 'Apache 2.0'
   s.add_runtime_dependency 'batali'
+  s.add_runtime_dependency 'chef', '~> 12.2.0'
   s.files = Dir['{lib}/**/**/*'] + %w(batali-wedge.gemspec README.md CHANGELOG.md LICENSE)
 end

data/lib/batali-wedge/sync.rb

@@ -36,15 +36,18 @@ module BataliWedge
     #
     # @return [Hash]
     def batali_cookbook_hash
-      Chef::Log.info 'Resolving cookbooks via Batali!'
+      Chef::Log.warn 'Resolving cookbooks via Batali!'
       system = batali_build_system
       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'
         end
       end
       requirements = Grimoire::RequirementList.new(
@@ -57,8 +60,8 @@ module BataliWedge
       )
       results = solver.generate!
       solution = results.pop
-      solution_output = solution.sort_by(&:name).map{|u| "#{u.name}<#{u.version}>"}.join(', ')
-      Chef::Log.info "Batali cookbook resolution: #{solution_output}"
+      solution_output = solution.units.sort_by(&:name).map{|u| "#{u.name}<#{u.version}>"}.join(', ')
+      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}")]
@@ -75,14 +78,16 @@ module BataliWedge
         meta['versions'].map do |info|
           "#{c_name}/#{info['version']}"
         end
-      end.map do |ckbk|
-        Smash.new(
-          :name => ckbk.split('/').first,
-          :version => ckbk.split('/').last,
-          :dependencies => api_service.get_rest("cookbooks/#{ckbk}").metadata.dependencies.to_a
+      end.flatten.map do |ckbk|
+        Batali::Unit.new(
+          Smash.new(
+            :name => ckbk.split('/').first,
+            :version => ckbk.split('/').last,
+            :dependencies => api_service.get_rest("cookbooks/#{ckbk}").metadata.dependencies.to_a
+          )
         )
       end
-      system.add_units(units)
+      system.add_unit(*units)
       system
     end
 

data/lib/batali-wedge/version.rb

@@ -1,3 +1,3 @@
 module BataliWedge
-  VERSION = Gem::Version.new('0.0.1')
+  VERSION = Gem::Version.new('0.0.2')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: batali-wedge
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Chris Roberts
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 12.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 12.2.0
 description: Wedge magic into Chef
 email: code@chrisroberts.org
 executables: []