kotovalexarian-likes-github
/
fog--fog
mirror of https://github.com/fog/fog.git
1
0
Fork 0
Code Releases Activity

Standardise empty lines throughout codebase 

Done with `rubocop --auto-correct --only EmptyLineBetweenDefs,EmptyLines,EmptyLinesAroundBody`
This commit is contained in:
Paul Thornthwaite 2014-05-26 14:20:02 +01:00
parent 2e4fb619df
commit 2e0b7e545a
3819 changed files with 21 additions and 10695 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchs/parse_vs_push.rb
View File

@ -3,7 +3,6 @@ require 'rubygems'
require 'nokogiri'
class Parser < Nokogiri::XML::SAX::Document
attr_reader :response
def initialize
@ -37,7 +36,6 @@ class Parser < Nokogiri::XML::SAX::Document
def value
@value.dup
end
end
data = <<-DATA

2
lib/fog/atmos/core.rb
View File

@ -2,10 +2,8 @@ require 'fog/core'
module Fog
module Atmos
extend Fog::Provider
service(:storage, 'Storage')
end
end

4
lib/fog/atmos/models/storage/directories.rb
View File

@ -4,9 +4,7 @@ require 'fog/atmos/models/storage/directory'
module Fog
module Storage
class Atmos
class Directories < Fog::Collection
attribute :directory
model Fog::Storage::Atmos::Directory
@ -40,9 +38,7 @@ module Fog
attributes = {:directory => directory}.merge(attributes) if directory
super(attributes)
end
end
end
end
end

5
lib/fog/atmos/models/storage/directory.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Storage
class Atmos
class Directory < Fog::Model
identity :key, :aliases => :Filename
attribute :objectid, :aliases => :ObjectID
@ -44,10 +42,7 @@ module Fog
end
service.delete_namespace key
end
end
end
end
end

4
lib/fog/atmos/models/storage/file.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Storage
class Atmos
class File < Fog::Model
identity :key, :aliases => :Filename
attribute :content_length, :aliases => ['bytes', 'Content-Length'], :type => :integer
@ -104,9 +102,7 @@ module Fog
def directory=(new_directory)
@directory = new_directory
end
end
end
end
end

4
lib/fog/atmos/models/storage/files.rb
View File

@ -4,9 +4,7 @@ require 'fog/atmos/models/storage/file'
module Fog
module Storage
class Atmos
class Files < Fog::Collection
attribute :directory
attribute :limit
attribute :marker
@ -70,9 +68,7 @@ module Fog
requires :directory
super({ :directory => directory }.merge!(attributes))
end
end
end
end
end

2
lib/fog/atmos/requests/storage/delete_namespace.rb
View File

@ -2,7 +2,6 @@ module Fog
module Storage
class Atmos
class Real
def delete_namespace(namespace = '', options = {})
options = options.reject {|key, value| value.nil?}
request({
@ -12,7 +11,6 @@ module Fog
:query => options
}.merge(options))
end
end
end
end

2
lib/fog/atmos/requests/storage/get_namespace.rb
View File

@ -2,7 +2,6 @@ module Fog
module Storage
class Atmos
class Real
def get_namespace(namespace = '', options = {})
options = options.reject {|key, value| value.nil?}
request({
@ -13,7 +12,6 @@ module Fog
:parse => true
}.merge(options))
end
end
end
end

2
lib/fog/atmos/requests/storage/head_namespace.rb
View File

@ -2,7 +2,6 @@ module Fog
module Storage
class Atmos
class Real
def head_namespace(namespace = '', options = {})
options = options.reject {|key, value| value.nil?}
request({
@ -13,7 +12,6 @@ module Fog
:parse => true
}.merge(options))
end
end
end
end

2
lib/fog/atmos/requests/storage/post_namespace.rb
View File

@ -2,7 +2,6 @@ module Fog
module Storage
class Atmos
class Real
def post_namespace(namespace = '', options = {})
options = options.reject {|key, value| value.nil?}
request({
@ -13,7 +12,6 @@ module Fog
:parse => true
}.merge(options))
end
end
end
end

2
lib/fog/atmos/requests/storage/put_namespace.rb
View File

@ -2,7 +2,6 @@ module Fog
module Storage
class Atmos
class Real
def put_namespace(namespace = '', options = {})
options = options.reject {|key, value| value.nil?}
request({
@ -13,7 +12,6 @@ module Fog
:parse => true
}.merge(options))
end
end
end
end

2
lib/fog/atmos/storage.rb
View File

@ -71,7 +71,6 @@ module Fog
def request(options)
raise "Atmos Storage mocks not implemented"
end
end
class Real
@ -179,7 +178,6 @@ module Fog
end
response
end
end
end
end

3
lib/fog/aws/auto_scaling.rb
View File

@ -177,7 +177,6 @@ module Fog
end
end
class Mock
include Fog::AWS::CredentialFetcher::ConnectionMethods
@ -274,9 +273,7 @@ module Fog
def setup_credentials(options)
@aws_access_key_id = options[:aws_access_key_id]
end
end
end
end
end

5
lib/fog/aws/beanstalk.rb
View File

@ -56,11 +56,9 @@ module Fog
collection :versions
class Mock
def initialize(options={})
Fog::Mock.not_implemented
end
end
class Real
@ -140,11 +138,8 @@ module Fog
Fog::AWS::ElasticBeanstalk::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
end
end
end
end
end
end
end

1
lib/fog/aws/cdn.rb
View File

@ -30,7 +30,6 @@ module Fog
request 'put_streaming_distribution_config'
class Mock
def self.data
@data ||= Hash.new do |hash, key|
hash[key] = {

4
lib/fog/aws/cloud_formation.rb
View File

@ -21,11 +21,9 @@ module Fog
request :list_stack_resources
class Mock
def initialize(options={})
Fog::Mock.not_implemented
end
end
class Real
@ -116,9 +114,7 @@ module Fog
Fog::AWS::CloudFormation::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
end
end
end
end
end
end

2
lib/fog/aws/cloud_watch.rb
View File

@ -35,7 +35,6 @@ module Fog
collection :alarms
class Mock
def self.data
@data ||= Hash.new do |hash, region|
hash[region] = Hash.new do |region_hash, key|
@ -159,7 +158,6 @@ module Fog
:parser => parser
})
end
end
end
end

2
lib/fog/aws/compute.rb
View File

@ -154,7 +154,6 @@ module Fog
# deprecation
class Real
def modify_image_attributes(*params)
Fog::Logger.deprecation("modify_image_attributes is deprecated, use modify_image_attribute instead [light_black](#{caller.first})[/]")
modify_image_attribute(*params)
@ -478,7 +477,6 @@ module Fog
Fog::Compute::AWS::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
end
end
end
end
end

1
lib/fog/aws/core.rb
View File

@ -121,7 +121,6 @@ module Fog
end
class Mock
def self.arn(vendor, account_id, path, region = nil)
"arn:aws:#{vendor}:#{region}:#{account_id}:#{path}"
end

1
lib/fog/aws/credential_fetcher.rb
View File

@ -32,7 +32,6 @@ module Fog
end
module ConnectionMethods
def refresh_credentials_if_expired
refresh_credentials if credentials_expired?
end

1
lib/fog/aws/dns.rb
View File

@ -24,7 +24,6 @@ module Fog
request :get_change
class Mock
def self.data
@data ||= Hash.new do |hash, region|
hash[region] = Hash.new do |region_hash, key|

2
lib/fog/aws/dynamodb.rb
View File

