batali 0.2.12 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa18c8e69b93424e57b8317616ce7724cb9978ef
-  data.tar.gz: 7f1399c6617d115a1d80150e955872c90ea7bcce
+  metadata.gz: 6a858775a739465f30069ecf5ce22dee5b8e1a24
+  data.tar.gz: 59eb2bf5517829257bbdd9d2b9afacca2633fded
 SHA512:
-  metadata.gz: ab46ecf666ecb4e50e8a235cfb67eb5b6288d4e0b0292854eb6ca6252b5abc54ca3ed1bcc1091962f9d96d53768bc51812fdef57e10e5ab2996c8803f7d4196b
-  data.tar.gz: ab32f312eade8efe395430641ae97539fe05e21b255b8a27149a19e946a4b7c00ae04c58615f17f1e8e81b29125aa771e211e88d68fdcb4f808eba66875f51e8
+  metadata.gz: ebd131450fdb5ba57f570f89795663f912c44237b04609576ed44890ffbe54623e8b65fcbb3b355ddb98d2c4c95c8bcf82c7c7244b3ca987b56d6741a40671dc
+  data.tar.gz: 4e2daaec6765cd360e821978e717e50b45cc98a3badf9b30e66952508da359e16729f927827f777ba9b7f8b7c8bc3c35c887402ffabcf961c612b228f8747742

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.14
+* Add support for using the Chef Server as a source
+
 # v0.2.12
 * Update home directory path generation to use `Dir.home`
 * Detect resolution type from manifest files

data/README.md

@@ -1,3 +1,5 @@
+![Batali](img/batali-logo.png)
+
 # Batali
 
 Batali is a light weight cookbook resolver. It is now in
@@ -50,6 +52,7 @@ Currently supported "origins":
 * RemoteSite
 * Path
 * Git
+* ChefServer
 
 #### RemoteSite
 
@@ -67,6 +70,23 @@ source 'https://supermarket.chef.io', :name => 'opscode'
 source 'https://cookbooks.example.com', :name => 'example'
 ```
 
+##### ChefServer
+
+This is a Chef Server endpoint:
+
+```ruby
+chef_server 'https://chef-server.example.com'
+```
+
+It will use the `node_name` and `client_key` defined within the
+`.chef/knife.rb` configuration by default. To use the Chef Server
+URL defined within the configuration, just declare it with no
+arguments:
+
+```ruby
+chef_server
+```
+
 ##### Path
 
 Paths are defined via cookbook entries:

data/batali.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'git'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'pry'
+  s.add_development_dependency 'chef'
   s.executables << 'batali'
   s.files = Dir['{lib,bin}/**/**/*'] + %w(batali.gemspec README.md CHANGELOG.md CONTRIBUTING.md LICENSE)
 end

data/lib/batali/b_file.rb

@@ -22,6 +22,15 @@ module Batali
       self
     end
 
+    def chef_server(*args)
+      unless(self[:chef_server])
+        set!(:chef_server, ::AttributeStruct::CollapseArray.new.push(args))
+      else
+        self[:chef_server].push(args)
+      end
+      self
+    end
+
     def restrict(*args)
       unless(self[:restrict])
         set!(:restrict, ::AttributeStruct::CollapseArray.new.push(args))
@@ -88,13 +97,20 @@ module Batali
     attribute :restrict, Restriction, :multiple => true, :coerce => lambda{|v|
       Restriction.new(:cookbook => v.first, :source => v.last.to_smash[:source])
     }
-    attribute :source, Origin::RemoteSite, :multiple => true, :coerce => lambda{|v|
+    attribute :source, Origin::RemoteSite, :multiple => true, :default => [], :coerce => lambda{|v|
       args = Smash.new(:endpoint => v.first)
       if(v.last.is_a?(Hash))
         args.merge!(v.last)
       end
       Origin::RemoteSite.new(args)
     }
+    attribute :chef_server, Origin::ChefServer, :multiple => true, :default => [], :coerce => lambda{|v|
+      args = Smash.new(:endpoint => v.first)
+      if(v.last.is_a?(Hash))
+        args.merge!(v.last)
+      end
+      Origin::ChefServer.new(args)
+    }
     attribute :group, Group, :multiple => true, :coerce => lambda{|v| Group.new()}
     attribute :cookbook, Cookbook, :multiple => true, :coerce => BFile.cookbook_coerce, :default => []
     attribute :metadata, Cookbook, :coerce => lambda{ |v, b_file|

data/lib/batali/origin/chef_server.rb

@@ -0,0 +1,60 @@
+require 'batali'
+require 'digest/sha2'
+require 'securerandom'
+require 'http'
+require 'fileutils'
+
+module Batali
+  class Origin
+    # Fetch unit information from chef server
+    class ChefServer < Origin
+
+      include Bogo::Memoization
+      include Utility::Chef
+
+      attribute :name, String
+      attribute :identifier, String
+
+      def initialize(*_)
+        super
+        init_chef!
+        self.identifier = Digest::SHA256.hexdigest(endpoint)
+        unless(name?)
+          self.name = self.identifier
+        end
+      end
+
+      # @return [Array<Unit>] all units
+      def units
+        memoize(:units) do
+          debug "Fetching units from chef server: #{endpoint}"
+          units = api_service.get_rest('cookbooks?num_versions=all').map do |c_name, meta|
+            meta['versions'].map do |info|
+              "#{c_name}/#{info['version']}"
+            end
+          end.flatten.map do |ckbk|
+            debug "Unit information from #{endpoint}: #{ckbk.inspect}"
+            c_name, c_version = ckbk.split('/', 2)
+            c_deps = api_service.get_rest(
+              "cookbooks/#{c_name}/#{c_version}"
+            ).metadata.dependencies.to_a
+            Unit.new(
+              :name => c_name,
+              :version => c_version,
+              :dependencies => c_deps,
+              :source => Smash.new(
+                :type => :chef_server,
+                :version => c_version,
+                :dependencies => c_deps,
+                :endpoint => endpoint,
+                :client_key => client_key,
+                :client_name => client_name
+              )
+            )
+          end.flatten
+        end
+      end
+
+    end
+  end
+end

data/lib/batali/origin.rb

@@ -4,6 +4,7 @@ module  Batali
   # Cookbook source origin
   class Origin < Utility
 
+    autoload :ChefServer, 'batali/origin/chef_server'
     autoload :RemoteSite, 'batali/origin/remote_site'
     autoload :Git, 'batali/origin/git'
     autoload :Path, 'batali/origin/path'

data/lib/batali/source/chef_server.rb

@@ -0,0 +1,86 @@
+require 'batali'
+require 'tmpdir'
+
+module Batali
+  class Source
+    # Chef Server based source
+    class ChefServer < Source
+
+      include Bogo::Memoization
+      include Utility::Chef
+
+      # @return [Array<Hash>] dependency strings
+      attr_reader :dependencies
+      # @return [String] local cache path
+      attr_accessor :cache
+      # @return [string] unique identifier
+      attr_reader :identifier
+
+      attribute :version, String, :required => true, :equivalent => true
+
+      # Extract extra info before allowing super to load data
+      #
+      # @param args [Hash]
+      # @return [self]
+      def initialize(args={})
+        @deps = args.delete(:dependencies) || {}
+        super
+        init_chef!
+      end
+
+      # @return [Chef::Rest]
+      def api_service
+        memoize(:api_service) do
+          Chef::Rest.new(endpoint)
+        end
+      end
+
+      # @return [String]
+      def unit_version
+        version
+      end
+
+      # @return [Array<Array<name, constraints>>]
+      def unit_dependencies
+        deps.to_a
+      end
+
+      # @return [String] path to cache
+      def cache_directory
+        memoize(:cache_directory) do
+          unless(@cache)
+            @cache = File.join(Dir.home, '.batali/cache/chef_server', endpoint)
+          end
+          cache
+        end
+      end
+
+      # @return [String] directory
+      def asset
+        path = File.join(cache_directory, name, version)
+        begin
+          FileUtils.mkdir_p(path)
+          cookbook = rest.get_rest("cookbooks/#{name}/#{version}")
+          manifest = cookbook.manifest
+          Chef::CookbookVersion::COOKBOOK_SEGMENTS.each do |segement|
+            if(manifest.has_key?(segment))
+              manifest[segement].each do |s_file|
+                new_path = File.join(path, s_file['path'].gsub('/', File::SEPARATOR))
+                FileUtils.mkdir_p(File.dirname(new_path))
+                api_service.sign_on_redirect = false
+                t_file = api_service.get_rest(s_file['url'], true)
+                FilUtils.mv(t_file.path, new_path)
+              end
+            end
+          end
+        rescue => e
+          debug "Failed to fully download cookbook [#{name}<#{version}>] - #{e.class}: #{e}"
+          FileUtils.rm_rf(path)
+          raise
+        end
+        path
+      end
+
+    end
+  end
+end

data/lib/batali/source.rb

@@ -7,6 +7,7 @@ module Batali
     autoload :Path, 'batali/source/path'
     autoload :Site, 'batali/source/site'
     autoload :Git, 'batali/source/git'
+    autoload :ChefServer, 'batali/source/chef_server'
 
     attribute :type, String, :required => true, :default => lambda{ self.name }
 

data/lib/batali/unit_loader.rb

@@ -15,7 +15,7 @@ module Batali
     # @return [self]
     def populate!
       memoize(:populate) do
-        file.source.each do |src|
+        (file.source + file.chef_server).each do |src|
           src.units.find_all do |unit|
             if(restrictions[unit.name])
               restrictions[unit.name] == src.identifier

data/lib/batali/utility.rb

@@ -3,5 +3,63 @@ require 'batali'
 module Batali
   class Utility < Grimoire::Utility
 
+    # Helper module for enabling chef server support
+    module Chef
+
+      # Provide common required attribute
+      def self.included(klass)
+        klass.class_eval do
+          attribute :client_name, String
+          attribute :client_key, String
+          attribute :endpoint, String
+          attr_accessor :c_name
+          attr_accessor :c_key
+        end
+      end
+
+      # Load and configure chef
+      def init_chef!
+        debug 'Loading chef into the runtime'
+        begin
+          require 'chef'
+          debug 'Successfully loaded chef into the runtime'
+        rescue LoadError => e
+          debug "Failed to load the chef gem: #{e.class}: #{e}"
+          raise 'The `chef` gem was not found. Please `gem install chef` or add `chef` to your bundle.'
+        end
+        Smash.new(
+          :endpoint => :chef_server_url,
+          :c_name => :node_name,
+          :c_key => :client_key
+        ).each do |local_attr, config_key|
+          unless(self.send(local_attr))
+            memoize(:knife_configure, :global) do
+              require 'chef/knife'
+              ::Chef::Knife.new.configure_chef
+            end
+            debug "Settting #{config_key} from knife configuration file for #{self.class} <#{endpoint}>"
+            self.send("#{local_attr}=", ::Chef::Config[config_key])
+          end
+        end
+        c_name ||= client_name
+        c_key ||= client_key
+      end
+
+      # Make request to api service
+      #
+      # @yieldparam service [Chef::Rest]
+      # @return [Object] result
+      def api_service
+        memoize(:api_service) do
+          ::Chef::REST.new(
+            endpoint,
+            c_name,
+            c_key
+          )
+        end
+      end
+
+    end
+
   end
 end

data/lib/batali/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.14
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -164,6 +164,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: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Magic
 email: code@chrisroberts.org
 executables:
@@ -190,12 +204,14 @@ files:
 - lib/batali/manifest.rb
 - lib/batali/monkey.rb
 - lib/batali/origin.rb
+- lib/batali/origin/chef_server.rb
 - lib/batali/origin/git.rb
 - lib/batali/origin/path.rb
 - lib/batali/origin/remote_site.rb
 - lib/batali/requirement_list.rb
 - lib/batali/score_keeper.rb
 - lib/batali/source.rb
+- lib/batali/source/chef_server.rb
 - lib/batali/source/git.rb
 - lib/batali/source/path.rb
 - lib/batali/source/site.rb