batali 0.2.24 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e2938e0db16df2660cdcc95f749013b7e59ee98
-  data.tar.gz: 4d03af6c43cbd88a501b7efd3fc04c031776b256
+  metadata.gz: dac0de77697b201893a7f171b36a7e27031936f2
+  data.tar.gz: d7ee1c50669c8a4c8ffcd818813c2fa07a998811
 SHA512:
-  metadata.gz: 1216d6feda21f8fa8f7db477a65e18970a55b83b77f532cd766e8b42b0f840041315db08c404d2e396591ef7796225dd968a7469f203fbc42fbc44163b7458f0
-  data.tar.gz: 91b90b17ec80979b8f84460d71be89b0ce2fcf6dbde3d78de3f7f7f47716b23c99f85249674192a9a1faca26e2e2fcd716316fa185dcd3bb1f2f552203271080
+  metadata.gz: c066c8150764c5cbf92d6e28448f3c0d243c2417dd3371265154822049c8c51ae23c2790c7642722103cf12eceef48d638436c36dac9d18f6dfe796cb756f315
+  data.tar.gz: 42b2598fd903b77feed6e5d1c2c0444ddc364ab3f1301e5a03bf408f9f6729b19b6db90e4ca13e459198be6be66be43ea910aa2c4e498fc581f618a5e3027a79

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.26
+* [feature] Add subdirectory support for git repository sources
+
 # v0.2.24
 * [enhancement] Add cache command for inspection and removal
 * [fix] Automatically destroy and retry failed asset unpack

data/README.md

@@ -114,6 +114,13 @@ Git sources are defined via cookbook entries:
 cookbook 'example', git: 'git://git.example.com/example-repo.git', ref: 'master'
 ```
 
+In some crazy instances, you may have a cookbook located in the subdirectory of
+a git repository:
+
+```ruby
+cookbook 'example', git: 'git://git.example.com/example-repo.git', ref: 'master', path: 'my-cookbook'
+```
+
 ### Least Impact Updates
 
 After a `batali.manifest` file has been generated, subsequent `resolve` requests

data/lib/batali/origin/git.rb

@@ -7,11 +7,10 @@ module Batali
     class Git < Path
 
       include Batali::Git
+      attribute :path, String, :required => false
+      attribute :subdirectory, String
 
       def initialize(args={})
-        unless(args[:path])
-          args[:path] = '/dev/null'
-        end
         super
         self.identifier = Smash.new(
           :url => url,
@@ -29,7 +28,7 @@ module Batali
           items.first.source = Source::Git.new(
             :url => url,
             :ref => ref,
-            :path => path
+            :subdirectory => subdirectory
           )
           items
         end
@@ -38,7 +37,11 @@ module Batali
       # @return [Smash] metadata information
       def load_metadata
         fetch_repo
-        super
+        original_path = path.dup
+        self.path = File.join(*[path, subdirectory].compact)
+        result = super
+        self.path = original_path
+        result
       end
 
       # @return [String] path to repository

data/lib/batali/source/git.rb

@@ -11,12 +11,13 @@ module Batali
       include Bogo::Memoization
       include Batali::Git
 
+      attribute :subdirectory, String
       attribute :path, String
 
       # @return [String] directory containing contents
       def asset
         clone_repository
-        self.path = ref_dup
+        self.path = File.join(*[ref_dup, subdirectory].compact)
         super
       end
 

data/lib/batali/unit_loader.rb

@@ -27,18 +27,19 @@ module Batali
           end
         end
         file.cookbook.each do |ckbk|
-          if(ckbk.path)
-            source = Origin::Path.new(
-              :name => ckbk.name,
-              :path => ckbk.path
-            )
-          elsif(ckbk.git)
+          if(ckbk.git)
             source = Origin::Git.new(
               :name => ckbk.name,
               :url => ckbk.git,
+              :subdirectory => ckbk.path,
               :ref => ckbk.ref || 'master',
               :cache => cache
             )
+          elsif(ckbk.path)
+            source = Origin::Path.new(
+              :name => ckbk.name,
+              :path => ckbk.path
+            )
           end
           if(source)
             system.add_unit(source.units.first)

data/lib/batali/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.26
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -242,9 +242,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Magic
 test_files: []
-has_rdoc: