chef-tlc-workflow 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+
+# [0.1.2] from 05/29/2013
+
+ * added this CHANGELOG.md :-)
+ * updated `test/ec2-bootstrap` for [compatibility](https://github.com/matschaffer/knife-solo/wiki/Upgrading-to-0.3.0) with latest knife-solo
+ * gemspec updates:
+  * updated to renamed librarian-chef 0.0.1
+  * updated knife-solo to 0.3.0.pre4
+
+# [0.1.1] from 05/29/2013
+
+ * fix path to Gemfile so that `rake test` is working again
+ * gemspec updates:
+  * update to mccloud 0.0.19
+
+# [0.1.0] from 05/28/2013
+
+ * initial version

data/chef-tlc-workflow.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   #
   gem.add_dependency 'chef-workflow-tasklib', '0.2.2'
   gem.add_dependency 'chef', '10.18.2'
-  gem.add_dependency 'librarian', '0.0.26.2'
+  gem.add_dependency 'librarian-chef', '0.0.1'
 
   #
   # further dependencies that are not `require`d here but we pull in for convenience
@@ -30,7 +30,7 @@ Gem::Specification.new do |gem|
 
   # for interaction with nodes in local/esx/ec2 environments
   gem.add_dependency 'vagrant', '1.0.5.1'
-  gem.add_dependency 'knife-solo', '0.3.0.pre2'
+  gem.add_dependency 'knife-solo', '0.3.0.pre4'
   gem.add_dependency 'mccloud', '0.0.19'
   
   # testing related

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

@@ -1,3 +1,3 @@
 module ChefTLCWorkflow
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/Gemfile

@@ -3,5 +3,5 @@ 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.1",
+gem "chef-tlc-workflow", "0.1.2",
   :path => "#{File.dirname(__FILE__)}/../../chef-tlc-workflow"

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

@@ -1,7 +1,10 @@
 # 
-# configure kitchen path on the server allowing us to adapt 
-# the cookbook_path in `solo.rb`
+# knife configuration that is honored by knife-solo, see 
+# https://github.com/matschaffer/knife-solo/wiki/Upgrading-to-0.3.0 
 #
-# see https://github.com/matschaffer/knife-solo/issues/199#issuecomment-13820473
-#
-knife[:solo_path] = '/tmp/chef-solo'
+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/Rakefile

@@ -47,18 +47,12 @@ def ssh_key_cmdline(args)
 end
 
 #
-# rewrites solo.rb with the cookbook_path adapted 
-# for the given app cookbook while the block executes
+# 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)
-  File.open("solo.rb", 'w') {|f| f.write(<<-EOF) }
-base = File.expand_path('..', __FILE__)
-data_bag_path             base + '/data_bags'
-encrypted_data_bag_secret base + '/data_bag_key'
-role_path                 base + '/roles'
-cookbook_path             base + '/cookbooks/#{app_cookbook}'
-EOF
+  ENV['CURRENT_APP_COOKBOOK'] = app_cookbook
   yield
 ensure
-  FileUtils.rm_rf "solo.rb"
+  ENV['CURRENT_APP_COOKBOOK'] = ""
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-tlc-workflow
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 10.18.2
 - !ruby/object:Gem::Dependency
-  name: librarian
+  name: librarian-chef
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.26.2
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.26.2
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: vagrant
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0.pre2
+        version: 0.3.0.pre4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0.pre2
+        version: 0.3.0.pre4
 - !ruby/object:Gem::Dependency
   name: mccloud
   requirement: !ruby/object:Gem::Requirement
@@ -244,6 +244,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md