fog-maestrodev 1.15.0.20130829165835 → 1.15.0.20130927082724

data/.gitignore

@@ -22,3 +22,4 @@ spec/credentials.yml
 vendor/*
 tags
 tests/digitalocean/fixtures/
+tests/vcloud_director/vcr_cassettes/

data/README.md

@@ -10,6 +10,7 @@ fog is the Ruby cloud services library, top to bottom:
 [![Gem Version](https://fury-badge.herokuapp.com/rb/fog.png)](http://badge.fury.io/rb/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)
+[![Coverage Status](https://coveralls.io/repos/fog/fog/badge.png?branch=master)](https://coveralls.io/r/fog/fog?branch=master)
 
 ## Getting Started
 

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-maestrodev'
-  s.version           = '1.15.0.20130829165835'
-  s.date              = '2013-08-29'
+  s.version           = '1.15.0.20130927082724'
+  s.date              = '2013-09-27'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -50,6 +50,7 @@ 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
@@ -64,6 +65,8 @@ 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('vcr', '~>2.5.0')
+  s.add_development_dependency('webmock', '~>1.11.0')
 #  s.add_development_dependency('ruby-libvirt','~>0.4.0')
 
   s.files = `git ls-files`.split("\n")

data/lib/fog.rb

@@ -37,6 +37,7 @@ require 'fog/serverlove'
 require 'fog/storm_on_demand'
 require 'fog/terremark'
 require 'fog/vcloud'
+require 'fog/vcloud_director'
 require 'fog/vmfusion'
 require 'fog/vsphere'
 require 'fog/voxel'

data/lib/fog/atmos/models/storage/file.rb

@@ -60,7 +60,8 @@ module Fog
           file = directory.files.head(key)
           self.objectid = if file && file.to_s.strip != "" then file.attributes['x-emc-meta'].scan(/objectid=(\w+),/).flatten[0] else nil end
           if self.objectid && self.objectid.to_s.strip != ""
-            uri = URI::HTTP.build(:scheme => service.ssl? ? "http" : "https" , :host => service.host, :port => service.port.to_i, :path => "/rest/objects/#{self.objectid}" )
+            klass = service.ssl? ? URI::HTTPS : URI::HTTP
+            uri = klass.build(:host => service.host, :port => service.port.to_i, :path => "/rest/objects/#{self.objectid}" )
 
             sb = "GET\n"
             sb += uri.path.downcase + "\n"

data/lib/fog/aws.rb

@@ -1,6 +1,7 @@
 require 'fog/core'
 require 'fog/aws/credential_fetcher'
 require 'fog/aws/signaturev4'
+require 'unicode'
 module Fog
   module AWS
     extend Fog::Provider
@@ -20,6 +21,7 @@ module Fog
     service(:glacier,         'aws/glacier',          'Glacier')
     service(:iam,             'aws/iam',              'IAM')
     service(:rds,             'aws/rds',              'RDS')
+    service(:redshift,        'aws/redshift',         'Redshift')
     service(:ses,             'aws/ses',              'SES')
     service(:simpledb,        'aws/simpledb',         'SimpleDB')
     service(:sns,             'aws/sns',              'SNS')
@@ -84,7 +86,8 @@ module Fog
     end
 
     def self.escape(string)
-      string.gsub(/([^a-zA-Z0-9_.\-~]+)/) {
+      string = Unicode::normalize_C(string)
+      string.gsub(/([^a-zA-Z0-9_.\-~\/]+)/) {
         "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
       }
     end

data/lib/fog/aws/data_pipeline.rb

@@ -15,6 +15,9 @@ module Fog
       request :describe_pipelines
       request :list_pipelines
       request :put_pipeline_definition
+      request :get_pipeline_definition
+      request :query_objects
+      request :describe_objects
 
       model_path 'fog/aws/models/data_pipeline'
       model       :pipeline

data/lib/fog/aws/elasticache.rb

@@ -5,6 +5,7 @@ module Fog
 
       class IdentifierTaken < Fog::Errors::Error; end
       class InvalidInstance < Fog::Errors::Error; end
+      class AuthorizationAlreadyExists < Fog::Errors::Error; end
 
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
@@ -130,6 +131,7 @@ module Fog
             hash[region] = Hash.new do |region_hash, key|
               region_hash[key] = {
                 :clusters  => {}, # cache cluster data, indexed by cluster ID
+                :security_groups => {}, # security groups
               }
             end
           end

data/lib/fog/aws/models/auto_scaling/group.rb

@@ -25,18 +25,18 @@ module Fog
         attribute :vpc_zone_identifier,       :aliases => 'VPCZoneIdentifier'
 
         def initialize(attributes={})
-          attributes['DefaultCooldown'] ||= 300
-          attributes['DesiredCapacity'] ||= 0
-          attributes['EnabledMetrics'] ||= []
-          attributes['HealthCheckGracePeriod'] ||= 0
-          attributes['HealthCheckType'] ||= 'EC2'
-          attributes['Instances'] ||= []
-          attributes['LoadBalancerNames'] ||= []
-          attributes['MaxSize'] ||= 0
-          attributes['MinSize'] ||= 0
-          attributes['SuspendedProcesses'] ||= []
-          attributes['Tags'] ||= []
-          attributes['TerminationPolicies'] ||= ['Default']
+          attributes['Instances'] = []
+          self.default_cooldown = 300
+          self.desired_capacity = 0
+          self.enabled_metrics = []
+          self.health_check_grace_period = 0
+          self.health_check_type = 'EC2'
+          self.load_balancer_names = []
+          self.max_size = 0
+          self.min_size = 0
+          self.suspended_processes = []
+          self.tags = []
+          self.termination_policies = ['Default']
           super
         end
 

data/lib/fog/aws/models/compute/subnet.rb

@@ -43,7 +43,9 @@ module Fog
 
         def save
           requires :vpc_id, :cidr_block
-          data = service.create_subnet(vpc_id, cidr_block).body['subnetSet'].first
+          options = {}
+          options['AvailabilityZone'] = availability_zone if availability_zone
+          data = service.create_subnet(vpc_id, cidr_block, options).body['subnetSet'].first
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true

data/lib/fog/aws/models/elasticache/cluster.rb

@@ -29,6 +29,8 @@ module Fog
         attribute :notification_config,
           :aliases => 'NotificationConfiguration', :type => :hash
 
+        attr_accessor :parameter_group_name
+
         def ready?
           status == 'available'
         end
@@ -57,7 +59,7 @@ module Fog
               :port                         => port,
               :preferred_availablility_zone => zone,
               :preferred_maintenance_window => maintenance_window,
-              :parameter_group_name => parameter_group['CacheParameterGroupName'],
+              :parameter_group_name         => parameter_group_name || parameter_group['CacheParameterGroupName'],
             }
           )
         end

data/lib/fog/aws/parsers/redshift/cluster.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Parsers
+    module Redshift
+      module AWS
+        require 'fog/aws/parsers/redshift/cluster_parser'
+
+        class Cluster < ClusterParser
+          def reset
+            super
+            @response = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            super
+            case name
+            when 'Cluster'
+              @response = {name => @cluster}
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/aws/parsers/redshift/cluster_parser.rb

@@ -0,0 +1,144 @@
+module Fog
+  module Parsers
+    module Redshift
+      module AWS
+
+        class ClusterParser < Fog::Parsers::Base
+          # :cluster_identifier - (String)
+          # :node_type - (String)
+          # :cluster_status - (String)
+          # :modify_status - (String)
+          # :master_username - (String)
+          # :db_name - (String)
+          # :endpoint - (Hash)
+          #   :address - (String)
+          #   :port - (Integer)
+          # :cluster_create_time - (Time)
+          # :automated_snapshot_retention_period - (Integer)
+          # :cluster_security_groups - (Array)
+          #   :cluster_security_group_name - (String)
+          #   :status - (String)
+          # :vpc_security_groups - (Array)
+          #   :vpc_security_group_id - (String)
+          #   :status - (String)
+          # :cluster_parameter_groups - (Array)
+          #   :parameter_group_name - (String)
+          #   :parameter_apply_status - (String)
+          # :cluster_subnet_group_name - (String)
+          # :vpc_id - (String)
+          # :availability_zone - (String)
+          # :preferred_maintenance_window - (String)
+          # :pending_modified_values - (Hash)
+          #   :master_user_password - (String)
+          #   :node_type - (String)
+          #   :number_of_nodes - (Integer)
+          #   :cluster_type - (String)
+          #   :cluster_version - (String)
+          #   :automated_snapshot_retention_period - (Integer)
+          # :cluster_version - (String)
+          # :allow_version_upgrade - (Boolean)
+          # :number_of_nodes - (Integer)
+          # :publicly_accessible - (Boolean)
+          # :encrypted - (Boolean)
+          # :restore_status - (Hash)
+          #   :status - (String)
+          #   :current_restore_rate_in_mega_bytes_per_second - (Numeric)
+          #   :snapshot_size_in_mega_bytes - (Integer)
+          #   :progress_in_mega_bytes - (Integer)
+          #   :elapsed_time_in_seconds - (Integer)
+          #   :estimated_time_to_completion_in_seconds - (Integer)
+
+          def reset
+            @cluster = fresh_cluster
+          end
+
+          def fresh_cluster
+            { 'ClusterParameterGroups' => [], 'ClusterSecurityGroups' => [], 'VpcSecurityGroups' => [], 
+              'EndPoint' => {}, 'PendingModifiedValues'=> {}, 'RestoreStatus' => {}}
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'ClusterSecurityGroups'
+              @in_cluster_security_groups = true
+              @cluster_security_group = {}
+            when 'ClusterParameterGroups'
+              @cluster_parameter_group = {}
+            when 'VpcSecurityGroups'
+              @in_vpc_security_groups = true
+              @vpc_security_group = {}
+            when 'PendingModifiedValues'
+              @in_pending_modified_values = true
+            end
+          end
+
+          def end_element(name)            
+            case name
+            when 'AvailabilityZone', 'ClusterIdentifier', 'ClusterStatus', 'ClusterSubnetGroupName', 'DBName', 
+              'MasterUsername', 'ModifyStatus', 'PreferredMaintenanceWindow', 'VpcId'
+              @cluster[name] = value
+            when 'ClusterCreateTime'
+              @cluster[name] = Time.parse(value)
+            when 'AllowVersionUpgrade', 'Encrypted', 'PubliclyAccessible'
+              @cluster[name] = (value == "true")
+            when 'Address'
+              @cluster['EndPoint'][name] = value            
+            when 'Port'
+              @cluster['EndPoint'][name] = value.to_i
+            when 'NodeType', 'ClusterVersion'
+              if @in_pending_modified_values
+                @cluster['PendingModifiedValues'][name] = value
+              else
+                @cluster[name] = value
+              end
+            when 'NumberOfNodes', 'AutomatedSnapshotRetentionPeriod'
+              if @in_pending_modified_values
+                @cluster['PendingModifiedValues'][name] = value.to_i
+              else
+                @cluster[name] = value.to_i
+              end
+            when 'MasterUserPassword', 'ClusterType'
+              @cluster['PendingModifiedValues'][name] = value
+            when 'Status'
+              if @in_vpc_security_groups
+                @vpc_security_group[name] = value
+              elsif @in_cluster_security_groups
+                @cluster_security_group[name] = value
+              else
+                @cluster['RestoreStatus'][name] = value
+              end
+            when 'ParameterGroupName', 'ParameterApplyStatus'
+              @cluster_parameter_group[name] = value
+            when 'ClusterSecurityGroupName'
+              @cluster_security_group[name] = value
+            when 'VpcSecurityGroupId'
+              @vpc_security_group[name] = value
+            when 'SnapshotSizeInMegaBytes', 'ProgressInMegaBytes', 'ElapsedTimeInSeconds', 'EstimatedTimeToCompletionInSeconds'
+              @cluster['RestoreStatus'][name] = value.to_i
+            when 'CurrentRestoreRateInMegaBytesPerSecond'
+              @cluster['RestoreStatus'][name] = value.to_f
+
+            when 'ClusterSecurityGroups'
+              @in_cluster_security_groups = false
+            when 'VpcSecurityGroups'
+              @in_vpc_security_groups = false
+            when 'PendingModifiedValues'
+              @in_pending_modified_values = false
+
+            when 'ClusterParameterGroup'
+              @cluster['ClusterParameterGroups'] << {name => @cluster_parameter_group}
+              @cluster_parameter_group = {}
+            when 'ClusterSecurityGroup'
+              @cluster['ClusterSecurityGroups'] << {name => @cluster_security_group}
+              @cluster_security_group = {}
+            when 'VpcSecurityGroup'
+              @cluster['VpcSecurityGroups'] << {name => @vpc_security_group}
+              @vpc_security_group = {}
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/redshift/cluster_security_group_parser.rb

@@ -0,0 +1,50 @@
+module Fog
+  module Parsers
+    module Redshift
+      module AWS
+
+        class ClusterSecurityGroupParser < Fog::Parsers::Base
+          #   :cluster_security_group_name - (String)
+          #   :description - (String)
+          #   :ec_2_security_groups - (Array)
+          #     :status - (String)
+          #     :ec2_security_group_name - (String)
+          #     :ec2_security_group_owner_id - (String)
+          #   :ip_ranges - (Array)
+          #     :status - (String)
+          #     :cidrip - (String)
+          
+          def reset
+            @cluster_security_group = fresh_cluster_security_group
+          end
+
+          def fresh_cluster_security_group
+            {'EC2SecurityGroups' => [], 'IPRanges' => []}
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'EC2SecurityGroups', 'IPRanges'
+              @list = {}
+              @list_name = name
+            end
+          end
+
+          def end_element(name)       
+            super     
+            case name
+            when 'ClusterSecurityGroupName', 'Description'
+              @cluster_security_group[name] = value
+            when 'EC2SecurityGroupName', 'EC2SecurityGroupOwnerId', 'CIDRIP', 'Status'
+              @list[name] = value
+            when 'EC2SecurityGroup', 'IPRange'
+              @cluster_security_group[@list_name] << {name => @list}
+              @list = {}
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/redshift/cluster_snapshot.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Parsers
+    module Redshift
+      module AWS
+
+        require 'fog/aws/parsers/redshift/cluster_snapshot_parser'
+
+        class ClusterSnapshot < ClusterSnapshotParser
+          # :parameter_group_name - (String)
+          # :parameter_group_status - (String)
+          
+          def reset
+            super
+            @response = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)            
+            super
+            case name
+            when 'Snapshot'
+              @response = @snapshot
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/redshift/cluster_snapshot_parser.rb

@@ -0,0 +1,66 @@
+module Fog
+  module Parsers
+    module Redshift
+      module AWS
+
+        class ClusterSnapshotParser < Fog::Parsers::Base
+          # :snapshot_identifier - (String)
+          # :cluster_identifier - (String)
+          # :snapshot_create_time - (Time)
+          # :status - (String)
+          # :port - (Integer)
+          # :availability_zone - (String)
+          # :cluster_create_time - (Time)
+          # :master_username - (String)
+          # :cluster_version - (String)
+          # :snapshot_type - (String)
+          # :node_type - (String)
+          # :number_of_nodes - (Integer)
+          # :db_name - (String)
+          # :vpc_id - (String)
+          # :encrypted - (Boolean)
+          # :accounts_with_restore_access - (Array)
+          #   :account_id - (String)
+          # :owner_account - (String)
+          # :total_backup_size_in_mega_bytes - (Numeric)
+          # :actual_incremental_backup_size_in_mega_bytes - (Numeric)
+          # :backup_progress_in_mega_bytes - (Numeric)
+          # :current_backup_rate_in_mega_bytes_per_second - (Numeric)
+          # :estimated_seconds_to_completion - (Integer)
+          # :elapsed_time_in_seconds - (Integer)
+
+          def reset
+            @snapshot = fresh_snapshot
+          end
+
+          def fresh_snapshot
+            {'Snapshot' =>  { 'AccountsWithRestoreAccess' => [] }}
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)  
+            super          
+            case name
+            when 'SnapshotIdentifier', 'ClusterIdentifier', 'Status', 'AvailabilityZone', 'MasterUsername', 'ClusterVersion', 'SnapshotType', 'NodeType',
+              'DBName', 'VpcId', 'OwnerAccount'
+              @snapshot['Snapshot'][name] = value
+            when 'Port', 'NumberOfNodes', 'ElapsedTimeInSeconds', 'EstimatedSecondsToCompletion'
+              @snapshot['Snapshot'][name] = value.to_i
+            when 'SnapshotCreateTime', 'ClusterCreateTime'
+              @snapshot['Snapshot'][name] = Time.parse(value)
+            when 'Encrypted'
+              @snapshot['Snapshot'][name] = (value == "true")
+            when 'TotalBackupSizeInMegaBytes', 'ActualIncrementalBackupSizeInMegaBytes', 'BackupProgressInMegaBytes', 'CurrentBackupRateInMegaBytesPerSecond'
+              @snapshot['Snapshot'][name] = value.to_f
+            when 'AccountId'
+              @snapshot['Snapshot']['AccountsWithRestoreAccess'] << value
+            end
+          end
+        end
+      end
+    end
+  end
+end