batali 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd8679efebec3984ad2b5e8155ca72f3e2f17445
-  data.tar.gz: cc7ee3d73c0e7a9fb7c331005d61095ceecd9fbb
+  metadata.gz: e09935acfcbc04835f428e88c65c46d5effbc164
+  data.tar.gz: 5d9b81aacd71727b823947a744a050962908e197
 SHA512:
-  metadata.gz: 0051b4f1cfbd04e1eb9d7b709c52ead0e5b9ef16077d5a6308e7b6c7d7412e320c47b4efef5c833be210582e837d38382ce334e5cccc6f19cd6f41841e6a1b71
-  data.tar.gz: 94b780e0299a7e759912694a2a1aafd78b3bf4cd86d9d63616ca75018808dac39c4ca3a28cf6d8febd38047af7fd5fb70ed93d16a00aab9d2b221039cd94b589
+  metadata.gz: cfa3f9193ac35a32b7d467d4f46dbc687c67e944f8ae0ffc95d5ca952d8613a93dde468af54a7310004677ed177cb78f44f581f6135c53899b64ad4e60af60c6
+  data.tar.gz: 05a5d1eff7e95a0b584a52f1a3e2ca38a17511a17dd5641f8256a8627027368e9db748df7be50b9078f6f43f2819ab0abcbc96a472b8fbe76915c095fe2b2565

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.2.8
+* Include missing infrastructure configuration flag on install command
+* Default the cache directory to home directory to isolate users
+* Add support for configuration file
+
 # v0.2.6
 * Add support for ChefSpec
 

data/README.md

@@ -202,6 +202,122 @@ $ batali resolve --infrastructure
 
 _NOTE: Depending on constraints defined within the Batali file, this can be a very large manifest_
 
+#### Uploading infrastructure cookbooks
+
+When the infrastructure cookbooks are installed locally, the cookbook directories will have
+the version number as a suffix. This can cause a problem when attempting to run:
+
+```
+$ knife cookbook upload --all
+```
+
+due to knife using the directory name as the actual cookbook name. To get around this problem
+the `upload` command can be used directly with the correct options enabled. These options must
+be defined within the config file as the options are not accessible via CLI flags. Assuming
+a `.chef/knife.rb` file exists:
+
+```ruby
+# .chef/knife.rb
+
+versioned_cookbooks true
+```
+
+```
+$ knife upload cookbooks
+```
+
+### Display outdated cookbooks
+
+Want to see what cookbooks have newer versions available within the defined constraints? Use
+the dry run option to see what upgrades are available without actually changing the manifest:
+
+```
+$ batali resolve --no-least-impact --dry-run
+```
+
+## Configuration
+
+Batali can be configured via the `.batali` file. The contents of the file can be in YAML,
+JSON, XML, or Ruby. Every option displayed via the help call can be set within this file.
+The configuration can hold items isolated within a command's name, or defined at the top
+level of the configuration file. For example:
+
+```ruby
+Configuration.new do
+  debug true
+  resolve do
+    debug false
+  end
+end
+```
+
+This configuration turns debug output on for all commands _except_ the resolve command.
+This feature is handy in situations where multiple commands may have the same flag that
+should always be enabled, like the `infrastructure` flag:
+
+```ruby
+Configuration.new do
+  infrastructure true
+end
+```
+
+When flags on the CLI contain a dash, they are referenced within the configuration file
+as an underscore. For example the least impact flag on the CLI looks like:
+
+```
+--least-impact
+```
+
+and the key in the configuration looks like:
+
+```
+least_impact
+```
+
+### Example configurations
+
+#### Ruby
+
+```ruby
+Configuration.new do
+  infrastructure true
+  resolve do
+    least_impact false
+  end
+end
+```
+
+#### JSON
+
+```json
+{
+  "infrastructure": true,
+  "resolve": {
+    "least_impact": false
+  }
+}
+```
+
+#### YAML
+
+```yaml
+---
+:infrastructure: true
+:resolve:
+  :least_impact: false
+```
+
+#### XML
+
+```xml
+<configuration>
+  <infrastructure>true</infrastructure>
+  <resolve>
+    <least_impact>false</least_impact>
+  </resolve>
+</configuration>
+```
+
 ## Test Kitchen
 
 Batali can be used with [Test Kitchen](https://github.com/test-kitchen/test-kitchen):

data/batali.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'attribute_struct', '~> 0.2.14'
   s.add_runtime_dependency 'grimoire', '~> 0.2.1'
   s.add_runtime_dependency 'bogo', '~> 0.1.18'
-  s.add_runtime_dependency 'bogo-cli', '~> 0.1.12'
+  s.add_runtime_dependency 'bogo-cli', '~> 0.1.18'
   s.add_runtime_dependency 'bogo-config', '~> 0.1.10'
   s.add_runtime_dependency 'bogo-ui', '~> 0.1.6'
   s.add_runtime_dependency 'http', '~> 0.8.2'

data/bin/batali

@@ -21,6 +21,7 @@ Bogo::Cli::Setup.define do
     self.instance_exec(&global_opts)
     on :d, 'dry-run', 'Print changes'
     on :p, 'path', 'Cookbook install path'
+    on :I, 'infrastructure', 'Resolve infrastructure cookbooks'
     run do |opts, args|
       Batali::Command::Install.new({:install => opts.to_hash}, args).execute!
     end

data/lib/batali/command/resolve.rb

@@ -29,7 +29,7 @@ module Batali
           :system => system,
           :score_keeper => score_keeper
         )
-        if(opts[:infrastructure])
+        if(config[:infrastructure])
           infrastructure_resolution(solv)
         else
           single_path_resolution(solv)
@@ -40,7 +40,7 @@ module Batali
       def score_keeper
         memoize(:score_keeper) do
           sk_manifest = Manifest.new(:cookbook => manifest.cookbook)
-          unless(opts[:least_impact])
+          unless(config[:least_impact])
             sk_manifest.cookbook.clear
           end
           sk_manifest.cookbook.delete_if do |unit|
@@ -62,7 +62,7 @@ module Batali
         ]
         ui.info 'Performing single path resolution.'
         if(manifest.infrastructure)
-          ui.ask 'Current manifest is resolved for infrastucture. Convert to single path?'
+          ui.confirm 'Current manifest is resolved for infrastucture. Convert to single path?'
         end
         results = []
         run_action 'Resolving dependency constraints' do

data/lib/batali/command.rb

@@ -5,6 +5,8 @@ module Batali
   # Customized command base for Batali
   class Command < Bogo::Cli::Command
 
+    DEFAULT_CONFIGURATION_FILES = ['.batali']
+
     include Bogo::Memoization
 
     autoload :Configure, 'batali/command/configure'
@@ -44,7 +46,7 @@ module Batali
     # @return [String] path to local cache
     def cache_directory(*args)
       memoize(['cache_directory', *args].join('_')) do
-        directory = config.fetch(:cache_directory, '/tmp/batali-cache')
+        directory = config.fetch(:cache_directory, File.expand_path('~/.batali/cache'))
         ui.debug "Cache directory to persist cookbooks: #{directory}"
         unless(args.empty?)
           directory = File.join(directory, *args.map(&:to_s))

data/lib/batali/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.18
 - !ruby/object:Gem::Dependency
   name: bogo-config
   requirement: !ruby/object:Gem::Requirement