chef 11.12.0.rc.1 → 11.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/chef/application/client.rb +6 -3
  3. data/lib/chef/version.rb +1 -1
  4. data/spec/unit/application/client_spec.rb +2 -0
  5. metadata +12 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 60391bafa32bf5cc32d6e20d2d7e4d73851b4831
4
- data.tar.gz: 35fe3189610b04474bf26cf2e4b6d6f3285c383e
3
+ metadata.gz: 829790278adb839ad7d668ef5a257314bac6454d
4
+ data.tar.gz: 814e2692f845803a88cca7d3dc7dcd1838dbd132
5
5
  SHA512:
6
- metadata.gz: a1b8ef49c08c01859feaf9dbe315fa7d6be0e9c8c27db37008fd725ee84e96685180db220612289cec70b2757ba61a810f56380016db5529a4b37037fdb349e3
7
- data.tar.gz: 24f43562e5917d82395fd74f9a5ef307890f3496264ace9369ef5f12ab82cd03809a1a86b7c4e26a5bb2a1b58cf4ab4ae3fdc5c11a5f581cfdb37c2d809678b9
6
+ metadata.gz: 08e3371e0f9d2cddb8ceae27163b2e5d311547c9e3bc32ed40ad6a3cc7becc50980d4ea777cb2623519162602edcba53cba2d297fa1b661344e76c262c8a1a32
7
+ data.tar.gz: 14dab9fde00fadf1e1c24b89fc9f43740874115d97f04676f3013bec8ae1ddb057b4081f05253a6a3cfc078bbd0320d4112002b341404c6b3106b4c25c4f8de4
data/lib/chef/application/client.rb CHANGED
@@ -295,9 +295,12 @@ class Chef::Application::Client < Chef::Application
295
295
  SELF_PIPE[1].putc(IMMEDIATE_RUN_SIGNAL) # wakeup master process from select
296
296
  end
297
297
 
298
- trap("TERM") do
299
- Chef::Log.info("SIGTERM received, exiting gracefully")
300
- SELF_PIPE[1].putc(GRACEFUL_EXIT_SIGNAL)
298
+ # see CHEF-5172
299
+ if Chef::Config[:daemonize] || Chef::Config[:interval]
300
+ trap("TERM") do
301
+ Chef::Log.info("SIGTERM received, exiting gracefully")
302
+ SELF_PIPE[1].putc(GRACEFUL_EXIT_SIGNAL)
303
+ end
301
304
  end
302
305
  end
303
306
 
data/lib/chef/version.rb CHANGED
@@ -17,7 +17,7 @@
17
17
 
18
18
  class Chef
19
19
  CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
20
- VERSION = '11.12.0.rc.1'
20
+ VERSION = '11.12.0'
21
21
  end
22
22
 
23
23
  # NOTE: the Chef::Version class is defined in version_class.rb
data/spec/unit/application/client_spec.rb CHANGED
@@ -128,8 +128,10 @@ end
128
128
 
129
129
  describe Chef::Application::Client, "run_application", :unix_only do
130
130
  before(:each) do
131
+ Chef::Config[:daemonize] = true
131
132
  @pipe = IO.pipe
132
133
  @app = Chef::Application::Client.new
134
+ Chef::Daemon.stub(:daemonize).and_return(true)
133
135
  @app.stub(:run_chef_client) do
134
136
  @pipe[1].puts 'started'
135
137
  sleep 1
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef
3
3
  version: !ruby/object:Gem::Version
4
- version: 11.12.0.rc.1
4
+ version: 11.12.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Jacob
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-31 00:00:00.000000000 Z
11
+ date: 2014-04-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-config
@@ -70,30 +70,30 @@ dependencies:
70
70
  name: mixlib-shellout
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '='
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.4.0.rc.1
75
+ version: '1.4'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - '='
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 1.4.0.rc.1
82
+ version: '1.4'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: ohai
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - '='
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 7.0.0.rc.2
89
+ version: '7.0'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - '='
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 7.0.0.rc.2
96
+ version: '7.0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rest-client
99
99
  requirement: !ruby/object:Gem::Requirement
@@ -1857,9 +1857,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
1857
1857
  version: '0'
1858
1858
  required_rubygems_version: !ruby/object:Gem::Requirement
1859
1859
  requirements:
1860
- - - ">"
1860
+ - - ">="
1861
1861
  - !ruby/object:Gem::Version
1862
- version: 1.3.1
1862
+ version: '0'
1863
1863
  requirements: []
1864
1864
  rubyforge_project:
1865
1865
  rubygems_version: 2.2.2