microwave 0.1006.16 → 0.1006.17

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1006.16
1
+ 0.1006.17
data/lib/chef/config.rb CHANGED
@@ -20,6 +20,8 @@
20
20
  require 'chef/log'
21
21
  require 'mixlib/config'
22
22
 
23
+ $microwave_root ||= "#{ENV['HOME']}/.microwave"
24
+
23
25
  class Chef
24
26
  class Config
25
27
 
@@ -50,16 +52,16 @@ class Chef
50
52
 
51
53
  # Where the cookbooks are located. Meaning is somewhat context dependent between
52
54
  # chef-client, and chef-solo.
53
- cookbook_path [ "#{ENV['HOME']}/cookbooks" ] + $:.collect {|x| File.join(File.expand_path("..", x), "cookbooks") }.select {|x| File.directory? x }
55
+ cookbook_path [ "#{$microwave_root}/cookbooks" ] + $:.collect {|x| File.join(File.expand_path("..", x), "cookbooks") }.select {|x| File.directory? x }
54
56
 
55
57
  # Where cookbook files are stored on the server (by content checksum)
56
- checksum_path "#{ENV['HOME']}/.microwave/checksums"
58
+ checksum_path "#{$microwave_root}/checksums"
57
59
 
58
60
  # Where chef's cache files should be stored
59
- file_cache_path "#{ENV['HOME']}/.microwave/cache"
61
+ file_cache_path "#{$microwave_root}/cache"
60
62
 
61
63
  # Where backups of chef-managed files should go
62
- file_backup_path "#{ENV['HOME']}/.microwave/backup"
64
+ file_backup_path "#{$microwave_root}/backup"
63
65
 
64
66
  interval nil
65
67
  log_level :info
@@ -67,7 +69,7 @@ class Chef
67
69
  # toggle info level log items that can create a lot of output
68
70
  verbose_logging true
69
71
  node_name nil
70
- node_path "#{ENV['HOME']}/nodes"
72
+ node_path "#{$microwave_root}/nodes"
71
73
 
72
74
  pid_file nil
73
75
 
@@ -77,7 +79,7 @@ class Chef
77
79
  splay nil
78
80
 
79
81
  # Where should chef-solo look for role files?
80
- role_path [ "#{ENV['HOME']}/roles" ]
82
+ role_path [ "#{$microwave_root}/roles" ]
81
83
 
82
84
  # Report Handlers
83
85
  report_handlers []
@@ -91,7 +93,7 @@ class Chef
91
93
  # Checksum Cache
92
94
  # Uses Moneta on the back-end
93
95
  cache_type "BasicFile"
94
- cache_options({ :path => "#{ENV['HOME']}/.microwave/cache/checksums", :skip_expires => true })
96
+ cache_options({ :path => "#{$microwave_root}}/cache/checksums", :skip_expires => true })
95
97
 
96
98
  # Those lists of regular expressions define what chef considers a
97
99
  # valid user and group name
@@ -27,7 +27,7 @@ class Chef
27
27
 
28
28
  def initialize(config={})
29
29
  @config = config
30
- @config[:path] ||= "#{ENV['HOME']}/.microwave/reports"
30
+ @config[:path] ||= "#{$microwave_root}/reports"
31
31
  @config
32
32
  end
33
33
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: microwave
3
3
  version: !ruby/object:Gem::Version
4
- hash: 3975
4
+ hash: 3973
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 1006
9
- - 16
10
- version: 0.1006.16
9
+ - 17
10
+ version: 0.1006.17
11
11
  platform: ruby
12
12
  authors:
13
13
  - Tom Bombadil
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-05-16 00:00:00 -07:00
18
+ date: 2012-05-18 00:00:00 -07:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency