mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
merging
This commit is contained in:
commit
3a73b4eea3
2 changed files with 60 additions and 36 deletions
93
fog.gemspec
93
fog.gemspec
|
@ -1,3 +1,8 @@
|
|||
# coding: utf-8
|
||||
lib = File.expand_path("../lib", __FILE__)
|
||||
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
||||
require "fog/version"
|
||||
|
||||
Gem::Specification.new do |s|
|
||||
s.specification_version = 2 if s.respond_to? :specification_version=
|
||||
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
||||
|
@ -5,10 +10,10 @@ Gem::Specification.new do |s|
|
|||
## Leave these as is they will be modified for you by the rake gemspec task.
|
||||
## If your rubyforge_project name is different, then edit it and comment out
|
||||
## the sub! line in the Rakefile
|
||||
s.name = 'fog'
|
||||
s.version = '1.22.1'
|
||||
s.date = '2014-05-29'
|
||||
s.rubyforge_project = 'fog'
|
||||
s.name = "fog"
|
||||
s.version = "1.37.0"
|
||||
s.date = "2015-12-22"
|
||||
s.rubyforge_project = "fog"
|
||||
|
||||
## Make sure your summary is short. The description may be as long
|
||||
## as you like.
|
||||
|
@ -19,9 +24,9 @@ Gem::Specification.new do |s|
|
|||
## better to set the email to an email list or something. If you don't have
|
||||
## a custom homepage, consider using your GitHub URL or the like.
|
||||
s.authors = ["geemus (Wesley Beary)"]
|
||||
s.email = 'geemus@gmail.com'
|
||||
s.homepage = 'http://github.com/fog/fog'
|
||||
s.license = 'MIT'
|
||||
s.email = "geemus@gmail.com"
|
||||
s.homepage = "http://github.com/fog/fog"
|
||||
s.license = "MIT"
|
||||
|
||||
## This sections is only necessary if you have C extensions.
|
||||
# s.require_paths << 'ext'
|
||||
|
@ -39,36 +44,58 @@ Gem::Specification.new do |s|
|
|||
s.rdoc_options = ["--charset=UTF-8"]
|
||||
s.extra_rdoc_files = %w[README.md]
|
||||
|
||||
## List your runtime dependencies here. Runtime dependencies are those
|
||||
## that are needed for an end user to actually USE your code.
|
||||
s.add_dependency("fog-core", "~> 1.22")
|
||||
s.add_dependency("fog-core", "~> 1.32")
|
||||
s.add_dependency("fog-json")
|
||||
s.add_dependency("fog-xml", "~> 0.1.1")
|
||||
|
||||
s.add_dependency('nokogiri', '~> 1.5', '>= 1.5.11')
|
||||
s.add_dependency('ipaddress', '~>0.5')
|
||||
s.add_dependency("ipaddress", "~> 0.5")
|
||||
|
||||
# Modular providers
|
||||
s.add_dependency("fog-brightbox")
|
||||
# Modular providers (please keep sorted)
|
||||
s.add_dependency("fog-aliyun",">= 0.1.0")
|
||||
s.add_dependency("fog-atmos")
|
||||
s.add_dependency("fog-aws", ">= 0.6.0")
|
||||
s.add_dependency("fog-brightbox", "~> 0.4")
|
||||
s.add_dependency("fog-cloudatcost", "~> 0.1.0")
|
||||
s.add_dependency("fog-dynect", "~> 0.0.2")
|
||||
s.add_dependency("fog-ecloud", "~> 0.1")
|
||||
s.add_dependency("fog-google", "<= 0.1.0")
|
||||
s.add_dependency("fog-local")
|
||||
s.add_dependency("fog-openstack")
|
||||
s.add_dependency("fog-powerdns", ">= 0.1.1")
|
||||
s.add_dependency("fog-profitbricks")
|
||||
s.add_dependency("fog-rackspace")
|
||||
s.add_dependency("fog-radosgw", ">= 0.0.2")
|
||||
s.add_dependency("fog-riakcs")
|
||||
s.add_dependency("fog-sakuracloud", ">= 0.0.4")
|
||||
s.add_dependency("fog-serverlove")
|
||||
s.add_dependency("fog-softlayer")
|
||||
s.add_dependency("fog-storm_on_demand")
|
||||
s.add_dependency("fog-terremark")
|
||||
s.add_dependency("fog-vmfusion")
|
||||
s.add_dependency("fog-voxel")
|
||||
s.add_dependency("fog-vsphere", ">= 0.4.0")
|
||||
s.add_dependency("fog-xenserver")
|
||||
|
||||
## List your development dependencies here. Development dependencies are
|
||||
## those that are only needed during development
|
||||
s.add_development_dependency('minitest')
|
||||
s.add_development_dependency('rake')
|
||||
s.add_development_dependency('rbvmomi')
|
||||
s.add_development_dependency('yard')
|
||||
s.add_development_dependency('thor')
|
||||
s.add_development_dependency('rbovirt', '0.0.24')
|
||||
s.add_development_dependency('shindo', '~> 0.3.4')
|
||||
s.add_development_dependency('fission')
|
||||
s.add_development_dependency('pry')
|
||||
s.add_development_dependency('opennebula', '>=4.4.0')
|
||||
s.add_development_dependency('google-api-client', '~> 0.6', '>= 0.6.2')
|
||||
s.add_development_dependency('rubocop') if RUBY_VERSION > "1.9"
|
||||
s.add_development_dependency("docker-api", ">= 1.13.6")
|
||||
s.add_development_dependency("fission")
|
||||
s.add_development_dependency("mime-types")
|
||||
s.add_development_dependency("minitest")
|
||||
s.add_development_dependency("minitest-stub-const")
|
||||
s.add_development_dependency("opennebula")
|
||||
s.add_development_dependency("pry")
|
||||
s.add_development_dependency("rake")
|
||||
s.add_development_dependency("rbovirt", "0.0.32")
|
||||
s.add_development_dependency("rbvmomi")
|
||||
s.add_development_dependency("rubocop")
|
||||
s.add_development_dependency("shindo", "~> 0.3.4")
|
||||
s.add_development_dependency("simplecov")
|
||||
s.add_development_dependency("thor")
|
||||
s.add_development_dependency("yard")
|
||||
s.add_development_dependency("rspec-core")
|
||||
s.add_development_dependency("rspec-expectations")
|
||||
s.add_development_dependency("vcr")
|
||||
s.add_development_dependency("webmock","~>1.22.2")
|
||||
|
||||
if ENV["FOG_USE_LIBVIRT"]
|
||||
s.add_development_dependency('ruby-libvirt','~> 0.5.0')
|
||||
end
|
||||
|
||||
s.files = `git ls-files`.split("\n") - `git ls-files -- providers/`.split("\n")
|
||||
s.files = `git ls-files`.split("\n")
|
||||
s.test_files = `git ls-files -- {spec,tests}/*`.split("\n")
|
||||
end
|
||||
|
|
|
@ -21,7 +21,6 @@ Shindo.tests('Parsers::Compute::VcloudDirector::Vm', ['vclouddirector', 'all'])
|
|||
tests('#links').returns(false){ vm[:links].empty? }
|
||||
|
||||
tests('#network_adapters').returns(2){ vm[:network_adapters].size }
|
||||
|
||||
primary_nic = vm[:network_adapters].select { |nic| nic[:primary] }.first
|
||||
tests('#network_adapters:ip_address').returns('192.168.96.10'){ primary_nic[:ip_address] }
|
||||
tests('#network_adapters:primary').returns(true){ primary_nic[:primary] }
|
||||
|
@ -60,7 +59,6 @@ Shindo.tests('Parsers::Compute::VcloudDirector::Vms', ['vclouddirector', 'all'])
|
|||
tests('vms[0]#network_adapters').returns(false){ vms[0][:network_adapters].empty? }
|
||||
|
||||
tests('#network_adapters').returns(2){ vms[0][:network_adapters].size }
|
||||
|
||||
primary_nic = vms[0][:network_adapters].select { |nic| nic[:primary] }.first
|
||||
tests('vms[0]#network_adapters:ip_address').returns('192.168.96.4'){ primary_nic[:ip_address] }
|
||||
tests('vms[0]#network_adapters:primary').returns(true){ primary_nic[:primary] }
|
||||
|
@ -90,7 +88,6 @@ Shindo.tests('Parsers::Compute::VcloudDirector::Vms', ['vclouddirector', 'all'])
|
|||
tests('vms[1]#links').returns(false){ vms[1][:links].empty? }
|
||||
|
||||
tests('#network_adapters').returns(2){ vms[1][:network_adapters].size }
|
||||
|
||||
primary_nic = vms[1][:network_adapters].select { |nic| nic[:primary] }.first
|
||||
tests('vms[0]#network_adapters:ip_address').returns('192.168.96.5'){ primary_nic[:ip_address] }
|
||||
tests('vms[0]#network_adapters:primary').returns(true){ primary_nic[:primary] }
|
||||
|
|
Loading…
Reference in a new issue