Skip to content

Commit

Permalink
Merge pull request #11 from tknerr/relax-versions
Browse files Browse the repository at this point in the history
revert relaxed chef/vagrant versions because the 1.0.x vagrant api is no...
  • Loading branch information
hedgehog committed Aug 28, 2012
2 parents cfb9325 + 2dc8d35 commit 6ed0278
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
source "http://rubygems.org"
# Add dependencies required to use your gem here.
group :default do
gem 'chef', ">= 0.10.0"
gem 'chef', "~> 0.10.0"
gem 'childprocess', '>= 0.1.7'
gem 'cucumber', '> 1.0.0' #, :require => 'cucumber'
gem 'grit', "~>2.4.1"
# gem 'json', "1.5.2"
gem 'open4'
gem 'rspec'
gem 'rvm', '~> 1.8.0' #, :path => '/usr/src/rvm'
gem "vagrant", '>= 0.8.7'
gem "vagrant", '~> 0.8.7'
end
# Add dependencies to develop your gem here.
# Include everything needed to run rake, tests, features, etc.
group :development do
gem "rr", "~> 1.0.2"
gem 'chef', ">= 0.10.0"
gem 'chef', "~> 0.10.0"
gem 'cucumber', '> 1.0.0' #, :require => 'cucumber'
gem 'yard', "~> 0.6.0"
gem 'bundler', "~> 1.1.rc"
Expand All @@ -24,5 +24,5 @@ group :development do
gem 'reek', "~> 1.2.8"
gem 'roodi', "~> 2.1.0"
gem 'fakefs', '~> 0.3.1'
gem 'vagrant', '>= 0.8.7'
gem 'vagrant', '~> 0.8.7'
end
24 changes: 12 additions & 12 deletions cuken.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -521,16 +521,16 @@ Gem::Specification.new do |s|
s.specification_version = 3

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<chef>, [">= 0.10.0"])
s.add_runtime_dependency(%q<chef>, ["~> 0.10.0"])
s.add_runtime_dependency(%q<childprocess>, [">= 0.1.7"])
s.add_runtime_dependency(%q<cucumber>, ["> 1.0.0"])
s.add_runtime_dependency(%q<grit>, ["~> 2.4.1"])
s.add_runtime_dependency(%q<open4>, [">= 0"])
s.add_runtime_dependency(%q<rspec>, [">= 0"])
s.add_runtime_dependency(%q<rvm>, ["~> 1.8.0"])
s.add_runtime_dependency(%q<vagrant>, [">= 0.8.7"])
s.add_runtime_dependency(%q<vagrant>, ["~> 0.8.7"])
s.add_development_dependency(%q<rr>, ["~> 1.0.2"])
s.add_development_dependency(%q<chef>, [">= 0.10.0"])
s.add_development_dependency(%q<chef>, ["~> 0.10.0"])
s.add_development_dependency(%q<cucumber>, ["> 1.0.0"])
s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
s.add_development_dependency(%q<bundler>, ["~> 1.1.rc"])
Expand All @@ -539,18 +539,18 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<reek>, ["~> 1.2.8"])
s.add_development_dependency(%q<roodi>, ["~> 2.1.0"])
s.add_development_dependency(%q<fakefs>, ["~> 0.3.1"])
s.add_development_dependency(%q<vagrant>, [">= 0.8.7"])
s.add_development_dependency(%q<vagrant>, ["~> 0.8.7"])
else
s.add_dependency(%q<chef>, [">= 0.10.0"])
s.add_dependency(%q<chef>, ["~> 0.10.0"])
s.add_dependency(%q<childprocess>, [">= 0.1.7"])
s.add_dependency(%q<cucumber>, ["> 1.0.0"])
s.add_dependency(%q<grit>, ["~> 2.4.1"])
s.add_dependency(%q<open4>, [">= 0"])
s.add_dependency(%q<rspec>, [">= 0"])
s.add_dependency(%q<rvm>, ["~> 1.8.0"])
s.add_dependency(%q<vagrant>, [">= 0.8.7"])
s.add_dependency(%q<vagrant>, ["~> 0.8.7"])
s.add_dependency(%q<rr>, ["~> 1.0.2"])
s.add_dependency(%q<chef>, [">= 0.10.0"])
s.add_dependency(%q<chef>, ["~> 0.10.0"])
s.add_dependency(%q<cucumber>, ["> 1.0.0"])
s.add_dependency(%q<yard>, ["~> 0.6.0"])
s.add_dependency(%q<bundler>, ["~> 1.1.rc"])
Expand All @@ -559,19 +559,19 @@ Gem::Specification.new do |s|
s.add_dependency(%q<reek>, ["~> 1.2.8"])
s.add_dependency(%q<roodi>, ["~> 2.1.0"])
s.add_dependency(%q<fakefs>, ["~> 0.3.1"])
s.add_dependency(%q<vagrant>, [">= 0.8.7"])
s.add_dependency(%q<vagrant>, ["~> 0.8.7"])
end
else
s.add_dependency(%q<chef>, [">= 0.10.0"])
s.add_dependency(%q<chef>, ["~> 0.10.0"])
s.add_dependency(%q<childprocess>, [">= 0.1.7"])
s.add_dependency(%q<cucumber>, ["> 1.0.0"])
s.add_dependency(%q<grit>, ["~> 2.4.1"])
s.add_dependency(%q<open4>, [">= 0"])
s.add_dependency(%q<rspec>, [">= 0"])
s.add_dependency(%q<rvm>, ["~> 1.8.0"])
s.add_dependency(%q<vagrant>, [">= 0.8.7"])
s.add_dependency(%q<vagrant>, ["~> 0.8.7"])
s.add_dependency(%q<rr>, ["~> 1.0.2"])
s.add_dependency(%q<chef>, [">= 0.10.0"])
s.add_dependency(%q<chef>, ["~> 0.10.0"])
s.add_dependency(%q<cucumber>, ["> 1.0.0"])
s.add_dependency(%q<yard>, ["~> 0.6.0"])
s.add_dependency(%q<bundler>, ["~> 1.1.rc"])
Expand All @@ -580,7 +580,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<reek>, ["~> 1.2.8"])
s.add_dependency(%q<roodi>, ["~> 2.1.0"])
s.add_dependency(%q<fakefs>, ["~> 0.3.1"])
s.add_dependency(%q<vagrant>, [">= 0.8.7"])
s.add_dependency(%q<vagrant>, ["~> 0.8.7"])
end
end

0 comments on commit 6ed0278

Please sign in to comment.