Skip to content

Commit

Permalink
bump mixlib-shellout + misc gemspec
Browse files Browse the repository at this point in the history
- bumps ohai version
- update homepage
- update rake now that we've dropped 1.8
  • Loading branch information
lamont-granquist committed Sep 8, 2014
1 parent 0018fe4 commit 901d409
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion lib/ohai/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 3 additions & 5 deletions ohai.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,21 @@ 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"
s.add_dependency "ffi-yajl", "~> 1.1"
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"
Expand Down

1 comment on commit 901d409

@schisamo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lamont-granquist This change is causing Gem::UnsatisfiableDependencyError failures. Here is an example: https://gist.github.com/schisamo/27a5519bbdf6608c0e0b

Please sign in to comment.