batali 0.1.22 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbea03b20a8f3a778cf33c5419052e6287d03fa6
-  data.tar.gz: 31cb700a57303625a7b153d7cd337d697ddbcaff
+  metadata.gz: 848af492e8e0f263b8d8577dd3830ce985a2de5f
+  data.tar.gz: f3484364c7e5e2f9f83f1f93dd99b70a0490dfd3
 SHA512:
-  metadata.gz: 8cb20016cc7b46f91cc629020b50e5661c16ad0c81ebdb56beeb64d9bbef012973937e9bb8844197278a819b75a52072cc38db4f96f831bea0a12b79bbbc1ded
-  data.tar.gz: 78b4188b71cbeaaccf38a244ecc2c31ec134485aca8974bbf527d15f747c15a96da8a02a31adaba58fd07a427f53207edc0eb1b15432ed4beffaf6f1c9230ecf
+  metadata.gz: 22ee3396473217e237facd53e3e0e07357fd6afc5595bb814c944484015aea4ec6724b28cf23b92832628fc3c8d77459f5fffaf365c504b065ab14359149bb1f
+  data.tar.gz: 4d3eae0ae14d20cca5cdbbc1574401146c236a8e04d4b5862e5ff72248d71119d08b062ead31c64dfbb722d245b034179c2f2281c749c727d209ed58777c496b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.0
+* Add proxy support (#18)
+* Transition to "beta" state
+
 # v0.1.22
 * Add support for `metadata` keyword in Batali file
 * Extract install path from merged config instead of only namespaced opts

data/README.md

@@ -1,9 +1,13 @@
 # Batali
 
-Batali is a light weight cookbook resolver. It is currently
-in an alpha state and should not be used with anything you
-care about or love. There is a high chance it will burn it
-all to the ground, and laugh.
+Batali is a light weight cookbook resolver. It is now in
+a beta state, moving quickly towards a proper stable release.
+
+## What is Batali?
+
+Batali is a cookbook resolver. It's built to be light weight
+but feature rich. Batali helps to manage your cookbooks and
+stay out of your way.
 
 ## Usage
 
@@ -27,6 +31,10 @@ by default.
 
 _IT WILL DESTROY YOUR COOKBOOKS DIRECTORY BY DEFAULT_
 
+You can make it not destroy your cookbooks directory by providing
+a different path. A better idea is to not use the cookbooks directory.
+Just ignore that sucker and let Batali do its thing.
+
 ## Commands
 
 * `batali resolve` - Resolve dependencies and produce `batali.manifest`

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.0'
   s.add_runtime_dependency 'bogo', '~> 0.1.18'
-  s.add_runtime_dependency 'bogo-cli', '~> 0.1.8'
+  s.add_runtime_dependency 'bogo-cli', '~> 0.1.12'
   s.add_runtime_dependency 'bogo-config', '~> 0.1.10'
   s.add_runtime_dependency 'bogo-ui', '~> 0.1.6'
   s.add_runtime_dependency 'git'

data/lib/batali/command.rb

@@ -22,7 +22,7 @@ module Batali
     def batali_file
       memoize(:batali_file) do
         # TODO: Add directory traverse searching
-        path = opts.fetch(:file, File.join(Dir.pwd, 'Batali'))
+        path = config.fetch(:file, File.join(Dir.pwd, 'Batali'))
         ui.verbose "Loading Batali file from: #{path}"
         BFile.new(path)
       end
@@ -33,7 +33,7 @@ module Batali
       memoize(:manifest) do
         path = File.join(
           File.dirname(
-            opts.fetch(:file, File.join(Dir.pwd, 'batali.manifest'))
+            config.fetch(:file, File.join(Dir.pwd, 'batali.manifest'))
           ), 'batali.manifest'
         )
         ui.verbose "Loading manifest file from: #{path}"
@@ -44,7 +44,7 @@ module Batali
     # @return [String] path to local cache
     def cache_directory(*args)
       memoize(['cache_directory', *args].join('_')) do
-        directory = opts.fetch(:cache_directory, '/tmp/batali-cache')
+        directory = config.fetch(:cache_directory, '/tmp/batali-cache')
         ui.debug "Cache directory to persist cookbooks: #{directory}"
         unless(args.empty?)
           directory = File.join(directory, *args.map(&:to_s))
@@ -59,7 +59,7 @@ module Batali
     # @param action [String] action to be performed
     # @yield block to execute
     def dry_run(action)
-      if(opts[:dry_run])
+      if(config[:dry_run])
         ui.warn "Dry run disabled: #{action}"
       else
         yield

data/lib/batali/monkey.rb

@@ -16,3 +16,25 @@ module Batali
     end
   end
 end
+
+require 'resolv'
+require 'http'
+require 'http/request'
+
+class HTTP::Request
+
+  def proxy
+    if(_proxy_point = ENV["#{uri.scheme}_proxy"])
+      _proxy = URI.parse(_proxy_point)
+      Hash.new.tap do |opts|
+        opts[:proxy_address] = _proxy.host
+        opts[:proxy_port] = _proxy.port
+        opts[:proxy_username] = _proxy.user if _proxy.user
+        opts[:proxy_password] = _proxy.password if _proxy.password
+      end
+    else
+      @proxy
+    end
+  end
+
+end

data/lib/batali/score_keeper.rb

@@ -18,7 +18,7 @@ module Batali
     # @param unit [Unit] unit to score
     # @param idx [Integer] current index location
     # @return [Numeric, NilClass]
-    def score_for(unit, idx)
+    def score_for(unit, idx=0)
       multiplier = 1
       manifest_unit = manifest.cookbook.detect do |m_unit|
         m_unit.name == unit.name

data/lib/batali/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-04-01 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.8
+        version: 0.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.12
 - !ruby/object:Gem::Dependency
   name: bogo-config
   requirement: !ruby/object:Gem::Requirement