mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
fix dependency issues when building on 1.9.*
This commit is contained in:
parent
596f288f0b
commit
cd2ff87fa1
7 changed files with 78 additions and 5 deletions
16
.travis.yml
16
.travis.yml
|
@ -5,12 +5,9 @@ sudo: false
|
||||||
script: bundle exec rake travis
|
script: bundle exec rake travis
|
||||||
|
|
||||||
rvm:
|
rvm:
|
||||||
- 1.9
|
|
||||||
- 2.0
|
|
||||||
- 2.1
|
- 2.1
|
||||||
- 2.2
|
- 2.2
|
||||||
- jruby-head
|
- jruby-head
|
||||||
- jruby-19mode
|
|
||||||
|
|
||||||
gemfile:
|
gemfile:
|
||||||
- Gemfile
|
- Gemfile
|
||||||
|
@ -20,6 +17,19 @@ matrix:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- rvm: jruby-head
|
- rvm: jruby-head
|
||||||
|
include:
|
||||||
|
- rvm: 1.9.3
|
||||||
|
gemfile: gemfiles/Gemfile-1.9
|
||||||
|
- rvm: 1.9.3
|
||||||
|
gemfile: gemfiles/Gemfile-edge-1.9
|
||||||
|
- rvm: jruby-19mode
|
||||||
|
gemfile: gemfiles/Gemfile-1.9
|
||||||
|
- rvm: jruby-19mode
|
||||||
|
gemfile: gemfiles/Gemfile-edge-1.9
|
||||||
|
- rvm: 2.0
|
||||||
|
gemfile: gemfiles/Gemfile-2.0
|
||||||
|
- rvm: 2.0
|
||||||
|
gemfile: gemfiles/Gemfile-edge-2.0
|
||||||
|
|
||||||
notifications:
|
notifications:
|
||||||
email: false
|
email: false
|
||||||
|
|
|
@ -90,7 +90,7 @@ Gem::Specification.new do |s|
|
||||||
s.add_development_dependency("rake")
|
s.add_development_dependency("rake")
|
||||||
s.add_development_dependency("rbovirt", "0.0.32")
|
s.add_development_dependency("rbovirt", "0.0.32")
|
||||||
s.add_development_dependency("rbvmomi")
|
s.add_development_dependency("rbvmomi")
|
||||||
s.add_development_dependency("rubocop")
|
s.add_development_dependency("rubocop", "0.41.2")
|
||||||
s.add_development_dependency("shindo", "~> 0.3.4")
|
s.add_development_dependency("shindo", "~> 0.3.4")
|
||||||
s.add_development_dependency("simplecov")
|
s.add_development_dependency("simplecov")
|
||||||
s.add_development_dependency("thor")
|
s.add_development_dependency("thor")
|
||||||
|
|
16
gemfiles/Gemfile-1.9
Normal file
16
gemfiles/Gemfile-1.9
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
source "https://rubygems.org"
|
||||||
|
|
||||||
|
gem "nokogiri", "1.6.8.1"
|
||||||
|
gem "rake", "10.5.0"
|
||||||
|
gem "rest-client", "1.8.0"
|
||||||
|
gem "term-ansicolor", "1.3.2"
|
||||||
|
gem "tins", "1.6.0"
|
||||||
|
gem "public_suffix", "1.4.6"
|
||||||
|
|
||||||
|
group :development, :test do
|
||||||
|
gem "coveralls", :require => false
|
||||||
|
gem "netrc", :require => false
|
||||||
|
gem "octokit", "4.3.0", :require => false
|
||||||
|
end
|
||||||
|
|
||||||
|
gemspec :path => "../"
|
11
gemfiles/Gemfile-2.0
Normal file
11
gemfiles/Gemfile-2.0
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
source "https://rubygems.org"
|
||||||
|
|
||||||
|
gem "nokogiri", "1.6.8.1"
|
||||||
|
|
||||||
|
group :development, :test do
|
||||||
|
gem "coveralls", :require => false
|
||||||
|
gem "netrc", :require => false
|
||||||
|
gem "octokit", :require => false
|
||||||
|
end
|
||||||
|
|
||||||
|
gemspec :path => "../"
|
|
@ -5,10 +5,10 @@ gem "fog-core", :github => "fog/fog-core"
|
||||||
gem "fog-json", :github => "fog/fog-json"
|
gem "fog-json", :github => "fog/fog-json"
|
||||||
|
|
||||||
group :development, :test do
|
group :development, :test do
|
||||||
# This is here because gemspec doesn"t support require: false
|
|
||||||
gem "coveralls", :require => false
|
gem "coveralls", :require => false
|
||||||
gem "netrc", :require => false
|
gem "netrc", :require => false
|
||||||
gem "octokit", :require => false
|
gem "octokit", :require => false
|
||||||
|
gem "term-ansicolor", "1.3.2"
|
||||||
end
|
end
|
||||||
|
|
||||||
gemspec :path => "../"
|
gemspec :path => "../"
|
||||||
|
|
20
gemfiles/Gemfile-edge-1.9
Normal file
20
gemfiles/Gemfile-edge-1.9
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
source "https://rubygems.org"
|
||||||
|
|
||||||
|
# Shared components
|
||||||
|
gem "fog-core", :github => "fog/fog-core"
|
||||||
|
gem "fog-json", :github => "fog/fog-json"
|
||||||
|
|
||||||
|
group :development, :test do
|
||||||
|
gem "coveralls", :require => false
|
||||||
|
gem "netrc", :require => false
|
||||||
|
gem "octokit", "4.3.0", :require => false
|
||||||
|
end
|
||||||
|
|
||||||
|
gem "nokogiri", "1.6.8.1"
|
||||||
|
gem "rake", "10.5.0"
|
||||||
|
gem "rest-client", "1.8.0"
|
||||||
|
gem "term-ansicolor", "1.3.2"
|
||||||
|
gem "tins", "1.6.0"
|
||||||
|
gem "public_suffix", "1.4.6"
|
||||||
|
|
||||||
|
gemspec :path => "../"
|
16
gemfiles/Gemfile-edge-2.0
Normal file
16
gemfiles/Gemfile-edge-2.0
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
source "https://rubygems.org"
|
||||||
|
|
||||||
|
# Shared components
|
||||||
|
gem "fog-core", :github => "fog/fog-core"
|
||||||
|
gem "fog-json", :github => "fog/fog-json"
|
||||||
|
|
||||||
|
gem "nokogiri", "1.6.8.1"
|
||||||
|
|
||||||
|
group :development, :test do
|
||||||
|
gem "coveralls", :require => false
|
||||||
|
gem "netrc", :require => false
|
||||||
|
gem "octokit", :require => false
|
||||||
|
gem "term-ansicolor", "1.3.2"
|
||||||
|
end
|
||||||
|
|
||||||
|
gemspec :path => "../"
|
Loading…
Add table
Add a link
Reference in a new issue