chef-tlc-workflow 0.1.3 → 0.2.0

data/Gemfile

@@ -1,7 +1,4 @@
 source 'https://rubygems.org'
 
-source 'https://gems.gemfury.com/hUe8s8nSyzxs7JMMSZV8/' # vagrant-1.0.5.1
-source 'https://gems.gemfury.com/psBbdHx94zqZrvxpiVmm/' # librarian-0.0.26.2
-
 # Specify your gem's dependencies in chef-tlc-workflow.gemspec
 gemspec

data/README.md

@@ -1,13 +1,21 @@
-# TLC Chef Workflow
+# Chef "Top-Level Cookbooks" Workflow
 
-The `chef-tlc-workflow` aims to make our workflow for developing with Chef more explict.
+`chef-tlc-workflow` supports an opiniated workflow for working with Chef. It is based on the strict distinction of top-level vs. dependent cookbooks (see below) and it's currently focussed on chef-solo only.
 
-First of all, it provides templates for three different deployment environments (esx, ec2 and local). The templates contain among others a `Rakefile` for interacting with the deployment environment as well as a description of the nodes in these environments.
+First of all, it provides a [working sample](https://github.com/tknerr/chef-tlc-workflow/tree/master/test/vagrant-1.x-bootstrap) for deployment to esx, ec2 and local from within single `Vagrantfile`.
 
-Other than the templates it provides helper methods to use the dependencies defined in `metadata.rb` from within [librarian](https://github.com/applicationsonline/librarian) `Cheffile`s. This ensures consistency between the dependencies specified in metadata and resolved via librarian. 
+Other than that it provides helper methods to use the dependencies defined in `metadata.rb` from within [librarian](https://github.com/applicationsonline/librarian) `Cheffile`s. This ensures consistency between the dependencies specified in metadata and resolved via librarian (**NOTE:** to be replaced with Berkshelf soon!)
 
 Finally, it ensures a consistent gem set by declaring all the gems we use in our workflow in its own gemspec, i.e. `chef-tlc-workflow` is the only gem you need to depend on - everything else (like vagrant, mcloud, etc..) comes in as transitive dependencies.
 
+
+## Terminology
+
+* **infrastructure** is a Chef-Repo like structure which describes the nodes that are part of it and which services are to be installed on these nodes via *top-level cookbooks*
+* **top-level cookbooks** are the top-level cookbooks that fully configure a node by combining a set of *dependent cookbooks*, configuring them appropriately and locking them at a specific version.
+* **dependent cookbooks** are the finer-grained, reusable and flexible cookbooks that you typically leverage for building high-level services in terms of *top-level cookbooks*
+
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -23,63 +31,114 @@ Or install it yourself as:
     $ gem install chef-tlc-workflow
 
 
+## Prerequisites
+
+You need Vagrant 1.2.x and the following plugins for the [sample Vagrantfile](https://github.com/tknerr/chef-tlc-workflow/tree/master/test/vagrant-1.x-bootstrap/Vagrantfile) to work:
+
+```
+vagrant plugin install vagrant-aws --plugin-version 0.2.2
+vagrant plugin install vagrant-managed-servers --plugin-version 0.1.0
+vagrant plugin install vagrant-omnibus --plugin-version 1.0.2
+vagrant plugin install vagrant-cachier --plugin-version 0.1.0
+```
+
 ## Usage
 
-See valid usages below.
+### Deployment to VirtualBox, AWS and Managed ESX Servers
+
+Assuming you are in the `test/vagrant-1.x-bootstrap` directory you need to install the bundle first:  
+```
+$ cd test/vagrant-1.x-bootstrap
+$ bundle install
+Fetching gem metadata from http://rubygems.org/..
+Fetching gem metadata from https://gems.gemfury.com/psBbdHx94zqZrvxpiVmm/..
+Using rake (0.9.6)
+Using Platform (0.4.0)
+Using ansi (1.4.3)
+Using archive-tar-minitar (0.5.2)
+Using multi_json (1.7.6)
+...
+```
+
+Then you need to resolve the [sample-app](https://github.com/tknerr/chef-tlc-workflow/tree/master/test/sample-app) top-level cookbook along with all its dependencies into the `./cookbooks` directory:
+```
+$ rake resolve_sample_app
+cd tmp/tlc/sample-app-0.1.0 && librarian-chef install --path D:/Repos/_github/chef-tlc-workflow/test/vagrant-1.x-bootstrap/cookbooks/sample-app-0.1.0
+Installing apache2 (1.5.0)
+Installing apt (1.3.2)
+Installing sample-app (0.1.0)
+```
 
-### Templates for Deployment Environments
+See, the dependencies are now resolved per top-level cookbook (i.e. `sample-app-0.1.0` in this case) separately:
+```
+$ ls -la cookbooks/sample-app-0.1.0
+total 12
+drwxr-xr-x 5 tkn tkn    0 Jun 11 17:44 .
+drwxr-xr-x 3 tkn tkn    0 Jun 11 17:44 ..
+drwxr-xr-x 7 tkn tkn 4096 Jun 11 17:44 apache2
+drwxr-xr-x 6 tkn tkn 4096 Jun 11 17:44 apt
+drwxr-xr-x 6 tkn tkn 4096 Jun 11 17:44 sample-app
+```
 
-As of TLC Project Infrastructure v1 we support three different deployment environments:
+Deploy to VirtualBox:
 
- * `esx` - VMs on our ESX infrastructure where we have ssh access but no control over the VMs (provisioned via [knife-solo](http://matschaffer.github.com/knife-solo/)) 
- * `ec2` - ec2 instances in the amazon cloud (managed and provisioned via [mccloud](https://github.com/jedi4ever/mccloud))
- * `local` - local VirtualBox VMs for development and testing (managed and provisioned via [vagrant](http://vagrantup.com))
+```
+vagrant up sample-app-vbox 
+```
 
-This project contains "templates" for each of these deployment environments in the `test/` directory. For now, you have to copy the directories - there is no scaffolding yet. 
+Deploy to AWS via [vagrant-aws]:
+```
+vagrant up sample-app-aws --provider=aws
+```
 
-Each of the deployment environments in the `test/` directory provides a `Rakefile` with a similar interface (i.e. similar rake tasks) to interact with. See the integration tests in the top level `Rakefile` for an example.
+Deploy to a [managed](https://github.com/tknerr/vagrant-managed-servers) ESX Server:
+```
+vagrant up sample-app-esx --provider=managed
+vagrant provision sample-app-esx
+```
 
-In addition, it provides a place for describing the nodes within that deployment environment. Depending on the environment this might be a `Vagrantfile`, `Mccloudfile` or `<node>.json` file. Again, see the examples in the `test/` directory. 
 
 ### Librarian Helper
 
+**NOTE:** this is going to be replaced with Berkshelf soon
+
 Since librarian does not support reading the cookbook dependencies from `metadata.rb`, the `ChefTLCWorkflow::Helpers` module adds this functionality.
 
 In the trivial case you can use it in your cookbook project's `Cheffile` like so:
 
-    require 'chef-tlc-workflow/helpers'
+```ruby
+require 'chef-tlc-workflow/helpers'
 
-    ChefTLCWorkflow::Helpers::from_metadata.each do |cb_name, cb_version|
-      cookbook cb_name, cb_version
-    end
+ChefTLCWorkflow::Helpers::from_metadata.each do |cb_name, cb_version|
+  cookbook cb_name, cb_version
+end
+```
 
 If some of the cookbooks defined in metadata.rb are not available from the community site, you can define your overrides like so: 
 
-    ...
-    @overrides = {
-      'tlc-base' => { :git => 'https://github.com/tknerr/cookbook-tlc-base.git', :ref => 'master' },
-    }
+```ruby
+...
+@overrides = {
+  'tlc-base' => { :git => 'https://github.com/tknerr/cookbook-tlc-base.git', :ref => 'master' },
+}
 
-    ChefTLCWorkflow::Helpers::from_metadata.each do |cb_name, cb_version|
-      cookbook cb_name, cb_version, @overrides[cb_name]
-    end
+ChefTLCWorkflow::Helpers::from_metadata.each do |cb_name, cb_version|
+  cookbook cb_name, cb_version, @overrides[cb_name]
+end
+```
 
 
 ### Single Gemfile Dependency
 
 It references all gems we need for our Chef workflow, this means that your `Gemfile` basically looks like this:
 
-```
+```ruby
 source :rubygems
 
-# additional sources for patched gems
-source 'https://gems.gemfury.com/hUe8s8nSyzxs7JMMSZV8/' # vagrant-1.0.5.1
-source 'https://gems.gemfury.com/psBbdHx94zqZrvxpiVmm/' # librarian-0.0.26.2
-
-gem "chef-tlc-workflow", "0.1.0"
+gem "chef-tlc-workflow", "0.2.0"
 ```
 
-This brings in all the transitive gem dependencies as defined in the `chef-tlc-workflow.gemspec`, e.g. vagrant, librarian, chef, mccloud etc...
+This brings in all the transitive gem dependencies as defined in the `chef-tlc-workflow.gemspec`, e.g. librarian, chef, foodcritic, etc...
 
 While this is not ideal in terms of keeping the LOAD_PATH as small as possible, it's a tradeoff in favor of convenience and consistency.
 

data/Rakefile

@@ -2,9 +2,9 @@ require "bundler/gem_tasks"
 
 desc "run all tests"
 task :test => [
-  :test_esx_bootstrap, 
-  :test_ec2_bootstrap,
-  :test_local_bootstrap
+  :test_vagrant_esx_bootstrap,
+  :test_vagrant_aws_bootstrap,
+  :test_vagrant_vbox_bootstrap
 ]
 
 #
@@ -13,98 +13,75 @@ task :test => [
 # * check for apache default page
 # * more realistic scenario: e.g. scaffold infra, create Cheffile and node.json on the fly, etc...
 #
-desc "tests bootstrapping with knife-solo in an esx-like environment"
-task :test_esx_bootstrap do
-
-  app = 'sample-app@0.1.0'
-  user = 'vagrant'
-  host = '33.33.77.10'
-  ssh_key = 'W:/home/.vagrant.d/insecure_private_key'
+desc "tests bootstrapping in an esx-like environment via vagrant-managed-servers provider"
+task :test_vagrant_esx_bootstrap do
 
   begin
     # simulate esx-like environment using vagrant and a bare-os basebox
-    sh "vagrant destroy esx_like_vm -f"
-    sh "vagrant up esx_like_vm" do |ok, res|
+    run_cmd_esx "vagrant destroy esx_like_vm -f"
+    run_cmd_esx "vagrant up esx_like_vm" do |ok, res|
       puts "ok: #{ok}\nres: #{res}" # ignore vagrant error for bare-os vm
     end
 
-    # resolve deps and provision node
-    run_cmd_esx "rake resolve_deps"
-    # bootstrap node with chef
-    run_cmd_esx "rake bootstrap[#{host},#{user},#{ssh_key}]"
-    # provision node with app
-    run_cmd_esx "rake provision[#{app},#{host},#{user},#{ssh_key}]"
-    # remove chef-solo traces from node
-    run_cmd_esx "rake cleanup[#{host},#{user},#{ssh_key}]"
-
-    # TODO: test if sample app works
+    test_vagrant_commands(:esx)
   ensure
     # cleanup
-    sh "vagrant destroy esx_like_vm -f"
+    run_cmd_esx "vagrant destroy esx_like_vm -f"
   end
 end
 
 
-desc "tests bootstrapping with mccloud in ec2 (requires ec2 credentials)"
-task :test_ec2_bootstrap do
-
-  vm_name = 'sample-app'
-
-  begin
-    # resolve deps
-    run_cmd_ec2 "rake resolve_deps"
-    # bring up ec2 instance, bootstrap with chef and provision
-    run_cmd_ec2 "rake up[#{vm_name}]"
-    # re-provison ec2 instance
-    run_cmd_ec2 "rake provision[#{vm_name}]"
-    # show status of ec2 instances
-    run_cmd_ec2 "rake status"
-
-
-    # TODO: test if sample app works
-  ensure
-    # destroy ec2 instance
-    run_cmd_ec2 "rake destroy[#{vm_name}]"
-  end
+desc "tests bootstrapping in AWS via vagrant-aws provider"
+task :test_vagrant_aws_bootstrap do
+  test_vagrant_commands(:aws)
 end
 
 
-desc "tests bootstrapping with local Vagrant VMs"
-task :test_local_bootstrap do
+desc "tests bootstrapping with local Vagrant VMs via default virtualbox provider"
+task :test_vagrant_vbox_bootstrap do
+  test_vagrant_commands(:vbox)
+end
 
-  vm_name = 'sample-app'
 
+def test_vagrant_commands(suffix)
   begin
-    # resolve deps
-    run_cmd_local "rake resolve_deps"
-    # bring up vagrant vm, bootstrap with chef and provision
-    run_cmd_local "rake up[#{vm_name}]"
-    # re-provison vagrant vm
-    run_cmd_local "rake provision[#{vm_name}]"
-    # show status of vagrant vms
-    run_cmd_local "rake status"
-
+    # resolve deps and provision node
+    bundle_exec "rake resolve_deps"
+    # create VM
+    run_cmd "vagrant up sample-app-#{suffix} --provider=#{provider(suffix)}"
+    # provision node with app
+    run_cmd "vagrant provision sample-app-#{suffix}"
+    # check ssh
+    run_cmd "vagrant ssh sample-app-#{suffix} -c 'ohai ipaddress'"
+    # check status
+    run_cmd "vagrant status sample-app-#{suffix}"
+    
     # TODO: test if sample app works
   ensure
-    # destroy vagrant vm
-    run_cmd_local "rake destroy[#{vm_name}]"
+    # destroy
+    run_cmd "vagrant destroy sample-app-#{suffix} -f"
   end
 end
 
-
-def run_cmd_esx(command)
-  run_cmd command, "test/esx-bootstrap"
+def provider(suffix)
+  providers = { 
+    :aws => "aws",
+    :esx => "managed",
+    :vbox => "virtualbox"
+  }
+  providers[suffix]
 end
 
-def run_cmd_ec2(command)
-  run_cmd command, "test/ec2-bootstrap"
+
+def bundle_exec(command, cwd = "test/vagrant-1.x-bootstrap")
+  fail "need #{cwd}/Gemfile for a clean environment" unless File.exist? "#{cwd}/Gemfile"
+  sh "cd #{cwd} && bundle exec #{command}"
 end
 
-def run_cmd_local(command)
-  run_cmd command, "test/local-bootstrap"
+def run_cmd(command, cwd = "test/vagrant-1.x-bootstrap")
+  sh "cd #{cwd} && #{command}"
 end
 
-def run_cmd(command, cwd)
-  fail "need #{cwd}/../Gemfile for a clean environment" unless File.exist? "#{cwd}/../Gemfile"
-  sh "cd #{cwd} && bundle exec #{command}"
-end
+def run_cmd_esx(command)
+  run_cmd command, "test/esx_fake"
+end

data/chef-tlc-workflow.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |gem|
   gem.version       = ChefTLCWorkflow::VERSION
   gem.authors       = ["Torben Knerr"]
   gem.email         = ["tkn@zuehlke.com"]
-  gem.description   = %q{makes our workflow for developing with Chef explict by adding a set of Rake tasks embodying the workflow}
-  gem.summary       = %q{makes our workflow for developing with Chef explict by adding a set of Rake tasks embodying the workflow}
-  gem.homepage      = ""
+  gem.description   = %q{Chef Workflow based on the idea of Top-Level Cookbooks }
+  gem.summary       = %q{Chef Workflow based on the idea of Top-Level Cookbooks }
+  gem.homepage      = "https://github.com/tknerr/chef-tlc-workflow"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -28,18 +28,12 @@ Gem::Specification.new do |gem|
   # so that the only dependency one needs in the `Gemfile` is `chef-tlc-workflow`
   #
 
-  # for interaction with nodes in local/esx/ec2 environments
-  gem.add_dependency 'vagrant', '~> 1.0.5'
-  gem.add_dependency 'knife-solo', '0.3.0.pre4'
-  gem.add_dependency 'mccloud', '0.0.19'
-  
   # testing related
   gem.add_dependency 'foodcritic', '1.7.0'
   gem.add_dependency 'chefspec', '0.9.0'
   gem.add_dependency 'fauxhai', '0.1.1'
 
   # others
-  gem.add_dependency 'rake', '0.9.6'
   gem.add_dependency 'sahara', '0.0.13'
   gem.add_dependency 'knife-solo_data_bag', '0.3.1'
 

data/lib/chef-tlc-workflow/version.rb

@@ -1,3 +1,3 @@
 module ChefTLCWorkflow
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/test/esx_fake/Vagrantfile

@@ -0,0 +1,39 @@
+#
+# Vagrantfile simulating an ESX-like environment for testing purposes:
+#
+# * assume ssh root access as the only prerequisite
+# * using bare OS baseboxes with no Chef installed
+#
+Vagrant::configure("2") do |config|
+
+  # use provionerless baseboxes
+  config.vm.box = "opscode_ubuntu-13.04_provisionerless"
+  config.vm.box_url = "https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-13.04_provisionerless.box"
+
+  config.vm.define :esx_like_vm do | esx_like_vm_config |
+    
+    esx_like_vm_config.vm.provider :virtualbox do |vbox|
+      vbox.customize ["modifyvm", :id,
+        "--memory", "1024",
+        "--name", "chef-tlc-workflow-esx-like-vm"]
+    end
+    esx_like_vm_config.vm.hostname = "chef-tlc-workflow-esx-like-vm.local"
+    esx_like_vm_config.vm.network :private_network, ip: "33.33.77.10"
+  end
+
+  #
+  # dummy vm in the same network, keeping it on so that no additional
+  # user elevation dialogs appear for the other VMs
+  #
+  config.vm.define :dummy do | dummy_vm_config |
+
+    dummy_vm_config.vm.provider :virtualbox do |vbox|
+      vbox.customize ["modifyvm", :id,
+        "--memory", "256",
+        "--name", "chef-tlc-workflow-dummy-vm"]
+    end
+    dummy_vm_config.vm.hostname = "chef-tlc-workflow-dummy-vm.local"
+    dummy_vm_config.vm.network :private_network, ip: "33.33.77.2"
+  end
+
+end

data/test/vagrant-1.x-bootstrap/.gitignore

@@ -0,0 +1,3 @@
+cookbooks
+tmp
+.vagrant

data/test/vagrant-1.x-bootstrap/Gemfile

@@ -0,0 +1,4 @@
+source :rubygems
+
+gem "chef-tlc-workflow", "0.2.0.dev",
+  :path => "#{File.dirname(__FILE__)}/../../../chef-tlc-workflow"

data/test/vagrant-1.x-bootstrap/Rakefile

@@ -0,0 +1,13 @@
+require 'bundler/setup'
+require 'chef-workflow/tasks/tlc/deps'
+
+desc "resolve application cookbook with all its dependencies"
+task :resolve_deps, [:app_cookbook] do |t, args|
+  Rake::Task["tlc:deps:resolve_app_cookbook"].invoke(args[:app_cookbook])
+end
+
+
+desc "resolve sample-app"
+task :resolve_sample_app do
+  Rake::Task["resolve_deps"].invoke("sample-app@0.1.0")
+end

data/test/vagrant-1.x-bootstrap/Vagrantfile

@@ -0,0 +1,104 @@
+
+def configure_provider(provider, config, config_lambda)
+  config.vm.provider provider do |prvdr, override|
+    config_lambda.call(prvdr, override)
+  end
+end
+
+def vbox_config(name, ip, memory_size = 384) 
+  lambda do |vbox, override|
+    # override box url
+    override.vm.box = "opscode_ubuntu-13.04_provisionerless"
+    override.vm.box_url = "https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-13.04_provisionerless.box"
+    # configure host-only network
+    override.vm.hostname = "#{name}.local"
+    override.vm.network :private_network, ip: ip
+    # enable cachier for local vbox vms
+    override.cache.auto_detect = true
+ 
+    # virtualbox specific configuration
+    vbox.customize ["modifyvm", :id, 
+      "--memory", memory_size,
+      "--name", name
+    ] 
+  end
+end
+
+def aws_config(instance_type)
+  lambda do |aws, override|
+    # use dummy box
+    override.vm.box = "aws_dummy_box"
+    override.vm.box_url = "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"
+    # override ssh user and private key
+    override.ssh.username = "ubuntu"
+    override.ssh.private_key_path = "#{ENV['HOME']}/.ssh/mccloud_rsa"
+    
+    # aws specific settings
+    aws.access_key_id = ENV['AWS_ACCESS_KEY']
+    aws.secret_access_key = ENV['AWS_SECRET_KEY']
+    aws.ami = "ami-524e4726"
+    aws.region = "eu-west-1"
+    aws.availability_zone = "eu-west-1c"
+    aws.instance_type = instance_type
+    aws.security_groups = [ "mccloud", "http" ]
+    aws.keypair_name = "mccloud-key-tlc"
+  end
+end
+
+def esx_config(server)
+  lambda do |managed, override|
+    # use dummy box
+    override.vm.box = "managed_dummy_box"
+    override.vm.box_url = "https://github.com/tknerr/vagrant-managed-servers/raw/master/dummy.box"
+    
+    # link with this server
+    managed.server = server
+  end
+end
+
+#
+# Vagrantfile for testing
+#
+# NOTE: you need the following plugins:
+# - `vagrant plugin install vagrant-aws --plugin-version 0.2.2`
+# - `vagrant plugin install vagrant-managed-servers --plugin-version 0.1.0`
+# - `vagrant plugin install vagrant-omnibus --plugin-version 1.0.2`
+# - `vagrant plugin install vagrant-cachier --plugin-version 0.1.0`
+#
+Vagrant::configure("2") do |config|
+
+  # the Chef version to use
+  config.omnibus.chef_version = "11.4.4"
+
+  #
+  # define a separate VMs for the 3 providers (vbox, aws, managed) 
+  # because with Vagrant 1.2.2 you can run a VM with only one provider at once
+  #
+  [:aws, :vbox, :esx].each do |provider|
+    #
+    # Sample VM per provider
+    #
+    config.vm.define :"sample-app-#{provider}" do | sample_app_config |
+
+      case provider
+      when :vbox
+        configure_provider(:virtualbox, sample_app_config, vbox_config("sample-app", "33.33.40.10"))
+      when :aws
+        configure_provider(:aws, sample_app_config, aws_config("m1.small"))
+      when :esx    
+        configure_provider(:managed, sample_app_config, esx_config("33.33.77.10"))  
+      end
+      
+      sample_app_config.vm.provision :chef_solo do |chef|
+        chef.cookbooks_path = [ './cookbooks/sample-app-0.1.0' ]
+        chef.add_recipe "sample-app"
+        chef.json = {
+          :sample_app => {
+            :words_of_wisdom => "Vagrant on #{provider} Rocks!"
+          }
+        }
+      end
+    end
+  end
+
+end

data/test/{ec2-bootstrap → vagrant-1.x-bootstrap}/app_cookbooks.yml

@@ -4,9 +4,3 @@
   path: "../sample-app"
   # git: "https://github.com/tknerr/sample-app-tlc.git"
   # ref: "v0.1.0"
-
-- name: "sample-app"
-  version: "0.2.0"
-  path: "../sample-app"
-  # git: "https://github.com/tknerr/sample-app-tlc.git"
-  # ref: "v0.2.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-tlc-workflow
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-workflow-tasklib
@@ -59,54 +59,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: vagrant
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-- !ruby/object:Gem::Dependency
-  name: knife-solo
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.0.pre4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.0.pre4
-- !ruby/object:Gem::Dependency
-  name: mccloud
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.19
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.19
 - !ruby/object:Gem::Dependency
   name: foodcritic
   requirement: !ruby/object:Gem::Requirement
@@ -155,22 +107,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: sahara
   requirement: !ruby/object:Gem::Requirement
@@ -235,8 +171,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.2
-description: makes our workflow for developing with Chef explict by adding a set of
-  Rake tasks embodying the workflow
+description: ! 'Chef Workflow based on the idea of Top-Level Cookbooks '
 email:
 - tkn@zuehlke.com
 executables: []
@@ -249,7 +184,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- Vagrantfile
 - chef-tlc-workflow.gemspec
 - docs/ApplicationVsLibraryVsForkedCookbooks.md
 - docs/TmpLibrarianHelpers.md
@@ -260,21 +194,7 @@ files:
 - lib/chef-workflow/tasks/tlc.rb
 - lib/chef-workflow/tasks/tlc/deps.rb
 - lib/chef-workflow/tasks/tlc/test.rb
-- test/Gemfile
-- test/ec2-bootstrap/.chef/bootstrap/omnibus-chef.sh
-- test/ec2-bootstrap/.gitignore
-- test/ec2-bootstrap/Mccloudfile
-- test/ec2-bootstrap/Rakefile
-- test/ec2-bootstrap/app_cookbooks.yml
-- test/esx-bootstrap/.chef/knife.rb
-- test/esx-bootstrap/.gitignore
-- test/esx-bootstrap/Rakefile
-- test/esx-bootstrap/app_cookbooks.yml
-- test/esx-bootstrap/nodes/33.33.77.10.json
-- test/local-bootstrap/.gitignore
-- test/local-bootstrap/Rakefile
-- test/local-bootstrap/Vagrantfile
-- test/local-bootstrap/app_cookbooks.yml
+- test/esx_fake/Vagrantfile
 - test/sample-app/CHANGELOG.md
 - test/sample-app/Cheffile
 - test/sample-app/README.md
@@ -282,7 +202,12 @@ files:
 - test/sample-app/metadata.rb
 - test/sample-app/recipes/default.rb
 - test/sample-app/templates/default/sample.html.erb
-homepage: ''
+- test/vagrant-1.x-bootstrap/.gitignore
+- test/vagrant-1.x-bootstrap/Gemfile
+- test/vagrant-1.x-bootstrap/Rakefile
+- test/vagrant-1.x-bootstrap/Vagrantfile
+- test/vagrant-1.x-bootstrap/app_cookbooks.yml
+homepage: https://github.com/tknerr/chef-tlc-workflow
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -305,24 +230,9 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: makes our workflow for developing with Chef explict by adding a set of Rake
-  tasks embodying the workflow
+summary: Chef Workflow based on the idea of Top-Level Cookbooks
 test_files:
-- test/Gemfile
-- test/ec2-bootstrap/.chef/bootstrap/omnibus-chef.sh
-- test/ec2-bootstrap/.gitignore
-- test/ec2-bootstrap/Mccloudfile
-- test/ec2-bootstrap/Rakefile
-- test/ec2-bootstrap/app_cookbooks.yml
-- test/esx-bootstrap/.chef/knife.rb
-- test/esx-bootstrap/.gitignore
-- test/esx-bootstrap/Rakefile
-- test/esx-bootstrap/app_cookbooks.yml
-- test/esx-bootstrap/nodes/33.33.77.10.json
-- test/local-bootstrap/.gitignore
-- test/local-bootstrap/Rakefile
-- test/local-bootstrap/Vagrantfile
-- test/local-bootstrap/app_cookbooks.yml
+- test/esx_fake/Vagrantfile
 - test/sample-app/CHANGELOG.md
 - test/sample-app/Cheffile
 - test/sample-app/README.md
@@ -330,3 +240,8 @@ test_files:
 - test/sample-app/metadata.rb
 - test/sample-app/recipes/default.rb
 - test/sample-app/templates/default/sample.html.erb
+- test/vagrant-1.x-bootstrap/.gitignore
+- test/vagrant-1.x-bootstrap/Gemfile
+- test/vagrant-1.x-bootstrap/Rakefile
+- test/vagrant-1.x-bootstrap/Vagrantfile
+- test/vagrant-1.x-bootstrap/app_cookbooks.yml

data/Vagrantfile

@@ -1,33 +0,0 @@
-#
-# Vagrantfile simulating an ESX-like environment for testing purposes:
-#
-# * assume ssh root access as the only prerequisite
-# * using bare OS baseboxes with no Chef installed
-#
-Vagrant::Config.run do |config|
-
-  # use bare os baseboxes
-  config.vm.box = "ubuntu-12.04-server-amd64-bare-os"
-  config.vm.box_url = "http://dl.dropbox.com/u/13494216/ubuntu-12.04-server-amd64-bare-os.box"
-
-  config.vm.define :esx_like_vm do | esx_like_vm_config |
-    esx_like_vm_config.vm.customize ["modifyvm", :id,
-      "--memory", "1024",
-      "--name", "chef-tlc-workflow-esx-like-vm"]
-    esx_like_vm_config.vm.host_name = "chef-tlc-workflow-esx-like-vm.local"
-    esx_like_vm_config.vm.network :hostonly, "33.33.77.10"
-  end
-
-  #
-  # dummy vm in the same network, keeping it on so that no additional
-  # user elevation dialogs appear for the other VMs
-  #
-  config.vm.define :dummy do | dummy_vm_config |
-    dummy_vm_config.vm.customize ["modifyvm", :id,
-      "--memory", "256",
-      "--name", "chef-tlc-workflow-dummy-vm"]
-    dummy_vm_config.vm.host_name = "chef-tlc-workflow-dummy-vm.local"
-    dummy_vm_config.vm.network :hostonly, "33.33.77.2"
-  end
-
-end

data/test/Gemfile

@@ -1,7 +0,0 @@
-source :rubygems
-
-source 'https://gems.gemfury.com/hUe8s8nSyzxs7JMMSZV8/' # vagrant-1.0.5.1
-source 'https://gems.gemfury.com/psBbdHx94zqZrvxpiVmm/' # librarian-0.0.26.2
-
-gem "chef-tlc-workflow", "0.1.3",
-  :path => "#{File.dirname(__FILE__)}/../../chef-tlc-workflow"

data/test/ec2-bootstrap/.chef/bootstrap/omnibus-chef.sh

@@ -1,34 +0,0 @@
-#!/bin/bash -ex
-
-if which curl 2>/dev/null; then
-    HTTP_GET_CMD="curl -L"
-else
-    HTTP_GET_CMD="wget -qO-"
-fi
-
-# read/parse user-data
-USERDATA=`$HTTP_GET_CMD http://169.254.169.254/latest/user-data`
-CHEF_VERSION=`echo $USERDATA | tr -s ',' '\n' | grep "chef_version" | cut -d'=' -f2`
-FQDN=`echo $USERDATA | tr -s ',' '\n' | grep "fqdn" | cut -d'=' -f2`
-
-# install Chef
-if [ -z "$CHEF_VERSION" ]; then
-	$HTTP_GET_CMD https://www.opscode.com/chef/install.sh | sudo bash -s
-else
-	$HTTP_GET_CMD https://www.opscode.com/chef/install.sh | sudo bash -s -- -v $CHEF_VERSION
-fi
-
-# set proper hostname
-if [ "$FQDN" ]; then
-	HOSTNAME=`echo $FQDN | sed -r 's/\..*//'`
-	if [ "`grep "127.0.1.1" /etc/hosts`" ]; then
-		sudo sed -r -i "s/^(127[.]0[.]1[.]1[[:space:]]+).*$/\\1$FQDN $HOSTNAME/" /etc/hosts
-	else
-		sudo sed -r -i "s/^(127[.]0[.]0[.]1[[:space:]]+localhost[[:space:]]*)$/\\1\n127.0.1.1 $FQDN $HOSTNAME/" /etc/hosts
-	fi
-	sudo sed -i "s/.*$/$HOSTNAME/" /etc/hostname
-	sudo hostname -F /etc/hostname
-fi
-
-# XXX: ensure that file_cache_path configured in solo.rb exists (Mccloud does not create it)
-sudo mkdir -p /var/chef-solo 

data/test/ec2-bootstrap/.gitignore

@@ -1,3 +0,0 @@
-cookbooks/
-tmp/
-Cheffile.lock

data/test/ec2-bootstrap/Mccloudfile

@@ -1,60 +0,0 @@
-Mccloud::Config.run do |config|
-
-  # identity / namespace
-  config.mccloud.prefix="mccloud"
-  config.mccloud.environment="tlc"
-  config.mccloud.identity=ENV['USERNAME']
-
-  # define AWS cloud provider for EU-West region
-  config.provider.define "aws-eu-west" do |provider_config|
-    provider_config.provider.flavor = :aws
-    provider_config.provider.options = { }
-    provider_config.provider.region = "eu-west-1"
-    provider_config.provider.check_keypairs = true
-    provider_config.provider.check_security_groups = true
-    provider_config.provider.namespace = "mccloud-tlc-#{ENV['USERNAME']}"
-  end
-
-  # ***********************************************
-  # VM Definitions
-  # ***********************************************
-  
-  config.vm.define "sample-app" do |config|
-
-    # official Ubuntu 12.04 AMI
-    config.vm.ami = "ami-524e4726"
-    config.vm.provider= "aws-eu-west"
-    config.vm.flavor = "m1.small"
-    config.vm.zone = "eu-west-1c"
-    config.vm.user = "ubuntu"
-
-    # NOTE: the security groups must exist (e.g. create it beforehand via AWS console)
-    config.vm.security_groups = [ "mccloud", "http" ]
-    
-    # see http://fog.io/1.1.2/rdoc/Fog/Compute/AWS/Servers.html
-    # and https://github.com/fog/fog/blob/v1.1.2/lib/fog/aws/requests/compute/run_instances.rb
-    config.vm.create_options = {
-      :user_data => "chef_version=10.18.2-1,fqdn=sample-app.example.com"
-    }
-
-    # NOTE: the keypair (for logging in to the VM) must exist (e.g. create it beforehand via AWS console)
-    config.vm.key_name = "mccloud-key-tlc"
-    config.vm.private_key_path = "#{ENV['HOME']}/.ssh/mccloud_rsa"
-    config.vm.public_key_path = "#{ENV['HOME']}/.ssh/mccloud_rsa.pub"
-  
-    # bootstrap template (runs at first-boot only)
-    config.vm.bootstrap = ".chef/bootstrap/omnibus-chef.sh"
-
-    # provisioning sript (runs on each mccloud up or provision)
-    config.vm.provision :chef_solo do |chef|
-      chef.cookbooks_path = [ "cookbooks/sample-app-0.1.0" ]
-      chef.log_level = "info"
-      chef.add_recipe "sample-app"
-      chef.json.merge!({
-        :sample_app => {
-          :words_of_wisdom => "YEAH! I did it for the Lulz!"
-        }
-      })
-    end
-  end
-end

data/test/ec2-bootstrap/Rakefile

@@ -1,57 +0,0 @@
-require 'bundler/setup'
-require 'fileutils'
-require 'chef-workflow/tasks/tlc/deps'
-
-desc "resolve application cookbook with all its dependencies"
-task :resolve_deps, [:app_cookbook] do |t, args|
-  Rake::Task["tlc:deps:resolve_app_cookbook"].invoke(args[:app_cookbook])
-end
-
-desc "bring up the mccloud \"VM\" as configured in the Mccloudfile"
-task :up, [:vm_name] do |t, args|
-  vm_name = get_required_args(args, :vm_name)
-  sh "mccloud up #{vm_name}"
-end
-
-desc "provision the mccloud \"VM\" with the provisioners as defined in the Mccloudfile"
-task :provision, [:vm_name] do |t, args|
-  vm_name = get_required_args(args, :vm_name)
-  sh "mccloud provision #{vm_name}"
-end
-
-desc "destroy the mccloud \"VM\" with the given name"
-task :destroy, [:vm_name] do |t, args|
-  vm_name = get_required_args(args, :vm_name)
-  sh "mccloud destroy #{vm_name}"
-end
-
-desc "ssh into the mccloud \"VM\" with the given name"
-task :ssh, [:vm_name] do |t, args|
-  vm_name = get_required_args(args, :vm_name)
-  sh "mccloud ssh #{vm_name}"
-end
-
-desc "show status of all mccloud \"VMs\" defined in the Mccloudfile"
-task :status do
-  sh "mccloud status"
-end
-
-desc "returns the ip address of the mccloud \"VM\" with the given name"
-task :get_ip, [:vm_name] do |t, args|
-  vm_name = get_required_args(args, :vm_name)
-  # TODO: filter out IP of given vm rather than printing status for all
-  sh "mccloud status"
-end
-
-
-#
-# helper methods below
-#
-def get_required_args(args, *param_keys)
-  param_values = Array.new
-  param_keys.each do |param_key|
-    fail "parameter #{param_key.to_sym} is required" unless args[param_key.to_sym]
-    param_values << args[param_key.to_sym]
-  end
-  param_values.size == 1 ? param_values[0] : param_values
-end

data/test/esx-bootstrap/.chef/knife.rb

@@ -1,10 +0,0 @@
-# 
-# knife configuration that is honored by knife-solo, see 
-# https://github.com/matschaffer/knife-solo/wiki/Upgrading-to-0.3.0 
-#
-log_level                 :info
-log_location              STDOUT
-data_bag_path             "data_bags"
-encrypted_data_bag_secret "data_bag_key"
-role_path                 "roles"
-cookbook_path             "cookbooks/#{ENV['CURRENT_APP_COOKBOOK']}"

data/test/esx-bootstrap/.gitignore

@@ -1,4 +0,0 @@
-cookbooks/
-tmp/
-Cheffile.lock
-solo.rb

data/test/esx-bootstrap/Rakefile

@@ -1,58 +0,0 @@
-require 'bundler/setup'
-require 'fileutils'
-require 'chef-workflow/tasks/tlc/deps'
-require 'chef-tlc-workflow/helpers'
-
-desc "resolve application cookbook with all its dependencies"
-task :resolve_deps, [:app_cookbook] do |t, args|
-  Rake::Task["tlc:deps:resolve_app_cookbook"].invoke(args[:app_cookbook])
-end
-
-desc "bootstrap a server with Chef, does not provision (will ask for password if no key provided)"
-task :bootstrap, [:host, :user, :ssh_key] do |t, args|
-  host, user = get_required_args(args, :host, :user)
-  sh "knife solo prepare #{user}@#{host} #{ssh_key_cmdline(args)} --bootstrap-version 10.18.2-1 --no-librarian -V"
-end
-
-desc "provision a server with data from `nodes/<host>.json` (will ask for password if no key provided)"
-task :provision, [:app_cookbook, :host, :user, :ssh_key] do |t, args|
-  app_cookbook, host, user = get_required_args(args, :app_cookbook, :host, :user)
-  name, version = ChefTLCWorkflow::Helpers::parse_name_and_version(args[:app_cookbook])
-  with_app "#{name}-#{version}" do
-    sh "knife solo cook #{user}@#{host} #{ssh_key_cmdline(args)} --no-chef-check --no-librarian -V"
-  end
-end
-
-desc "remove Chef-solo cookbook traces from the server (will ask for password if no key provided)"
-task :cleanup, [:host, :user, :ssh_key] do |t, args|
-  host, user = get_required_args(args, :host, :user)
-  sh "knife solo clean #{user}@#{host} #{ssh_key_cmdline(args)} -V"
-end
-
-
-#
-# helper methods below
-#
-def get_required_args(args, *param_keys)
-  param_values = Array.new
-  param_keys.each do |param_key|
-    fail "parameter #{param_key.to_sym} is required" unless args[param_key.to_sym]
-    param_values << args[param_key.to_sym]
-  end
-  param_values
-end
-
-def ssh_key_cmdline(args)
-  args[:ssh_key] ? "-i #{args[:ssh_key]}" : ""
-end
-
-#
-# sets the 'CURRENT_APP_COOKBOOK' env var while the block executes, which is used in
-# `.chef/knife.rb` for correctly setting the `cookbook_path` for the given app cookbook 
-#
-def with_app(app_cookbook)
-  ENV['CURRENT_APP_COOKBOOK'] = app_cookbook
-  yield
-ensure
-  ENV['CURRENT_APP_COOKBOOK'] = ""
-end

data/test/esx-bootstrap/app_cookbooks.yml

@@ -1,12 +0,0 @@
-
-- name: "sample-app"
-  version: "0.1.0"
-  path: "../sample-app"
-  # git: "https://github.com/tknerr/sample-app-tlc.git"
-  # ref: "v0.1.0"
-
-- name: "sample-app"
-  version: "0.2.0"
-  path: "../sample-app"
-  # git: "https://github.com/tknerr/sample-app-tlc.git"
-  # ref: "v0.2.0"

data/test/esx-bootstrap/nodes/33.33.77.10.json

@@ -1,6 +0,0 @@
-{
-  "sample_app": {
-    "words_of_wisdom": "I did it for the Lulz!"
-  },
-  "run_list": [ "recipe[sample-app]" ]
-}

data/test/local-bootstrap/.gitignore

@@ -1,4 +0,0 @@
-cookbooks/
-tmp/
-Cheffile.lock
-.vagrant

data/test/local-bootstrap/Rakefile

@@ -1,50 +0,0 @@
-require 'bundler/setup'
-require 'fileutils'
-require 'chef-workflow/tasks/tlc/deps'
-
-desc "resolve application cookbook with all its dependencies"
-task :resolve_deps, [:app_cookbook] do |t, args|
-  Rake::Task["tlc:deps:resolve_app_cookbook"].invoke(args[:app_cookbook])
-end
-
-desc "bring up the vagrant \"VM\" as configured in the Vagrantfile"
-task :up, [:vm_name] do |t, args|
-  vm_name = get_required_args(args, :vm_name)
-  sh "vagrant up #{vm_name}"
-end
-
-desc "provision the vagrant \"VM\" with the provisioners as defined in the Vagrantfile"
-task :provision, [:vm_name] do |t, args|
-  vm_name = get_required_args(args, :vm_name)
-  sh "vagrant provision #{vm_name}"
-end
-
-desc "destroy the vagrant \"VM\" with the given name"
-task :destroy, [:vm_name] do |t, args|
-  vm_name = get_required_args(args, :vm_name)
-  sh "vagrant destroy #{vm_name} -f"
-end
-
-desc "ssh into the vagrant \"VM\" with the given name"
-task :ssh, [:vm_name] do |t, args|
-  vm_name = get_required_args(args, :vm_name)
-  sh "vagrant ssh #{vm_name}"
-end
-
-desc "show status of all vagrant \"VMs\" defined in the Vagrantfile"
-task :status do
-  sh "vagrant status"
-end
-
-
-#
-# helper methods below
-#
-def get_required_args(args, *param_keys)
-  param_values = Array.new
-  param_keys.each do |param_key|
-    fail "parameter #{param_key.to_sym} is required" unless args[param_key.to_sym]
-    param_values << args[param_key.to_sym]
-  end
-  param_values.size == 1 ? param_values[0] : param_values
-end

data/test/local-bootstrap/Vagrantfile

@@ -1,31 +0,0 @@
-#
-# Vagrantfile for testing
-#
-Vagrant::Config.run do |config|
-
-  # default base box for all VMs
-  config.vm.box = "opscode-ubuntu-12.04"
-  config.vm.box_url = "https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-10.18.2.box"
-
-  # sample-app
-  config.vm.define :'sample-app' do | sample_app_config |
-    sample_app_config.vm.customize ["modifyvm", :id, 
-      "--memory", "384",
-      "--name", "sample-app.local"
-    ] 
-    sample_app_config.vm.host_name = "sample-app.local"
-    sample_app_config.vm.network :hostonly, "33.33.40.10"
-
-    sample_app_config.vm.provision :chef_solo do |chef|
-      chef.cookbooks_path = [ './cookbooks/sample-app-0.1.0' ]
-      chef.add_recipe "sample-app"
-      chef.json = {
-        :sample_app => {
-          :words_of_wisdom => 'AWESOMENESS - When i feel sad, i stop being sad and be awesome instead.'
-        }
-      }
-    end
-  end
-
-end
-

data/test/local-bootstrap/app_cookbooks.yml

@@ -1,12 +0,0 @@
-
-- name: "sample-app"
-  version: "0.1.0"
-  path: "../sample-app"
-  # git: "https://github.com/tknerr/sample-app-tlc.git"
-  # ref: "v0.1.0"
-
-- name: "sample-app"
-  version: "0.2.0"
-  path: "../sample-app"
-  # git: "https://github.com/tknerr/sample-app-tlc.git"
-  # ref: "v0.2.0"