diff options
| author | Stuart Preston <stuart@chef.io> | 2018-07-24 13:45:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 13:45:12 +0100 |
| commit | 96c71e93dd9fea3fc8bd52394559149578c03f6b (patch) | |
| tree | 4e0819827ed88703512e6bc839575ab69f8ea43b | |
| parent | 02ea1d785b22107dd5e04240ef523b080250758d (diff) | |
| parent | e5fe82316403110d61d5eb06bde88778a67540b1 (diff) | |
| download | chef-96c71e93dd9fea3fc8bd52394559149578c03f6b.tar.gz | |
Merge pull request #7505 from MsysTechnologiesllc/nimesh/MSYS-868_bump_version_ISO8601
Bump version of ISO8601 to latest (0.11.0)
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | chef.gemspec | 2 | ||||
| -rw-r--r-- | lib/chef/resource/windows_task.rb | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6d29f3d4f0..12a95f6e9a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,7 +20,7 @@ PATH ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) iniparse (~> 1.4) - iso8601 (~> 0.9.1) + iso8601 (~> 0.11.0) mixlib-archive (~> 0.4) mixlib-authentication (~> 2.1) mixlib-cli (~> 1.7) @@ -51,7 +51,7 @@ PATH ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) iniparse (~> 1.4) - iso8601 (~> 0.9.1) + iso8601 (~> 0.11.0) mixlib-archive (~> 0.4) mixlib-authentication (~> 2.1) mixlib-cli (~> 1.7) @@ -169,7 +169,7 @@ GEM tomlrb (~> 1.2) train-core (~> 1.4, >= 1.4.15) ipaddress (0.8.3) - iso8601 (0.9.1) + iso8601 (0.11.0) json (2.1.0) launchy (2.4.3) addressable (~> 2.3) diff --git a/chef.gemspec b/chef.gemspec index cb92cc8003..2242d6e5fd 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -38,7 +38,7 @@ Gem::Specification.new do |s| s.add_dependency "plist", "~> 3.2" s.add_dependency "iniparse", "~> 1.4" s.add_dependency "addressable" - s.add_dependency "iso8601", "~> 0.9.1" + s.add_dependency "iso8601", "~> 0.11.0" # Audit mode requires these, so they are non-developmental dependencies now %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.5" } diff --git a/lib/chef/resource/windows_task.rb b/lib/chef/resource/windows_task.rb index fd4c93907d..b311caf743 100644 --- a/lib/chef/resource/windows_task.rb +++ b/lib/chef/resource/windows_task.rb @@ -267,8 +267,8 @@ class Chef # Converts the number of seconds to an ISO8601 duration format and returns it. # Ref : https://github.com/arnau/ISO8601/blob/master/lib/iso8601/duration.rb#L18-L23 # e.g. - # ISO8601::Duration.new(65707200) - # returns 'P65707200S' + # ISO8601::Duration.new(65707200).to_s + # returns 'PT65707200S' def sec_to_dur(seconds) ISO8601::Duration.new(seconds.to_i).to_s end |