Merge branch 'master' of github.com:fog/fog into changelog

.gitignore

@@ -19,9 +19,12 @@ doc/*
 docs/_site/*
 docs/about/supported_services.markdown
 Gemfile.lock
+gemfiles/*.lock
 yardoc
 pkg
 spec/credentials.yml
 vendor/*
 tags
 tests/digitalocean/fixtures/
+
+providers/*/doc

.travis.yml

@@ -6,7 +6,7 @@ matrix:
   fast_finish: true
   include:
     - rvm: 1.8.7
-      gemfile: Gemfile.1.8.7
+      gemfile: gemfiles/Gemfile-ruby-1.8.7
     - rvm: 1.9.3
       gemfile: Gemfile
     - rvm: 2.0.0
@@ -16,8 +16,10 @@ matrix:
     - rvm: 2.1.1
       gemfile: Gemfile
       env: COVERAGE=true
+    - rvm: 2.1.1
+      gemfile: gemfiles/Gemfile-edge
     - rvm: jruby-18mode
-      gemfile: Gemfile.1.8.7
+      gemfile: gemfiles/Gemfile-ruby-1.8.7
     - rvm: jruby-19mode
       gemfile: Gemfile
     - rvm: jruby-head

.yardopts

@@ -0,0 +1 @@
+--exclude 'lib/fog/.*/examples'

fog.gemspec

@@ -62,7 +62,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('fission')
   s.add_development_dependency('pry')
   s.add_development_dependency('google-api-client', '~> 0.6', '>= 0.6.2')
-  s.add_development_dependency('unf')
 
   if ENV["FOG_USE_LIBVIRT"]
     s.add_development_dependency('ruby-libvirt','~> 0.5.0')

gemfiles/Gemfile-edge

@@ -0,0 +1,15 @@
+source "https://rubygems.org"
+
+# Embedded provider gems
+gem "fog-brightbox", :path => "../providers/brightbox"
+
+# Shared components
+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
+end
+
+gemspec :path => "../"

gemfiles/Gemfile-ruby-1.8.7

@@ -11,4 +11,4 @@ group :development, :test do
   gem 'rake', '~> 10.1.0'
 end
 
-gemspec
+gemspec :path => "../"

lib/fog/aws/core.rb

@@ -89,15 +89,6 @@ module Fog
     end
 
     def self.escape(string)
-      unless @unf_loaded_or_warned
-        begin
-          require('unf/normalizer')
-        rescue LoadError
-          Fog::Logger.warning("Unable to load the 'unf' gem. Your AWS strings may not be properly encoded.")
-        end
-        @unf_loaded_or_warned = true
-      end
-      string = defined?(::UNF::Normalizer) ? ::UNF::Normalizer.normalize(string, :nfc) : string
       string.gsub(/([^a-zA-Z0-9_.\-~]+)/) {
         "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
       }

lib/fog/aws/requests/compute/run_instances.rb

@@ -36,7 +36,7 @@ module Fog
         #     * 'SubnetId'<~String> - The subnet ID. Applies only when creating a network interface
         #     * 'Description'<~String> - A description. Applies only when creating a network interface
         #     * 'PrivateIpAddress'<~String> - The primary private IP address. Applies only when creating a network interface
-        #     * 'SecurityGroupId'<~String> - The ID of the security group. Applies only when creating a network interface.
+        #     * 'SecurityGroupId'<~Array> or <~String> - ids of security group(s) for network interface. Applies only when creating a network interface.
         #     * 'DeleteOnTermination'<~String> - Indicates whether to delete the network interface on instance termination.
         #     * 'PrivateIpAddresses.PrivateIpAddress'<~String> - The private IP address. This parameter can be used multiple times to specify explicit private IP addresses for a network interface, but only one private IP address can be designated as primary.
         #     * 'PrivateIpAddresses.Primary'<~Bool> - Indicates whether the private IP address is the primary private IP address.
@@ -122,8 +122,14 @@ module Fog
           end
           if network_interfaces = options.delete('NetworkInterfaces')
             network_interfaces.each_with_index do |mapping, index|
+              iface = format("NetworkInterface.%d", index)
               for key, value in mapping
-                options.merge!({ format("NetworkInterface.%d.#{key}", index) => value })
+                case key
+                when "SecurityGroupId"
+                  options.merge!(Fog::AWS.indexed_param("#{iface}.SecurityGroupId", [*value]))
+                else
+                  options.merge!({ "#{iface}.#{key}" => value })
+                end
               end
             end
           end

lib/fog/aws/storage.rb

@@ -177,15 +177,6 @@ module Fog
 
         # NOTE: differs from Fog::AWS.escape by NOT escaping `/`
         def escape(string)
-          unless @unf_loaded_or_warned
-            begin
-              require('unf/normalizer')
-            rescue LoadError
-              Fog::Logger.warning("Unable to load the 'unf' gem. Your AWS strings may not be properly encoded.")
-            end
-            @unf_loaded_or_warned = true
-          end
-          string = defined?(::UNF::Normalizer) ? ::UNF::Normalizer.normalize(string, :nfc) : string
           string.gsub(/([^a-zA-Z0-9_.\-~\/]+)/) {
             "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
           }

lib/fog/ecloud/compute.rb

@@ -14,7 +14,7 @@ module Fog
       #requires
       recognizes :ecloud_username, :ecloud_password, :ecloud_version,
                  :ecloud_access_key, :ecloud_private_key,
-                 :ecloud_authentication_method
+                 :ecloud_authentication_method, :base_path
 
       #### Models
       model_path 'fog/ecloud/models/compute'

lib/fog/glesys/compute.rb

@@ -44,9 +44,9 @@ module Fog
       class Mock
 
         def initialize(options={})
-          @api_url            = options[:glesys_api_url] || Fog.credentials[:glesys_api_url] || API_URL
-          @glesys_username    = options[:glesys_username] || Fog.credentials[:glesys_api_key]
-          @glesys_api_key     = options[:glesys_api_key] || Fog.credentials[:glesys_api_key]
+          @api_url            = options[:glesys_api_url] || API_URL
+          @glesys_username    = options[:glesys_username]
+          @glesys_api_key     = options[:glesys_api_key]
           @connection_options = options[:connection_options] || {}
         end
 
@@ -74,9 +74,9 @@ module Fog
         def initialize(options)
           require 'base64'
 
-          @api_url            = options[:glesys_api_url] || Fog.credentials[:glesys_api_url] || API_URL
-          @glesys_username    = options[:glesys_username] || Fog.credentials[:glesys_api_key]
-          @glesys_api_key     = options[:glesys_api_key] || Fog.credentials[:glesys_api_key]
+          @api_url            = options[:glesys_api_url] || API_URL
+          @glesys_username    = options[:glesys_username]
+          @glesys_api_key     = options[:glesys_api_key]
           @connection_options = options[:connection_options] || {}
           @persistent         = options[:persistent] || false
           @connection = Fog::XML::Connection.new(@api_url, @persistent, @connection_options)

lib/fog/joyent/analytics.rb

@@ -132,8 +132,8 @@ module Fog
         end
 
         def initialize(options = {})
-          @joyent_username = options[:joyent_username] || Fog.credentials[:joyent_username]
-          @joyent_password = options[:joyent_password] || Fog.credentials[:joyent_password]
+          @joyent_username = options[:joyent_username]
+          @joyent_password = options[:joyent_password]
           @joyent_url = 'https://us-sw-1.api.joyentcloud.com'
           @joyent_version = '~7'
         end

lib/fog/joyent/compute.rb

@@ -101,8 +101,8 @@ module Fog
         end
 
         def initialize(options = {})
-          @joyent_username = options[:joyent_username] || Fog.credentials[:joyent_username]
-          @joyent_password = options[:joyent_password] || Fog.credentials[:joyent_password]
+          @joyent_username = options[:joyent_username]
+          @joyent_password = options[:joyent_password]
         end
 
         def request(opts)

lib/fog/joyent/models/compute/server.rb

@@ -10,6 +10,8 @@ module Fog
         attribute :state
         attribute :type
         attribute :dataset
+        attribute :compute_node
+        attribute :networks
         attribute :ips
         attribute :memory
         attribute :disk

lib/fog/ninefold/compute.rb

@@ -71,9 +71,9 @@ module Fog
       class Mock
 
         def initialize(options)
-          @api_url = options[:ninefold_api_url] || Fog.credentials[:ninefold_api_url] || API_URL
-          @ninefold_compute_key = options[:ninefold_compute_key] || Fog.credentials[:ninefold_compute_key]
-          @ninefold_compute_secret = options[:ninefold_compute_secret] || Fog.credentials[:ninefold_compute_secret]
+          @api_url = options[:ninefold_api_url] || API_URL
+          @ninefold_compute_key = options[:ninefold_compute_key]
+          @ninefold_compute_secret = options[:ninefold_compute_secret]
         end
 
         def request(options)
@@ -84,9 +84,9 @@ module Fog
       class Real
 
         def initialize(options)
-          @api_url                  = options[:ninefold_api_url] || Fog.credentials[:ninefold_api_url] || API_URL
-          @ninefold_compute_key     = options[:ninefold_compute_key] || Fog.credentials[:ninefold_compute_key]
-          @ninefold_compute_secret  = options[:ninefold_compute_secret] || Fog.credentials[:ninefold_compute_secret]
+          @api_url                  = options[:ninefold_api_url] || API_URL
+          @ninefold_compute_key     = options[:ninefold_compute_key]
+          @ninefold_compute_secret  = options[:ninefold_compute_secret]
           @connection_options       = options[:connection_options] || {}
           @persistent               = options[:persistent] || false
           @connection = Fog::XML::Connection.new(@api_url, @persistent, @connection_options)

lib/fog/openstack/examples/network/network_subnets_routers.rb

@@ -59,5 +59,5 @@ public_subnet = network.subnets.create :name => 'floating_ips_net',
 
 
 # Create tenant networks
-create_tenant_network, 'admin@example.net', public_net
-create_tenant_network, 'demo@example.net', public_net
+create_tenant_network 'admin@example.net', public_net
+create_tenant_network 'demo@example.net', public_net

lib/fog/serverlove/compute.rb

@@ -42,8 +42,8 @@ module Fog
       class Mock
 
         def initialize(options)
-          @serverlove_uuid = options[:serverlove_uuid] || Fog.credentials[:serverlove_uuid]
-          @serverlove_api_key = options[:serverlove_api_key] || Fog.credentials[:serverlove_api_key]
+          @serverlove_uuid = options[:serverlove_uuid]
+          @serverlove_api_key = options[:serverlove_api_key]
         end
 
         def request(options)

providers/brightbox/lib/fog/brightbox/compute/shared.rb

@@ -45,21 +45,21 @@ module Fog
         #
         def initialize(options)
           # Currently authentication and api endpoints are the same but may change
-          @auth_url            = options[:brightbox_auth_url]  || Fog.credentials[:brightbox_auth_url] || API_URL
+          @auth_url            = options[:brightbox_auth_url]  || API_URL
           @auth_connection     = Fog::Core::Connection.new(@auth_url)
 
-          @api_url             = options[:brightbox_api_url]   || Fog.credentials[:brightbox_api_url]  || API_URL
+          @api_url             = options[:brightbox_api_url]   || API_URL
           @connection_options  = options[:connection_options]  || {}
           @persistent          = options[:persistent]          || false
           @connection          = Fog::Core::Connection.new(@api_url, @persistent, @connection_options)
 
           # Authentication options
-          client_id            = options[:brightbox_client_id] || Fog.credentials[:brightbox_client_id]
-          client_secret        = options[:brightbox_secret]    || Fog.credentials[:brightbox_secret]
+          client_id            = options[:brightbox_client_id]
+          client_secret        = options[:brightbox_secret]
 
-          username             = options[:brightbox_username]  || Fog.credentials[:brightbox_username]
-          password             = options[:brightbox_password]  || Fog.credentials[:brightbox_password]
-          @configured_account  = options[:brightbox_account]   || Fog.credentials[:brightbox_account]
+          username             = options[:brightbox_username]
+          password             = options[:brightbox_password]
+          @configured_account  = options[:brightbox_account]
           # Request account can be changed at anytime and changes behaviour of future requests
           @scoped_account      = @configured_account
 

tests/aws/signed_params_tests.rb

@@ -3,11 +3,15 @@
 Shindo.tests('AWS | signed_params', ['aws']) do
   returns( Fog::AWS.escape( "'Stöp!' said Fred_-~./" ) ) { "%27St%C3%B6p%21%27%20said%20Fred_-~.%2F" }
 
-  tests('Keys should be canonicalised using Unicode NFC') do
-    returns( Fog::AWS.escape( ["00E9".to_i(16)].pack("U*") ) ) { "%C3%A9" }
+  tests('Unicode characters should be escaped') do
+    unicode = ["00E9".to_i(16)].pack("U*")
+    escaped = "%C3%A9"
+    returns( escaped ) { Fog::AWS.escape( unicode ) }
+  end
 
-    tests('Characters with combining mark should be combined and then escaped') do
-      returns( Fog::AWS.escape( ["0065".to_i(16), "0301".to_i(16)].pack("U*") ) ) { "%C3%A9" }
-    end
+  tests('Unicode characters with combining marks should be escaped') do
+    unicode = ["0065".to_i(16), "0301".to_i(16)].pack("U*")
+    escaped = "e%CC%81"
+    returns( escaped ) { Fog::AWS.escape( unicode ) }
   end
 end