@ -24,7 +24,6 @@ module Fog
request :update_table
class Mock
def self.data
@data ||= Hash.new do |hash, key|
hash[key] = {
@ -134,7 +133,6 @@ module Fog
response
end
end
end
end

4
lib/fog/aws/elasticache.rb
View File

@ -124,9 +124,7 @@ module Fog
Fog::AWS::Elasticache::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
end
end
end
end
class Mock
@ -199,8 +197,6 @@ module Fog
end
end
end
end
end
end

1
lib/fog/aws/elb.rb
View File

@ -56,7 +56,6 @@ module Fog
collection :backend_server_descriptions
class Mock
require 'fog/aws/elb/policy_types'
def self.data

3
lib/fog/aws/emr.rb
View File

@ -35,11 +35,9 @@ module Fog
# collection :security_groups
class Mock
def initialize(options={})
Fog::Mock.not_implemented
end
end
class Real
@ -126,7 +124,6 @@ module Fog
response
end
end
end
end

5
lib/fog/aws/glacier.rb
View File

@ -37,7 +37,6 @@ module Fog
MEGABYTE = 1024*1024
class TreeHash
def self.digest(body)
new.add_part(body)
end
@ -92,11 +91,9 @@ module Fog
end
class Mock
def initialize(options={})
Fog::Mock.not_implemented
end
end
class Real
@ -120,7 +117,6 @@ module Fog
# ==== Returns
# * Glacier object with connection to AWS.
def initialize(options={})
@use_iam_profile = options[:use_iam_profile]
@region = options[:region] || 'us-east-1'
@ -137,7 +133,6 @@ module Fog
@connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
private
def setup_credentials(options)
@aws_access_key_id = options[:aws_access_key_id]

2
lib/fog/aws/iam.rb
View File

@ -84,7 +84,6 @@ module Fog
model :role
collection :roles
class Mock
def self.data
@data ||= Hash.new do |hash, key|
@ -249,7 +248,6 @@ module Fog
Fog::AWS::IAM::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
end
end
end
end
end

1
lib/fog/aws/models/auto_scaling/activities.rb
View File

@ -31,7 +31,6 @@ module Fog
data = service.describe_scaling_activities('ActivityId' => identity).body['DescribeScalingActivitiesResult']['Activities'].first
new(data) unless data.nil?
end
end
end
end

2
lib/fog/aws/models/auto_scaling/activity.rb
View File

@ -4,7 +4,6 @@ module Fog
module AWS
class AutoScaling
class Activity < Fog::Model
identity :id, :aliases => 'ActivityId'
attribute :auto_scaling_group_name, :aliases => 'AutoScalingGroupName'
attribute :cause, :aliases => 'Cause'
@ -22,7 +21,6 @@ module Fog
def save
raise "Operation not supported"
end
end
end
end

2
lib/fog/aws/models/auto_scaling/configuration.rb
View File

@ -4,7 +4,6 @@ module Fog
module AWS
class AutoScaling
class Configuration < Fog::Model
identity :id, :aliases => 'LaunchConfigurationName'
attribute :arn, :aliases => 'LaunchConfigurationARN'
attribute :associate_public_ip, :aliases => 'AssociatePublicIpAddress'
@ -62,7 +61,6 @@ module Fog
requires :id
service.delete_launch_configuration(id)
end
end
end
end

2
lib/fog/aws/models/auto_scaling/configurations.rb
View File

@ -4,7 +4,6 @@ module Fog
module AWS
class AutoScaling
class Configurations < Fog::Collection
model Fog::AWS::AutoScaling::Configuration
# Creates a new launch configuration
@ -28,7 +27,6 @@ module Fog
data = service.describe_launch_configurations('LaunchConfigurationNames' => identity).body['DescribeLaunchConfigurationsResult']['LaunchConfigurations'].first
new(data) unless data.nil?
end
end
end
end

1
lib/fog/aws/models/auto_scaling/groups.rb
View File

@ -31,7 +31,6 @@ module Fog
data = service.describe_auto_scaling_groups('AutoScalingGroupNames' => identity).body['DescribeAutoScalingGroupsResult']['AutoScalingGroups'].first
new(data) unless data.nil?
end
end
end
end

2
lib/fog/aws/models/auto_scaling/instance.rb
View File

@ -4,7 +4,6 @@ module Fog
module AWS
class AutoScaling
class Instance < Fog::Model
identity :id, :aliases => 'InstanceId'
attribute :auto_scaling_group_name, :aliases => 'AutoScalingGroupName'
attribute :availability_zone, :aliases => 'AvailabilityZone'
@ -53,7 +52,6 @@ module Fog
# requires :id
# service.delete_auto_scaling_group(id)
#end
end
end
end

2
lib/fog/aws/models/auto_scaling/instances.rb
View File

@ -4,7 +4,6 @@ module Fog
module AWS
class AutoScaling
class Instances < Fog::Collection
model Fog::AWS::AutoScaling::Instance
def all
@ -23,7 +22,6 @@ module Fog
data = service.describe_auto_scaling_instances('InstanceIds' => identity).body['DescribeAutoScalingInstancesResult']['AutoScalingInstances'].first
new(data) unless data.nil?
end
end
end
end

3
lib/fog/aws/models/beanstalk/application.rb
View File

@ -3,7 +3,6 @@ require 'fog/core/model'
module Fog
module AWS
class ElasticBeanstalk
class Application < Fog::Model
identity :name, :aliases => 'ApplicationName'
attribute :template_names, :aliases => 'ConfigurationTemplates'
@ -54,9 +53,7 @@ module Fog
merge_attributes(data)
true
end
end
end
end
end

2
lib/fog/aws/models/beanstalk/applications.rb
View File

@ -4,7 +4,6 @@ require 'fog/aws/models/beanstalk/application'
module Fog
module AWS
class ElasticBeanstalk
class Applications < Fog::Collection
model Fog::AWS::ElasticBeanstalk::Application
@ -18,7 +17,6 @@ module Fog
new(data)
end
end
end
end
end

4
lib/fog/aws/models/beanstalk/environment.rb
View File

@ -3,7 +3,6 @@ require 'fog/core/model'
module Fog
module AWS
class ElasticBeanstalk
class Environment < Fog::Model
identity :name, :aliases => 'EnvironmentName'
attribute :id, :aliases => 'EnvironmentId'
@ -47,7 +46,6 @@ module Fog
# Returns the load balancer object associated with the environment.
def load_balancer(elb_connection = Fog::AWS[:elb])
if resources.nil?
elb_connection.load_balancers.get(live_resources['LoadBalancers'].first['Name'])
else
@ -141,9 +139,7 @@ module Fog
merge_attributes(data)
true
end
end
end
end
end

2
lib/fog/aws/models/beanstalk/environments.rb
View File

@ -4,7 +4,6 @@ require 'fog/aws/models/beanstalk/environment'
module Fog
module AWS
class ElasticBeanstalk
class Environments < Fog::Collection
model Fog::AWS::ElasticBeanstalk::Environment
@ -22,7 +21,6 @@ module Fog
new(data)
end
end
end
end
end

2
lib/fog/aws/models/beanstalk/event.rb
View File

@ -3,7 +3,6 @@ require 'fog/core/model'
module Fog
module AWS
class ElasticBeanstalk
class Event < Fog::Model
attribute :application_name, :aliases => 'ApplicationName'
attribute :environment_name, :aliases => 'EnvironmentName'
@ -14,7 +13,6 @@ module Fog
attribute :template_name, :aliases => 'TemplateName'
attribute :version_label, :aliases => 'VersionLabel'
end
end
end
end

2
lib/fog/aws/models/beanstalk/events.rb
View File

@ -4,7 +4,6 @@ require 'fog/aws/models/beanstalk/event'
module Fog
module AWS
class ElasticBeanstalk
class Events < Fog::Collection
model Fog::AWS::ElasticBeanstalk::Event
@ -12,7 +11,6 @@ module Fog
data = service.describe_events(options).body['DescribeEventsResult']['Events']
load(data) # data is an array of attribute hashes
end
end
end
end

2
lib/fog/aws/models/beanstalk/template.rb
View File

@ -3,7 +3,6 @@ require 'fog/core/model'
module Fog
module AWS
class ElasticBeanstalk
class Template < Fog::Model
attribute :name, :aliases => 'TemplateName'
attribute :application_name, :aliases => 'ApplicationName'
@ -72,7 +71,6 @@ module Fog
true
end
end
end
end
end

2
lib/fog/aws/models/beanstalk/templates.rb
View File

@ -4,7 +4,6 @@ require 'fog/aws/models/beanstalk/template'
module Fog
module AWS
class ElasticBeanstalk
class Templates < Fog::Collection
model Fog::AWS::ElasticBeanstalk::Template
@ -63,7 +62,6 @@ module Fog
end
result
end
end
end
end

2
lib/fog/aws/models/beanstalk/version.rb
View File

@ -3,7 +3,6 @@ require 'fog/core/model'
module Fog
module AWS
class ElasticBeanstalk
class Version < Fog::Model
attribute :label, :aliases => 'VersionLabel'
attribute :application_name, :aliases => 'ApplicationName'
@ -73,7 +72,6 @@ module Fog
merge_attributes(data)
end
end
end
end
end

2
lib/fog/aws/models/beanstalk/versions.rb
View File

@ -4,7 +4,6 @@ require 'fog/aws/models/beanstalk/version'
module Fog
module AWS
class ElasticBeanstalk
class Versions < Fog::Collection
model Fog::AWS::ElasticBeanstalk::Version
@ -24,7 +23,6 @@ module Fog
end
end
end
end
end

3
lib/fog/aws/models/cdn/distribution.rb
View File

@ -5,7 +5,6 @@ require 'fog/aws/models/cdn/distribution_helper'
module Fog
module CDN
class AWS
class Distribution < Fog::Model
include Fog::CDN::AWS::DistributionHelper
@ -85,9 +84,7 @@ module Fog
def distribution_config_to_attributes(new_attributes = {})
new_attributes.merge(new_attributes.delete('DistributionConfig') || {})
end
end
end
end
end

4
lib/fog/aws/models/cdn/distribution_helper.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/collection'
module Fog
module CDN
class AWS
module DistributionHelper
def destroy
requires :identity, :etag, :caller_reference
raise "Distribution must be disabled to be deleted" unless disabled?
@ -56,9 +54,7 @@ module Fog
end
true
end
end
end
end
end

3
lib/fog/aws/models/cdn/distributions.rb
View File

@ -5,7 +5,6 @@ require 'fog/aws/models/cdn/distributions_helper'
module Fog
module CDN
class AWS
class Distributions < Fog::Collection
include Fog::CDN::AWS::DistributionsHelper
@ -25,9 +24,7 @@ module Fog
alias_method :each_distribution_this_page, :each
alias_method :each, :each_distribution
end
end
end
end

3
lib/fog/aws/models/cdn/distributions_helper.rb
View File

@ -3,7 +3,6 @@ require 'fog/core/collection'
module Fog
module CDN
class AWS
module DistributionsHelper
def all(options = {})
@ -40,9 +39,7 @@ module Fog
self
end
end
end
end
end
end

4
lib/fog/aws/models/cdn/invalidation.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module CDN
class AWS
class Invalidation < Fog::Model
identity :id, :aliases => 'Id'
attribute :status, :aliases => 'Status'
@ -56,9 +54,7 @@ module Fog
end
new_attributes
end
end
end
end
end

4
lib/fog/aws/models/cdn/invalidations.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/cdn/invalidation'
module Fog
module CDN
class AWS
class Invalidations < Fog::Collection
attribute :is_truncated, :aliases => ['IsTruncated']
attribute :max_items, :aliases => ['MaxItems']
attribute :next_marker, :aliases => ['NextMarker']
@ -46,9 +44,7 @@ module Fog
requires :distribution
super({ :distribution => distribution }.merge!(attributes))
end
end
end
end
end

3
lib/fog/aws/models/cdn/streaming_distribution.rb
View File

@ -5,7 +5,6 @@ require 'fog/aws/models/cdn/distribution_helper'
module Fog
module CDN
class AWS
class StreamingDistribution < Fog::Model
include Fog::CDN::AWS::DistributionHelper
@ -69,9 +68,7 @@ module Fog
def distribution_config_to_attributes(new_attributes = {})
new_attributes.merge(new_attributes.delete('StreamingDistributionConfig') || {})
end
end
end
end
end

3
lib/fog/aws/models/cdn/streaming_distributions.rb
View File

@ -5,7 +5,6 @@ require 'fog/aws/models/cdn/distributions_helper'
module Fog
module CDN
class AWS
class StreamingDistributions < Fog::Collection
include Fog::CDN::AWS::DistributionsHelper
@ -25,9 +24,7 @@ module Fog
alias_method :each_distribution_this_page, :each
alias_method :each, :each_distribution
end
end
end
end

1
lib/fog/aws/models/cloud_watch/alarm_data.rb
View File

@ -32,7 +32,6 @@ module Fog
data = service.describe_alarms_for_metric(list_opts).body['DescribeAlarmsForMetricResult']['MetricAlarms']
load(data)
end
end
end
end

1
lib/fog/aws/models/cloud_watch/alarm_datum.rb
View File

@ -3,7 +3,6 @@ require 'fog/core/model'
module Fog
module AWS
class CloudWatch
class AlarmDatum < Fog::Model
attribute :alarm_name, :aliases => 'AlarmName'
attribute :metric_name, :aliases => 'MetricName'

1
lib/fog/aws/models/cloud_watch/alarm_histories.rb
View File

@ -11,7 +11,6 @@ module Fog
data = service.describe_alarm_history(conditions).body['DescribeAlarmHistoryResult']['AlarmHistoryItems']
load(data) # data is an array of attribute hashes
end
end
end
end

1
lib/fog/aws/models/cloud_watch/alarm_history.rb
View File

@ -3,7 +3,6 @@ require 'fog/core/model'
module Fog
module AWS
class CloudWatch
class AlarmHistory < Fog::Model
attribute :alarm_name, :aliases => 'AlarmName'
attribute :end_date, :aliases => 'EndDate'

2
lib/fog/aws/models/cloud_watch/alarms.rb
View File

@ -4,7 +4,6 @@ require 'fog/aws/models/cloud_watch/alarm'
module Fog
module AWS
class CloudWatch
class Alarms < Fog::Collection
model Fog::AWS::CloudWatch::Alarm
@ -40,7 +39,6 @@ module Fog
service.enable_alarm_actions(alarm_names)
true
end
end
end
end

1
lib/fog/aws/models/cloud_watch/metric.rb
View File

@ -3,7 +3,6 @@ require 'fog/core/model'
module Fog
module AWS
class CloudWatch
class Metric < Fog::Model
attribute :name, :aliases => 'MetricName'
attribute :namespace, :aliases => 'Namespace'

1
lib/fog/aws/models/cloud_watch/metric_statistic.rb
View File

@ -3,7 +3,6 @@ require 'fog/core/model'
module Fog
module AWS
class CloudWatch
class MetricStatistic < Fog::Model
attribute :label, :aliases => 'Label'
attribute :minimum, :aliases => 'Minimum'

1
lib/fog/aws/models/cloud_watch/metric_statistics.rb
View File

@ -16,7 +16,6 @@ module Fog
data.collect! { |datum| datum.merge('MetricName' => metricName, 'Namespace' => namespace, 'Dimensions' => dimensions) }
load(data) # data is an array of attribute hashes
end
end
end
end

2
lib/fog/aws/models/cloud_watch/metrics.rb
View File

@ -4,7 +4,6 @@ require 'fog/aws/models/cloud_watch/metric'
module Fog
module AWS
class CloudWatch
class Metrics < Fog::Collection
attribute :next_token, :aliases => 'NextToken'
@ -45,7 +44,6 @@ module Fog
new(data)
end
end
end
end
end

4
lib/fog/aws/models/compute/address.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class Address < Fog::Model
identity :public_ip, :aliases => 'publicIp'
attribute :allocation_id, :aliases => 'allocationId'
@ -70,9 +68,7 @@ module Fog
service.disassociate_address(public_ip)
end
end
end
end
end
end

4
lib/fog/aws/models/compute/addresses.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/address'
module Fog
module Compute
class AWS
class Addresses < Fog::Collection
attribute :filters
attribute :server
@ -92,9 +90,7 @@ module Fog
super(attributes)
end
end
end
end
end
end

2
lib/fog/aws/models/compute/dhcp_option.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class DhcpOption < Fog::Model
identity :id, :aliases => 'dhcpOptionsId'
attribute :dhcp_configuration_set, :aliases => 'dhcpConfigurationSet'
attribute :tag_set, :aliases => 'tagSet'

4
lib/fog/aws/models/compute/dhcp_options.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/dhcp_option'
module Fog
module Compute
class AWS
class DhcpOptions < Fog::Collection
attribute :filters
model Fog::Compute::AWS::DhcpOption
@ -83,9 +81,7 @@ module Fog
self.class.new(:service => service).all('dhcp-options-id' => dhcp_options_id).first
end
end
end
end
end
end

4
lib/fog/aws/models/compute/flavor.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class Flavor < Fog::Model
identity :id
attribute :bits
@ -15,9 +13,7 @@ module Fog
attribute :ram
attribute :ebs_optimized_available
attribute :instance_store_volumes
end
end
end
end

4
lib/fog/aws/models/compute/flavors.rb
View File

@ -4,7 +4,6 @@ require 'fog/aws/models/compute/flavor'
module Fog
module Compute
class AWS
FLAVORS = [
{
:id => 't1.micro',
@ -309,7 +308,6 @@ module Fog
]
class Flavors < Fog::Collection
model Fog::Compute::AWS::Flavor
# Returns an array of all flavors that have been created
@ -522,9 +520,7 @@ module Fog
def get(flavor_id)
self.class.new(:service => service).all.detect {|flavor| flavor.id == flavor_id}
end
end
end
end
end

4
lib/fog/aws/models/compute/image.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class Image < Fog::Model
identity :id, :aliases => 'imageId'
attribute :architecture
@ -40,9 +38,7 @@ module Fog
def ready?
state == 'available'
end
end
end
end
end

3
lib/fog/aws/models/compute/images.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/image'
module Fog
module Compute
class AWS
class Images < Fog::Collection
attribute :filters
model Fog::Compute::AWS::Image
@ -56,7 +54,6 @@ module Fog
end
end
end
end
end
end

3
lib/fog/aws/models/compute/internet_gateway.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class InternetGateway < Fog::Model
identity :id, :aliases => 'internetGatewayId'
attribute :attachment_set, :aliases => 'attachmentSet'
attribute :tag_set, :aliases => 'tagSet'
@ -42,7 +40,6 @@ module Fog
reload
end
# Removes an existing internet gateway
#
# internet_gateway.destroy

4
lib/fog/aws/models/compute/internet_gateways.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/internet_gateway'
module Fog
module Compute
class AWS
class InternetGateways < Fog::Collection
attribute :filters
model Fog::Compute::AWS::InternetGateway
@ -83,9 +81,7 @@ module Fog
self.class.new(:service => service).all('internet-gateway-id' => internet_gateway_id).first
end
end
end
end
end
end

6
lib/fog/aws/models/compute/key_pair.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class KeyPair < Fog::Model
identity :name, :aliases => 'keyName'
attribute :fingerprint, :aliases => 'keyFingerprint'
@ -31,11 +29,9 @@ module Fog
new_attributes = data.reject {|key,value| !['keyFingerprint', 'keyMaterial', 'keyName'].include?(key)}
merge_attributes(new_attributes)
true
end
def write(path="#{ENV['HOME']}/.ssh/fog_#{Fog.credential.to_s}_#{name}.pem")
if writable?
split_private_key = private_key.split(/\n/)
File.open(path, "w") do |f|
@ -51,9 +47,7 @@ module Fog
def writable?
!!(private_key && ENV.has_key?('HOME'))
end
end
end
end
end

4
lib/fog/aws/models/compute/key_pairs.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/key_pair'
module Fog
module Compute
class AWS
class KeyPairs < Fog::Collection
attribute :filters
attribute :key_name
@ -80,9 +78,7 @@ module Fog
self.class.new(:service => service).all('key-name' => key_name).first
end
end
end
end
end
end

1
lib/fog/aws/models/compute/network_acl.rb
View File

@ -3,7 +3,6 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class NetworkAcl < Fog::Model
ICMP = 1
TCP = 6

2
lib/fog/aws/models/compute/network_acls.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/network_acl'
module Fog
module Compute
class AWS
class NetworkAcls < Fog::Collection
attribute :filters
model Fog::Compute::AWS::NetworkAcl

4
lib/fog/aws/models/compute/network_interface.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class NetworkInterface < Fog::Model
identity :network_interface_id, :aliases => 'networkInterfaceId'
attribute :state
attribute :request_id, :aliases => 'requestId'
@ -27,7 +25,6 @@ module Fog
attribute :association, :aliases => 'association'
attribute :tag_set, :aliases => 'tagSet'
# Removes an existing network interface
#
# network_interface.destroy
@ -69,7 +66,6 @@ module Fog
merge_attributes(new_attributes)
true
end
end
end
end

3
lib/fog/aws/models/compute/network_interfaces.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/network_interface'
module Fog
module Compute
class AWS
class NetworkInterfaces < Fog::Collection
attribute :filters
model Fog::Compute::AWS::NetworkInterface
@ -130,7 +128,6 @@ module Fog
end
end
end
end
end
end

3
lib/fog/aws/models/compute/route_table.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class RouteTable < Fog::Model
identity :id, :aliases => 'routeTableId'
attribute :vpc_id, :aliases => 'vpcId'
@ -62,7 +60,6 @@ module Fog
def routeSet=(new_route_set)
merge_attributes(new_route_set || {})
end
end
end
end

4
lib/fog/aws/models/compute/route_tables.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/route_table'
module Fog
module Compute
class AWS
class RouteTables < Fog::Collection
attribute :filters
model Fog::Compute::AWS::RouteTable
@ -84,9 +82,7 @@ module Fog
self.class.new(:service => service).all('route-table-id' => route_table_id).first
end
end
end
end
end
end

4
lib/fog/aws/models/compute/security_group.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class SecurityGroup < Fog::Model
identity :name, :aliases => 'groupName'
attribute :description, :aliases => 'groupDescription'
attribute :group_id, :aliases => 'groupId'
@ -277,9 +275,7 @@ module Fog
info
end
end
end
end
end

3
lib/fog/aws/models/compute/security_groups.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/security_group'
module Fog
module Compute
class AWS
class SecurityGroups < Fog::Collection
attribute :filters
model Fog::Compute::AWS::SecurityGroup
@ -114,7 +112,6 @@ module Fog
end
end
end
end
end
end

4
lib/fog/aws/models/compute/server.rb
View File

@ -3,7 +3,6 @@ require 'fog/compute/models/server'
module Fog
module Compute
class AWS
class Server < Fog::Compute::Server
extend Fog::Deprecation
deprecate :ip_address, :public_ip_address
@ -57,7 +56,6 @@ module Fog
attr_accessor :password
attr_writer :iam_instance_profile_name, :iam_instance_profile_arn
def initialize(attributes={})
self.groups ||= ["default"] unless (attributes[:subnet_id] || attributes[:security_group_ids] || attributes[:network_interfaces])
self.flavor_id ||= 't1.micro'
@ -275,9 +273,7 @@ module Fog
self.attributes[:placement] = new_placement
end
end
end
end
end
end

4
lib/fog/aws/models/compute/servers.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/server'
module Fog
module Compute
class AWS
class Servers < Fog::Collection
attribute :filters
model Fog::Compute::AWS::Server
@ -156,9 +154,7 @@ module Fog
rescue Fog::Errors::NotFound
nil
end
end
end
end
end

4
lib/fog/aws/models/compute/snapshot.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class Snapshot < Fog::Model
identity :id, :aliases => 'snapshotId'
attribute :description
@ -49,9 +47,7 @@ module Fog
def volume=(new_volume)
self.volume_id = new_volume.volume_id
end
end
end
end
end

4
lib/fog/aws/models/compute/snapshots.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/snapshot'
module Fog
module Compute
class AWS
class Snapshots < Fog::Collection
attribute :filters
attribute :volume
@ -44,9 +42,7 @@ module Fog
super
end
end
end
end
end
end

3
lib/fog/aws/models/compute/spot_request.rb
View File

@ -3,9 +3,7 @@ require 'fog/compute/models/server'
module Fog
module Compute
class AWS
class SpotRequest < Fog::Compute::Server
identity :id, :aliases => 'spotInstanceRequestId'
attribute :price, :aliases => 'spotPrice'
@ -115,7 +113,6 @@ module Fog
spot_instance_request.merge(options)
merge_attributes( spot_instance_request )
end
end
end
end

2
lib/fog/aws/models/compute/spot_requests.rb
View File

@ -5,7 +5,6 @@ module Fog
module Compute
class AWS
class SpotRequests < Fog::Collection
attribute :filters
model Fog::Compute::AWS::SpotRequest
@ -81,7 +80,6 @@ module Fog
rescue Fog::Errors::NotFound
nil
end
end
end
end

3
lib/fog/aws/models/compute/subnet.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class Subnet < Fog::Model
identity :subnet_id, :aliases => 'subnetId'
attribute :state
attribute :vpc_id, :aliases => 'vpcId'
@ -56,7 +54,6 @@ module Fog
true
end
end
end
end

4
lib/fog/aws/models/compute/subnets.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/subnet'
module Fog
module Compute
class AWS
class Subnets < Fog::Collection
attribute :filters
model Fog::Compute::AWS::Subnet
@ -91,9 +89,7 @@ module Fog
self.class.new(:service => service).all('subnet-id' => subnet_id).first
end
end
end
end
end
end

3
lib/fog/aws/models/compute/tag.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class Tag < Fog::Model
identity :key
attribute :value
@ -27,7 +25,6 @@ module Fog
service.create_tags(resource_id, key => value)
true
end
end
end
end

3
lib/fog/aws/models/compute/tags.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/tag'
module Fog
module Compute
class AWS
class Tags < Fog::Collection
attribute :filters
model Fog::Compute::AWS::Tag
@ -28,7 +26,6 @@ module Fog
end
end
end
end
end
end

3
lib/fog/aws/models/compute/volume.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class Volume < Fog::Model
identity :id, :aliases => 'volumeId'
attribute :attached_at, :aliases => 'attachTime'
@ -122,7 +120,6 @@ module Fog
reload
end
end
end
end
end

4
lib/fog/aws/models/compute/volumes.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/volume'
module Fog
module Compute
class AWS
class Volumes < Fog::Collection
attribute :filters
attribute :server
@ -113,9 +111,7 @@ module Fog
super
end
end
end
end
end
end

4
lib/fog/aws/models/compute/vpc.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module Compute
class AWS
class VPC < Fog::Model
identity :id, :aliases => 'vpcId'
attribute :state
@ -60,9 +58,7 @@ module Fog
merge_attributes(new_attributes)
true
end
end
end
end
end

4
lib/fog/aws/models/compute/vpcs.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/compute/vpc'
module Fog
module Compute
class AWS
class Vpcs < Fog::Collection
attribute :filters
model Fog::Compute::AWS::VPC
@ -85,9 +83,7 @@ module Fog
self.class.new(:service => service).all('vpc-id' => vpc_id).first
end
end
end
end
end
end

5
lib/fog/aws/models/data_pipeline/pipeline.rb
View File

@ -3,9 +3,7 @@ require 'fog/core/model'
module Fog
module AWS
class DataPipeline
class Pipeline < Fog::Model
identity :id, :aliases => 'pipelineId'
attribute :name
attribute :description
@ -15,7 +13,6 @@ module Fog
attribute :unique_id, :aliases => 'uniqueId'
def initialize(attributes={})
# Extract the 'fields' portion of a response to attributes
if attributes.include?('fields')
string_fields = attributes['fields'].select { |f| f.include?('stringValue') }
@ -59,9 +56,7 @@ module Fog
true
end
end
end
end
end

3
lib/fog/aws/models/data_pipeline/pipelines.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/data_pipeline/pipeline'
module Fog
module AWS
class DataPipeline
class Pipelines < Fog::Collection
model Fog::AWS::DataPipeline::Pipeline
def all
@ -29,7 +27,6 @@ module Fog
nil
end
end
end
end

3
lib/fog/aws/models/dns/record.rb
View File

@ -3,7 +3,6 @@ require 'fog/core/model'
module Fog
module DNS
class AWS
class Record < Fog::Model
extend Fog::Deprecation
deprecate :ip, :value
@ -105,9 +104,7 @@ module Fog
end
options
end
end
end
end
end

4
lib/fog/aws/models/dns/records.rb
View File

@ -4,9 +4,7 @@ require 'fog/aws/models/dns/record'
module Fog
module DNS
class AWS
class Records < Fog::Collection
attribute :is_truncated, :aliases => ['IsTruncated']
attribute :max_items, :aliases => ['MaxItems']
attribute :name
@ -116,9 +114,7 @@ module Fog
requires :zone
super({ :zone => zone }.merge!(attributes))
end
end
end
end
end

4
lib/fog/aws/models/dns/zone.rb
View File

@ -4,9 +4,7 @@ require 'fog/core/model'
module Fog
module DNS
class AWS
class Zone < Fog::Model
identity :id, :aliases => 'Id'
attribute :caller_reference, :aliases => 'CallerReference'
@ -45,9 +43,7 @@ module Fog
define_method(:HostedZone=) do |new_hosted_zone|
merge_attributes(new_hosted_zone)
end
end
end
end
end

Some files were not shown because too many files have changed in this diff Show More