batali-wedge 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6f124231d53d1814403f5400386e24a8545241d
-  data.tar.gz: 62d952e59accd7f3f5e1612a599f1a68ed11ddc2
+  metadata.gz: cd741e3b9eae3dbcae3ab5768344996aed820026
+  data.tar.gz: c63707d74fe4f8df1f449660dc6aba01f0096cc3
 SHA512:
-  metadata.gz: 9d29e1eb3dfd9b83bdb99c2c20dd577ae15602c9fad0bec2451e9d2ce54157b049cb871de5a155ea5ee553bf4c6ed6bb67b5ce5575ee44d187096f655e517512
-  data.tar.gz: b136b66efd8da4256ed80410cad2c7f1d76ba97cb99db12481b8c86345098d1e4fe00e4745f9182d23ca882c7c31a22c0f66cee0621d386454c7910e7e2547e9
+  metadata.gz: a4979ac7edb638581e1ce26c717dfb759bcd5c49e54c81309a17bf941beb18da2756c0f9e93f861b3314de35d6e5e4cd99da95246e1e49b8c37e0856a723cb3b
+  data.tar.gz: 4be01b72a68af46ea3de9eff37b7ab2a1da08cc423b53f1702f6ebc678fe399cac0deef183ef257f6d080bfb1b8f456cdad567724367eb1631ff7cd7ebae9369

data/batali-wedge.gemspec

@@ -1,16 +1,13 @@
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__)) + '/lib/'
-require 'batali-wedge/version'
 Gem::Specification.new do |s|
   s.name = 'batali-wedge'
-  s.version = BataliWedge::VERSION.version
+  s.version = '0.1.2'
   s.summary = 'Magic wedger'
   s.author = 'Chris Roberts'
   s.email = 'code@chrisroberts.org'
-  s.homepage = 'https://github.com/hw-labs/batali-wedge'
+  s.homepage = 'https://github.com/hw-labs/batali-infuse'
   s.description = 'Wedge magic into Chef'
-  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)
+  s.add_runtime_dependency 'batali-infuse', '> 0'
+  s.files = %w(batali-wedge.gemspec)
 end

metadata

@@ -1,57 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: batali-wedge
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: batali
+  name: batali-infuse
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !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: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- LICENSE
-- README.md
 - batali-wedge.gemspec
-- lib/batali-wedge.rb
-- lib/batali-wedge/sync.rb
-- lib/batali-wedge/version.rb
-homepage: https://github.com/hw-labs/batali-wedge
+homepage: https://github.com/hw-labs/batali-infuse
 licenses:
 - Apache 2.0
 metadata: {}

data/CHANGELOG.md

@@ -1,2 +0,0 @@
-# v0.1.0
-* Initial release

data/LICENSE

@@ -1,13 +0,0 @@
-   Copyright 2015 Chris Roberts
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

data/README.md

@@ -1,50 +0,0 @@
-# Batali Wedge
-
-Lets have some fun with `chef-client`!
-
-## Wedge Batali
-
-This gem wedges Batali into `chef-client` to perform cookbook
-resolution locally on the node, and request the solution set
-from the Chef Server.
-
-## OMG WHY!?
-
-There were old complaints about local solvers not generating
-the same results as the solver on the server. So, what if we
-just used the same solver, then you'd know you had the same
-resolution. This lead to:
-
-> I wonder if Batali could be wedged into the client
-
-As it turns out, it can.
-
-## Usage
-
-This only support 12.2.x versions of Chef. The gem needs to be
-installed into the omnibus like so:
-
-```
-$ /opt/chef/emebedded/bin/gem install batali-wedge --no-document
-```
-
-Then you can enable it via the `client.rb` file by adding this to
-the top:
-
-```ruby
-# /etc/chef/client.rb
-
-require 'batali-wedge/sync'
-```
-
-## What does this provide?
-
-Cookbook resolution, just on the client, via Batali. There's no
-least impact yet, but mostly because this was a first pass to
-see _if_ it would work. The next release will likely include
-that feature just to see what happens.
-
-# Info
-
-* Repository: https://github.com/hw-labs/batali-wedge
-* IRC: Freenode @ #heavywater

data/lib/batali-wedge.rb

@@ -1,2 +0,0 @@
-require 'batali'
-require 'batali-wedge/version'

data/lib/batali-wedge/sync.rb

@@ -1,95 +0,0 @@
-require 'batali-wedge'
-
-class Chef::PolicyBuilder::ExpandNodeObject
-
-  # Provide override to force Batali resolution
-  def sync_cookbooks
-    Chef::Log.debug("Synchronizing cookbooks")
-
-    begin
-      events.cookbook_resolution_start(@expanded_run_list_with_versions)
-      cookbook_hash = batali_cookbook_hash
-
-    rescue Exception => e
-      # TODO: wrap/munge exception to provide helpful error output
-      events.cookbook_resolution_failed(@expanded_run_list_with_versions, e)
-      raise
-    else
-      events.cookbook_resolution_complete(cookbook_hash)
-    end
-
-    synchronizer = Chef::CookbookSynchronizer.new(cookbook_hash, events)
-    if temporary_policy?
-      synchronizer.remove_obsoleted_files = false
-    end
-    synchronizer.sync_cookbooks
-
-    # register the file cache path in the cookbook path so that CookbookLoader actually picks up the synced cookbooks
-    Chef::Config[:cookbook_path] = File.join(Chef::Config[:file_cache_path], "cookbooks")
-
-    cookbook_hash
-
-  end
-
-  # Generate expected cookbook version hash
-  #
-  # @return [Hash]
-  def batali_cookbook_hash
-    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(
-      :name => :batali_resolv,
-      :requirements => constraints.to_a
-    )
-    solver = Grimoire::Solver.new(
-      :requirements => requirements,
-      :system => system
-    )
-    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.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
-    ]
-  end
-
-  # Build the base system for generating solution
-  #
-  # @return [Grimoire::System]
-  def batali_build_system
-    system = Grimoire::System.new
-    units = api_service.get_rest('cookbooks').map do |c_name, meta|
-      meta['versions'].map do |info|
-        "#{c_name}/#{info['version']}"
-      end
-    end.flatten.map do |ckbk|
-      Grimoire::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_unit(*units)
-    system
-  end
-
-end

data/lib/batali-wedge/version.rb

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