builderator 1.0.0.pre.rc.8 → 1.0.0.pre.rc.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3107e46a56b06938100d063863069057d3e41029
-  data.tar.gz: c3ee1359da52f109a0df1ae5ae10c157495548f6
+  metadata.gz: ff5accfec82561d29eafb07b3477a9f739684fd2
+  data.tar.gz: ac6c8c3d414ddff108046a84fc5c32e0ac4a10a3
 SHA512:
-  metadata.gz: dc7996bbb42485c088b907a5b6d4e4f37a58071eb9a82625890507f80c9fb40ed42e1eadcf9c7f2248e85ed44367f43627df808854e3b4da65de9febdd0dd022
-  data.tar.gz: 8151b9909f77548a9ed8c338efe27e487edf1dcb23118de4c6644e33fd049d1339caea8d913e8b6b36c89497945de373ce028e146d6888428e5fad1e8b0775a6
+  metadata.gz: 8e50ade752fcfa4ae0d80bbb90eb614d9cb52301f614d76efe02239ce3cece1e1413724039e4bdb4c0d11fdef7aec1bdddc8898fb7232c8f88d6a5ca63ec4153
+  data.tar.gz: 161932a36e9ac67e57fcfc7ccb682bb44cbebd279be4c467ed5002e7f09ab20f7f706a69ed3c25eb80f342e3b8b5623f48bf6675270cb9e7c7d77cf0c3df5ae1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    builderator (1.0.0.pre.rc.7)
+    builderator (1.0.0.pre.rc.8)
       aws-sdk (~> 2.0)
       berkshelf (~> 3.2)
       chef (~> 12.0)
@@ -16,12 +16,12 @@ GEM
     ast (2.1.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
-    aws-sdk (2.2.9)
-      aws-sdk-resources (= 2.2.9)
-    aws-sdk-core (2.2.9)
+    aws-sdk (2.2.16)
+      aws-sdk-resources (= 2.2.16)
+    aws-sdk-core (2.2.16)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.9)
-      aws-sdk-core (= 2.2.9)
+    aws-sdk-resources (2.2.16)
+      aws-sdk-core (= 2.2.16)
     berkshelf (3.3.0)
       addressable (~> 2.3.4)
       berkshelf-api-client (~> 1.2)
@@ -56,23 +56,22 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef (12.6.0)
-      chef-config (= 12.6.0)
-      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)
       proxifier (~> 1.0)
-      pry (~> 0.9)
       rspec-core (~> 3.4)
       rspec-expectations (~> 3.4)
       rspec-mocks (~> 3.4)
@@ -80,18 +79,18 @@ GEM
       serverspec (~> 2.7)
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
-    chef-config (12.6.0)
+      uuidtools (~> 2.1.5)
+    chef-config (12.7.2)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-zero (4.4.0)
+    chef-zero (4.5.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
       rack
       uuidtools (~> 2.1)
     cleanroom (1.0.0)
-    coderay (1.1.0)
-    dep-selector-libgecode (1.0.2)
+    dep-selector-libgecode (1.1.0)
     dep_selector (1.0.3)
       dep-selector-libgecode (~> 1.0)
       ffi (~> 1.9)
@@ -109,14 +108,16 @@ GEM
     hitimes (1.2.3)
     httpclient (2.6.0.1)
     ignorefile (1.1.0)
-    ipaddress (0.8.0)
+    ipaddress (0.8.2)
     jmespath (1.1.3)
     json (1.8.3)
     libyajl2 (1.2.0)
-    method_source (0.8.2)
     minitar (0.5.4)
-    mixlib-authentication (1.3.0)
+    mixlib-authentication (1.4.0)
       mixlib-log
+      rspec-core (~> 3.2)
+      rspec-expectations (~> 3.2)
+      rspec-mocks (~> 3.2)
     mixlib-cli (1.5.0)
     mixlib-config (2.2.1)
     mixlib-log (1.6.0)
@@ -125,17 +126,17 @@ GEM
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
+    net-ssh (3.0.2)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
-    nio4r (1.2.0)
+    nio4r (1.2.1)
     octokit (3.8.0)
       sawyer (~> 0.6.0, >= 0.5.3)
-    ohai (8.8.1)
+    ohai (8.10.0)
       chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -152,15 +153,11 @@ GEM
     plist (3.1.0)
     powerpack (0.1.1)
     proxifier (1.0.3)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
     rack (1.6.4)
     rainbow (2.0.0)
     rake (10.4.2)
     retryable (2.0.3)
-    ridley (4.3.0)
+    ridley (4.4.2)
       addressable
       buff-config (~> 1.0)
       buff-extensions (~> 1.0)
@@ -168,6 +165,7 @@ GEM
       buff-shell_out (~> 0.1)
       celluloid (~> 0.16.0)
       celluloid-io (~> 0.16.1)
+      chef-config
       erubis
       faraday (~> 0.9.0)
       hashie (>= 2.0.2, < 4.0.0)
@@ -176,7 +174,7 @@ GEM
       mixlib-authentication (>= 1.3.0)
       retryable (~> 2.0)
       semverse (~> 1.1)
-      varia_model (~> 0.4)
+      varia_model (~> 0.4.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -208,17 +206,16 @@ GEM
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     semverse (1.2.1)
-    serverspec (2.28.0)
+    serverspec (2.29.2)
       multi_json
       rspec (~> 3.0)
       rspec-its
       specinfra (~> 2.48)
     sfl (2.2)
-    slop (3.6.0)
     solve (1.2.1)
       dep_selector (~> 1.0)
       semverse (~> 1.1)
-    specinfra (2.49.0)
+    specinfra (2.51.0)
       net-scp
       net-ssh (>= 2.7, < 3.1)
       net-telnet
@@ -233,7 +230,7 @@ GEM
       hitimes
     tins (1.6.0)
     uuidtools (2.1.5)
-    varia_model (0.5.0)
+    varia_model (0.4.1)
       buff-extensions (~> 1.0)
       hashie (>= 2.0.2, < 4.0.0)
     wmi-lite (1.0.0)
@@ -247,3 +244,6 @@ DEPENDENCIES
   rspec (~> 3.0)
   rubocop (~> 0.35)
   thor-scmversion (= 1.7.0)
+
+BUNDLED WITH
+   1.10.5

data/README.md

@@ -4,6 +4,8 @@ Orchestration and configuration of the code development life-cycle.
 
 ## Commands
 
+Run `build help` for a complete enumeration of Builderator's commands.
+
 ### `local [PROFILE = default]`
 
 Provision a local VM using Vagrant and, by default, VirtualBox. Uses Berkshelf to fetch cookbooks, and Chef to provision the VM.
@@ -12,9 +14,9 @@ Provision a local VM using Vagrant and, by default, VirtualBox. Uses Berkshelf t
 
 Provision an EC2 VM using Vagrant. Same workflow as `local` using the `vagrant-aws` plugin.
 
-### `release [PROFILE = default]`
+### `image [PROFILE = default]`
 
-Perform release tasks and execute Packer builds with released artifacts.
+Use [Packer](packer.io) to build an image(s) for the specified profile.
 
 ## Configuration
 
@@ -35,9 +37,17 @@ Builderator integrates with other tools, including [Berkshelf](http://berkshelf.
 
 ### Packer
 
-The Packer integration generates Packer JSON and passes it to STDIN of `packer build -`.
+The Packer integration generates a Packer JSON configuration and passes it to STDIN of `packer build -`.
+
+### Vagrant
+
+Builderator shells out to Vagrant to provision VMs on demand. Run
+
+```sh
+build vagrant plugins
+```
 
-    *NOTE* Currently, we assume that you're building Ubuntu images, as one of the provisioners is hard-coded to chown the Chef data directories to `ubuntu:ubuntu`
+to install required plugins for Builderator.
 
 ## Versioning
 
@@ -82,3 +92,27 @@ end
 Valid actions for resources include `:ignore`, `:create` (update only if missing), `:sync` (create or update with prompt), and `:rm`. `:create` and `:sync` actions require a valid template source.
 
 By default, the `generator` subcommand includes a `default` project which removes Vagrant, Berkshelf, and Packer configurations.
+
+## Utilities
+
+Builderator includes two utilities to search for and clean up EC2 resources.
+
+### `build-clean`
+
+The `build-clean` command prunes old EC2 resources in a region. The cleaner utility has [configurable](docs/configuration.md#namespace-cleaner) limits. For complete usage, run `build-clean help`.
+
+### `build-data`
+
+The `build-data` utility is a command line interface for Builderator's internal resource lookup API. It has a limited query interface that allows filters to be constructed from a trailing list of argument:
+
+```sh
+build-data image architecture x86_64 virtualization-type hvm ...
+```
+
+Pre-defined filters can also be applied with the `-f FILTER` flag. These currently include
+
+* `ubuntu-14.04-daily`
+* `windows-server2012-r2`
+* `windows-server2012-r2-core`
+
+Run `build-data help` for a complete listing of commands and arguments.

data/VERSION

@@ -1 +1 @@
-1.0.0-rc.8
+1.0.0-rc.9

data/lib/builderator/tasks/vagrant.rb

@@ -98,13 +98,6 @@ module Builderator
         end
       end
 
-      desc 'rebuild ARGS', 'Destroy and recreate Vagrant VM(s)'
-      method_option :force, :aliases => :f, :type => :boolean, :default => true
-      def rebuild(profile = :default, *args)
-        destroy(profile, *args)
-        up(profile, *args)
-      end
-
       desc 'clean', 'Destroy VMs and clean up local files'
       method_option :force, :aliases => :f, :type => :boolean, :default => true
       def clean(profile = :default)

data/template/Vagrantfile.erb

@@ -10,7 +10,9 @@ Vagrant.configure('2') do |config|
     local.cpus = <%= profile.current.vagrant.local.cpus %>
 
     override.vm.box = '<%= profile.current.vagrant.local.box %>'
+<% if profile.current.vagrant.local.has?(:box_url) -%>
     override.vm.box_url = '<%= profile.current.vagrant.local.box_url %>'
+<% end -%>
   end
 
   ## EC2 Provider
@@ -68,8 +70,14 @@ Vagrant.configure('2') do |config|
 <% unless profile.current.chef.environment.nil? -%>
     chef.environment = '<%= profile.current.chef.environment %>'
 <% end -%>
-<% unless profile.current.chef.node_attrs.nil? -%>
+
+<% if profile.current.chef.node_attrs.nil? -%>
+    chef.json = {}
+<% else -%>
     chef.json = <%= profile.current.chef.node_attrs %>
 <% end -%>
+
+    ## Tell Chef that this is a Vagrant build
+    chef.json[:vagrant] = true
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builderator
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc.8
+  version: 1.0.0.pre.rc.9
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -271,4 +271,3 @@ test_files:
 - spec/resource/Buildfile
 - spec/spec_helper.rb
 - spec/version_spec.rb
-has_rdoc: