fog 1.16.0 → 1.17.0

data/.travis.yml

@@ -9,6 +9,8 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - jruby-18mode
+  - jruby-19mode
 
 script: bundle exec rake travis
 
@@ -22,6 +24,10 @@ matrix:
       gemfile: Gemfile.1.8.7
     - rvm: 2.0.0
       gemfile: Gemfile.1.8.7
+    - rvm: jruby-18mode
+      gemfile: Gemfile
+    - rvm: jruby-19mode
+      gemfile: Gemfile.1.8.7
 
 notifications:
   email: false

data/README.md

@@ -135,6 +135,31 @@ for more details and examples. Once you are ready to start scripting fog, here i
 
 geemus says: "That should give you everything you need to get started, but let me know if there is anything I can do to help!"
 
+## Versioning
+
+Fog library aims to adhere to [Semantic Versioning 2.0.0][semver], although it does not
+address challenges of multi-provider libraries. Semantic versioning is only guaranteed for
+the common API, not any provider-specific extensions.  You may also need to update your
+configuration from time to time (even between Fog releases) as providers update or deprecate
+services.
+
+However, we still aim for forwards compatibility within Fog major versions.  As a result of this policy, you can (and
+should) specify a dependency on this gem using the [Pessimistic Version
+Constraint][pvc] with two digits of precision. For example:
+
+```ruby
+spec.add_dependency 'fog', '~> 1.0'
+```
+
+This means your project is compatible with Fog 1.0 up until 2.0.  You can also set a higher minimum version:
+
+```ruby
+spec.add_dependency 'fog', '~> 1.16'
+```
+
+[semver]: http://semver.org/
+[pvc]: http://guides.rubygems.org/patterns/
+
 ## Contributing
 
 * Find something you would like to work on.

data/changelog.txt

@@ -1,3 +1,111 @@
+1.17.0 10/29/2013 9f0627eec16e636bfe86895bbd36f89d7a017737
+==========================================================
+
+Stats! { 'collaborators' => 53, 'downloads' => 3531286, 'forks' => 964, 'open_issues' => 177, 'watchers' => 2765 }
+
+MVP! Chris Roberts
+
+[Brightbox]
+  Add SSL settings to load balancer. thanks Paul Thornthwaite
+
+[aws|iam]
+  Don't pass :host to Excon request. thanks Robert Bousquet
+
+[aws|storage]
+  ensure connection uses correct scheme, host and port. thanks Brian D. Burns
+  remove unused :path option. thanks Brian D. Burns
+
+[core]
+  log warning for unrecognized arguments. thanks Brian D. Burns
+  identify origin of log messages. thanks Brian D. Burns
+  Make `ruby-libvirt` dependency optional. thanks Paul Thornthwaite
+
+[google|compute]
+  examples tweaks. thanks Nat Welch
+  Fix externalIP setup. thanks Nat Welch
+
+[google|storage]
+  ensure connection uses correct URI. thanks Brian D. Burns
+
+[jruby]
+  Ignore failures until fully supported. thanks Paul Thornthwaite
+
+[linode|compute]
+  Avoid passing host to request. thanks Fletcher Nichol
+
+[linode|dns]
+  avoid passing host to request. thanks geemus
+
+[misc]
+  Create a Snapshot based on a Disk. thanks Akshay Moghe
+  Add s3 bucket tagging support. thanks Chris Roberts
+  Add mocks in for bucket tagging and include in bucket tests. thanks Chris Roberts
+  Store tag information in mock and check for set tags in `put_bucket_tagging`. thanks Chris Roberts
+  Namespace tagging and move tagging tests prior to bucket deletion. thanks Chris Roberts
+  Return `body` out of test so we have proper value to match against expected `returns`. thanks Chris Roberts
+  Move mock storage initialization and remove storage checks. thanks Chris Roberts
+  AWS IAM userless key management. thanks Jacob Burkhart & Shai Rosenfeld
+  Removed errant :host argument. thanks Jon Topper
+  aws/compute: Hotfix, wrong Name argument for copy_image. thanks Jonas Pfenniger
+  Added testing in JRuby for Travis. thanks Kevin Menard
+  Don't load a couple MRI-only development dependencies on JRuby. thanks Kevin Menard
+  Temporary hack around #2279 to get fog loading on JRuby. thanks Kevin Menard
+  Added logging message for JRuby users to know they're at a disadvantage. thanks Kevin Menard
+  Scope the Unicode module so NameErrors make more sense. thanks Kevin Menard
+  Handle another case of the 'unicode' gem breaking things on JRuby. thanks Kevin Menard
+  Added a JRuby workaround in a test that's failing due to a JRuby bug. thanks Kevin Menard
+  Bound the 'myns' XML namespace to keep Nokogiri on JRuby happy. thanks Kevin Menard
+  Replaced the 'unicode' gem with 'unf' so it'll work with JRuby. thanks Kevin Menard
+  Made the 'unf' dependency optional. thanks Kevin Menard
+  Added a development dependency on 'unf' so the AWS escaping tests will pass. thanks Kevin Menard
+  Don't ignore JRuby failures in Travis any longer, since all known ones have been addressed. thanks Kevin Menard
+  Semantic Versioning (and Pessimistic Versioning Constraint) notice. thanks Max Lincoln
+  Update GCE to v1beta16. thanks Nat Welch
+  @icco can't spell. thanks Nat Welch
+  Fix bug in list images example. thanks Nat Welch
+  typo. thanks Nat Welch
+  Forgot to update Google Readme. thanks Nat Welch
+  allow custom hp_service_type. thanks Omar Reiss
+  applied hp_service_type fix on all services. thanks Omar Reiss
+  add v1 auth fix #2248. thanks Peter Bonnell
+  Add EnableLogging field to FirewallService XML. thanks Philip Potter
+  ensuring that edgegateway list elements are list. thanks Sneha Somwanshi
+  corrected name of edgegateway generator. thanks Sneha Somwanshi
+  tests for configure edge gateways. thanks Sneha Somwanshi
+  added comment on test. thanks Sneha Somwanshi
+  Add a reload() method to the vSphere service. thanks Timur Alperovich
+  Assign service to clone_result before new instance of vm. thanks Xavier Fontrodona
+  add end date for aws instance reservations. thanks aabes
+  - update compute api version to 2013/10/01      - add 'end' to described_reserved_instance. thanks aabes
+  fix mock for purchase ri. thanks aabes
+  Update create_server.rb. thanks avic85
+  Removed host params for excon connections. thanks ccloes
+  Invalid Excon request keys: :host, :port. thanks wenlock
+
+[rackspace]
+  setting rackspace_region to nil in default tests to override any settings loaded via Fog.credentials. thanks Kyle Rames
+
+[rackspace|block_storage]
+  fixing merge issue. thanks Kyle Rames
+
+[vSphere]
+  Implemented feature to specify a socket cpu layout as specified in vmware API. If not used numCoresPerSocket is left out and default VMware behaviour is used.     [vSphere] also fixed bug in vm_reconfig_memory: wrong memory value passed to reconfig_hardware (memory in bytes instead of memory in MB). thanks Marc Grimme
+
+[vcloud_director]
+  improoved tests for #ensure_list!. thanks Dan Abel
+  fixes so that non configured gateway are supported. thanks Dan Abel
+  Change input options structure. thanks Nick Osborn
+  strftime not iso8601 for ruby 1.8.7. thanks Nick Osborn
+  Mocking for tasks. thanks Nick Osborn
+  strftime not iso8601 for ruby 1.8.7. thanks Nick Osborn
+  Consistent usage of ensure_list! in get_disk. thanks Nick Osborn
+  Fix ruby 1.9-isms in media_tests. thanks Nick Osborn
+
+[vsphere|compute]
+  Small code cleanup. thanks Kevin Menard
+  cleanup merge conflicts with clone method. thanks Mick Pollard
+
+
 1.16.0 10/16/2013 13a86cd41e8ea10022fb822cb0b4340cbf2c023d
 ==========================================================
 

data/fog.gemspec

@@ -6,8 +6,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.16.0'
-  s.date              = '2013-10-16'
+  s.version           = '1.17.0'
+  s.date              = '2013-10-29'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -50,11 +50,10 @@ Gem::Specification.new do |s|
   s.add_dependency('net-ssh', '>=2.1.3')
   s.add_dependency('nokogiri', '~>1.5')
   s.add_dependency('ruby-hmac')
-  s.add_dependency('unicode', "~> 0.4.4")
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
-  s.add_development_dependency('jekyll')
+  s.add_development_dependency('jekyll') unless RUBY_PLATFORM == 'java'
   s.add_development_dependency('rake')
   s.add_development_dependency('rbvmomi')
   s.add_development_dependency('yard')
@@ -65,7 +64,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency('fission')
   s.add_development_dependency('pry')
   s.add_development_dependency('google-api-client', '~>0.6.2')
-#  s.add_development_dependency('ruby-libvirt','~>0.4.0')
+  s.add_development_dependency('unf')
+  if ENV["FOG_USE_LIBVIRT"] && RUBY_PLATFORM != 'java'
+    s.add_development_dependency('ruby-libvirt','~>0.4.0')
+  end
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {spec,tests}/*`.split("\n")

data/lib/fog/aws.rb

@@ -1,7 +1,13 @@
 require 'fog/core'
 require 'fog/aws/credential_fetcher'
 require 'fog/aws/signaturev4'
-require 'unicode'
+
+begin
+  require 'unf/normalizer'
+rescue LoadError
+  Fog::Logger.warning("Unable to load the 'unf' gem. Your AWS strings may not be properly encoded.")
+end
+
 module Fog
   module AWS
     extend Fog::Provider
@@ -86,7 +92,7 @@ module Fog
     end
 
     def self.escape(string)
-      string = Unicode::normalize_C(string)
+      string = defined?(::UNF::Normalizer) ? ::UNF::Normalizer.normalize(string, :nfc) : string
       string.gsub(/([^a-zA-Z0-9_.\-~]+)/) {
         "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
       }

data/lib/fog/aws/cloud_formation.rb

@@ -103,7 +103,6 @@ module Fog
               :expects    => 200,
               :idempotent => idempotent,
               :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-              :host       => @host,
               :method     => 'POST',
               :parser     => parser
             })

data/lib/fog/aws/compute.rb

@@ -372,7 +372,7 @@ module Fog
           @region                 = options[:region] ||= 'us-east-1'
           @instrumentor           = options[:instrumentor]
           @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.compute'
-          @version                = options[:version]     ||  '2013-08-15'
+          @version                = options[:version]     ||  '2013-10-01'
 
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)

data/lib/fog/aws/elb.rb

@@ -189,7 +189,6 @@ module Fog
             :expects    => 200,
             :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
             :idempotent => idempotent,
-            :host       => @host,
             :method     => 'POST',
             :parser     => parser
           })

data/lib/fog/aws/iam.rb

@@ -88,6 +88,10 @@ module Fog
             hash[key] = {
               :owner_id => Fog::AWS::Mock.owner_id,
               :server_certificates => {},
+              :access_keys => [{
+                "Status" => "Active",
+                "AccessKeyId" => key
+              }],
               :users => Hash.new do |uhash, ukey|
                 uhash[ukey] = {
                   :user_id     => Fog::AWS::Mock.key_id,
@@ -205,7 +209,6 @@ module Fog
             :expects    => 200,
             :idempotent => idempotent,
             :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-            :host       => @host,
             :method     => 'POST',
             :parser     => parser
           })

data/lib/fog/aws/models/iam/access_key.rb

@@ -14,7 +14,11 @@ module Fog
         def save
           requires :username
 
-          data = service.create_access_key('UserName'=> username).body["AccessKey"]
+          if !persisted?
+            data = service.create_access_key('UserName'=> username).body["AccessKey"]
+          else
+            data = service.update_access_key(id, status, "UserName" => username).body["AccessKey"]
+          end
           merge_attributes(data)
           true
         end

data/lib/fog/aws/models/iam/access_keys.rb

@@ -11,7 +11,6 @@ module Fog
 
         def initialize(attributes = {})
           @username = attributes[:username]
-          raise ArgumentError.new("Can't get an access_key's user without a username") unless @username
           super
         end
 

data/lib/fog/aws/parsers/compute/describe_reserved_instances.rb

@@ -23,9 +23,10 @@ module Fog
               @reserved_instance = {}
             when 'requestId'
               @response[name] = value
-            when 'start'
+            when 'start','end'
               @reserved_instance[name] = Time.parse(value)
             end
+
           end
 
         end

data/lib/fog/aws/parsers/storage/get_bucket_tagging.rb

@@ -0,0 +1,37 @@
+module Fog
+  module Parsers
+    module Storage
+      module AWS
+
+        class GetBucketTagging < Fog::Parsers::Base
+
+          def reset
+            @in_tag = {}
+            @response = {'BucketTagging' => {}}
+          end
+
+          def start_element(name, *args)
+            super
+            if name == 'Tag'
+              @in_tag = {}
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'Tag'
+              @response['BucketTagging'].merge!(@in_tag)
+              @in_tag = {}
+            when 'Key'
+              @in_tag[value] = nil
+            when 'Value'
+              @in_tag = {@in_tag.keys.first => value}
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/compute/copy_image.rb

@@ -26,7 +26,7 @@ module Fog
             'Action'          => 'CopyImage',
             'SourceImageId'   => source_image_id,
             'SourceRegion'    => source_region,
-            'Name'            => source_region,
+            'Name'            => name,
             'Description'     => description,
             'ClientToken'     => client_token,
             :parser           => Fog::Parsers::Compute::AWS::CopyImage.new

data/lib/fog/aws/requests/compute/describe_reserved_instances.rb

@@ -25,6 +25,7 @@ module Fog
         #       * 'start'<~Time> - start time for reservation
         #       * 'state'<~String> - state of reserved instance purchase, in .[pending-payment, active, payment-failed, retired]
         #       * 'usagePrice"<~Float> - usage price of reserved instances, per hour
+        #       * 'end' - time reservation stopped being applied (i.e sold or canceled - as of version 2013/10/01)
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstances.html]
         def describe_reserved_instances(filters = {})

data/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb

@@ -45,6 +45,7 @@ module Fog
           self.data[:reserved_instances][reserved_instances_id] = reserved_instance_offering.merge({
             'reservedInstancesId' => reserved_instances_id,
             'start'               => Time.now,
+            'end'                 => Time.now,
             'instanceCount'       => instance_count,
             'state'               => 'payment-pending',
             'tagSet'              => []

data/lib/fog/aws/requests/iam/create_access_key.rb

@@ -36,23 +36,30 @@ module Fog
         def create_access_key(options)
           #FIXME: Not 100% correct as AWS will use the signing credentials when there is no 'UserName' in the options hash
           #       Also doesn't raise an error when there are too many keys
-          user_name = options['UserName']
-          if data[:users].has_key? user_name
-            key = { 'SecretAccessKey' => Fog::Mock.random_base64(40),
-                    'Status' => 'Active',
-                    'AccessKeyId' => Fog::AWS::Mock.key_id(20),
-                    'UserName' => user_name
-                  }
-
-            data[:users][user_name][:access_keys] << key
-
-            Excon::Response.new.tap do |response|
-              response.status = 200
-              response.body = { 'AccessKey' => key,
-                                'RequestId' => Fog::AWS::Mock.request_id } 
+          if user = options['UserName']
+            if data[:users].has_key? user
+              access_keys_data = data[:users][user][:access_keys]
+            else
+              raise Fog::AWS::IAM::NotFound.new('The user with name #{user_name} cannot be found.')
             end
           else
-            raise Fog::AWS::IAM::NotFound.new('The user with name booboboboob cannot be found.')
+            access_keys_data = data[:access_keys]
+          end
+
+          key = { 'SecretAccessKey' => Fog::Mock.random_base64(40),
+                  'Status' => 'Active',
+                  'AccessKeyId' => Fog::AWS::Mock.key_id(20),
+                }
+          if user
+            key["UserName"] = user
+          end
+
+          access_keys_data << key
+
+          Excon::Response.new.tap do |response|
+            response.status = 200
+            response.body = { 'AccessKey' => key,
+                              'RequestId' => Fog::AWS::Mock.request_id }
           end
         end
       end

data/lib/fog/aws/requests/iam/list_access_keys.rb

@@ -40,19 +40,23 @@ module Fog
 
         def list_access_keys(options = {})
           #FIXME: Doesn't do anything with options, aside from UserName
-          user = options['UserName']
-
-          if data[:users].has_key? user
-            Excon::Response.new.tap do |response|
-              response.body = { 'AccessKeys' => data[:users][user][:access_keys].map do |akey|
-                                                  {'Status' => akey['Status'], 'AccessKeyId' => akey['AccessKeyId']}
-                                                end,
-                                 'IsTruncated' => false,
-                                 'RequestId' => Fog::AWS::Mock.request_id }
-              response.status = 200
+          if user = options['UserName']
+            if data[:users].has_key? user
+              access_keys_data = data[:users][user][:access_keys]
+            else
+              raise Fog::AWS::IAM::NotFound.new("The user with name #{user} cannot be found.")
             end
           else
-            raise Fog::AWS::IAM::NotFound.new("The user with name #{user} cannot be found.")
+            access_keys_data = data[:access_keys]
+          end
+
+          Excon::Response.new.tap do |response|
+            response.body = { 'AccessKeys' => access_keys_data.map do |akey|
+                                                {'Status' => akey['Status'], 'AccessKeyId' => akey['AccessKeyId']}
+                                              end,
+                               'IsTruncated' => false,
+                               'RequestId' => Fog::AWS::Mock.request_id }
+            response.status = 200
           end
         end
       end