builderator 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89e14c2393d87e5b4a95b6e08442efde1b56a3d2
-  data.tar.gz: 5c0e467fc4f9228e7d2c981ecd607c1659072d7f
+  metadata.gz: 52ba96400e257cab5d027e0660517fc8f9a441e7
+  data.tar.gz: 96427250ed38ca68e25c15e9929688a5b8b0eabd
 SHA512:
-  metadata.gz: 87cb9385e02b95d9672ab4fceb21bd905b27e6aeaa142d317e3ef182888851999e0db0400703a86d6d65b2934567715a4509222f701b62cd5097bc866d31254a
-  data.tar.gz: 0448ea00eb5a00064975a18df49d468e17da249b2eb8cf48ea52109ff0136c8c4b194ffa0bfb2bf2ebddcff2953130e469936a4322412d937a98ab5f69f9a2d0
+  metadata.gz: f805d125bf84917a960d10f53b26d34b2ba12553ee82385e45b2879ba21bfa58ce7b55d3519bf85b54ee99a060f20becda48b848d824431a402e6cde918b97b1
+  data.tar.gz: ea3ad354a1a0a9e37e7fab78cdb8b491d5010c2db4d374c7bd821f4fb2579a119dceba437938fab90f50ecd435bb7588a9b04ead36ddacb0565318da20e36dd8

data/Gemfile.lock

@@ -15,13 +15,13 @@ GEM
   specs:
     addressable (2.4.0)
     ast (2.3.0)
-    aws-sdk (2.3.13)
-      aws-sdk-resources (= 2.3.13)
-    aws-sdk-core (2.3.13)
+    aws-sdk (2.3.14)
+      aws-sdk-resources (= 2.3.14)
+    aws-sdk-core (2.3.14)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.13)
-      aws-sdk-core (= 2.3.13)
-    berkshelf (4.3.3)
+    aws-sdk-resources (2.3.14)
+      aws-sdk-core (= 2.3.14)
+    berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
       buff-config (~> 1.0)
@@ -33,6 +33,7 @@ GEM
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
+      mixlib-archive (~> 0.1)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 4.5)
@@ -56,30 +57,31 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef (12.5.1)
-      chef-config (= 12.5.1)
-      chef-zero (~> 4.2, >= 4.2.2)
+    chef (12.7.2)
+      chef-config (= 12.7.2)
+      chef-zero (~> 4.5)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
-      mixlib-authentication (~> 1.3)
+      mixlib-authentication (~> 1.4)
       mixlib-cli (~> 1.4)
       mixlib-log (~> 1.3)
       mixlib-shellout (~> 2.0)
-      net-ssh (~> 2.6)
+      net-ssh (>= 2.9, < 4.0)
       net-ssh-multi (~> 1.1)
       ohai (>= 8.6.0.alpha.1, < 9)
       plist (~> 3.1.0)
-      pry (~> 0.9)
-      rspec-core (~> 3.2)
-      rspec-expectations (~> 3.2)
-      rspec-mocks (~> 3.2)
+      proxifier (~> 1.0)
+      rspec-core (~> 3.4)
+      rspec-expectations (~> 3.4)
+      rspec-mocks (~> 3.4)
       rspec_junit_formatter (~> 0.2.0)
       serverspec (~> 2.7)
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
-    chef-config (12.5.1)
+      uuidtools (~> 2.1.5)
+    chef-config (12.7.2)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     chef-zero (4.6.2)
@@ -89,7 +91,6 @@ GEM
       rack
       uuidtools (~> 2.1)
     cleanroom (1.0.0)
-    coderay (1.1.1)
     dep-selector-libgecode (1.2.0)
     dep_selector (1.0.3)
       dep-selector-libgecode (~> 1.0)
@@ -114,8 +115,8 @@ GEM
     json (1.8.3)
     json_pure (1.8.3)
     libyajl2 (1.2.0)
-    method_source (0.8.2)
     minitar (0.5.4)
+    mixlib-archive (0.1.0)
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-cli (1.6.0)
@@ -127,7 +128,7 @@ GEM
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.4)
+    net-ssh (3.1.1)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.1)
@@ -153,10 +154,7 @@ GEM
       ast (~> 2.2)
     plist (3.1.0)
     powerpack (0.1.1)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+    proxifier (1.0.3)
     rack (1.6.4)
     rainbow (2.1.0)
     rake (10.5.0)
@@ -215,7 +213,6 @@ GEM
       rspec-its
       specinfra (~> 2.53)
     sfl (2.2)
-    slop (3.6.0)
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)

data/README.md

@@ -37,6 +37,31 @@ Configuration can be loaded from DSL files as well as JSON and command line argu
 
 Builderator integrates with other tools, including [Berkshelf](http://berkshelf.com), [Vagrant](https://www.vagrantup.com/), and [Packer](https://www.packer.io/), to orchestrate workflows by generating `Berksfile`s, `Vagrantfile`s, and JSON strings for Packer. This means that you can replace all of these files in your project with a single `Buildfile`.
 
+### Berkshelf
+
+The Berkshelf integration generates a Berksfile. The following configuration
+values are supported.
+
+#### solver
+
+The generated Berksfile uses the `:gecode` dependency resolver by default. To
+use the `:ruby` solver, add this snippet to your Buildfile.
+
+```ruby
+berkshelf do |berks|
+  berks.solver :ruby
+end
+```
+
+For help debugging cookbook dependency issues, you can set the `DEBUG_RESOLVER`
+environment variable and use the `--debug` flag when running `build berks`
+sucommands.
+
+```bash
+export DEBUG_RESOLVER=1
+build berks vendor --debug
+```
+
 ### Packer
 
 The Packer integration generates a Packer JSON configuration and passes it to STDIN of `packer build -`.

data/VERSION

@@ -1 +1 @@
-1.1.7
+1.1.8

data/lib/builderator/config/defaults.rb

@@ -32,6 +32,10 @@ module Builderator
         cookbook.add_source 'https://supermarket.chef.io'
       end
 
+      berkshelf do |berkshelf|
+        berkshelf.solver :gecode
+      end
+
       aws.region 'us-east-1'
 
       profile :default do |profile|

data/lib/builderator/config/file.rb

@@ -132,6 +132,10 @@ module Builderator
         attribute :version
       end
 
+      namespace :berkshelf do
+        attribute :solver
+      end
+
       ##
       # Cookbook build options
       ##

data/lib/builderator/patch/berkshelf.rb

@@ -16,8 +16,3 @@ module FaradayMiddleware
 end
 
 Faraday::Response.register_middleware :gzip => FaradayMiddleware::Gzip
-
-# Force Berkshelf to use the gecode dependency solver
-require 'solve'
-
-Solve.engine = :gecode

data/rvm.env

@@ -1,14 +1,14 @@
-declare -x GEM_HOME="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-2"
-declare -x GEM_PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-2:/home/jenkins/.rvm/gems/ruby-2.1.5@global"
+declare -x GEM_HOME="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-0"
+declare -x GEM_PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-0:/home/jenkins/.rvm/gems/ruby-2.1.5@global"
 declare -x HOME="/home/jenkins"
-declare -x HUDSON_COOKIE="e18797dc-72cf-4e64-9f78-1a26e5fe5703"
+declare -x HUDSON_COOKIE="9f5b176e-8e17-4db0-9dd4-67911f3f1a9c"
 declare -x IRBRC="/home/jenkins/.rvm/rubies/ruby-2.1.5/.irbrc"
 declare -x LANG="en_US.UTF-8"
 declare -x LC_ALL="en_US.UTF-8"
 declare -x MY_RUBY_HOME="/home/jenkins/.rvm/rubies/ruby-2.1.5"
 declare -x NLSPATH="/usr/dt/lib/nls/msg/%L/%N.cat"
 declare -x OLDPWD
-declare -x PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-2/bin:/home/jenkins/.rvm/gems/ruby-2.1.5@global/bin:/home/jenkins/.rvm/rubies/ruby-2.1.5/bin:/home/jenkins/.rvm/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
+declare -x PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-0/bin:/home/jenkins/.rvm/gems/ruby-2.1.5@global/bin:/home/jenkins/.rvm/rubies/ruby-2.1.5/bin:/home/jenkins/.rvm/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
 declare -x PWD="/home/jenkins/workspace/gem-public-builderator-master"
 declare -x RUBY_VERSION="ruby-2.1.5"
 declare -x SHLVL="1"

data/spec/config_spec.rb

@@ -8,6 +8,11 @@ module Builderator
       Config.load(::File.expand_path('../resource/Buildfile', __FILE__))
     end
 
+    it 'defaults to the gecode solver' do
+      Config.compile
+      expect(Config.berkshelf.solver).to eq :gecode
+    end
+
     it 'loads a DSL file' do
       expect(Config.layers.length).to eq 1
     end

data/template/Berksfile.erb

@@ -8,3 +8,5 @@ source '<%= s %>'
 <% cookbook.depends.each do |name, cookbook| -%>
 cookbook '<%= name %>', '<%= cookbook.fetch(:version, '>= 0.0.0') %>', <%= cookbook.to_hash %>
 <% end -%>
+
+solver :<%= berkshelf.solver %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builderator
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake