vagabond 0.2.8 → 0.2.10

data/lib/vagabond/vagabondfile.rb

@@ -1,20 +1,68 @@
+#encoding: utf-8
 require 'chef/mash'
+require 'attribute_struct'
 
 module Vagabond
   class Vagabondfile
 
+    class << self
+      def describe(&block)
+        inst = AttributeStruct.new
+        if(block.arity != 1)
+          inst.instance_exec(&block)
+        else
+          inst.instance_exec(inst, &block)
+        end
+        inst
+      end
+    end
+
     attr_reader :path
     attr_reader :config
 
-    DEFAULT_KEYS = %w(boxes mappings test_mappings spec_mappings local_chef_server)
-    ALIASES = Mash.new(:boxes => :nodes, :nodes => :boxes)
-    
+    DEFAULT_KEYS = %w(defaults definitions nodes clusters specs server callbacks)
+    ALIASES = Mash.new(
+      :boxes => :nodes,
+      :nodes => :boxes,
+      :local_chef_server => :server,
+      :server => :local_chef_server
+    )
+
     def initialize(path=nil, *args)
       path = discover_path(Dir.pwd) unless path
       @path = path
       load_configuration!(args.include?(:allow_missing))
     end
 
+    def callbacks_for(name)
+      callbacks = self[:callbacks] || Mash.new
+      callbacks = Chef::Mixin::DeepMerge.merge(callbacks, for_node(name, :allow_missing)[:callbacks])
+      callbacks
+    end
+
+    def for_node(name, *args)
+      unless(self[:nodes][name])
+        return Mash.new if args.include?(:allow_missing)
+        raise VagabondError::InvalidName.new("Requested name is not a valid node name: #{name}")
+      end
+      if(self[:nodes][name][:definition])
+        base = for_definition(self[:nodes][name][:definition])
+      else
+        base = self[:defaults]
+      end
+      base = Chef::Mixin::DeepMerge.merge(base, self[:nodes][name])
+      base
+    end
+
+    def for_definition(name)
+      base = self[:defaults]
+      unless(self[:definitions][name])
+        raise VagabondError::InvalidName.new("Requested name is not a valid definition name: #{name}")
+      end
+      base = Chef::Mixin::DeepMerge.merge(base, self[:definitions][name])
+      base
+    end
+
     def [](k)
       if(DEFAULT_KEYS.include?(k.to_s))
         @config[k] ||= Mash.new
@@ -40,7 +88,7 @@ module Vagabond
         end
       end
     end
-    
+
     def load_configuration!(*args)
       unless(args.empty?)
         no_raise = args.first == true
@@ -48,7 +96,12 @@ module Vagabond
         no_raise ||= force_store
       end
       if(@path && File.exists?(@path))
-        @config = Mash.new(self.instance_eval(IO.read(@path), @path, 1))
+        thing = self.instance_eval(IO.read(@path), @path, 1)
+        if(thing.is_a?(AttributeStruct))
+          @config = Mash.new(thing._dump)
+        else
+          @config = Mash.new(thing)
+        end
       end
       if(!@config || force_store)
         raise 'No Vagabondfile file found!' unless no_raise
@@ -57,11 +110,22 @@ module Vagabond
       end
     end
 
+    def build_private_store
+      unless(@_private_store_path)
+        @_private_store_path = File.join('/tmp/vagabond-solos', directory.gsub(%r{[^0-9a-zA-Z]}, '-'), 'Vagabondfile')
+        @_private_store_path = File.expand_path(@_private_store_path.gsub('-', '/'))
+        FileUtils.mkdir_p(File.dirname(@_private_store_path))
+        File.dirname(@_private_store_path)
+      end
+      File.dirname(@_private_store_path)
+    end
+
     def generate_store_path
       @path ||= File.expand_path(File.join(Dir.pwd, 'Vagabondfile'))
-      @store_path = File.join('/tmp/vagabond-solos', directory.gsub(%r{[^0-9a-zA-Z]}, '-'), 'Vagabondfile')
-      @store_path = File.expand_path(@store_path.gsub('-', '/'))
-      FileUtils.mkdir_p(File.dirname(@store_path))
+      unless(@store_path)
+        build_private_store
+        @store_path = @_private_store_path
+      end
       File.dirname(@store_path)
     end
 
@@ -76,7 +140,7 @@ module Vagabond
     def store_directory
       File.dirname(@store_path || @path)
     end
-    
+
     def discover_path(path)
       d_path = Dir.glob(File.join(path, 'Vagabondfile')).first
       unless(d_path)

data/lib/vagabond/version.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Vagabond
   class Version < Gem::Version
     attr_reader :codename
@@ -6,5 +7,5 @@ module Vagabond
       super(v)
     end
   end
-  VERSION = Version.new('0.2.8', 'nomad')
+  VERSION = Version.new('0.2.10', 'Hi friend')
 end

data/vagabond.gemspec

@@ -1,16 +1,16 @@
+#encoding: utf-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__)) + '/lib/'
 require 'vagabond/version'
 
 Gem::Specification.new do |s|
   s.name = 'vagabond'
   s.version = Vagabond::VERSION.version
-  s.summary = 'Vagabond creator'
+  s.summary = 'Node building and testing tooling'
   s.author = 'Chris Roberts'
-  s.email = 'chrisroberts.code@gmail.com'
+  s.email = 'code@chrisroberts.org'
   s.homepage = 'http://github.com/chrisroberts/vagabond'
-  s.description = 'Vagabonds, lazing about'
+  s.description = 'LXC driven node generation and testing tooling'
   s.require_path = 'lib'
-  s.has_rdoc = true
   s.extra_rdoc_files = ['README.md']  
   s.files = Dir['**/*']
   s.executables = ['vagabond']
@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'test-kitchen', '>= 1.0.0.alpha'
   s.add_dependency 'thor'
   s.add_dependency 'uuidtools'
-  s.add_dependency 'elecksee', '>= 1.0.6'
+  s.add_dependency 'elecksee', '>= 1.0.10'
   s.add_dependency 'serverspec', '>= 0.6.3'
+  s.add_dependency 'attribute_struct'
+  s.add_dependency 'knife-bootstrapsync'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagabond
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.10
 - !ruby/object:Gem::Dependency
   name: serverspec
   requirement: !ruby/object:Gem::Requirement
@@ -123,89 +123,53 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.3
-description: Vagabonds, lazing about
-email: chrisroberts.code@gmail.com
+- !ruby/object:Gem::Dependency
+  name: attribute_struct
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: knife-bootstrapsync
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: LXC driven node generation and testing tooling
+email: code@chrisroberts.org
 executables:
 - vagabond
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- lib/vagabond/cookbooks/lxc/files/default/lxc-awesome-ephemeral
-- lib/vagabond/cookbooks/lxc/files/default/knife_lxc
-- lib/vagabond/cookbooks/lxc/metadata.rb
-- lib/vagabond/cookbooks/lxc/templates/default/interface.erb
-- lib/vagabond/cookbooks/lxc/templates/default/fstab.erb
-- lib/vagabond/cookbooks/lxc/templates/default/client.rb.erb
-- lib/vagabond/cookbooks/lxc/templates/default/file_content.erb
-- lib/vagabond/cookbooks/lxc/templates/default/default-lxc.erb
-- lib/vagabond/cookbooks/lxc/Gemfile
-- lib/vagabond/cookbooks/lxc/attributes/default.rb
-- lib/vagabond/cookbooks/lxc/README.md
-- lib/vagabond/cookbooks/lxc/providers/fstab.rb
-- lib/vagabond/cookbooks/lxc/providers/default.rb
-- lib/vagabond/cookbooks/lxc/providers/interface.rb
-- lib/vagabond/cookbooks/lxc/providers/service.rb
-- lib/vagabond/cookbooks/lxc/providers/config.rb
-- lib/vagabond/cookbooks/lxc/providers/ephemeral.rb
-- lib/vagabond/cookbooks/lxc/providers/container.rb
-- lib/vagabond/cookbooks/lxc/libraries/monkey.rb
-- lib/vagabond/cookbooks/lxc/libraries/lxc_file_config.rb
-- lib/vagabond/cookbooks/lxc/libraries/lxc_expanded_resources.rb
-- lib/vagabond/cookbooks/lxc/libraries/lxc.rb
-- lib/vagabond/cookbooks/lxc/resources/fstab.rb
-- lib/vagabond/cookbooks/lxc/resources/default.rb
-- lib/vagabond/cookbooks/lxc/resources/interface.rb
-- lib/vagabond/cookbooks/lxc/resources/service.rb
-- lib/vagabond/cookbooks/lxc/resources/config.rb
-- lib/vagabond/cookbooks/lxc/resources/ephemeral.rb
-- lib/vagabond/cookbooks/lxc/resources/container.rb
-- lib/vagabond/cookbooks/lxc/CHANGELOG.md
-- lib/vagabond/cookbooks/lxc/Gemfile.lock
-- lib/vagabond/cookbooks/lxc/recipes/default.rb
-- lib/vagabond/cookbooks/lxc/recipes/install_dependencies.rb
-- lib/vagabond/cookbooks/lxc/recipes/knife.rb
-- lib/vagabond/cookbooks/lxc/recipes/containers.rb
-- lib/vagabond/cookbooks/vagabond/files/default/lxc-centos
-- lib/vagabond/cookbooks/vagabond/metadata.rb
-- lib/vagabond/cookbooks/vagabond/attributes/default.rb
-- lib/vagabond/cookbooks/vagabond/README.md
-- lib/vagabond/cookbooks/vagabond/libraries/vagabond.rb
-- lib/vagabond/cookbooks/vagabond/recipes/default.rb
-- lib/vagabond/cookbooks/vagabond/recipes/zero.rb
-- lib/vagabond/cookbooks/apt/files/default/apt-proxy-v2.conf
-- lib/vagabond/cookbooks/apt/metadata.rb
-- lib/vagabond/cookbooks/apt/templates/default/01proxy.erb
-- lib/vagabond/cookbooks/apt/templates/default/acng.conf.erb
-- lib/vagabond/cookbooks/apt/templates/debian-6.0/acng.conf.erb
-- lib/vagabond/cookbooks/apt/templates/ubuntu-10.04/acng.conf.erb
-- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/files/default/tests/minitest/cacher-ng_test.rb
-- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/files/default/tests/minitest/lwrps_test.rb
-- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/files/default/tests/minitest/default_test.rb
-- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/files/default/tests/minitest/support/helpers.rb
-- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/metadata.rb
-- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/README.md
-- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/recipes/default.rb
-- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/recipes/cacher-ng.rb
-- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/recipes/lwrps.rb
-- lib/vagabond/cookbooks/apt/Berksfile
-- lib/vagabond/cookbooks/apt/attributes/default.rb
-- lib/vagabond/cookbooks/apt/README.md
-- lib/vagabond/cookbooks/apt/LICENSE
-- lib/vagabond/cookbooks/apt/CONTRIBUTING
-- lib/vagabond/cookbooks/apt/providers/repository.rb
-- lib/vagabond/cookbooks/apt/providers/preference.rb
-- lib/vagabond/cookbooks/apt/TESTING.md
-- lib/vagabond/cookbooks/apt/resources/repository.rb
-- lib/vagabond/cookbooks/apt/resources/preference.rb
-- lib/vagabond/cookbooks/apt/CHANGELOG.md
-- lib/vagabond/cookbooks/apt/recipes/default.rb
-- lib/vagabond/cookbooks/apt/recipes/cacher-ng.rb
-- lib/vagabond/cookbooks/apt/recipes/cacher-client.rb
 - lib/vagabond/errors.rb
+- lib/vagabond/Cheffile
 - lib/vagabond/server.rb
 - lib/vagabond/kitchen.rb
 - lib/vagabond/vagabondfile.rb
+- lib/vagabond/bootstraps/chef_10_compat_config.erb
+- lib/vagabond/bootstraps/no_lazy_load.erb
 - lib/vagabond/bootstraps/server-zero.erb
 - lib/vagabond/bootstraps/server.erb
 - lib/vagabond/version.rb
@@ -216,10 +180,19 @@ files:
 - lib/vagabond/uploader/berkshelf.rb
 - lib/vagabond/uploader/knife.rb
 - lib/vagabond/uploader/librarian.rb
+- lib/vagabond/core.rb
 - lib/vagabond/constants.rb
 - lib/vagabond/helpers.rb
 - lib/vagabond/spec.rb
-- lib/vagabond/helpers/cheffile_loader.rb
+- lib/vagabond/settings.rb
+- lib/vagabond/helpers/commands.rb
+- lib/vagabond/helpers/callbacks.rb
+- lib/vagabond/helpers/server.rb
+- lib/vagabond/helpers/naming.rb
+- lib/vagabond/helpers/knife.rb
+- lib/vagabond/helpers/chains.rb
+- lib/vagabond/helpers/base.rb
+- lib/vagabond/notify_mash.rb
 - lib/vagabond/internal_configuration.rb
 - lib/vagabond/actions/up.rb
 - lib/vagabond/actions/create.rb
@@ -233,17 +206,21 @@ files:
 - lib/vagabond/actions/destroy.rb
 - lib/vagabond/actions/freeze.rb
 - lib/vagabond/actions/ssh.rb
+- lib/vagabond/Cheffile.dev
 - lib/vagabond/uploader.rb
 - lib/vagabond.rb
 - test/Vagrantfile
-- vagabond-0.2.6.gem
+- Gemfile
 - README.md
 - LICENSE
 - vagabond.gemspec
 - Vagrantfile
 - bin/vagabond
+- Vagabondfile.sample
 - USAGE.md
 - CHANGELOG.md
+- Gemfile.lock
+- DEVELOP.md
 homepage: http://github.com/chrisroberts/vagabond
 licenses: []
 post_install_message: 
@@ -267,6 +244,6 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Vagabond creator
+summary: Node building and testing tooling
 test_files: []
-has_rdoc: true
+has_rdoc: 

data/lib/vagabond/cookbooks/apt/Berksfile

@@ -1,8 +0,0 @@
-site :opscode
-
-metadata
-
-group :integration do
-  cookbook "minitest-handler"
-  cookbook "apt_test", :path => "./test/cookbooks/apt_test"
-end

data/lib/vagabond/cookbooks/apt/CHANGELOG.md

@@ -1,97 +0,0 @@
-## v2.0.0:
-
-### Bug
-
-- [COOK-2258]: apt: LWRP results in error under why-run mode in apt 1.9.0 cookbook
-
-## v1.10.0:
-
-### Improvement
-
-- [COOK-2885]: Improvements for apt cache server search
-
-### Bug
-
-- [COOK-2441]: Apt recipe broken in new chef version
-- [COOK-2660]: Create Debian 6.0 "squeeze" specific template for
-  apt-cacher-ng
-
-## v1.9.2:
-
-* [COOK-2631] - Create Ubuntu 10.04 specific template for apt-cacher-ng
-
-## v1.9.0:
-
-* [COOK-2185] - Proxy for apt-key
-* [COOK-2338] - Support pinning by glob() or regexp
-
-## v1.8.4:
-
-* [COOK-2171] - Update README to clarify required Chef version: 10.18.0
-  or higher.
-
-## v1.8.2:
-
-* [COOK-2112] - need [] around "arch" in sources.list entries
-* [COOK-2171] - fixes a regression in the notification
-
-## v1.8.0:
-
-* [COOK-2143] - Allow for a custom cacher-ng port
-* [COOK-2171] - On `apt_repository.run_action(:add)` the source file
-  is not created.
-* [COOK-2184] - apt::cacher-ng, use `cacher_port` attribute in
-  acng.conf
-
-## v1.7.0:
-
-* [COOK-2082] - add "arch" parameter to apt_repository LWRP
-
-## v1.6.0:
-
-* [COOK-1893] - `apt_preference` use "`package_name`" resource instead of "name"
-* [COOK-1894] - change filename for sources.list.d files
-* [COOK-1914] - Wrong dir permissions for /etc/apt/preferences.d/
-* [COOK-1942] - README.md has wrong name for the keyserver attribute
-* [COOK-2019] - create 01proxy before any other apt-get updates get executed
-
-## v1.5.2:
-
-* [COOK-1682] - use template instead of file resource in apt::cacher-client
-* [COOK-1875] - cacher-client should be Environment-aware
-
-## V1.5.0:
-
-* [COOK-1500] - Avoid triggering apt-get update
-* [COOK-1548] - Add execute commands for autoclean and autoremove
-* [COOK-1591] - Setting up the apt proxy should leave https
-  connections direct
-* [COOK-1596] - execute[apt-get-update-periodic] never runs
-* [COOK-1762] - create /etc/apt/preferences.d directory
-* [COOK-1776] - apt key check isn't idempotent
-
-## v1.4.8:
-
-* Adds test-kitchen support
-* [COOK-1435] - repository lwrp is not idempotent with http key
-
-## v1.4.6:
-
-* [COOK-1530] - apt_repository isn't aware of update-success-stamp
-  file (also reverts COOK-1382 patch).
-
-## v1.4.4:
-
-* [COOK-1229] - Allow cacher IP to be set manually in non-Chef Solo
-  environments
-* [COOK-1530] - Immediately update apt-cache when sources.list file is dropped off
-
-## v1.4.2:
-
-* [COOK-1155] - LWRP for apt pinning
-
-## v1.4.0:
-
-* [COOK-889] - overwrite existing repo source files
-* [COOK-921] - optionally use cookbook\_file or remote\_file for key
-* [COOK-1032] - fixes problem with apt repository key installation