batali 0.2.10 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26d1612a3534961100e76d695b09186fdfd8fa31
-  data.tar.gz: 4e7804e3d98b4cfe9f9fde3be6a78357945cffd6
+  metadata.gz: aa18c8e69b93424e57b8317616ce7724cb9978ef
+  data.tar.gz: 7f1399c6617d115a1d80150e955872c90ea7bcce
 SHA512:
-  metadata.gz: dd028fa13dd2eb38f133d309f6c402add91bd70665dd9c55dec1db2da13312765e43bbd499eac4550e4aba292169d94a80c03fe4965eca5244c07892dffbe9c5
-  data.tar.gz: e2c1f1f064380fabc81c4366477af941fc60172cbf00840e649a2c7aa5d9501b0b84ea05c71ad013a9dd540fbfcaee6e7e6c54cf5523f53f1eca5a9fbffd239d
+  metadata.gz: ab46ecf666ecb4e50e8a235cfb67eb5b6288d4e0b0292854eb6ca6252b5abc54ca3ed1bcc1091962f9d96d53768bc51812fdef57e10e5ab2996c8803f7d4196b
+  data.tar.gz: ab32f312eade8efe395430641ae97539fe05e21b255b8a27149a19e946a4b7c00ae04c58615f17f1e8e81b29125aa771e211e88d68fdcb4f808eba66875f51e8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.2.12
+* Update home directory path generation to use `Dir.home`
+* Detect resolution type from manifest files
+* Add support for chefignore file (also allows `.chefignore`)
+* Introduce automatic cookbook constraint detection
+
 # v0.2.10
 * Parse full metadata file on path sources to properly discover all deps (#26)
 * Allow source to be optionally defined for Units

data/README.md

@@ -235,6 +235,28 @@ the dry run option to see what upgrades are available without actually changing
 $ batali resolve --no-least-impact --dry-run
 ```
 
+### Automatic cookbook discovery
+
+Tired of tracking constraints in multiple places when using Chef Environment `cookbook_versions`
+for environment specific constraints? Let Batali manage it for you! Define your `Batali` file
+to enable automatic discovery:
+
+```ruby
+Batali.define do
+  source 'https://example.com'
+  discover true
+end
+```
+
+That's it! Now you can resolve for the infrastructure:
+
+```
+$ batali resolve --infrastructure
+```
+
+which will generate a resulting manifest that includes all required cookbook versions to
+satisfiy constraints defined by all environments.
+
 ## Configuration
 
 Batali can be configured via the `.batali` file. The contents of the file can be in YAML,

data/batali.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.license = 'Apache 2.0'
   s.add_runtime_dependency 'attribute_struct', '~> 0.2.14'
-  s.add_runtime_dependency 'grimoire', '~> 0.2.3'
+  s.add_runtime_dependency 'grimoire', '~> 0.2.6'
   s.add_runtime_dependency 'bogo', '~> 0.1.20'
   s.add_runtime_dependency 'bogo-cli', '~> 0.1.18'
   s.add_runtime_dependency 'bogo-config', '~> 0.1.10'

data/lib/batali/b_file.rb

@@ -84,6 +84,7 @@ module Batali
       attribute :cookbook, Cookbook, :multiple => true, :required => true, :coerce => BFile.cookbook_coerce
     end
 
+    attribute :discover, [TrueClass, FalseClass], :required => true, :default => false
     attribute :restrict, Restriction, :multiple => true, :coerce => lambda{|v|
       Restriction.new(:cookbook => v.first, :source => v.last.to_smash[:source])
     }
@@ -104,6 +105,156 @@ module Batali
       ckbk
     }
 
+    # Search environments for cookbooks and restraints
+    #
+    # @return [TrueClass]
+    def auto_discover!(environment=nil)
+      debug 'Starting cookbook auto-discovery'
+      unless(discover)
+        raise 'Attempting to perform auto-discovery but auto-discovery is not enabled!'
+      end
+      environment_items = Dir.glob(File.join(File.dirname(path), 'environments', '*.{json,rb}')).map do |e_path|
+        result = parse_environment(e_path)
+        if(result[:name] && result[:cookbooks])
+          Smash.new(
+            result[:name] => result[:cookbooks]
+          )
+        end
+      end.compact.inject(Smash.new){|m,n| m.merge(n)}
+      environment_items.each do |e_name, items|
+        next if environment && e_name != environment
+        debug "Discovery processing of environment: #{e_name}"
+        items.each do |ckbk_name, constraints|
+          ckbk = cookbook.detect do |c|
+            c.name == ckbk_name
+          end
+          if(ckbk)
+            new_constraints = ckbk.constraint.dup
+            new_constraints += constraints
+            requirement = UnitRequirement.new(*new_constraints)
+            new_constraints = flatten_constraints(requirement.requirements)
+            debug "Discovery merged constraints for #{ckbk.name}: #{new_constraints.inspect}"
+            ckbk.constraint.replace(new_constraints)
+          else
+            debug "Discovery added cookbook #{ckbk_name}: #{constraints.inspect}"
+            cookbook.push(
+              Cookbook.new(
+                :name => ckbk_name,
+                :constraint => constraints
+              )
+            )
+          end
+        end
+      end
+      debug 'Completed cookbook auto-discovery'
+      true
+    end
+
+    protected
+
+    # Convert constraint for merging
+    #
+    # @param constraint [String]
+    # @param [Array<String>]
+    def convert_constraint(constraint)
+      comp, ver = constraint.split(' ', 2).map(&:strip)
+      if(comp == '~>')
+        ver = UnitVersion.new(ver)
+        [">= #{ver}", "< #{ver.bump}"]
+      else
+        [constraint]
+      end
+    end
+
+    # Consume list of constraints and generate compressed list that
+    # satisfies all defined constraints.
+    #
+    # @param constraints [Array<Array<String, UnitVersion>>]
+    # @return [Array<Array<String, UnitVersion>>]
+    # @note if an explict constraint is provided, only it will be
+    # returned
+    def flatten_constraints(constraints)
+      grouped = constraints.group_by(&:first)
+      grouped = Smash[
+        grouped.map do |comp, items|
+          versions = items.map(&:last)
+          if(comp.start_with?('>'))
+            [comp, [versions.min]]
+          elsif(comp.start_with?('<'))
+            [comp, [versions.max]]
+          else
+            [comp, versions]
+          end
+        end
+      ]
+      if(grouped['='])
+        grouped['>='] ||= []
+        grouped['<='] ||= []
+        grouped['='].each do |ver|
+          grouped['>='] << ver
+          grouped['<='] << ver
+        end
+        grouped.delete('=')
+      end
+      if(grouped['>'] || grouped['>='])
+        if(grouped['>='] && (grouped['>'].nil? || grouped['>='].min <= grouped['>'].min))
+          grouped['>='] = [grouped['>='].min]
+          grouped.delete('>')
+        else
+          grouped['>'] = [grouped['>'].min]
+          grouped.delete('>=')
+        end
+      end
+      if(grouped['<'] || grouped['<='])
+        if(grouped['<='] && (grouped['<'].nil? || grouped['<='].max >= grouped['<'].max))
+          grouped['<='] = [grouped['<='].max]
+          grouped.delete('<')
+        else
+          grouped['<'] = [grouped['<'].max]
+          grouped.delete('<=')
+        end
+      end
+      grouped.map do |comp, vers|
+        vers.map do |version|
+          "#{comp} #{version}"
+        end
+      end.flatten
+    end
+
+    # Read environment file and return defined cookbook constraints
+    #
+    # @param path [String] path to environment
+    # @return [Smash]
+    def parse_environment(path)
+      case File.extname(path)
+      when '.json'
+        env = MultiJson.load(
+          File.read(path)
+        ).to_smash
+      when '.rb'
+        struct = Struct.new
+        struct.set_state!(:value_collapse => true)
+        struct.instance_eval(File.read(path), path, 1)
+        env = struct._dump.to_smash
+      else
+        raise "Unexpected file format encountered! (#{File.extname(path)})"
+      end
+      Smash.new(
+        :name => env[:name],
+        :cookbooks => Smash[
+          env.fetch(
+            :cookbook_versions,
+            Smash.new
+          ).map{|k,v| [k, v.to_s.split(',')]}
+        ]
+      )
+    end
+
+    # Proxy debug output
+    def debug(s)
+      Batali.debug(s)
+    end
+
   end
 
 end

data/lib/batali/command/install.rb

@@ -28,7 +28,7 @@ module Batali
                 end
                 asset_path = unit.source.asset
                 final_path = File.join(install_path, unit.name)
-                if(config[:infrastructure])
+                if(config[:infrastructure] || (config[:infrastructure].nil? && manifest.infrastructure))
                   final_path << "-#{unit.version}"
                 end
                 begin

data/lib/batali/command/resolve.rb

@@ -29,7 +29,7 @@ module Batali
           :system => system,
           :score_keeper => score_keeper
         )
-        if(config[:infrastructure])
+        if(config[:infrastructure] || (config[:infrastructure].nil? && manifest.infrastructure))
           infrastructure_resolution(solv)
         else
           single_path_resolution(solv)

data/lib/batali/command/update.rb

@@ -7,8 +7,10 @@ module Batali
     class Update < Batali::Command
 
       def execute!
-        Resolve.new(options.merge(:ui => ui), arguments).execute!
-        Install.new(options.merge(:ui => ui), arguments).execute!
+        Resolve.new(opts.merge(:ui => ui), arguments).execute!
+        if(opts[:install])
+          Install.new(opts.merge(:ui => ui, :install => {}), arguments).execute!
+        end
       end
 
     end

data/lib/batali/command.rb

@@ -26,7 +26,11 @@ module Batali
         # TODO: Add directory traverse searching
         path = config.fetch(:file, File.join(Dir.pwd, 'Batali'))
         ui.verbose "Loading Batali file from: #{path}"
-        BFile.new(path)
+        bfile = BFile.new(path)
+        if(bfile.discover)
+          bfile.auto_discover!
+        end
+        bfile
       end
     end
 
@@ -46,7 +50,7 @@ module Batali
     # @return [String] path to local cache
     def cache_directory(*args)
       memoize(['cache_directory', *args].join('_')) do
-        directory = config.fetch(:cache_directory, File.expand_path('~/.batali/cache'))
+        directory = config.fetch(:cache_directory, File.join(Dir.home, '.batali/cache'))
         ui.debug "Cache directory to persist cookbooks: #{directory}"
         unless(args.empty?)
           directory = File.join(directory, *args.map(&:to_s))

data/lib/batali/git.rb

@@ -47,7 +47,7 @@ module Batali
       klass.class_eval do
         attribute :url, String, :required => true, :equivalent => true
         attribute :ref, String, :required => true, :equivalent => true
-        attribute :cache, String, :default => File.expand_path('~/.batali/cache/git')
+        attribute :cache, String, :default => File.join(Dir.home, '.batali/cache/git')
       end
     end
 

data/lib/batali/origin/remote_site.rb

@@ -19,7 +19,7 @@ module Batali
       attribute :endpoint, String, :required => true
       attribute :force_update, [TrueClass, FalseClass], :required => true, :default => false
       attribute :update_interval, Integer, :required => true, :default => 60
-      attribute :cache, String, :default => File.expand_path('~/.batali/cache/remote_site'), :required => true
+      attribute :cache, String, :default => File.join(Dir.home, '.batali/cache/remote_site'), :required => true
 
       def initialize(*_)
         super

data/lib/batali/source/path.rb

@@ -8,6 +8,11 @@ module Batali
     # Path based source
     class Path < Source
 
+      # @return [Array<String>] default ignore globs
+      DEFAULT_IGNORE = ['.git*']
+      # @return [Array<String>] valid ignore file names
+      IGNORE_FILE = ['chefignore', '.chefignore']
+
       include Bogo::Memoization
 
       attribute :path, String, :required => true, :equivalent => true
@@ -16,7 +21,24 @@ module Batali
       def asset
         memoize(:asset) do
           dir = Dir.mktmpdir
-          FileUtils.cp_r(File.join(path, '.'), dir)
+          chefignore = IGNORE_FILE.map do |c_name|
+            c_path = File.join(path, c_name)
+            c_path if File.exists?(c_path)
+          end.compact.first
+          chefignore = chefignore ? File.readlines(chefignore) : []
+          chefignore += DEFAULT_IGNORE
+          chefignore.uniq!
+          files_to_copy = Dir.glob(File.join(path, '{.[^.]*,**}', '**', '{*,*.*,.*}'))
+          files_to_copy = files_to_copy.map do |file_path|
+            next unless File.file?(file_path)
+            relative_path = file_path.sub("#{path}/", '')
+            relative_path unless chefignore.detect{|ig| File.fnmatch(ig, relative_path)}
+          end.compact
+          files_to_copy.each do |relative_path|
+            new_path = File.join(dir, relative_path)
+            FileUtils.mkdir_p(File.dirname(new_path))
+            FileUtils.cp(File.join(path, relative_path), new_path)
+          end
           dir
         end
       end

data/lib/batali/source/site.rb

@@ -44,7 +44,7 @@ module Batali
       def cache_directory
         memoize(:cache_directory) do
           unless(@cache)
-            @cache = File.expand_path('~/.batali/cache/remote_site')
+            @cache = File.join(Dir.home, '.batali/cache/remote_site')
           end
           ['entitystore', 'metastore'].each do |leaf|
             FileUtils.mkdir_p(File.join(cache, leaf))

data/lib/batali/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.12
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: bogo
   requirement: !ruby/object:Gem::Requirement
@@ -228,4 +228,3 @@ signing_key:
 specification_version: 4
 summary: Magic
 test_files: []
-has_rdoc: