bellboy 0.2.6 → 0.3.0

data/lib/bellboy.rb

@@ -18,6 +18,8 @@
 require 'berkshelf'
 require 'ridley'
 
+require 'bellboy/mixin/berkshelf.rb'
+
 require 'bellboy/errors'
 require 'bellboy/logger'
 require 'bellboy/versioner'

data/lib/bellboy/installer.rb

@@ -32,7 +32,7 @@ module Bellboy
           Bellboy.logger.debug "Source: #{source.cached_cookbook.path}"
 
           if File.exists?(File.join(source.cached_cookbook.path, @bellboyfile))
-            site = berksfile.locations.select { |loc| loc[:type] == :site }.first
+            site = berksfile.locations.select { |loc| loc[:type] == :databags }.first
 
             fail Berkshelf::InvalidChefAPILocation if site.nil?
 
@@ -79,7 +79,7 @@ module Bellboy
       end
 
       def download_item(site, databag, item, itempath)
-        location = File.join("#{site[:value]}", 'databags', databag, item)
+        location = File.join("#{site[:value]}", databag, item)
 
         Bellboy.logger.log "Downloading data bag item #{databag}/#{item} from '#{location}'"
 

data/lib/bellboy/mixin/berkshelf.rb

@@ -0,0 +1,25 @@
+module Bellboy
+  module BerksfileBellboy
+
+    def self.included(base)
+      base.class_eval do
+        expose_method :databags
+      end
+    end
+
+    # Add a 'Databags' default location which will be used to resolve databag sources.
+    #
+    # @example
+    #   databags "http://example.com/databags"
+    #
+    # @param [String] value
+    #
+    # @return [Hash]
+    def databags(value)
+      add_location(:databags, value)
+    end
+
+  end
+
+  Berkshelf::Berksfile.send(:include, BerksfileBellboy) 
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bellboy
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -112,6 +112,7 @@ files:
 - lib/bellboy/errors.rb
 - lib/bellboy/installer.rb
 - lib/bellboy/logger.rb
+- lib/bellboy/mixin/berkshelf.rb
 - lib/bellboy/uploader.rb
 - lib/bellboy/versioner.rb
 - spec/cli_spec.rb