diff options
| author | lamont-granquist <lamont@scriptkiddie.org> | 2014-09-09 12:55:31 -0700 |
|---|---|---|
| committer | lamont-granquist <lamont@scriptkiddie.org> | 2014-09-09 12:55:31 -0700 |
| commit | 060a5311846dcc288772d75e2683d56e0197df5f (patch) | |
| tree | 44de47a98401ed4159927fe8a0d8f1ddacc8a8a5 | |
| parent | 0018fe4e0e2033e22af5018eabbc149640507fea (diff) | |
| parent | 901d40952e723b22bda0042151d4767dfc01ecf1 (diff) | |
| download | ohai-060a5311846dcc288772d75e2683d56e0197df5f.tar.gz | |
Merge pull request #408 from opscode/lcg/mixlib-shellout-bump
bump mixlib-shellout + misc gemspec
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | lib/ohai/version.rb | 2 | ||||
| -rw-r--r-- | ohai.gemspec | 8 |
3 files changed, 6 insertions, 8 deletions
@@ -8,10 +8,10 @@ gemspec gem "rspec_junit_formatter", :git => 'https://github.com/sj26/rspec_junit_formatter.git', :ref => "147836c41fab23ff7b92806f34122c8e5f2ddcad" -# Rake 10.2 drops Ruby 1.8 support -gem "rake", "~> 10.1.0" +gem "mixlib-shellout", github: "opscode/mixlib-shellout", branch: "master" group :development do + gem "chef", github: "opscode/chef", branch: "master" gem "sigar", :platform => "ruby" gem 'plist' diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb index 5be37b4b..71713b26 100644 --- a/lib/ohai/version.rb +++ b/lib/ohai/version.rb @@ -18,5 +18,5 @@ module Ohai OHAI_ROOT = File.expand_path(File.dirname(__FILE__)) - VERSION = '7.4.0.dev' + VERSION = '7.6.0.dev' end diff --git a/ohai.gemspec b/ohai.gemspec index 45e2a1c8..d2a462ff 100644 --- a/ohai.gemspec +++ b/ohai.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |s| s.license = "Apache-2.0" s.author = "Adam Jacob" s.email = "adam@opscode.com" - s.homepage = "http://wiki.opscode.com/display/chef/Ohai" + s.homepage = "https://docs.getchef.com/ohai.html" s.add_dependency "mime-types", "~> 1.16" s.add_dependency "systemu", "~> 2.6.4" @@ -19,15 +19,13 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-cli" s.add_dependency "mixlib-config", "~> 2.0" s.add_dependency "mixlib-log" - s.add_dependency "mixlib-shellout", "~> 1.2" + s.add_dependency "mixlib-shellout", ">= 2.0.0.rc.0", "< 3.0" s.add_dependency "net-dhcp" s.add_dependency "ipaddress" s.add_dependency "wmi-lite", "~> 1.0" s.add_dependency "ffi", "~> 1.9" - # Rake 10.2 drops Ruby 1.8 support, so stick to 10.1.x until chef also drops - # 1.8. - s.add_development_dependency "rake", "~> 10.1.0" + s.add_dependency "rake", "~> 10.1" s.add_development_dependency "rspec-core", "~> 3.0" s.add_development_dependency "rspec-expectations", "~> 3.0" s.add_development_dependency "rspec-mocks", "~> 3.0" |