diff options
| author | Tim Smith <tsmith@chef.io> | 2018-10-25 10:32:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-25 10:32:25 -0700 |
| commit | a5421610d1fb354b96f2d25fd7e36de75d9b9094 (patch) | |
| tree | 34c17e492a36193f8e5deb4ecf1e770bfced41b1 | |
| parent | 444647af82db691f47efeaa0bd58ee68ac48c201 (diff) | |
| parent | 616d0fe205bbb2f2ef6103399954829fe3cbd9a3 (diff) | |
| download | chef-a5421610d1fb354b96f2d25fd7e36de75d9b9094.tar.gz | |
Merge pull request #7778 from chef/iso8601
Move iso8601 gem to windows only gemspec
| -rw-r--r-- | Gemfile.lock | 5 | ||||
| -rw-r--r-- | chef-universal-mingw32.gemspec | 1 | ||||
| -rw-r--r-- | chef.gemspec | 1 | ||||
| -rw-r--r-- | lib/chef/provider/windows_task.rb | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index cf52fb108c..91a62c3d52 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,7 +20,6 @@ PATH ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) iniparse (~> 1.4) - iso8601 (~> 0.11.0) mixlib-archive (~> 0.4) mixlib-authentication (~> 2.1) mixlib-cli (~> 1.7) @@ -51,7 +50,7 @@ PATH ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) iniparse (~> 1.4) - iso8601 (~> 0.11.0) + iso8601 (~> 0.12.1) mixlib-archive (~> 0.4) mixlib-authentication (~> 2.1) mixlib-cli (~> 1.7) @@ -170,7 +169,7 @@ GEM tomlrb (~> 1.2) train-core (~> 1.5, >= 1.5.4) ipaddress (0.8.3) - iso8601 (0.11.0) + iso8601 (0.12.1) json (2.1.0) launchy (2.4.3) addressable (~> 2.3) diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec index 3b17837dac..f663153159 100644 --- a/chef-universal-mingw32.gemspec +++ b/chef-universal-mingw32.gemspec @@ -15,6 +15,7 @@ gemspec.add_dependency "win32-service", "~> 1.0" gemspec.add_dependency "windows-api", "~> 0.4.4" gemspec.add_dependency "wmi-lite", "~> 1.0" gemspec.add_dependency "win32-taskscheduler", "~> 2.0" +gemspec.add_dependency "iso8601", "~> 0.12.1" gemspec.extensions << "ext/win32-eventlog/Rakefile" gemspec.files += Dir.glob("{distro,ext}/**/*") diff --git a/chef.gemspec b/chef.gemspec index 7a1d5dfc68..13ec88f223 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -38,7 +38,6 @@ 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.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/provider/windows_task.rb b/lib/chef/provider/windows_task.rb index d2ac9fdc59..cd8e07e24c 100644 --- a/lib/chef/provider/windows_task.rb +++ b/lib/chef/provider/windows_task.rb @@ -18,7 +18,7 @@ require "chef/mixin/shell_out" require "rexml/document" -require "iso8601" +require "iso8601" if Chef::Platform.windows? require "chef/mixin/powershell_out" require "chef/provider" require "chef/util/path_helper" |