bellboy 0.4.0 → 0.5.0

data/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
+gem "berkshelf", github: "berkshelf/berkshelf"
+gem "rspec"
+
 gemspec

data/README.md

@@ -124,3 +124,22 @@ $PWD/config.json
 You can also specify the path to the Berkshelf configuration file with the ```-c``` option:
 
     bellboy install -c /path/to/berkshelf/config.json
+
+### Databags API
+
+Bellboy requires a working API server which it uses to download databag items. Normally Bellboy expects this API to run alongside your existing Berkshelf API, and Bellboy will use the existing `site` directive from the Berksfile to find the API.
+
+For example, if your Berksfile contains
+
+    site "https://example.com"
+
+then Bellboy assumes that the databag API is running at `https://example.com/databags`
+
+It is also possible to run the databag API at a different location. You can specify the URL to the API with the Bellboy specific `databags` directive in your Berksfile. However, Berkshelf will not understand this directive, so using `databags` in your Berksfile is slightly more complicated
+
+    site "https://example.com"
+    databags "https://databags.example.com" if Object.constants.include? :Bellboy
+
+The `if` clause ensures that Berkshelf will ignore the new directive, but that it will be processed if the Berksfile is loaded by Bellboy.
+
+The databag API is a simple Sinatra application. See [the Githib page](https://github.com/dyninc/databagapi) for the source and documentation.

data/bellboy.gemspec

@@ -7,15 +7,14 @@ Gem::Specification.new do |g|
   g.description             = "Version, install & upload data bag items that are stored alongside your Berkshelf Cookbooks"
   g.authors                 = ["Kristian Van Der Vliet"]
   g.email                   = 'kvandervliet@dyn.com'
-  g.homepage                = ''
+  g.homepage                = 'https://github.com/Vanders/bellboy'
   g.license                 = 'Apache-2.0'
 
   g.files                   = `git ls-files`.split($\)
   g.executables             = g.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
 
   g.add_runtime_dependency 'thor',                    '~> 0.18.0'
-  g.add_runtime_dependency 'berkshelf',               '~> 2.0.10'
   g.add_runtime_dependency 'faraday',                 '~> 0.8.0'
-  g.add_runtime_dependency 'ridley',                  '~> 1.5.0'
+  g.add_runtime_dependency 'ridley',                  '~> 2.3'
   g.add_runtime_dependency 'knife-data-bag-version',  '~> 1.1.1'
 end

data/lib/bellboy.rb

@@ -42,8 +42,15 @@ module Bellboy
     attr_accessor :logger
 
     def berks_sources(berksfile)
-      resolver = Berkshelf.ui.mute { berksfile.resolve(berksfile.sources) }
-      resolver[:sources]
+      sources = Array.new
+
+      dependencies = berksfile.list
+      dependencies.each do |dependency|
+        Bellboy.logger.debug "Adding source for #{dependency.name}"
+        sources << berksfile.retrieve_locked(dependency)
+      end
+
+      sources
     end
 
     def ridley_connection(options = {})
@@ -74,9 +81,9 @@ module Bellboy
       local_sources = Bellboy.berks_sources(berksfile)
 
       local_sources.each do |source|
-        Bellboy.logger.debug "Source: #{source.cached_cookbook.path}"
+        Bellboy.logger.debug "Source: #{source.path}"
 
-        path = File.join(source.cached_cookbook.path, 'data_bags')
+        path = File.join(source.path, 'data_bags')
         Dir.foreach(path) do |dir|
           subdir = File.join(path, dir)
 

data/lib/bellboy/installer.rb

@@ -26,25 +26,30 @@ module Bellboy
       def install(berksfile, options = {})
         @bellboyfile = options[:bellboyfile]
 
+        # Make sure no one (E.g. rspec) did anything silly
+        abort if @bellboyfile.nil?
+
         local_sources = Bellboy.berks_sources(berksfile)
 
         local_sources.each do |source|
-          Bellboy.logger.debug "Source: #{source.cached_cookbook.path}"
+          Bellboy.logger.debug "Source: #{source.path}"
 
-          if File.exists?(File.join(source.cached_cookbook.path, @bellboyfile))
-            site = berksfile.locations.select { |loc| loc[:type] == :databags }.first
+          if File.exists?(File.join(source.path, @bellboyfile))
+            site = berksfile.databags_source
 
             if site.nil?
-              # Try the 'site' location
-              site = berksfile.locations.select { |loc| loc[:type] == :site }.first
+              # Try the first source
+              site = berksfile.sources.first
 
               fail Berkshelf::InvalidChefAPILocation if site.nil?
 
-              location = "#{site[:value]}/databags"
+              location = "#{site.uri}/databags"
             else
-              location = site[:value]
+              location = site.uri
             end
 
+            Bellboy.logger.debug "Using #{site} for databags API location"
+
             download_databags(source, location)
           end
 
@@ -54,9 +59,9 @@ module Bellboy
       private
 
       def download_databags(source, site)
-        Bellboy.logger.log "Downloading databags for #{source.cached_cookbook.name}"
+        Bellboy.logger.log "Downloading databags for #{source.name}"
 
-        path = source.cached_cookbook.path
+        path = source.path
         containerpath = File.join(path, 'data_bags')
 
         begin

data/lib/bellboy/mixin/berkshelf.rb

@@ -4,6 +4,7 @@ module Bellboy
     def self.included(base)
       base.class_eval do
         expose_method :databags
+        expose_method :databags_source
       end
     end
 
@@ -14,9 +15,16 @@ module Bellboy
     #
     # @param [String] value
     #
-    # @return [Hash]
-    def databags(value)
-      add_location(:databags, value)
+    # @return [Berkshelf::Source]
+    def databags(api_url)
+      @databags = Berkshelf::Source.new(api_url)
+    end
+
+    # Get the 'Databags' location which will be used to resolve databag sources.
+    #
+    # @return [Berkshelf::Source]
+    def databags_source
+      @databags
     end
 
   end

data/lib/bellboy/uploader.rb

@@ -29,9 +29,9 @@ module Bellboy
         conn = Bellboy.ridley_connection(options)
  
         local_sources.each do |source|
-          Bellboy.logger.debug "Source: #{source.cached_cookbook.path}"
+          Bellboy.logger.debug "Source: #{source.path}"
 
-          upload_databags(source.cached_cookbook, conn)
+          upload_databags(source, conn)
         end
       end
 

data/lib/bellboy/versioner.rb

@@ -26,10 +26,10 @@ module Bellboy
         local_sources = Bellboy.berks_sources(berksfile)
 
         local_sources.each do |source|
-          Bellboy.logger.debug "Source: #{source.cached_cookbook.path}"
+          Bellboy.logger.debug "Source: #{source.path}"
 
-          DatabagVersion.process_all(options[:verbose], "#{source.cached_cookbook.path}/data_bags") if
-            Dir.exists?("#{source.cached_cookbook.path}/data_bags")
+          DatabagVersion.process_all(options[:verbose], "#{source.path}/data_bags") if
+            Dir.exists?("#{source.path}/data_bags")
         end
       end
     end

data/spec/cli_spec.rb

@@ -5,6 +5,8 @@ require 'bellboy'
 require_relative 'spec-helpers'
 
 describe 'cli' do
+  include UsesTempFiles
+
   it 'should output help information if run with no arguments' do
     content = capture(:stdout) { Bellboy::Cli.start(%w[]) }
     expect(content).to match(/Commands:/)
@@ -30,20 +32,30 @@ describe 'cli' do
     expect(content).to match(/Upload all databags for all Cookbooks known by Berkshelf/)
   end
 
-  it 'should not fail to run the \'version\' command with an empty Berksfile' do
-    Bellboy::Cli.start(%w[version -b /dev/null])
+  it 'should fail to run with an invalid Berksfile' do
+    content = capture(:stdout) { lambda{ Bellboy::Cli.start(%w[version -b /i/dont/exist]) }.should exit_with_code(0) }
+    expect(content).to match(/could not be found/)
   end
 
-  it 'should not fail to run the \'install\' command with an empty Berksfile' do
-    Bellboy::Cli.start(%w[install -b /dev/null])
-  end
+  context "with non-empty Berksfile" do
 
-  it 'should not fail to run the \'upload\' command with an empty Berksfile' do
-    Bellboy::Cli.start(%w[upload -b /dev/null])
-  end
+    in_directory_with_file('Berksfile')
+
+    before (:each) do
+      content_for_file("source 'http://example.com'")
+    end
+
+    it 'should not fail to run the \'version\' command' do
+      Bellboy::Cli.start(%w[version -b Berksfile])
+    end
+
+    it 'should not fail to run the \'install\' command' do
+      Bellboy::Cli.start(%w[install -b Berksfile])
+    end
+
+    it 'should not fail to run the \'upload\' command' do
+      Bellboy::Cli.start(%w[upload -b Berksfile])
+    end
 
-  it 'should fail to run with an invalid Berksfile' do
-    content = capture(:stdout) { lambda{ Bellboy::Cli.start(%w[version -b /i/dont/exist]) }.should exit_with_code(0) }
-    expect(content).to match(/could not be found/)
   end
 end

data/spec/installer_spec.rb

@@ -4,11 +4,20 @@ $LOAD_PATH.push File.expand_path('../../lib', __FILE__)
 require 'bellboy'
 
 describe 'installer' do
-  before (:each) do
-    @berksfile = Bellboy.berks_from_file('/dev/null')
-  end
+  include UsesTempFiles
+
+  context "with non-empty Berksfile" do
+
+    in_directory_with_file('Berksfile')
+
+    before (:each) do
+      content_for_file("source 'http://example.com'")
+      @berksfile = Bellboy.berks_from_file('Berksfile')
+    end
+
+    it 'should not throw any exceptions' do
+      Bellboy::Installer.install(@berksfile, {:bellboyfile => '/dev/null'})
+    end
 
-  it 'should not throw any exceptions' do
-    Bellboy::Installer.install(@berksfile)
   end
 end

data/spec/spec-helpers.rb

@@ -19,3 +19,33 @@ RSpec::Matchers.define :exit_with_code do |exp_code|
     "expect block to call exit(#{exp_code})"
   end
 end
+
+module UsesTempFiles
+  def self.included(example_group)
+    example_group.extend(self)
+  end
+
+  def in_directory_with_file(file)
+    before do
+      @pwd = Dir.pwd
+      @tmp_dir = File.join(File.dirname(__FILE__), 'tmp')
+      FileUtils.mkdir_p(@tmp_dir)
+      Dir.chdir(@tmp_dir)
+
+      FileUtils.mkdir_p(File.dirname(file))
+      FileUtils.touch(file)
+    end
+
+    define_method(:content_for_file) do |content|
+      f = File.new(File.join(@tmp_dir, file), 'a+')
+      f.write(content)
+      f.flush
+      f.close
+    end
+
+    after do
+      Dir.chdir(@pwd)
+      FileUtils.rm_rf(@tmp_dir)
+    end
+  end
+end

data/spec/uploader_spec.rb

@@ -4,11 +4,19 @@ $LOAD_PATH.push File.expand_path('../../lib', __FILE__)
 require 'bellboy'
 
 describe 'uploader' do
-  before (:each) do
-    @berksfile = Bellboy.berks_from_file('/dev/null')
-  end
+  include UsesTempFiles
+
+  context "with non-empty Berksfile" do
+
+    in_directory_with_file('Berksfile')
+
+    before (:each) do
+      content_for_file("source 'http://example.com'")
+      @berksfile = Bellboy.berks_from_file('Berksfile')
+    end
 
-  it 'should not throw any exceptions' do
-    Bellboy::Uploader.upload(@berksfile)
+    it 'should not throw any exceptions' do
+      Bellboy::Uploader.upload(@berksfile)
+    end
   end
 end

data/spec/versioner_spec.rb

@@ -4,11 +4,19 @@ $LOAD_PATH.push File.expand_path('../../lib', __FILE__)
 require 'bellboy'
 
 describe 'versioner' do
-  before (:each) do
-    @berksfile = Bellboy.berks_from_file('/dev/null')
-  end
+  include UsesTempFiles
+
+  context "with non-empty Berksfile" do
+
+    in_directory_with_file('Berksfile')
+
+    before (:each) do
+      content_for_file("source 'http://example.com'")
+      @berksfile = Bellboy.berks_from_file('Berksfile')
+    end
 
-  it 'should not throw any exceptions' do
-    Bellboy::Versioner.version(@berksfile)
+    it 'should not throw any exceptions' do
+      Bellboy::Versioner.version(@berksfile)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bellboy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.18.0
-- !ruby/object:Gem::Dependency
-  name: berkshelf
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.10
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: knife-data-bag-version
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +105,7 @@ files:
 - spec/spec-helpers.rb
 - spec/uploader_spec.rb
 - spec/versioner_spec.rb
-homepage: ''
+homepage: https://github.com/Vanders/bellboy
 licenses:
 - Apache-2.0
 post_install_message: