mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
Drop Ruby<2 support
This commit is contained in:
parent
3ea8007df4
commit
10d7a040ca
7 changed files with 6 additions and 60 deletions
|
@ -21,14 +21,6 @@ matrix:
|
|||
allow_failures:
|
||||
- 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
|
||||
|
|
|
@ -20,9 +20,8 @@ If there's a metagem available for your cloud provider, e.g. `fog-aws`,
|
|||
you should be using it instead of requiring the full fog collection to avoid
|
||||
unnecessary dependencies.
|
||||
|
||||
'fog' should be required explicitly only if:
|
||||
- The provider you use doesn't yet have a metagem available.
|
||||
- You require Ruby 1.9.3 support.
|
||||
'fog' should be required explicitly only if the provider you use doesn't yet
|
||||
have a metagem available.
|
||||
|
||||
## Getting Started
|
||||
|
||||
|
|
|
@ -44,6 +44,8 @@ Gem::Specification.new do |s|
|
|||
s.rdoc_options = ["--charset=UTF-8"]
|
||||
s.extra_rdoc_files = %w[README.md]
|
||||
|
||||
s.required_ruby_version = '>= 2.0.0'
|
||||
|
||||
s.add_dependency("fog-core", "~> 1.45")
|
||||
s.add_dependency("fog-json")
|
||||
s.add_dependency("fog-xml", "~> 0.1.1")
|
||||
|
@ -113,9 +115,8 @@ If there's a metagem available for your cloud provider, e.g. `fog-aws`,
|
|||
you should be using it instead of requiring the full fog collection to avoid
|
||||
unnecessary dependencies.
|
||||
|
||||
'fog' should be required explicitly only if:
|
||||
- The provider you use doesn't yet have a metagem available.
|
||||
- You require Ruby 1.9.3 support.
|
||||
'fog' should be required explicitly only if the provider you use doesn't yet
|
||||
have a metagem available.
|
||||
------------------------------
|
||||
POSTINST
|
||||
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
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 => "../"
|
|
@ -1,20 +0,0 @@
|
|||
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 => "../"
|
|
@ -116,10 +116,6 @@ module Fog
|
|||
child_vms = data[:vms].select do |vm_id, vm_details|
|
||||
vm_details[:parent_vapp] == id
|
||||
end
|
||||
if RUBY_VERSION.to_f < 1.9
|
||||
# 1.8 Hash.select returns an Array of [k,v] pairs.
|
||||
child_vms = Hash[child_vms]
|
||||
end
|
||||
child_vms.keys.collect do |vm_id|
|
||||
get_mock_vm_body(vm_id)
|
||||
end
|
||||
|
|
|
@ -39,12 +39,6 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
|
|||
'none?', 'one?'
|
||||
]
|
||||
|
||||
# JRuby 1.7.5+ issue causes a SystemStackError: stack level too deep
|
||||
# https://github.com/jruby/jruby/issues/1265
|
||||
if RUBY_PLATFORM == "java" and JRUBY_VERSION =~ /1\.7\.[5-8]/
|
||||
methods.delete('all?')
|
||||
end
|
||||
|
||||
methods.each do |enum_method|
|
||||
if collection.respond_to?(enum_method)
|
||||
tests("##{enum_method}").succeeds do
|
||||
|
|
Loading…
Add table
Reference in a new issue