fog 1.42.1 → 2.0.0.pre.0

data/CONTRIBUTING.md

@@ -56,7 +56,7 @@ Relevant issues include:
 
 * Organize your patches by keeping all related changes together in a topic branch.
 * Rebase your branch against master before submitting a pull request (and squish any 'oops' or work in progress commits).
-* We support several rubies!  Make sure your changes will work for all the Rubies in `.travis.yml`
+* We support several rubies!  Make sure your changes will work for all the Rubies in .travis.yml (currently MRI 1.8, 1.9, and Ruby 2.0).
 * Submit changes as pull requests describing what the changes should cover and referencing issues (if any).
 * Use 'tags' in your commits to indicate the scope, so things like `[aws|compute] fixed something`.
 * Write and run tests.  Tests should follow through usage workflows and ought to pass both with mocking on and off.

data/CONTRIBUTORS.md

@@ -893,6 +893,4 @@
 * wenlock <edward.raigosa@gmail.com>
 * Ørjan Blom <blom@blom.tv>
 * Обоев Рулон ибн Хаттаб <me@nomadrain.com>
-* 应俊 <yj2317916@gmail.com>
-* Raul Roa <raulroa@playfulcorp.com>
-* zhitongLBN <z.liu@linkbynet.com>
+* 应俊 <yj2317916@gmail.com>

data/Gemfile

@@ -4,7 +4,7 @@ group :development, :test do
   # This is here because gemspec doesn't support require: false
   gem "netrc", :require => false
   gem "octokit", :require => false
-  gem "rspec", :require => false
+  gem 'rspec', :require => false
 end
 
 gemspec

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2009-2016 [CONTRIBUTORS.md](https://github.com/fog/fog/blob/master/CONTRIBUTORS.md)
+Copyright (c) 2009-2015 [CONTRIBUTORS.md](https://github.com/fog/fog/blob/master/CONTRIBUTORS.md)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -6,23 +6,11 @@ fog is the Ruby cloud services library, top to bottom:
 * Requests allow power users to get the most out of the features of each individual cloud.
 * Mocks make testing and integrating a breeze.
 
-[![Build Status](https://secure.travis-ci.org/fog/fog.svg?branch=master)](http://travis-ci.org/fog/fog)
-[![Dependency Status](https://gemnasium.com/fog/fog.svg)](https://gemnasium.com/fog/fog)
-[![Code Climate](https://codeclimate.com/github/fog/fog/badges/gpa.svg)](https://codeclimate.com/github/fog/fog)
-[![Gem Version](https://badge.fury.io/rb/fog.svg)](http://badge.fury.io/rb/fog)
-
-## Dependency Notice
-
-Currently all fog providers are getting separated into metagems to lower the
-load time and dependency count.
-
-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.
+[![Build Status](https://secure.travis-ci.org/fog/fog.png?branch=master)](http://travis-ci.org/fog/fog)
+[![Dependency Status](https://gemnasium.com/fog/fog.png)](https://gemnasium.com/fog/fog)
+[![Code Climate](https://codeclimate.com/github/fog/fog.png)](https://codeclimate.com/github/fog/fog)
+[![Gem Version](https://fury-badge.herokuapp.com/rb/fog.png)](http://badge.fury.io/rb/fog)
+[![Gittip](http://img.shields.io/gittip/geemus.png)](https://www.gittip.com/geemus/)
 
 ## Getting Started
 
@@ -50,10 +38,10 @@ true
 
 ## Ruby version
 
-Fog requires Ruby `2.0.0` or later.
+Fog requires Ruby `1.9.3` or later.
 
-Ruby `1.8` and `1.9` support was dropped in `fog-v2.0.0` as a backwards incompatible
-change. Please use the later fog `1.x` versions if you require `1.8.7` or `1.9.x` support.
+Ruby `1.8.7` and `1.9.2` support was dropped in `fog-v2.0.0` as a backwards incompatible
+change. Please use the later fog `1.x` versions if you require `1.8.7` or `1.9.2` support.
 
 ## Collections
 
@@ -74,7 +62,7 @@ Collections share basic CRUD type operations, such as:
 
 * `all` - fetch every object of that type from the provider.
 * `create` - initialize a new record locally and a remote resource with the provider.
-* `get` - fetch a single object by its identity from the provider.
+* `get` - fetch a single object by it's identity from the provider.
 * `new` - initialize a new record locally, but do not create a remote resource with the provider.
 
 As an example, we'll try initializing and persisting a Rackspace Cloud server:
@@ -107,9 +95,9 @@ Many of the collection methods return individual objects, which also provide com
 
 ## Mocks
 
-As you might imagine, testing code using Fog can be slow and expensive, constantly turning on and shutting down instances.
-Mocking allows skipping this overhead by providing an in memory representation of resources as you make requests.
-Enabling mocking is easy to use: before you run other commands, simply run:
+As you might imagine, testing code using Fog can be slow and expensive, constantly turning on and and shutting down instances.
+Mocking allows skipping this overhead by providing an in memory representation resources as you make requests.
+Enabling mocking easy to use, before you run other commands, simply run:
 
 ```ruby
 Fog.mock!

data/Rakefile

@@ -42,10 +42,6 @@ def gem_file
   "#{name}-#{version}.gem"
 end
 
-def package_gem_file
-  "pkg/#{gem_file}"
-end
-
 def replace_header(head, header_name)
   head.sub!(/(\.#{header_name}\s*= \").*\"/) { "#{$1}#{send(header_name)}\""}
 end
@@ -58,7 +54,7 @@ end
 
 GEM_NAME = "#{name}"
 task :default => :test
-task :travis  => ['test', 'test:travis']
+task :travis  => ['test', 'test:travis', 'test:openstack_specs']
 
 Rake::TestTask.new do |t|
   t.pattern = File.join("spec", "**", "*_spec.rb")
@@ -67,24 +63,31 @@ end
 
 namespace :test do
   mock = ENV['FOG_MOCK'] || 'true'
-  task :travis do
+  task :openstack_specs do
+    sh("export FOG_MOCK=false && bundle exec rspec spec/fog/openstack/*_spec.rb")
+  end
+  task :travis => [:openstack_specs] do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont")
   end
+  task :vsphere do
+      sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/vsphere")
+  end
   task :openvz do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/openvz")
   end
-  task :cloudstack do
-      sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/cloudstack")
+  task :ovirt do
+      sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/ovirt")
   end
-  task :vcloud_director do
-      sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/vcloud_director")
+  task :openstack do
+      sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/openstack")
   end
-  task :vcloud_director_specs do
-    puts "Running vCloud Minitest Suite"
-    Rake::TestTask.new do |t|
-      Dir.glob('./spec/vcloud_director/**/*_spec.rb').each { |file| require file}
-    end
+  task :rackspace do
+      sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/rackspace")
   end
+  task :cloudstack do
+      sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/cloudstack")
+  end
+
 end
 
 desc 'Run mocked tests for a specific provider'
@@ -157,7 +160,7 @@ namespace :release do
 
   task :prepare => :preflight do
     Rake::Task[:build].invoke
-    sh "gem install #{package_gem_file}"
+    sh "gem install pkg/#{name}-#{version}.gem"
     Rake::Task[:git_mark_release].invoke
   end
 
@@ -177,7 +180,7 @@ task :git_push_release do
 end
 
 task :gem_push do
-  sh "gem push #{package_gem_file}"
+  sh "gem push pkg/#{name}-#{version}.gem"
 end
 
 desc "Build fog-#{version}.gem"
@@ -188,12 +191,6 @@ task :build => :gemspec do
 end
 task :gem => :build
 
-desc "Install fog-#{version}.gem"
-task "install" do
-  Rake::Task[:build].invoke
-  sh "gem install #{package_gem_file} --no-document"
-end
-
 desc "Updates the gemspec and runs 'validate'"
 task :gemspec => :validate do
   # read spec file and split out manifest section

data/fog.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   ## 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.42.1"
-  s.date              = "2018-06-28"
+  s.version           = "2.0.0.pre.0"
+  s.date              = "2015-09-15"
   s.rubyforge_project = "fog"
 
   ## Make sure your summary is short. The description may be as long
@@ -44,32 +44,26 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md]
 
-  s.add_dependency("fog-core", "~> 1.45")
+  ## Ruby version
+  s.required_ruby_version = ">= 1.9.3"
+
+  s.add_dependency("fog-core", "~> 1.32")
   s.add_dependency("fog-json")
   s.add_dependency("fog-xml", "~> 0.1.1")
 
-  s.add_dependency("json", "~> 2.0")
   s.add_dependency("ipaddress", "~> 0.5")
+  s.add_dependency("nokogiri")
 
   # 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-digitalocean", ">= 0.3.0")
-  s.add_dependency("fog-dnsimple", "~> 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-internet-archive")
-  s.add_dependency("fog-joyent")
+  s.add_dependency("fog-google", ">= 0.0.2")
   s.add_dependency("fog-local")
-  s.add_dependency("fog-openstack")
-  s.add_dependency("fog-ovirt")
   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")
@@ -79,19 +73,18 @@ Gem::Specification.new do |s|
   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")
 
   s.add_development_dependency("docker-api", ">= 1.13.6")
   s.add_development_dependency("fission")
-  s.add_development_dependency("mime-types", "<=2.99.1")
   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", "0.41.2")
+  s.add_development_dependency("rubocop") if RUBY_VERSION > "1.9"
   s.add_development_dependency("shindo", "~> 0.3.4")
   s.add_development_dependency("simplecov")
   s.add_development_dependency("thor")
@@ -99,25 +92,8 @@ Gem::Specification.new do |s|
   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")
+  s.add_development_dependency("webmock")
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {spec,tests}/*`.split("\n")
-
-  postinstall_message =  <<-POSTINST
-------------------------------
-Thank you for installing fog!
-
-IMPORTANT NOTICE:
-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.
-------------------------------
-  POSTINST
-
-  s.post_install_message = postinstall_message
 end

data/gemfiles/Gemfile-edge

@@ -5,10 +5,10 @@ gem "fog-core", :github => "fog/fog-core"
 gem "fog-json", :github => "fog/fog-json"
 
 group :development, :test do
+  # This is here because gemspec doesn"t support require: false
   gem "coveralls", :require => false
   gem "netrc", :require => false
   gem "octokit", :require => false
-  gem "term-ansicolor", "1.3.2"
 end
 
 gemspec :path => "../"

data/lib/fog.rb

@@ -35,12 +35,14 @@ require 'fog/ecloud'
 require 'fog/glesys'
 require 'fog/go_grid'
 require 'fog/google'
+require 'fog/hp'
 require 'fog/ibm'
 require 'fog/internet_archive'
 require 'fog/joyent'
 require 'fog/linode'
 require 'fog/local'
 require 'fog/bare_metal_cloud'
+require 'fog/ninefold'
 require 'fog/rackspace'
 require 'fog/rage4'
 require 'fog/riakcs'
@@ -63,4 +65,3 @@ require 'fog/zerigo'
 require 'fog/cloudsigma'
 require 'fog/openvz'
 require 'fog/opennebula'
-require 'fog/aliyun'

data/lib/fog/bin.rb

@@ -67,12 +67,14 @@ require 'fog/bin/ecloud'
 require 'fog/bin/glesys'
 require 'fog/bin/go_grid'
 require 'fog/bin/google'
+require 'fog/bin/hp'
 require 'fog/bin/ibm'
 require 'fog/bin/internet_archive'
 require 'fog/bin/joyent'
 require 'fog/bin/linode'
 require 'fog/bin/local'
 require 'fog/bin/bare_metal_cloud'
+require 'fog/bin/ninefold'
 require 'fog/bin/rackspace'
 require 'fog/bin/rage4'
 require 'fog/bin/riakcs'
@@ -95,4 +97,3 @@ require 'fog/bin/zerigo'
 require 'fog/bin/cloudsigma'
 require 'fog/bin/openvz'
 require 'fog/bin/opennebula'
-require 'fog/bin/aliyun'

data/lib/fog/bin/digitalocean.rb

@@ -0,0 +1,29 @@
+class DigitalOcean < Fog::Bin
+  class << self
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Compute::DigitalOcean
+      else
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :compute
+          Fog::Logger.warning("DigitalOcean[:compute] is not recommended, use Compute[:digitalocean] for portability")
+          Fog::Compute.new(:provider => 'DigitalOcean')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::DigitalOcean.services
+    end
+  end
+end

data/lib/fog/bin/dnsimple.rb

@@ -0,0 +1,29 @@
+class DNSimple < Fog::Bin
+  class << self
+    def class_for(key)
+      case key
+      when :dns
+        Fog::DNS::DNSimple
+      else
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :dns
+          Fog::Logger.warning("DNSimple[:dns] is not recommended, use DNS[:dnsimple] for portability")
+          Fog::DNS.new(:provider => 'DNSimple')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::DNSimple.services
+    end
+  end
+end

data/lib/fog/bin/hp.rb

@@ -0,0 +1,60 @@
+class HP < Fog::Bin
+  class << self
+    def class_for(key)
+      case key
+      when :block_storage
+        Fog::HP::BlockStorage
+      when :block_storage_v2
+        Fog::HP::BlockStorageV2
+      when :cdn
+        Fog::CDN::HP
+      when :compute
+        Fog::Compute::HP
+      when :dns
+        Fog::HP::DNS
+      when :lb
+        Fog::HP::LB
+      when :network
+        Fog::HP::Network
+      when :storage
+        Fog::Storage::HP
+      else
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :block_storage
+          Fog::Logger.deprecation "HP Cloud Block Storage V1 service will be soon deprecated. Please use `Fog::HP::BlockStorageV2` provider to use latest HP Cloud Block Storage service."
+          Fog::HP::BlockStorage.new
+        when :block_storage_v2
+          Fog::HP::BlockStorageV2.new
+        when :cdn
+          Fog::Logger.warning("HP[:cdn] is deprecated, use CDN[:hp] instead")
+          Fog::CDN.new(:provider => 'HP')
+        when :compute
+          Fog::Logger.warning("HP[:compute] is deprecated, use Compute[:hp] instead")
+          Fog::Compute.new(:provider => 'HP')
+        when :dns
+          Fog::HP::DNS.new
+        when :lb
+          Fog::HP::LB.new
+        when :network
+          Fog::HP::Network.new
+        when :storage
+          Fog::Logger.warning("HP[:storage] is deprecated, use Storage[:hp] instead")
+          Fog::Storage.new(:provider => 'HP')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::HP.services
+    end
+  end
+end