summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian C. Dunn <jdunn@aquezada.com>2015-07-21 08:30:34 -0400
committerJulian C. Dunn <jdunn@aquezada.com>2015-07-21 08:30:34 -0400
commit63c1218b4ca27e5f503b2f4527c363de451f0701 (patch)
tree12de59aea12fac9fc8c4bd201e5c6ed9b9c75b79
parent2accf7e204aeaa8bf58d1a9b210c4c3b722e7fef (diff)
parentd7352f5ef8c5d2bf77b8e4ec8c3ff9749ff2a408 (diff)
downloadohai-63c1218b4ca27e5f503b2f4527c363de451f0701.tar.gz
Merge pull request #584 from juliandunn/junit_formatter
-rw-r--r--Gemfile8
-rw-r--r--ohai.gemspec6
2 files changed, 4 insertions, 10 deletions
diff --git a/Gemfile b/Gemfile
index aba36fa9..596b850b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,14 +2,8 @@ source "https://rubygems.org"
gemspec
-# https://github.com/sj26/rspec_junit_formatter/pull/14
-# rspec_junit_formatter isn't compatible with RSpec3 yet, but is fixed in
-# master. Once it's released we should remove this.
-gem "rspec_junit_formatter", :git => 'https://github.com/sj26/rspec_junit_formatter.git',
- :ref => "147836c41fab23ff7b92806f34122c8e5f2ddcad"
-
group :development do
- gem "chef", github: "opscode/chef", branch: "master"
+ gem "chef", github: "chef/chef", branch: "master"
gem "sigar", :platform => "ruby"
gem 'plist'
diff --git a/ohai.gemspec b/ohai.gemspec
index b8789a05..8760f1ce 100644
--- a/ohai.gemspec
+++ b/ohai.gemspec
@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
s.description = s.summary
s.license = "Apache-2.0"
s.author = "Adam Jacob"
- s.email = "adam@opscode.com"
- s.homepage = "https://docs.getchef.com/ohai.html"
+ s.email = "adam@chef.io"
+ s.homepage = "https://docs.chef.io/ohai.html"
s.required_ruby_version = ">= 2.0.0"
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
s.add_development_dependency "rspec-expectations", "~> 3.0"
s.add_development_dependency "rspec-mocks", "~> 3.0"
s.add_development_dependency "rspec-collection_matchers", "~> 1.0"
-# s.add_development_dependency "rspec_junit_formatter"
+ s.add_development_dependency "rspec_junit_formatter"
s.add_development_dependency "chef"
s.bindir = "bin"
s.executables = %w(ohai)