batali 0.2.14 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a858775a739465f30069ecf5ce22dee5b8e1a24
-  data.tar.gz: 59eb2bf5517829257bbdd9d2b9afacca2633fded
+  metadata.gz: 95116c2d6a246d0c41771808a3de9097db08e4f5
+  data.tar.gz: ba3506822b97ffe1fa18c200f734b395b876e03e
 SHA512:
-  metadata.gz: ebd131450fdb5ba57f570f89795663f912c44237b04609576ed44890ffbe54623e8b65fcbb3b355ddb98d2c4c95c8bcf82c7c7244b3ca987b56d6741a40671dc
-  data.tar.gz: 4e2daaec6765cd360e821978e717e50b45cc98a3badf9b30e66952508da359e16729f927827f777ba9b7f8b7c8bc3c35c887402ffabcf961c612b228f8747742
+  metadata.gz: dc4ac9054ff2bbb0e9e07c98a25cb44714c1f303da5714a85b633bc76a75867c39be50e9f7c44fc35ee9c3447afcf4cec346ae25db475500f1c46621a7f0deea
+  data.tar.gz: 41d22ff1c595f21414abae181d63a6a49ff870d3e2f4a9250fa3d26679cd7f2fbe3471e9cd6ee08e73f0486a2387013ae9afff2ebc970ca140a89bd18563c484

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.16
+* Add `display` command for inspect manifest
+* [fix] Update bogo-cli constraint to provide configuration merge fix
+
 # v0.2.14
 * Add support for using the Chef Server as a source
 

data/README.md

@@ -95,6 +95,16 @@ Paths are defined via cookbook entries:
 cookbook 'example', path: '/path/to/example'
 ```
 
+A short cut is also available when you're Batali file is
+located at the root of the cookbook you want to add:
+
+```ruby
+metadata
+```
+
+This will extract the name from the `metadata` file and automatically
+set the path `'.'`.
+
 ##### Git
 
 Git sources are defined via cookbook entries:

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.6'
   s.add_runtime_dependency 'bogo', '~> 0.1.20'
-  s.add_runtime_dependency 'bogo-cli', '~> 0.1.18'
+  s.add_runtime_dependency 'bogo-cli', '~> 0.1.23'
   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

@@ -16,6 +16,14 @@ Bogo::Cli::Setup.define do
     on :f, :file, 'Path to Batali file'
   end
 
+  command 'display' do
+    description 'Display manifest information'
+    self.instance_exec(&global_opts)
+    run do |opts, args|
+      Batali::Command::Display.new({:display => opts.to_hash}, args).execute!
+    end
+  end
+
   command 'install' do
     description 'Install cookbooks from manifest'
     self.instance_exec(&global_opts)

data/lib/batali/command/display.rb

@@ -0,0 +1,47 @@
+require 'batali'
+
+module Batali
+  class Command
+
+    # Display manifest information
+    class Display < Batali::Command
+
+      # Display information from manifest
+      def execute!
+        ui.puts ui.color('Batali manifest information:', :bold) + "\n"
+        display(arguments)
+      end
+
+      # Display manifest information
+      #
+      # @param names [Array<String>] limit to given cookbooks
+      # @return [NilClass]
+      def display(ckbk_names)
+        info = Smash.new.tap do |ckbks|
+          manifest.cookbook.sort_by(&:name).each do |ckbk|
+            ckbks[ckbk.name] ||= []
+            ckbks[ckbk.name].push(ckbk)
+          end
+        end
+        info.each do |name, ckbks|
+          next unless ckbk_names.empty? || ckbk_names.include?(name)
+          ui.puts "  #{ui.color(name, :bold)}:"
+          ckbks.each do |ckbk|
+            ui.puts "    Version: #{ckbk.version}"
+            case ckbk.source
+            when Batali::Source::Site
+              ui.puts "    Source: #{URI.parse(ckbk.source.url).host}"
+            when Batali::Source::Git
+              ui.puts "    Source: #{ckbk.source.url}"
+              ui.puts "    Reference: #{ckbk.source.ref}"
+            when Batali::Source::Path
+              ui.puts "    Source: #{ckbk.source.path}"
+            end
+          end
+        end
+      end
+
+    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] || (config[:infrastructure].nil? && manifest.infrastructure))
+                if(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] || (config[:infrastructure].nil? && manifest.infrastructure))
+        if(infrastructure?)
           infrastructure_resolution(solv)
         else
           single_path_resolution(solv)

data/lib/batali/command.rb

@@ -10,6 +10,7 @@ module Batali
     include Bogo::Memoization
 
     autoload :Configure, 'batali/command/configure'
+    autoload :Display, 'batali/command/display'
     autoload :Install, 'batali/command/install'
     autoload :Resolve, 'batali/command/resolve'
     autoload :Update, 'batali/command/update'
@@ -72,5 +73,13 @@ module Batali
       end
     end
 
+    # @return [TrueClass, FalseClass] infrastructure mode
+    def infrastructure?
+      config[:infrastructure] || (
+        config[:infrastructure].nil? &&
+        manifest.infrastructure
+      )
+    end
+
   end
 end

data/lib/batali/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.16
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-30 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.18
+        version: 0.1.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.23
 - !ruby/object:Gem::Dependency
   name: bogo-config
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +196,7 @@ files:
 - lib/batali/chefspec.rb
 - lib/batali/command.rb
 - lib/batali/command/configure.rb
+- lib/batali/command/display.rb
 - lib/batali/command/install.rb
 - lib/batali/command/resolve.rb
 - lib/batali/command/update.rb
@@ -244,3 +245,4 @@ signing_key:
 specification_version: 4
 summary: Magic
 test_files: []
+has_rdoc: