chef-tlc-workflow 0.1.1 → 0.1.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. data/CHANGELOG.md +18 -0
  2. data/chef-tlc-workflow.gemspec +2 -2
  3. data/lib/chef-tlc-workflow/version.rb +1 -1
  4. data/test/Gemfile +1 -1
  5. data/test/esx-bootstrap/.chef/knife.rb +8 -5
  6. data/test/esx-bootstrap/Rakefile +4 -10
  7. metadata +7 -6
data/CHANGELOG.md ADDED
@@ -0,0 +1,18 @@
1
+
2
+ # [0.1.2] from 05/29/2013
3
+
4
+ * added this CHANGELOG.md :-)
5
+ * updated `test/ec2-bootstrap` for [compatibility](https://github.com/matschaffer/knife-solo/wiki/Upgrading-to-0.3.0) with latest knife-solo
6
+ * gemspec updates:
7
+ * updated to renamed librarian-chef 0.0.1
8
+ * updated knife-solo to 0.3.0.pre4
9
+
10
+ # [0.1.1] from 05/29/2013
11
+
12
+ * fix path to Gemfile so that `rake test` is working again
13
+ * gemspec updates:
14
+ * update to mccloud 0.0.19
15
+
16
+ # [0.1.0] from 05/28/2013
17
+
18
+ * initial version
data/chef-tlc-workflow.gemspec CHANGED
@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
21
21
  #
22
22
  gem.add_dependency 'chef-workflow-tasklib', '0.2.2'
23
23
  gem.add_dependency 'chef', '10.18.2'
24
- gem.add_dependency 'librarian', '0.0.26.2'
24
+ gem.add_dependency 'librarian-chef', '0.0.1'
25
25
 
26
26
  #
27
27
  # further dependencies that are not `require`d here but we pull in for convenience
@@ -30,7 +30,7 @@ Gem::Specification.new do |gem|
30
30
 
31
31
  # for interaction with nodes in local/esx/ec2 environments
32
32
  gem.add_dependency 'vagrant', '1.0.5.1'
33
- gem.add_dependency 'knife-solo', '0.3.0.pre2'
33
+ gem.add_dependency 'knife-solo', '0.3.0.pre4'
34
34
  gem.add_dependency 'mccloud', '0.0.19'
35
35
 
36
36
  # testing related
data/lib/chef-tlc-workflow/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ChefTLCWorkflow
2
- VERSION = "0.1.1"
2
+ VERSION = "0.1.2"
3
3
  end
data/test/Gemfile CHANGED
@@ -3,5 +3,5 @@ source :rubygems
3
3
  source 'https://gems.gemfury.com/hUe8s8nSyzxs7JMMSZV8/' # vagrant-1.0.5.1
4
4
  source 'https://gems.gemfury.com/psBbdHx94zqZrvxpiVmm/' # librarian-0.0.26.2
5
5
 
6
- gem "chef-tlc-workflow", "0.1.1",
6
+ gem "chef-tlc-workflow", "0.1.2",
7
7
  :path => "#{File.dirname(__FILE__)}/../../chef-tlc-workflow"
data/test/esx-bootstrap/.chef/knife.rb CHANGED
@@ -1,7 +1,10 @@
1
1
  #
2
- # configure kitchen path on the server allowing us to adapt
3
- # the cookbook_path in `solo.rb`
2
+ # knife configuration that is honored by knife-solo, see
3
+ # https://github.com/matschaffer/knife-solo/wiki/Upgrading-to-0.3.0
4
4
  #
5
- # see https://github.com/matschaffer/knife-solo/issues/199#issuecomment-13820473
6
- #
7
- knife[:solo_path] = '/tmp/chef-solo'
5
+ log_level :info
6
+ log_location STDOUT
7
+ data_bag_path "data_bags"
8
+ encrypted_data_bag_secret "data_bag_key"
9
+ role_path "roles"
10
+ cookbook_path "cookbooks/#{ENV['CURRENT_APP_COOKBOOK']}"
data/test/esx-bootstrap/Rakefile CHANGED
@@ -47,18 +47,12 @@ def ssh_key_cmdline(args)
47
47
  end
48
48
 
49
49
  #
50
- # rewrites solo.rb with the cookbook_path adapted
51
- # for the given app cookbook while the block executes
50
+ # sets the 'CURRENT_APP_COOKBOOK' env var while the block executes, which is used in
51
+ # `.chef/knife.rb` for correctly setting the `cookbook_path` for the given app cookbook
52
52
  #
53
53
  def with_app(app_cookbook)
54
- File.open("solo.rb", 'w') {|f| f.write(<<-EOF) }
55
- base = File.expand_path('..', __FILE__)
56
- data_bag_path base + '/data_bags'
57
- encrypted_data_bag_secret base + '/data_bag_key'
58
- role_path base + '/roles'
59
- cookbook_path base + '/cookbooks/#{app_cookbook}'
60
- EOF
54
+ ENV['CURRENT_APP_COOKBOOK'] = app_cookbook
61
55
  yield
62
56
  ensure
63
- FileUtils.rm_rf "solo.rb"
57
+ ENV['CURRENT_APP_COOKBOOK'] = ""
64
58
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef-tlc-workflow
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -44,13 +44,13 @@ dependencies:
44
44
  - !ruby/object:Gem::Version
45
45
  version: 10.18.2
46
46
  - !ruby/object:Gem::Dependency
47
- name: librarian
47
+ name: librarian-chef
48
48
  requirement: !ruby/object:Gem::Requirement
49
49
  none: false
50
50
  requirements:
51
51
  - - '='
52
52
  - !ruby/object:Gem::Version
53
- version: 0.0.26.2
53
+ version: 0.0.1
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
58
58
  requirements:
59
59
  - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: 0.0.26.2
61
+ version: 0.0.1
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: vagrant
64
64
  requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
82
82
  requirements:
83
83
  - - '='
84
84
  - !ruby/object:Gem::Version
85
- version: 0.3.0.pre2
85
+ version: 0.3.0.pre4
86
86
  type: :runtime
87
87
  prerelease: false
88
88
  version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
90
90
  requirements:
91
91
  - - '='
92
92
  - !ruby/object:Gem::Version
93
- version: 0.3.0.pre2
93
+ version: 0.3.0.pre4
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: mccloud
96
96
  requirement: !ruby/object:Gem::Requirement
@@ -244,6 +244,7 @@ extensions: []
244
244
  extra_rdoc_files: []
245
245
  files:
246
246
  - .gitignore
247
+ - CHANGELOG.md
247
248
  - Gemfile
248
249
  - LICENSE.txt
249
250
  - README.md