fog 1.4.0 → 1.5.0

data/docs/about/users.markdown

@@ -28,6 +28,7 @@ Thanks for following these rules to keep the quality high and and the content us
 * [Engine Yard AppCloud](http://www.engineyard.com/cloud) = AWS => \[Compute, Storage\]
 * [iSwifter](http://iswifter.youwebinc.com/) = BlueBox => Compute
 * [OpenFeint](http://openfeint.com) = BlueBox => Compute
+* [PeopleAdmin](http://www.peopleadmin.com) = AWS => [Compute, Storage]
 * [PHPFog](https://phpfog.com) = AWS => Compute
 * [RowFeeder](https://rowfeeder.com) = Blue Box Group => Compute
 * [Viximo](http://viximo.com) = AWS => Compute

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.4.0'
-  s.date              = '2012-06-24'
+  s.version           = '1.5.0'
+  s.date              = '2012-07-28'
   s.rubyforge_project = 'fog'
 
 
@@ -37,12 +37,12 @@ Gem::Specification.new do |s|
   ## Specify any RDoc options here. You'll want to add your README and
   ## LICENSE files to the extra_rdoc_files list.
   s.rdoc_options = ["--charset=UTF-8"]
-  s.extra_rdoc_files = %w[README.rdoc]
+  s.extra_rdoc_files = %w[README.md]
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('excon', '~>0.14.0')
+  s.add_dependency('excon', '~>0.14')
   s.add_dependency('formatador', '~>0.2.0')
   s.add_dependency('multi_json', '~>1.0')
   s.add_dependency('mime-types')

data/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '1.4.0'
+    VERSION = '1.5.0'
   end
 
 end

data/lib/fog/aws.rb

@@ -186,6 +186,10 @@ module Fog
         ip.join('.')
       end
 
+      def self.private_ip_address
+        ip_address.gsub(/^\d{1,3}\./,"10.")
+      end
+
       def self.kernel_id
         "aki-#{Fog::Mock.random_hex(8)}"
       end

data/lib/fog/aws/auto_scaling.rb

@@ -50,6 +50,8 @@ module Fog
       collection :groups
       model      :instance
       collection :instances
+      model      :policy
+      collection :policies
 
       class Real
         include Fog::AWS::CredentialFetcher::ConnectionMethods
@@ -165,6 +167,7 @@ module Fog
                   'PercentChangeInCapacity'
                 ],
                 :auto_scaling_groups => {},
+                :scaling_policies => {},
                 :health_states => ['Healthy', 'Unhealthy'],
                 :launch_configurations => {},
                 :metric_collection_types => {

data/lib/fog/aws/cloud_watch.rb

@@ -36,9 +36,37 @@ module Fog
 
       class Mock
 
+        def self.data
+          @data ||= Hash.new do |hash, region|
+            hash[region] = Hash.new do |region_hash, key|
+              region_hash[key] = {
+                :metric_alarms => {}
+              }
+            end
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
+          @aws_access_key_id = options[:aws_access_key_id]
+
+          @region = options[:region] || 'us-east-1'
+
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+            raise ArgumentError, "Unknown region: #{@region.inspect}"
+          end
+        end
+
+        def data
+          self.class.data[@region][@aws_access_key_id]
         end
 
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+        end
       end
 
       class Real

data/lib/fog/aws/compute.rb

@@ -138,6 +138,7 @@ module Fog
       end
 
       class Mock
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
 
         def self.data
           @data ||= Hash.new do |hash, region|
@@ -197,7 +198,11 @@ module Fog
                 :tags => {},
                 :tag_sets => Hash.new do |tag_set_hash, resource_id|
                   tag_set_hash[resource_id] = {}
-                end
+                end,
+                :subnets => [],
+                :vpcs => [],
+                :dhcp_options => [],
+                :internet_gateways => []
               }
             end
           end
@@ -209,6 +214,7 @@ module Fog
 
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
+          @aws_credentials_expire_at = Time::now + 20
           setup_credentials(options)
           @region = options[:region] || 'us-east-1'
 

data/lib/fog/aws/elasticache.rb

@@ -41,12 +41,6 @@ module Fog
       model :parameter_group
       collection :parameter_groups
 
-      class Mock
-        def initalize(options={})
-          Fog::Mock.not_implemented
-        end
-      end
-
       class Real
         include Fog::AWS::CredentialFetcher::ConnectionMethods
         def initialize(options={})
@@ -129,6 +123,70 @@ module Fog
         end
 
       end
+
+      class Mock
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
+
+        def self.data
+          @data ||= Hash.new do |hash, region|
+            hash[region] = Hash.new do |region_hash, key|
+              owner_id = Fog::AWS::Mock.owner_id
+              security_group_id = Fog::AWS::Mock.security_group_id
+              region_hash[key] = {
+                :clusters  => {}, # cache cluster data, indexed by cluster ID
+              }
+            end
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+          @aws_credentials_expire_at = Time::now + 20
+          setup_credentials(options)
+          @region = options[:region] || 'us-east-1'
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1',
+                  'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
+            raise ArgumentError, "Unknown region: #{@region.inspect}"
+          end
+        end
+
+        def region_data
+          self.class.data[@region]
+        end
+
+        def data
+          self.region_data[@aws_access_key_id]
+        end
+
+        def reset_data
+          self.region_data.delete(@aws_access_key_id)
+        end
+
+        def setup_credentials(options)
+          @aws_access_key_id = options[:aws_access_key_id]
+        end
+
+        # returns an Array of (Mock) elasticache nodes, representated as Hashes
+        def create_cache_nodes(cluster_id, num_nodes = 1, port = '11211')
+          (1..num_nodes).map do |node_number|
+            node_id = "%04d" % node_number
+            { # each hash represents a cache cluster node
+              "CacheNodeId"           => node_id,
+              "Port"                  => port,
+              "ParameterGroupStatus"  => "in-sync",
+              "CacheNodeStatus"       => "available",
+              "CacheNodeCreateTime"   => Time.now.utc.to_s,
+              "Address" =>
+                "#{cluster_id}.#{node_id}.use1.cache.amazonaws.com"
+            }
+          end
+        end
+      end
+
+
     end
   end
 end

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

@@ -39,7 +39,9 @@ module Fog
           requires :image_id
           requires :instance_type
 
-          connection.create_launch_configuration(image_id, instance_type, id) #, listeners.map{|l| l.to_params})
+          options = Hash[self.class.aliases.map { |key, value| [key, send(value)] }]
+          options.delete_if { |key, value| value.nil? }
+          connection.create_launch_configuration(image_id, instance_type, id, options) #, listeners.map{|l| l.to_params})
 
           # reload instead of merge attributes b/c some attrs (like HealthCheck)
           # may be set, but only the DNS name is returned in the create_load_balance

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

@@ -4,7 +4,6 @@ module Fog
   module AWS
     class AutoScaling
       class Group < Fog::Model
-
         identity  :id,                        :aliases => 'AutoScalingGroupName'
         attribute :arn,                       :aliases => 'AutoScalingGroupARN'
         attribute :availability_zones,        :aliases => 'AvailabilityZones'
@@ -22,6 +21,7 @@ module Fog
         attribute :placement_group,           :aliases => 'PlacementGroup'
         attribute :suspended_processes,       :aliases => 'SuspendedProcesses'
         attribute :vpc_zone_identifier,       :aliases => 'VPCZoneIdentifier'
+        attribute :tags,                      :aliases => 'Tags'
 
         def initialize(attributes={})
           attributes['DefaultCooldown'] ||= 0
@@ -34,6 +34,7 @@ module Fog
           attributes['MaxSize'] ||= 0
           attributes['MinSize'] ||= 0
           attributes['SuspendedProcesses'] ||= []
+          attributes['Tags'] ||= []
           super
         end
 
@@ -72,10 +73,7 @@ module Fog
         end
 
         def instances
-          Fog::AWS::AutoScaling::Instances.new({
-            :data => attributes['Instances'],
-            :connection => connection
-          })
+          Fog::AWS::AutoScaling::Instances.new(:connection => connection).load(attributes[:instance])
         end
 
         def instances_in_service
@@ -112,7 +110,7 @@ module Fog
           requires :max_size
           requires :min_size
 
-          connection.create_auto_scaling_group(id, availability_zones, launch_configuration_name, max_size, min_size)
+          connection.create_auto_scaling_group(id, availability_zones, launch_configuration_name, max_size, min_size, options)
           reload
         end
 
@@ -126,14 +124,17 @@ module Fog
           connection.delete_auto_scaling_group(id)
         end
 
-      private
-
-        def update(options)
+        def update
           requires :id
           connection.update_auto_scaling_group(id, options)
           reload
         end
 
+        def options
+          ret = Hash[self.class.aliases.map { |key, value| [key, send(value)] }]
+          ret.delete_if { |key, value| value.nil? }
+          ret
+        end
       end
     end
   end

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

@@ -0,0 +1,33 @@
+require 'fog/aws/models/auto_scaling/policy'
+
+module Fog
+  module AWS
+    class AutoScaling
+      class Policies < Fog::Collection
+        model Fog::AWS::AutoScaling::Policy
+
+        # Creates a new scaling policy.
+        def initialize(attributes={})
+          super
+        end
+
+        def all
+          data = []
+          next_token = nil
+          loop do
+            result = connection.describe_policies('NextToken' => next_token).body['DescribePoliciesResult']
+            data += result['ScalingPolicies']
+            next_token = result['NextToken']
+            break if next_token.nil?
+          end
+          load(data)
+        end
+
+        def get(identity, auto_scaling_group = nil)
+          data = connection.describe_policies('PolicyNames' => identity, 'AutoScalingGroupName' => auto_scaling_group).body['DescribePoliciesResult']['ScalingPolicies'].first
+          new(data) unless data.nil?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+require 'fog/core/model'
+
+module Fog
+  module AWS
+    class AutoScaling
+      class Policy < Fog::Model
+        identity :id,                       :aliases => 'PolicyName'
+        attribute :arn,                     :aliases => 'PolicyARN'
+        attribute :adjustment_type,         :aliases => 'AdjustmentType'
+        attribute :alarms,                  :aliases => 'Alarms'
+        attribute :auto_scaling_group_name, :aliases => 'AutoScalingGroupName'
+        attribute :cooldown,                :aliases => 'Cooldown'
+        attribute :min_adjustment_step,     :aliases => 'MinAdjustmentStep'
+        attribute :scaling_adjustment,      :aliases => 'ScalingAdjustment'
+
+        def initialize(attributes)
+          attributes['AdjustmentType']    ||= 'ChangeInCapacity'
+          attributes['ScalingAdjustment'] ||= 1
+          super
+        end
+
+        # TODO: implement #alarms
+        # TODO: implement #auto_scaling_group
+
+        def save
+          requires :id
+          requires :adjustment_type
+          requires :auto_scaling_group_name
+          requires :scaling_adjustment
+
+          options = Hash[self.class.aliases.map { |key, value| [key, send(value)] }]
+          options.delete_if { |key, value| value.nil? }
+
+          connection.put_scaling_policy(adjustment_type, auto_scaling_group_name, id, scaling_adjustment, options)
+          reload
+        end
+
+        def destroy
+          requires :id
+          requires :auto_scaling_group_name
+          connection.delete_policy(auto_scaling_group_name, id)
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/models/cloud_watch/alarm.rb

@@ -3,9 +3,57 @@ require 'fog/core/model'
 module Fog
   module AWS
     class CloudWatch
-
       class Alarm < Fog::Model
-        attribute :alarm_names, :aliases => 'AlarmNames'
+        identity :id, :aliases => 'AlarmName'
+
+        attribute :actions_enabled, :aliases => 'ActionsEnabled'
+        attribute :alarm_actions, :aliases => 'AlarmActions'
+        attribute :arn, :aliases => 'AlarmArn'
+        attribute :alarm_configuration_updated_timestamp, :aliases => 'AlarmConfigurationUpdatedTimestamp'
+        attribute :alarm_description, :aliases => 'AlarmDescription'
+        attribute :comparison_operator, :aliases => 'ComparisonOperator'
+        attribute :dimensions, :aliases => 'Dimensions'
+        attribute :evaluation_periods, :aliases => 'EvaluationPeriods'
+        attribute :insufficient_data_actions, :aliases => 'InsufficientDataActions'
+        attribute :metric_name, :aliases => 'MetricName'
+        attribute :namespace, :aliases => 'Namespace'
+        attribute :ok_actions, :aliases => 'OKActions'
+        attribute :period, :aliases => 'Period'
+        attribute :state_reason, :aliases => 'StateReason'
+        attribute :state_reason_data, :aliases => 'StateReasonData'
+        attribute :state_updated_timestamp, :aliases => 'StateUpdatedTimestamp'
+        attribute :state_value, :aliases => 'StateValue'
+        attribute :statistic, :aliases => 'Statistic'
+        attribute :threshold, :aliases => 'Threshold'
+        attribute :unit, :aliases => 'Unit'
+
+        def initialize(attributes)
+          attributes['EvaluationPeriods'] ||= 1
+          attributes['Namespace']         ||= 'AWS/EC2'
+          super
+        end
+
+        def save
+          requires :id
+          requires :comparison_operator
+          requires :evaluation_periods
+          requires :metric_name
+          requires :namespace
+          requires :period
+          requires :statistic
+          requires :threshold
+
+          options = Hash[self.class.aliases.map { |key, value| [key, send(value)] }]
+          options.delete_if { |key, value| value.nil? }
+
+          connection.put_metric_alarm(options)
+          reload
+        end
+
+        def destroy
+          requires :id
+          connection.delete_alarms(id)
+        end
       end
     end
   end

data/lib/fog/aws/models/cloud_watch/alarms.rb

@@ -7,7 +7,24 @@ module Fog
 
       class Alarms < Fog::Collection
         model Fog::AWS::CloudWatch::Alarm
-    
+
+        def all
+          data = []
+          next_token = nil
+          loop do
+            result = connection.describe_alarms('NextToken' => next_token).body['DescribeAlarmsResult']
+            data += result['MetricAlarms']
+            next_token = result['NextToken']
+            break if next_token.nil?
+          end
+          load(data)
+        end
+
+        def get(identity)
+          data = connection.describe_alarms('AlarmNames' => identity).body['DescribeAlarmsResult']['MetricAlarms'].first
+          new(data) unless data.nil?
+        end
+
         #alarm_names is an array of alarm names
         def delete(alarm_names)
           connection.delete_alarms(alarm_names)