chef-tlc-workflow 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Zjk4Zjk4YzRmNzRiM2M0YmM0OWI2OTZkNzRhNTY3NDg1NGVhNmJhYw==
+  data.tar.gz: !binary |-
+    ZDU4ZTkzYjJkZTdhNzgwM2Y3MzE4NGMwNDJkMmVkNTk1ZmJiNzgwYQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YTk1MTVjYmFiZTYxOGJlZTdmM2U0MzczOTYzNDk1ZThlZTg0ZDgxMDcxMjM3
+    ZGI3YWViNGQ0ZTk0MjNmNjk2ZTVjZWUwNGQyYmU0YzgzODU1YmI1OWY2YmU4
+    NTg0OTE1YzAyNWJlZTZlMjI5OWVjNmU4MTBiMGZjOWYxNWNkMDk=
+  data.tar.gz: !binary |-
+    NDBlM2I2ZmU3N2JkMTcxYzAxMzA0YzNlYzI5YWI2ZTIxOTU2NjFlODhlODFi
+    ZjdhOTZhMzM5MzhkYTIyYzNiYmQ2YWQ1NzA4M2UzNDk1MDVkZmJhMjIxYTI4
+    Y2IwMTRiYmZkZGE2YjMzOWZhYWFhYTVkOTNjNTU3YzQyYThhNDk=

data/CHANGELOG.md

@@ -1,4 +1,17 @@
 
