batali 0.2.22 → 0.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63c8adabb64d858ed53678de2f81da590d3bf376
-  data.tar.gz: 89ae6233a82233078094bd6c249638f1a2c51143
+  metadata.gz: 9e2938e0db16df2660cdcc95f749013b7e59ee98
+  data.tar.gz: 4d03af6c43cbd88a501b7efd3fc04c031776b256
 SHA512:
-  metadata.gz: 2c427d0e6b08b0055c0be1a66939faa215fac3d83d03f22af46b3d755b00991d6a3c9c22cc2edf74214d4a54505a822d4ba8da77c8abd88e855552efc570daa7
-  data.tar.gz: 397dbafd4cb3be3c1f40e43ba28114df7ddfa510fa825710e686ed3420476d3ec63e65da3f39c63ddbf48f15da4048f48c0d948f49989cd9c2df5cd11bead187
+  metadata.gz: 1216d6feda21f8fa8f7db477a65e18970a55b83b77f532cd766e8b42b0f840041315db08c404d2e396591ef7796225dd968a7469f203fbc42fbc44163b7458f0
+  data.tar.gz: 91b90b17ec80979b8f84460d71be89b0ce2fcf6dbde3d78de3f7f7f47716b23c99f85249674192a9a1faca26e2e2fcd716316fa185dcd3bb1f2f552203271080

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.2.24
+* [enhancement] Add cache command for inspection and removal
+* [fix] Automatically destroy and retry failed asset unpack
+* [fix] Use relative path with metadata keyword
+
 # v0.2.22
 * [fix] Update chefspec integration to properly install cookbooks
 

data/bin/batali

@@ -6,6 +6,7 @@ Bogo::Cli::Setup.define do
 
   on :v, :version, 'Print version' do
     puts "batali - Cookbook Collection Manager - [Version: #{Batali::VERSION}]"
+    puts "  - #{Batali::TAG_LINES.sample}"
     exit
   end
 
@@ -61,6 +62,15 @@ Bogo::Cli::Setup.define do
     end
   end
 
+  command 'cache' do
+    description 'Local cache management and information'
+    self.instance_exec(&global_opts)
+    on :s, 'scrub', 'Delete local cache contents'
+    run do |opts, args|
+      Batali::Command::Cache.new({:cache => opts.to_hash}, args).execute!
+    end
+  end
+
   command 'configure' do
     self.instance_exec(&global_opts)
     run do |opts, args|

data/lib/batali/b_file.rb

@@ -1,4 +1,5 @@
 require 'batali'
+require 'pathname'
 
 module Batali
 
@@ -123,10 +124,12 @@ module Batali
     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|
-      dir = File.dirname(b_file.path)
+      dir = Pathname.new(File.dirname(b_file.path)).relative_path_from(Pathname.new(Dir.pwd)).to_path
       m_unit = Origin::Path.new(:name => 'metadata', :path => dir).units.first
       ckbk = Cookbook.new(:name => m_unit.name, :version => m_unit.version, :path => dir)
-      b_file.cookbook.push ckbk
+      unless(b_file.cookbook.map(&:name).include?(ckbk.name))
+        b_file.cookbook.push ckbk
+      end
       ckbk
     }
 

data/lib/batali/command/cache.rb

@@ -0,0 +1,44 @@
+require 'batali'
+
+module Batali
+  class Command
+
+    # Cache management and information
+    class Cache < Batali::Command
+
+      # Display information from manifest
+      def execute!
+        if(opts[:scrub])
+          scrub!
+        end
+        ui.puts ui.color('Batali cache information:', :bold) + "\n"
+        display
+      end
+
+      # Remove all contents from local cache
+      def scrub!
+        ui.confirm "Remove all contents from local cache (#{cache_directory})"
+        run_action 'Scrubbing local cache' do
+          FileUtils.rm_rf(cache_directory)
+          nil
+        end
+      end
+
+      # Display local cache information
+      def display
+        cache_size = Dir.glob(File.join(cache_directory, '**', '**', '*')).map do |path|
+          File.size(path) if File.file?(path)
+        end.compact.inject(&:+).to_i
+        cache_size = "#{sprintf('%.2f', ((cache_size / 1024.to_f) / 1024))}M"
+        [
+          "#{ui.color('Path:', :bold)} #{cache_directory}",
+          "#{ui.color('Size:', :bold)} #{cache_size}"
+        ].each do |line|
+          ui.puts "  #{line}"
+        end
+      end
+
+    end
+
+  end
+end

