cap-elb 0.0.8 → 0.0.9

data/lib/cap-elb/version.rb

@@ -1,5 +1,5 @@
 module Cap
   module Elb
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/lib/cap-elb.rb

@@ -1,5 +1,4 @@
 require 'right_aws'
-require 'aws-sdk' # need for ELB instance getter
 require 'cap-elb/version'
 
 unless Capistrano::Configuration.respond_to?(:instance)
@@ -90,8 +89,6 @@ module Capistrano
 
       def loadbalancer (named_load_balancer, *args)
 
-	      aws_config_setup
-
 	      require_arglist = args[1][:require] rescue {}
 	      exclude_arglist = args[1][:exclude] rescue {}
 	      named_region = fetch(:aws_params)[:region] rescue 'us-east-1'
@@ -99,21 +96,19 @@ module Capistrano
 	      # list of all the instances assoc'ed with this account
 	      @ec2_api ||= RightAws::Ec2.new(fetch(:aws_access_key_id), fetch(:aws_secret_access_key), fetch(:aws_params, {}))
 
-	      # fetch a raw list all the load balancers, this is best done in Amaazons' aws-sdk, as it allows region specification for LBs.
-	      # strangely, RightScale gem doesnt seem to support this.
-	      # i filed a bug with RightScale: https://github.com/rightscale/right_aws/issues/95
-	      @elb_api = AWS::ELB.new
-
+	      # fetch a raw list all the load balancers
+	      @elb_api ||= RightAws::ElbInterface.new(fetch(:aws_access_key_id), fetch(:aws_secret_access_key), :region => named_region)
+	      
 	      # only get the named load balancer
-	      named_elb = @elb_api.load_balancers[named_load_balancer]
+	      named_elb = @elb_api.describe_load_balancers.delete_if{ |instance| instance[:load_balancer_name] != named_load_balancer.to_s }
 
 	      # must exit if no load balancer on record for this account by given name in cap config file
 	      raise Exception, "No load balancer found named: #{named_load_balancer.to_s} for aws account with this access key: #{fetch(:aws_access_key_id)} in this region: #{named_region}" if named_elb.nil?
-	      # probe for a count of the instances, if this raises Exception, load balancer can't be found
-	      named_elb.instances.count rescue raise Exception, "No load balancer found named: #{named_load_balancer.to_s} for aws account with this access key: #{fetch(:aws_access_key_id)} in this region: #{named_region}" 
-	      raise Exception, "No instances within this load balancer: #{named_load_balancer.to_s} for aws account with this access key: #{fetch(:aws_access_key_id)} in this region: #{named_region}" if  named_elb.instances.count == 0
+	      # probe for the load balancer ec2 instance set, if this raises Exception, load balancer can't be found
+	      named_elb[0] rescue raise Exception, "No load balancer found named: #{named_load_balancer.to_s} for aws account with this access key: #{fetch(:aws_access_key_id)} in this region: #{named_region}" 
+	      raise Exception, "No instances within this load balancer: #{named_load_balancer.to_s} for aws account with this access key: #{fetch(:aws_access_key_id)} in this region: #{named_region}" if  named_elb[0][:instances].count == 0
 
-	      elb_ec2_instances = named_elb.instances.map { |i| i.id }  # list of instance ids
+	      elb_ec2_instances = named_elb[0][:instances] rescue {}
 
 	      # get the full instance list for account, this is necessary to subsquently fish out the :dns_name for the instances that survive our reduction steps
 	      account_instance_list = @ec2_api.describe_instances
@@ -135,27 +130,6 @@ module Capistrano
 
       private
 
-      # AWS SDK setup
-      def aws_config_setup()
-
-	      # derive AWS canonical endpoints from given region
-	      # set :ec2_endpoint , 'ec2.us-west-1.amazonaws.com'
-	      # set :elb_endpoint ,'us-west-1.elasticloadbalancing.amazonaws.com'
-
-	      named_region = fetch(:aws_params)[:region] rescue 'us-east-1'
-
-	      ec2_endpoint = "ec2.#{named_region}.amazonaws.com"
-	      elb_endpoint = "#{named_region}.elasticloadbalancing.amazonaws.com"
-
-	      # aws configuration, required separately
-	      AWS.config({
-				 :access_key_id => fetch(:aws_access_key_id),
-				 :secret_access_key => fetch(:aws_secret_access_key),
-				 :ec2_endpoint => ec2_endpoint,
-				 :elb_endpoint => elb_endpoint,
-			 })
-      end
-      
       def any_args_within_instance(instance, exclude_arglist)
 	      exargs = exclude_arglist.clone # must copy since delete transcends scope; if we don't copy, subsequent 'map'ped enum arglists would be side-effected
 	      tag_exclude_state = nil # default assumption

metadata

@@ -1,95 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cap-elb
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.0.9
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 8
-  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - Dan Miley
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-28 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: right_aws
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153101920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: aws-sdk
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153101920
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: &2153101220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 2
-        - 2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153101220
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2153100660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153100660
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2153099800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id004
-description: Capistrano can perform tasks on the EC2 instances managed by named Amazon ELB instances.  Various filters are qvailable to allow EC2 instance top level metadata and tags to determine whether the task should be applied on the given instance.
-email: 
+  prerelease: false
+  version_requirements: *2153099800
+description: Capistrano can perform tasks on the EC2 instances managed by named Amazon
+  ELB instances.  Various filters are qvailable to allow EC2 instance top level metadata
+  and tags to determine whether the task should be applied on the given instance.
+email:
 - dan.miley@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -101,40 +75,31 @@ files:
 - test/.gemtest
 - test/elb_test.rb
 - test/health/test_elb.rb
-has_rdoc: true
 homepage: http://github.com/danmiley/cap-elb
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: cap-elb
-rubygems_version: 1.6.0
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Capistrano can perform tasks on EC2 intstance managed by individual Amazon ELB instances.
-test_files: 
+summary: Capistrano can perform tasks on EC2 intstance managed by individual Amazon
+  ELB instances.
+test_files:
 - test/elb_test.rb
 - test/health/test_elb.rb