+# [0.3.0] from 06/18/2013
+
+ * update to Chef 11 and yank chef-workflow-tasklib (GH-2)
+ * replace librarian-chef with [berkshelf](http://berkshelf.com/) (GH-3)
+  * update `test/sample-app`: add `Berksfile`, add `Vagrantfile` with [vagrant-berkshelf](https://github.com/riotgames/vagrant-berkshelf) plugin 
+  * code cleanup, lots of code not needed anymore
+
+# [0.2.0] from 06/11/2013
+
+ * update to Vagrant from 1.0 to 1.2 (GH-1)
+  * replace mccloud and knife-solo with [vagrant-aws](https://github.com/mitchellh/vagrant-aws) and [vagrant-managed-servers](https://github.com/tknerr/vagrant-managed-servers) providers
+  * update `Vagrantfile`s in `test/` directory for Vagrant 1.2
+
 # [0.1.3] from 05/30/2013
 
  * relax version constraint on vagrant gem so that both 1.0.5 and 1.0.5.1 ([windows fixes](https://github.com/mitchellh/vagrant/issues/247)) can be used 

data/README.md

@@ -2,11 +2,9 @@
 
 `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 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`.
+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 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.
+Also, 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
@@ -63,10 +61,10 @@ 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
+cd tmp/tlc/sample-app-0.1.0 && berks install --path D:/Repos/_github/chef-tlc-workflow/test/vagrant-1.x-bootstrap/cookbooks/sample-app-0.1.0
+Using sample-app (0.1.0) at path: 'D:/Repos/_github/chef-tlc-workflow/test/sample-app'
 Installing apache2 (1.5.0)
 Installing apt (1.3.2)
-Installing sample-app (0.1.0)
 ```
 
 See, the dependencies are now resolved per top-level cookbook (i.e. `sample-app-0.1.0` in this case) separately:
@@ -97,37 +95,6 @@ vagrant up sample-app-esx --provider=managed
 vagrant provision sample-app-esx
 ```
 
-
-### 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:
-
-```ruby
-require 'chef-tlc-workflow/helpers'
-
-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: 
-
-```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
-```
-
-
 ### Single Gemfile Dependency
 
 It references all gems we need for our Chef workflow, this means that your `Gemfile` basically looks like this:
@@ -138,7 +105,7 @@ source :rubygems
 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. librarian, chef, foodcritic, etc...
+This brings in all the transitive gem dependencies as defined in the `chef-tlc-workflow.gemspec`, e.g. berkshelf, 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

@@ -11,7 +11,7 @@ task :test => [
 # TODO:
 # * rewrite as cucumber feature
 # * check for apache default page
-# * more realistic scenario: e.g. scaffold infra, create Cheffile and node.json on the fly, etc...
+# * more realistic scenario: e.g. scaffold infrastructure and app cookbook
 #
 desc "tests bootstrapping in an esx-like environment via vagrant-managed-servers provider"
 task :test_vagrant_esx_bootstrap do

data/chef-tlc-workflow.gemspec

@@ -17,11 +17,14 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  # lock down dependencies
+  # lock down direct dependencies
   #
-  gem.add_dependency 'chef-workflow-tasklib', '0.2.2'
-  gem.add_dependency 'chef', '10.18.2'
-  gem.add_dependency 'librarian-chef', '0.0.1'
+  gem.add_dependency 'chef', '11.4.4'
+  gem.add_dependency 'berkshelf', '2.0.4'
+  gem.add_dependency 'rake'
+
+  # help bundler resolve the json conflict (see RiotGames/berkshelf#676)
+  gem.add_dependency 'json', '1.7.7'
 
   #
   # further dependencies that are not `require`d here but we pull in for convenience
@@ -29,13 +32,12 @@ Gem::Specification.new do |gem|
   #
 
   # testing related
-  gem.add_dependency 'foodcritic', '1.7.0'
-  gem.add_dependency 'chefspec', '0.9.0'
-  gem.add_dependency 'fauxhai', '0.1.1'
+  gem.add_dependency 'foodcritic', '2.0.1'
+  gem.add_dependency 'chefspec', '1.3.1'
+  gem.add_dependency 'fauxhai', '1.1.1'
 
   # others
-  gem.add_dependency 'sahara', '0.0.13'
-  gem.add_dependency 'knife-solo_data_bag', '0.3.1'
+  gem.add_dependency 'knife-solo_data_bag', '0.4.0'
 
   # need these on windows only
   if RUBY_PLATFORM =~ /mswin|mingw/

data/docs/TmpWorkflowTasks.md

@@ -22,13 +22,13 @@ The `chef-tlc-workflow` makes our workflow for developing with Chef explict by a
      * create
      * release
      * resolve_deps
-     * validate (Cheffile in .gitignore)
+     * validate (Berksfile in .gitignore)
      * test (u.a. => test:converge, ggf. chef-workflow testlib?)
     * app
      * create
      * release
      * resolve_deps
-     * validate (=> u.a. deps:check, Cheffile nicht in .gitignore)
+     * validate (=> u.a. deps:check, Berksfile nicht in .gitignore)
      * test (was auch immer das heisst)
     * infra
      * create
@@ -71,7 +71,7 @@ Currently available are these tasks.
 The `deps` namespace embodies the workflow concerning cookbook dependency management
   
  * `tlc:deps:resolve` - resolve dependencies using [librarian](https://github.com/applicationsonline/librarian)
- * `tlc:deps:check` - check if dependencies in `metadata.rb` and `Cheffile` are consistent
+ * `tlc:deps:check` - check if dependencies in `metadata.rb` and `Berksfile` are consistent
 
 #### Cookbook Testing
 

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

@@ -16,59 +16,16 @@ module ChefTLCWorkflow
     end
 
     #
-    # reads the direct dependencies defined in `Cheffile` and 
-    # returns a map of dependency => version, e.g.:
-    #
-    #   { 'foo' => '1.0.0', 'bar' => '0.1.0' }
-    #
-    def self.read_cheffile_deps
-      require 'librarian/chef/environment'
-      env = ::Librarian::Chef::Environment.new
-      deps = env.spec.dependencies
-      Hash[deps.map { |dep| [dep.name, dep.requirement.to_s] }]
-    end
-
-    #
-    # resolves the dependencies as specified in `Cheffile` and 
-    # returns a map of dependency => version (including the 
-    # transitive ones), e.g.:
+    # returns the resolved dependencies as specified in `Berksfile` as a
+    # map of dependency => version (including the transitive ones), e.g.:
     #
     #   { 'foo' => '1.0.0', 'bar' => '0.1.0', 'baz_which_depends_on_bar' => '1.5.0' }
     #
-    def self.read_and_resolve_cheffile_deps
-      require 'librarian/chef/environment'
-      env = ::Librarian::Chef::Environment.new
-      deps = env.resolver.resolve(env.spec).manifests
-      Hash[deps.map { |dep| [dep.name, dep.version.to_s] }]
-    end
-
-    #
-    # returns the direct dependencies defined in `metadata.rb` as an 
-    # array of triples:
-    # 
-    #   [[<cookbook_name>, <cookbook_version>, <location>], ...]
-    #
-    # where `<location>` is `nil`, unless the `locations_yml`
-    # parameter is given and the specified file contains a location 
-    # mapping for `<cookbook_name>`
-    # 
-    # Example usage in `Cheffile`:
-    #   
-    #   require 'chef-tlc-workflow/helpers'
-    #   
-    #   ChefTLCWorkflow::Helpers::from_metadata.each do |cb_name, cb_version, location|
-    #     cookbook cb_name, cb_version, location
-    #   end
-    # 
-    def self.from_metadata(locations_yml = nil)
-      read_metadata_deps.to_a.map do |cb_name, cb_version|
-        if locations_yml
-          inferred_location = resolve_location_from_file(locations_yml, cb_name, cb_version)
-        else
-          inferred_location = nil
-        end
-        [cb_name, cb_version, inferred_location]
-      end
+    def self.read_berkshelf_deps
+      require 'json'
+      deps = JSON.parse(`berks list --format=json`)
+      fail "error resolving cookbooks: #{deps['errors']}" unless deps['errors'].empty?
+      Hash[deps['cookbooks'].map { |cb| [cb['name'], cb['version']] }]
     end
 
     #
@@ -90,6 +47,7 @@ module ChefTLCWorkflow
     #
     def self.read_app_cookbooks(yml_file, name = nil, version = nil)
       # TODO: validate format
+      require 'yaml'
       app_cookbooks = YAML.load_file yml_file
       app_cookbooks.select! { |ac| ac['name'] == name } if name
       app_cookbooks.select! { |ac| ac['version'] == version } if version
@@ -108,19 +66,5 @@ module ChefTLCWorkflow
       end
     end
 
-    private
-
-      def self.resolve_location_from_file(locations_yml, cb_name, cb_version)
-        cookbook_index = YAML.load_file(locations_yml)
-        if cookbook_index[cb_name]
-          default_opts = Hash.new
-          default_opts[:git] = cookbook_index[cb_name][:git] if cookbook_index[cb_name][:git]
-          default_opts[:ref] = cookbook_index[cb_name][:ref] if cookbook_index[cb_name][:ref]
-          version_specific_opts = cookbook_index[cb_name][cb_version] || {}
-          return default_opts.merge version_specific_opts
-        else
-          return nil
-        end
-      end
   end
 end

data/lib/{chef-workflow/tasks/tlc/deps.rb → chef-tlc-workflow/tasks.rb}

@@ -5,28 +5,25 @@ namespace :tlc do
     require 'chef-tlc-workflow/helpers'
 
     #
-    # resolve dependencies using librarian
+    # resolve dependencies using berkshelf
     #
     task :resolve do
-      require 'fileutils'
-      FileUtils.rm_rf('Cheffile.lock')
-      sh "librarian-chef clean"
-      sh "librarian-chef install"
+      sh "berks install"
     end
 
     #
-    # check if dependencies in metadata.rb and Cheffile are consistent
+    # check if dependencies in metadata.rb and Berksfile are consistent
     #
     task :check do
       errors = []
       metadata_deps = ChefTLCWorkflow::Helpers::read_metadata_deps
-      resolved_cheffile_deps = ChefTLCWorkflow::Helpers::read_and_resolve_cheffile_deps
-      resolved_cheffile_deps.each do | dep, version |
+      resolved_deps = ChefTLCWorkflow::Helpers::read_berkshelf_deps
+      resolved_deps.each do | dep, version |
         if metadata_deps.has_key?(dep)
           metadata_ver = ::Gem::Requirement.new(metadata_deps[dep])
-          cheffile_ver = ::Gem::Requirement.new(version)
-          if metadata_ver != cheffile_ver
-            errors << "dependency version for '#{dep}' is inconsistent: '#{metadata_ver}' vs '#{cheffile_ver}'!"
+          berkshelf_ver = ::Gem::Requirement.new(version)
+          if metadata_ver != berkshelf_ver
+            errors << "dependency version for '#{dep}' is inconsistent: '#{metadata_ver}' vs '#{berkshelf_ver}'!"
           end
         else
           errors << "dependency '#{dep}' is missing in metadata.rb!"
@@ -48,11 +45,11 @@ namespace :tlc do
 
     #
     # resolve an application cookbook with all it's dependenices 
-    # whilst honoring the application cookbook's Cheffile:
+    # whilst honoring the application cookbook's Berksfile:
     #
     # 1. clone (:git,:ref) or copy (:path) the app cookbook to './tmp'
     # 2. resolve dependencies (inlcuding app cookbook itself) as defined in
-    #    the app cookbook's Cheffile to './cookbooks/<app-cookbook-name>-<version>'
+    #    the app cookbook's Berksfile to './cookbooks/<app-cookbook-name>-<version>'
     #
     #
     def self.resolve_app_cookbook(app_cookbook)
@@ -80,17 +77,10 @@ namespace :tlc do
       end
 
       # resolve deps from tmp_dir into target_dir
-      fail "No Cheffile found in '#{tmp_dir}'" unless File.exist? "#{tmp_dir}/Cheffile"
+      fail "No Berksfile found in '#{tmp_dir}'" unless File.exist? "#{tmp_dir}/Berksfile"
       FileUtils.rm_rf target_dir
       FileUtils.mkdir_p target_dir
-      sh "cd #{tmp_dir} && librarian-chef install --path #{File.absolute_path(target_dir)}"
-
-      # copy application cookbook itself if it was not reference in Cheffile using `:path => '.'`
-      app_cookbook_in_targetdir = "#{target_dir}/#{name}"
-      unless File.exist? app_cookbook_in_targetdir
-        FileUtils.mkdir_p app_cookbook_in_targetdir
-        FileUtils.cp_r Dir.glob("#{tmp_dir}/*"), app_cookbook_in_targetdir
-      end
+      sh "cd #{tmp_dir} && berks install --path #{File.absolute_path(target_dir)}"
     end
 
     def self.cookbook_files_to_copy(path)

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

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

data/test/sample-app/.gitignore

@@ -0,0 +1,2 @@
+.kitchen
+Berksfile.lock

data/test/sample-app/Berksfile

@@ -0,0 +1,3 @@
+site :opscode
+
+metadata

data/test/sample-app/README.md

@@ -1,20 +1,20 @@
-Description
-===========
-
-A minimal sample application cookbook for testing.
-
-"Features" of an application cookbook:
-
- * strict dependency management - *all* dependency versions must be locked down in metadata.rb
- * Cheffile must exist and is *not* in .gitignore - we need it when resolving its dependencies
-
-
-Requirements
-============
-
-Attributes
-==========
-
-Usage
-=====
-
+Description
+===========
+
+A minimal sample top-level cookbook for testing.
+
+Requirements of a top-level cookbook:
+
+ * strict dependency management - *all* dependency versions must be locked down in metadata.rb
+ * Berksfile must exist and is *not* in .gitignore - we need it when resolving its dependencies
+
+
+Requirements
+============
+
+Attributes
+==========
+
+Usage
+=====
+

data/test/sample-app/Vagrantfile

@@ -0,0 +1,49 @@
+
+# Vagrantfile for testing
+#
+# NOTE: you need the following plugins:
+# - `vagrant plugin install vagrant-plugin-bundler --plugin-version 0.1.0`
+#
+Vagrant::configure("2") do |config|
+
+  # required vagrant plugins
+  config.plugin.deps do
+    depend 'vagrant-omnibus', '1.0.2'
+    depend 'vagrant-cachier', '0.1.0'
+    depend 'vagrant-berkshelf', '1.2.0'
+  end
+
+  # enable cachier
+  config.cache.auto_detect = true
+  # the Chef version to use
+  config.omnibus.chef_version = "11.4.4"
+  # enable berkshelf plugin
+  config.berkshelf.enabled = true
+  
+  #
+  # define the sample-app VM
+  #
+  config.vm.define :"sample-app" do | sample_app_config |
+    
+    # configure the basebox
+    sample_app_config.vm.box = "opscode_ubuntu-13.04_provisionerless"
+    sample_app_config.vm.box_url = "https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-13.04_provisionerless.box"
+    # configure host-only network
+    sample_app_config.vm.hostname = "sample-app-berkshelf.local"
+    sample_app_config.vm.network :private_network, ip: "33.33.40.15" 
+    # virtualbox customizations
+    sample_app_config.vm.provider :virtualbox do |vbox, override|
+      vbox.customize ["modifyvm", :id, "--name", "sample-app-berkshelf.local"] 
+    end
+    
+    # provisioning
+    sample_app_config.vm.provision :chef_solo do |chef|
+      chef.add_recipe "sample-app"
+      chef.json = {
+        :sample_app => {
+          :words_of_wisdom => "Sample App with vagrant-berkshelf Plugin!"
+        }
+      }
+    end
+  end 
+end

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

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

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

@@ -1,5 +1,5 @@
 require 'bundler/setup'
-require 'chef-workflow/tasks/tlc/deps'
+require 'chef-tlc-workflow/tasks'
 
 desc "resolve application cookbook with all its dependencies"
 task :resolve_deps, [:app_cookbook] do |t, args|

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

@@ -31,7 +31,7 @@ def aws_config(instance_type)
     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"
+    override.ssh.private_key_path = "./ssh_key/chef-tlc-insecure-key"
     
     # aws specific settings
     aws.access_key_id = ENV['AWS_ACCESS_KEY']
@@ -40,8 +40,8 @@ def aws_config(instance_type)
     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"
+    aws.security_groups = [ "ssh", "http" ]
+    aws.keypair_name = "chef-tlc-insecure-key"
   end
 end
 
@@ -60,13 +60,16 @@ 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 plugin install vagrant-plugin-bundler --plugin-version 0.1.0`
 #
 Vagrant::configure("2") do |config|
 
+  # required vagrant plugins
+  config.plugin.depend 'vagrant-aws', '0.2.2.rsyncfix'
+  config.plugin.depend 'vagrant-managed-servers', '0.1.0'
+  config.plugin.depend 'vagrant-omnibus', '1.0.2'
+  config.plugin.depend 'vagrant-cachier', '0.1.0'
+
   # the Chef version to use
   config.omnibus.chef_version = "11.4.4"
 

data/test/vagrant-1.x-bootstrap/ssh_key/chef-tlc-insecure-key

@@ -0,0 +1,23 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAsKLqz0Mkyv5w5hip7H1EV09NIvbYtY2Nc/r/zOUxdLl9bMj0tdmKmefdzWj7
+afoa7e+4wbBNTlQD72Ar4D3aIMpNyplcpFQ6EXnfrwYgtjGdynavQv9/aKRmKcHn8l+BcMjVJcTA
+biuIFbntR9waYkkaAwK4mzHcDI4/ENzNUuexTiPz3W0vNrMxmY9678DimZbjJjCtEkCiPDpnbmUO
+scVzwSEdqoTRIHrIxI4MtOVWQJ3hobwyJYk5AzlkIS8p6U1qeTvIoMC8l+JTyERPziVGovhfTjrd
+gjwFdXOgaOESaIP8la2Nu/29a+J7BFwllgwXfnx/uxAElMCmQFdpbwIDAQABAoIBAA9QcK87kQsQ
+eFVauhDI4432UCfB4xQKi8MMdfUbwefu1RMDcUP68mtZkP9oJLQRfRg3+nrAgFNUMWslmWg9tJW3
+NHtmRIPy0X4GZQBVtaxWLOoK1DMo17EI39qq9yMqaJyQrPozTsO+fnPzxMDAMoFm+RxdtgeukPd9
+tbYOjrarPtpxbsUPcKp6590+ity7ZIyyyDsJyrgzaJDxAUQyjB0OfnBJQVk2iZQ1zsFO2hcTL7Xa
+LQbQVkKQnHW6TpyfYQZFtRif2CmwoUfgNK++lLq/SRbfgi20ZHQI8uLGXZ3nvooBplIgIlK1QGc6
+yOtZNAOroZgIciUjdRsEnkxH/7ECgYEA5GWotYbjCdbX8WExqSR2v6qSnrvnDYAodOLCzCK370o/
+Mdv4KG5Dlz/QrgTeeDE7Sj4qljg22e0y7wRNdp+SqL4GZAwWvYAJsIBE9xQX5AMgTRVqhnEh347n
+3G3MNAILxVx3fe9cAR3UReaeGT7TCugbSDjFDSqJoN2YhxvpCFsCgYEAxfvXjPso1ynPbllrD40x
+Y4msjJnGKj+6m/zat6A0/kMXzm4jv4JdZQGU+bf0RTi53uiBCqtURuDkWE7QVs1NrMwt6cG2/Bm9
+q+xLm5oqPLI9HsLIGbAEcKPhI7nVXIfAdzq3gdBJ9by6ZwJI+ISmx2EX8z2x8V3my5cADc0DD30C
+gYAzeT3Ge3nbk9HjEpaQmikxFQ4qPArcng+AGELyorh1c3Q+lmadJgyRn842Cd7hk6bbGpuac1zZ
+TH34JC4ZF+mDoh/qmFbfqmWEo8PnM14XAyVaegMh/Yk2ywwyP4SQDA3/EtHTTgicL87RWiIzaldB
+1AGiCzlNuFKAMLDZck7YlQKBgQCIq66EAwmRZqpsGcwfQy+579sugCTdG3s9nVJ6+lw6vaQce8mv
+tVW1mV729/bnJh6hc01JSTZ3a14WW+nUUgtx4s07Fd+0rixSF1+mPck0dzJcHsg1e13FSEvt9qYE
+Jy5E4EK3mUrFGZBv9ZLcA+6BqlP3NTq2TUU6e7Ws0T5wnQKBgAwk4Eh3lUPiN7MOjsbzyXjfLrtv
+DS9Oas7qQ4zJJGeh4SfCQcRCn8Q0EVetj5Xt2zEiSBUveWdtCNuBWE+F89YoEaey/GXiT1F9A9T/
+/Re+YmI2ekmE+xNB8x15I02d0tDH2F+mzvSejDcgKXQlWCXbboHrCZ3DWje6Z1rMgVah
+-----END RSA PRIVATE KEY-----

metadata

@@ -1,148 +1,130 @@
 --- !ruby/object:Gem::Specification
 name: chef-tlc-workflow
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Torben Knerr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: chef-workflow-tasklib
+  name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 11.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 11.4.4
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: berkshelf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.18.2
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.18.2
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
-  name: librarian-chef
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: foodcritic
+  name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
-  name: chefspec
+  name: foodcritic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: fauxhai
+  name: chefspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: sahara
+  name: fauxhai
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: knife-solo_data_bag
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: ruby-wmi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-service
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -186,18 +165,17 @@ files:
 - Rakefile
 - chef-tlc-workflow.gemspec
 - docs/ApplicationVsLibraryVsForkedCookbooks.md
-- docs/TmpLibrarianHelpers.md
 - docs/TmpWorkflowTasks.md
 - lib/chef-tlc-workflow.rb
 - lib/chef-tlc-workflow/helpers.rb
+- lib/chef-tlc-workflow/tasks.rb
 - lib/chef-tlc-workflow/version.rb
-- lib/chef-workflow/tasks/tlc.rb
-- lib/chef-workflow/tasks/tlc/deps.rb
-- lib/chef-workflow/tasks/tlc/test.rb
 - test/esx_fake/Vagrantfile
+- test/sample-app/.gitignore
+- test/sample-app/Berksfile
 - test/sample-app/CHANGELOG.md
-- test/sample-app/Cheffile
 - test/sample-app/README.md
+- test/sample-app/Vagrantfile
 - test/sample-app/attributes/default.rb
 - test/sample-app/metadata.rb
 - test/sample-app/recipes/default.rb
@@ -207,35 +185,37 @@ files:
 - test/vagrant-1.x-bootstrap/Rakefile
 - test/vagrant-1.x-bootstrap/Vagrantfile
 - test/vagrant-1.x-bootstrap/app_cookbooks.yml
+- test/vagrant-1.x-bootstrap/ssh_key/chef-tlc-insecure-key
 homepage: https://github.com/tknerr/chef-tlc-workflow
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Chef Workflow based on the idea of Top-Level Cookbooks
 test_files:
 - test/esx_fake/Vagrantfile
+- test/sample-app/.gitignore
+- test/sample-app/Berksfile
 - test/sample-app/CHANGELOG.md
-- test/sample-app/Cheffile
 - test/sample-app/README.md
+- test/sample-app/Vagrantfile
 - test/sample-app/attributes/default.rb
 - test/sample-app/metadata.rb
 - test/sample-app/recipes/default.rb
@@ -245,3 +225,4 @@ test_files:
 - test/vagrant-1.x-bootstrap/Rakefile
 - test/vagrant-1.x-bootstrap/Vagrantfile
 - test/vagrant-1.x-bootstrap/app_cookbooks.yml
+- test/vagrant-1.x-bootstrap/ssh_key/chef-tlc-insecure-key

data/docs/TmpLibrarianHelpers.md

@@ -1,21 +0,0 @@
-
-## Librarian Helpers
-
-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'
-
-    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 provide a .yml file with custom location mappings and pass it to the helper method: 
-
-    ...
-    ChefTLCWorkflow::Helpers::from_metadata('../../locations.yml').each do |cb_name, cb_version, location|
-      cookbook cb_name, cb_version, location
-    end

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

@@ -1,4 +0,0 @@
-require 'chef-workflow-tasklib'
-
-chef_workflow_task 'tlc/deps'
-chef_workflow_task 'tlc/test'

data/lib/chef-workflow/tasks/tlc/test.rb

@@ -1,15 +0,0 @@
-
-namespace :tlc do
-  namespace :test do
-
-  	#
-    # destroy the default Vagrant VM, resolve dependencies and converge the default Vagrant VM
-    #
-    task :converge do
-      sh "vagrant destroy -f"
-      Rake::Task["tlc:deps:resolve"].invoke
-      sh "vagrant up"
-    end
-  end
-end
-

data/test/sample-app/Cheffile

@@ -1,15 +0,0 @@
-site "http://community.opscode.com/api/v1"
-
-require 'chef-tlc-workflow/helpers'
-
-#
-# read dependencies from metadata
-#
-ChefTLCWorkflow::Helpers::from_metadata.each do |cb_name, cb_version|
-  cookbook cb_name, cb_version
-end
-
-#
-# resolve self for testing with vagrant
-#
-cookbook "sample-app", :path => '.'