data/lib/batali/command.rb

@@ -9,6 +9,7 @@ module Batali
 
     include Bogo::Memoization
 
+    autoload :Cache, 'batali/command/cache'
     autoload :Configure, 'batali/command/configure'
     autoload :Display, 'batali/command/display'
     autoload :Install, 'batali/command/install'

data/lib/batali/source/site.rb

@@ -57,37 +57,48 @@ module Batali
       def asset
         path = File.join(cache_directory, Base64.urlsafe_encode64(url))
         unless(File.directory?(path))
-          FileUtils.mkdir_p(path)
-          result = HTTP.with_cache(
-            :metastore => "file:#{File.join(cache_directory, 'metastore')}",
-            :entitystore => "file:#{File.join(cache_directory, 'entitystore')}"
-          ).get(url)
-          while(result.code == 302)
+          retried = false
+          begin
+            FileUtils.mkdir_p(path)
             result = HTTP.with_cache(
               :metastore => "file:#{File.join(cache_directory, 'metastore')}",
               :entitystore => "file:#{File.join(cache_directory, 'entitystore')}"
-            ).get(result.headers['Location'])
-          end
-          File.open(a_path = File.join(path, 'asset'), 'w') do |file|
-            while(content = result.body.readpartial(2048))
-              file.write content
+            ).get(url)
+            while(result.code == 302)
+              result = HTTP.with_cache(
+                :metastore => "file:#{File.join(cache_directory, 'metastore')}",
+                :entitystore => "file:#{File.join(cache_directory, 'entitystore')}"
+              ).get(result.headers['Location'])
             end
-          end
-          ext = Gem::Package::TarReader.new(
-            Zlib::GzipReader.open(a_path)
-          )
-          ext.rewind
-          ext.each do |entry|
-            next unless entry.file?
-            n_path = File.join(path, entry.full_name)
-            FileUtils.mkdir_p(File.dirname(n_path))
-            File.open(n_path, 'w') do |file|
-              while(content = entry.read(2048))
-                file.write(content)
+            File.open(a_path = File.join(path, 'asset'), 'w') do |file|
+              while(content = result.body.readpartial(2048))
+                file.write content
               end
             end
+            ext = Gem::Package::TarReader.new(
+              Zlib::GzipReader.open(a_path)
+            )
+            ext.rewind
+            ext.each do |entry|
+              next unless entry.file?
+              n_path = File.join(path, entry.full_name)
+              FileUtils.mkdir_p(File.dirname(n_path))
+              File.open(n_path, 'w') do |file|
+                while(content = entry.read(2048))
+                  file.write(content)
+                end
+              end
+            end
+            FileUtils.rm(a_path)
+          rescue => e
+            FileUtils.rm_rf(path)
+            unless(retried)
+              FileUtils.mkdir_p(path)
+              retried = true
+              retry
+            end
+            raise
           end
-          FileUtils.rm(a_path)
         end
         Dir.glob(File.join(path, '*')).first
       end

data/lib/batali/tag_lines.rb

@@ -0,0 +1,13 @@
+require 'batali'
+
+module Batali
+
+  TAG_LINES = [
+    "I got 99 problems but a policyfile ain't one",
+    "Solve the way you want, not the way you're told",
+    "Build environments, not applications",
+    "DRY should be the rule, not the exception",
+    "Solve for the forest, not just a tree"
+  ]
+
+end

data/lib/batali/version.rb

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

data/lib/batali.rb

@@ -18,6 +18,8 @@ module Batali
   autoload :UnitLoader, 'batali/unit_loader'
   autoload :Utility, 'batali/utility'
 
+  autoload :TAG_LINES, 'batali/tag_lines'
+
   class << self
     # @return [Bogo::Ui]
     attr_reader :ui

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.24
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -195,6 +195,7 @@ files:
 - lib/batali/b_file.rb
 - lib/batali/chefspec.rb
 - lib/batali/command.rb
+- lib/batali/command/cache.rb
 - lib/batali/command/configure.rb
 - lib/batali/command/display.rb
 - lib/batali/command/install.rb
@@ -216,6 +217,7 @@ files:
 - lib/batali/source/git.rb
 - lib/batali/source/path.rb
 - lib/batali/source/site.rb
+- lib/batali/tag_lines.rb
 - lib/batali/unit.rb
 - lib/batali/unit_loader.rb
 - lib/batali/utility.rb