fog 1.41.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 829e5ef73eff833c9d38e2133d28d8d47771812f
-  data.tar.gz: 73097280f69981f019fcae7a9fb4084340af30a3
+SHA256:
+  metadata.gz: 83a7851a2cc9e27912386f5660add2eb81863ea96f7ae31e25a75914c8d065fe
+  data.tar.gz: b0c2e4ecc08a9c8f2fc4aca206aeda4077b11213ce5f11e7b60817a5d21ecb0d
 SHA512:
-  metadata.gz: 6ed7fe7cbd1f522376d2ab935abad73a90b489ea2edca3b418d6b7e7b9d214837404834c015e564f6118b21619096af4a9c25c1fc175a6d200264d4b7e9ad186
-  data.tar.gz: 69a6552cc360e8f8bf4a05e473b31ff3e8230f481f6c857a4f6da662d9497c044a965999d83429dba2e4fcb4558bb9a06727a288493cdc0d7d383e0dd773a04b
+  metadata.gz: 20118ffbc5b1cfc7b2ccccd201ed8a56db38f558f8d2487802c86da60cdaef1aab67de57862ccc57388a5a170adabc4f1413d58d0d69325c964cd17db7e5fd7e
+  data.tar.gz: bdd21c040588cdb1989f71360656db0b9ab22426ecbade850b9c978015df00ec364c3aef9d703e52172c81b6582496a796973c42004b3ecd932ae4a8f14705b0

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/codeql.yml

@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

data/.github/workflows/depsreview.yml

@@ -0,0 +1,14 @@
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v2

data/.github/workflows/ruby.yml

@@ -0,0 +1,23 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    permissions:
+      contents: none
+    uses: fog/.github/.github/workflows/ruby.yml@v1.1.0

data/.github/workflows/stale.yml

@@ -0,0 +1,14 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+permissions:
+  contents: read
+
+jobs:
+  stale:
+    permissions:
+      contents: none
+    uses: fog/.github/.github/workflows/stale.yml@v1.1.0

data/.travis.yml

@@ -10,6 +10,7 @@ rvm:
   - 2.2
   - 2.3
   - 2.4
+  - 2.5
   - jruby-head
 
 gemfile:
@@ -21,14 +22,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

data/CHANGELOG.md

@@ -1,3 +1,178 @@
+## 2.3.0 10/03/2022
+*Hash* 934c38de2597788b7f7cf5fb7540138232955544
+
+Statistic     | Value
+------------- | --------:
+Collaborators | 2
+Forks         | 1504
+Open Issues   | 4
+Watchers      | 4305
+
+**MVP!** Olle Jonsson
+
+#### [misc]
+*   Supported Ruby version is 2.5+ now. thanks Lukas Zapletal
+*   chore: Enable codeql action. thanks Naveen
+*   Rakefile: Drop EOL'd property rubyforge_project. thanks Olle Jonsson
+*   Gemspec: Drop EOL'd property rubyforge_project. thanks Olle Jonsson
+*   Update library dependences. thanks Takashi Yamamoto
+*   dependabot[bot] (43):. thanks Wesley Beary
+*   Update fog-dynect requirement from ~> 0.0.2 to >= 0.0.2, < 0.5.0. thanks Wesley Beary
+*   Update webmock requirement from ~> 1.22.2 to ~> 3.12.1. thanks Wesley Beary
+*   Update fog-brightbox requirement from ~> 0.4 to >= 0.4, < 2.0. thanks Wesley Beary
+*   Bump actions/stale from 3 to 3.0.18. thanks Wesley Beary
+*   Bump actions/checkout from 2 to 2.3.4. thanks Wesley Beary
+*   Bump actions/stale from 3.0.18 to 3.0.19. thanks Wesley Beary
+*   Update fog-dynect requirement from >= 0.0.2, < 0.5.0 to >= 0.0.2, < 0.6.0. thanks Wesley Beary
+*   Update webmock requirement from ~> 3.12.1 to ~> 3.13.0. thanks Wesley Beary
+*   Update rubocop requirement from = 0.52.1 to = 1.16.0. thanks Wesley Beary
+*   Update rubocop requirement from = 1.16.0 to = 1.16.1. thanks Wesley Beary
+*   Update rubocop requirement from = 1.16.1 to = 1.17.0. thanks Wesley Beary
+*   Update rubocop requirement from = 1.17.0 to = 1.18.0. thanks Wesley Beary
+*   Update rubocop requirement from = 1.18.0 to = 1.18.1. thanks Wesley Beary
+*   Update rubocop requirement from = 1.18.1 to = 1.18.2. thanks Wesley Beary
+*   Update rubocop requirement from = 1.18.2 to = 1.18.3. thanks Wesley Beary
+*   Bump actions/stale from 3.0.19 to 4. thanks Wesley Beary
+*   Update rubocop requirement from = 1.18.3 to = 1.18.4. thanks Wesley Beary
+*   Update webmock requirement from ~> 3.13.0 to ~> 3.14.0. thanks Wesley Beary
+*   Update rubocop requirement from = 1.18.4 to = 1.19.0. thanks Wesley Beary
+*   Update rubocop requirement from = 1.19.0 to = 1.20.0. thanks Wesley Beary
+*   Update rubocop requirement from = 1.20.0 to = 1.21.0. thanks Wesley Beary
+*   Update rubocop requirement from = 1.21.0 to = 1.22.0. thanks Wesley Beary
+*   Update rubocop requirement from = 1.22.0 to = 1.22.1. thanks Wesley Beary
+*   Bump actions/checkout from 2.3.4 to 2.3.5. thanks Wesley Beary
+*   Update rubocop requirement from = 1.22.1 to = 1.22.2. thanks Wesley Beary
+*   Update rubocop requirement from = 1.22.2 to = 1.22.3. thanks Wesley Beary
+*   Bump actions/checkout from 2.3.5 to 2.4.0. thanks Wesley Beary
+*   Update rubocop requirement from = 1.22.3 to = 1.23.0. thanks Wesley Beary
+*   Update rubocop requirement from = 1.23.0 to = 1.24.0. thanks Wesley Beary
+*   Update rubocop requirement from = 1.24.0 to = 1.24.1. thanks Wesley Beary
+*   Update rubocop requirement from = 1.24.1 to = 1.25.0. thanks Wesley Beary
+*   Update rubocop requirement from = 1.25.0 to = 1.25.1. thanks Wesley Beary
+*   Bump actions/checkout from 2.4.0 to 3. thanks Wesley Beary
+*   Update rubocop requirement from = 1.25.1 to = 1.26.0. thanks Wesley Beary
+*   Update rubocop requirement from = 1.26.0 to = 1.26.1. thanks Wesley Beary
+*   Update rubocop requirement from = 1.26.1 to = 1.27.0. thanks Wesley Beary
+*   Update rubocop requirement from = 1.27.0 to = 1.28.1. thanks Wesley Beary
+*   Update rubocop requirement from = 1.28.1 to = 1.28.2. thanks Wesley Beary
+*   Bump actions/dependency-review-action from 1 to 2. thanks Wesley Beary
+*   Update webmock requirement from ~> 3.14.0 to ~> 3.15.0. thanks Wesley Beary
+*   Update webmock requirement from ~> 3.15.0 to ~> 3.16.0. thanks Wesley Beary
+*   Update webmock requirement from ~> 3.16.0 to ~> 3.17.0. thanks Wesley Beary
+*   Update webmock requirement from ~> 3.17.0 to ~> 3.18.1. thanks Wesley Beary
+*   v2.2.0. thanks geemus
+*   refresh github actions and  config. thanks geemus
+*   focus actions tests on supported rubies. thanks geemus
+*   allow 3.0/head test failures for now. thanks geemus
+*   attempt to add libcurl dev headers to get bundler working. thanks geemus
+*   add bin/cloudstack back in to get ci on track. thanks geemus
+*   drop Aliyun bin require, as it is broken. thanks geemus
+*   make available check in bin resilient to nil. thanks geemus
+*   fix AWS CDN reference in bin tests. thanks geemus
+*   workaround autoload mismatch with renested AWS class/module names. thanks geemus
+*   use shared workflows. thanks geemus
+*   Set permissions for GitHub actions. thanks naveensrinivasan
+*   chore(deps): Included dependency review. thanks naveensrinivasan
+
+
+## 2.2.0 06/18/2019
+*Hash* 198649965a63fea6296831689cadda2c06570840
+
+Statistic     | Value
+------------- | --------:
+Collaborators | 2
+Forks         | 1534
+Open Issues   | 4
+Watchers      | 4215
+
+**MVP!** Conor Tinch
+
+#### [misc]
+*   Removed all references to fog-cloudstack. Fog-cloudstack can be added back into lib/fog/bin.rb once we have a fog-cloudstack gem. thanks Conor Tinch
+*   Added cloudstack in as a provider since there's a gem. thanks Conor Tinch
+*   Added cloudstack in as a provider since there's a gem. thanks Conor Tinch
+*   remove fog-joyent from gemspec, at least temporarily. thanks geemus
+*   bump fog-core version. thanks geemus
+
+
+## 2.1.0 11/12/2018
+*Hash* adc3d36e1c47976a1ec2630bd4577e082593c884
+
+Statistic     | Value
+------------- | --------:
+Collaborators | 2
+Forks         | 1545
+Open Issues   | 7
+Watchers      | 4168
+
+**MVP!** Akira Matsuda
+
+#### [cloudstack]
+*   Allow specifying the size of root volume. thanks Takashi Kokubun
+
+#### [misc]
+*   GitHub is https by default. thanks Akira Matsuda
+*   Remove BlueBox Blocks. thanks Chris Lundquist
+*   Add SemVer stability badge to README. thanks Grey Baker
+*   Upgrade google dependency. thanks Nat Welch
+*   Fix whitespace in gemspec. thanks Nat Welch
+*   unpin mime-types. thanks Nat Welch
+*   Removing leftovers from extraction of fog-ovirt. thanks Ori Rabin
+*   Make CloudSigma snapshot tests pending. thanks Paul Thornthwaite
+*   Rescue `opennebula` loading issues. thanks Paul Thornthwaite
+*   "Fix" incorrect `Compute` provider credential test. thanks Paul Thornthwaite
+*   Tweak CloudSigma testing schema. thanks Paul Thornthwaite
+*   Fix Cloudstack `#connection` deprecation warning. thanks Paul Thornthwaite
+*   Remove tests for deprecated binary `#[]`. thanks Paul Thornthwaite
+*   Enable Ruby 2.5 in CI. thanks Pavel Valena
+*   lib/fog/linode: Add Tokyo2 to avail_datacenters. thanks Penny
+*   Fix compatibility with fog-brightbox 1.0.0+. thanks t Ondruch
+*   v2.0.0. thanks geemus
+*   add stale bot config. thanks geemus
+*   remove tests around deprecated usage. thanks geemus
+
+
+## 2.0.0 03/06/2018
+*Hash* ff9fe270cd23627f748dd37e9bf2800640187f60
+
+Statistic     | Value
+------------- | --------:
+Collaborators | 2
+Forks         | 1553
+Open Issues   | 41
+Watchers      | 4102
+
+**MVP!** Tinguely Pierre
+
+#### [misc]
+*   Drop Zerigo. thanks Paulo Ribeiro
+*   add id in xml only if present. Else an id is generated from xsd generation. thanks Tinguely Pierre
+*   make network optionnal for instantiate request. thanks Tinguely Pierre
+*   implement the put api to configure the network section in vapp. thanks Tinguely Pierre
+*   Drop Ruby<2 support. thanks Tomer Brisker
+*   bump rubocop dep. thanks geemus
+
+
+## 1.42.0 09/29/2017
+*Hash* 41a38068d34237b9639ac045f99a4b48160834a9
+
+Statistic     | Value
+------------- | --------:
+Collaborators | 2
+Forks         | 1556
+Open Issues   | 45
+Watchers      | 4060
+
+**MVP!** swamp09
+
+#### [misc]
+*   Upgrade JSON to ~> 2.0. thanks Denis Defreyne
+*   Removing ovirt provider. thanks Ori Rabin
+*   fix changelog task. thanks geemus
+*   Suppress `warning: ambiguous first argument; put parentheses or a space even after `/' operator`. thanks swamp09
+*   Suppress `warning: mismatched indentations at 'end' with 'class'`. thanks swamp09
+
+
 ## 1.41.0 08/01/2017
 *Hash* e5d3672e804149d38f91ccdfdaf7cfd7be52b75b
 

data/README.md

@@ -6,10 +6,10 @@ 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)
+[![Build Status](https://github.com/fog/fog/actions/workflows/ruby.yml/badge.svg)](https://github.com/fog/fog/actions/workflows/ruby.yml)
 [![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)
+[![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=fog&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=fog&package-manager=bundler&version-scheme=semver)
 
 ## Dependency Notice
 
@@ -17,12 +17,11 @@ 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 
+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
 

data/Rakefile

@@ -30,10 +30,6 @@ def date
   Date.today.to_s
 end
 
-def rubyforge_project
-  name
-end
-
 def gemspec_file
   "#{name}.gemspec"
 end
@@ -73,12 +69,6 @@ namespace :test do
   task :openvz do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/openvz")
   end
-  task :ovirt do
-      sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/ovirt")
-  end
-  task :cloudstack do
-      sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/cloudstack")
-  end
   task :vcloud_director do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/vcloud_director")
   end
@@ -206,8 +196,6 @@ task :gemspec => :validate do
   replace_header(spec, :name)
   replace_header(spec, :version)
   replace_header(spec, :date)
-  #comment this out if your rubyforge_project has a different name
-  replace_header(spec, :rubyforge_project)
 
   File.open(gemspec_file, 'w') { |io| io.write(spec) }
   puts "Updated #{gemspec_file}"

data/fog.gemspec

@@ -11,9 +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.41.0"
-  s.date              = "2017-08-01"
-  s.rubyforge_project = "fog"
+  s.version           = "2.3.0"
+  s.date              = "2022-10-03"
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -25,7 +24,7 @@ Gem::Specification.new do |s|
   ## 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.homepage = "https://github.com/fog/fog"
   s.license  = "MIT"
 
   ## This sections is only necessary if you have C extensions.
@@ -44,29 +43,31 @@ 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")
+  s.required_ruby_version = '>= 2.5.0'
+
+  s.add_dependency("fog-core", "~> 2.1")
   s.add_dependency("fog-json")
   s.add_dependency("fog-xml", "~> 0.1.1")
-  
-  # JSON locked for Ruby 1.9, remove once deprecated
-  s.add_dependency("json", ">= 1.8", "< 2.0")
+
+  s.add_dependency("json", "~> 2.3")
   s.add_dependency("ipaddress", "~> 0.5")
 
   # 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-brightbox", ">= 0.4", "< 2.0")
+  s.add_dependency("fog-cloudatcost", "~> 0.4")
+  s.add_dependency("fog-cloudstack", "~> 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-dnsimple", "~> 2.1")
+  s.add_dependency("fog-dynect", ">= 0.0.2", "< 0.6.0")
   s.add_dependency("fog-ecloud", "~> 0.1")
-  s.add_dependency("fog-google", "<= 0.1.0")
+  s.add_dependency("fog-google", "~> 1.0")
   s.add_dependency("fog-internet-archive")
-  s.add_dependency("fog-joyent")
   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")
@@ -84,15 +85,14 @@ Gem::Specification.new do |s|
 
   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("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.1.3")
   s.add_development_dependency("rbvmomi")
-  s.add_development_dependency("rubocop", "0.41.2")
+  s.add_development_dependency("rubocop", "1.28.2")
   s.add_development_dependency("shindo", "~> 0.3.4")
   s.add_development_dependency("simplecov")
   s.add_development_dependency("thor")
@@ -100,7 +100,7 @@ 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","~>3.18.1")
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {spec,tests}/*`.split("\n")
@@ -114,9 +114,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
 

data/lib/fog/bin/brightbox.rb

@@ -3,9 +3,9 @@ class Brightbox < Fog::Bin
     def class_for(key)
       case key
       when :compute
-        Fog::Compute::Brightbox
+        Fog::Brightbox::Compute
       when :storage
-        Fog::Storage::Brightbox
+        Fog::Brightbox::Storage
       else
         raise ArgumentError, "Unsupported #{self} service: #{key}"
       end

data/lib/fog/bin.rb

@@ -3,7 +3,7 @@ require 'fog/core/credentials'
 module Fog
   class << self
     def available_providers
-      @available_providers ||= Fog.providers.values.select {|provider| Kernel.const_get(provider).available?}.sort
+      @available_providers ||= Fog.providers.values.select {|provider| Kernel.const_get(provider).try(:available?)}.sort
     end
 
     def registered_providers
@@ -53,10 +53,9 @@ end
 
 require 'fog/bin/atmos'
 require 'fog/bin/aws'
-require 'fog/bin/bluebox'
 require 'fog/bin/brightbox'
-require 'fog/bin/cloudstack'
 require 'fog/bin/clodo'
+require 'fog/bin/cloudstack'
 require 'fog/bin/digitalocean'
 require 'fog/bin/dnsimple'
 require 'fog/bin/dnsmadeeasy'
@@ -69,7 +68,6 @@ require 'fog/bin/go_grid'
 require 'fog/bin/google'
 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'
@@ -91,8 +89,6 @@ require 'fog/bin/vmfusion'
 require 'fog/bin/vsphere'
 require 'fog/bin/voxel'
 require 'fog/bin/xenserver'
-require 'fog/bin/zerigo'
 require 'fog/bin/cloudsigma'
 require 'fog/bin/openvz'
 require 'fog/bin/opennebula'
-require 'fog/bin/aliyun'

data/lib/fog/linode/requests/compute/avail_datacenters.rb

@@ -32,6 +32,7 @@ module Fog
               { "LOCATION" => "Tokyo, JP",           "DATACENTERID" => 8,  "ABBR" => "tokyo" },
               { "LOCATION" => "Singapore, SGP",      "DATACENTERID" => 9,  "ABBR" => "singapore" },
               { "LOCATION" => "Frankfurt, DE",       "DATACENTERID" => 10, "ABBR" => "frankfurt" },
+              { "LOCATION" => "Tokyo 2, JP",         "DATACENTERID" => 11, "ABBR" => "tokyo2" },
             ],
             "ACTION" => "avail.datacenters"
           }

data/lib/fog/opennebula/compute.rb

@@ -98,7 +98,12 @@ module Fog
           @opennebula_endpoint = options[:opennebula_endpoint]
           @opennebula_username = options[:opennebula_username]
           @opennebula_password = options[:opennebula_password]
-          require 'opennebula'
+
+          begin
+            require "opennebula"
+          rescue LoadError
+            raise Fog::Errors::LoadError, "To use OpenNebula provider, you must load 'opennebula' gem"
+          end
         end
 
         def client

data/lib/fog/opennebula/requests/compute/OpenNebulaVNC.rb

@@ -20,7 +20,11 @@
 
 require 'rubygems'
 require 'json'
-require 'opennebula'
+begin
+  require "opennebula"
+rescue LoadError
+  raise Fog::Errors::LoadError, "To use OpenNebula provider, you must load 'opennebula' gem"
+end
 
 
 #if !ONE_LOCATION

data/lib/fog/vcloud_director/compute.rb

@@ -267,6 +267,7 @@ module Fog
       request :put_vapp_template_metadata_item_metadata
       request :put_vm
       request :put_vm_capabilities
+      request :put_config_network_section_vapp
 
       class Model < Fog::Model
         def initialize(attrs={})
@@ -701,9 +702,9 @@ module Fog
                 :name => org_name,
                 :uuid => uuid
               },
-              
+
               :tags => {},
-              
+
               :tasks => {},
 
               :vapps => {

data/lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb

@@ -165,7 +165,7 @@ module Fog
                 xml.NatRule {
                   xml.RuleType rule[:RuleType]
                   xml.IsEnabled rule[:IsEnabled]
-                  xml.Id rule[:Id]
+                  xml.Id rule[:Id] if rule[:Id]
                   gateway_nat_rule = rule[:GatewayNatRule]
                   xml.GatewayNatRule {
                     xml.Interface(:name => gateway_nat_rule[:Interface][:name], :href => gateway_nat_rule[:Interface][:href])
@@ -211,7 +211,7 @@ module Fog
               xml.LogDefaultAction firewall_config[:LogDefaultAction] if firewall_config.key?(:LogDefaultAction)
               firewall_config[:FirewallRule].each do |rule|
                 xml.FirewallRule {
-                  xml.Id rule[:Id]
+                  xml.Id rule[:Id] if rule[:Id]
                   xml.IsEnabled rule[:IsEnabled] if rule.key?(:IsEnabled)
                   xml.MatchOnTranslate rule[:MatchOnTranslate] if rule.key?(:MatchOnTranslate)
                   xml.Description rule[:Description] if rule.key?(:Description)