capify-cloud 1.5.0.pre.1 → 1.5.0.pre.3

data/capify-cloud.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Noah Cantor"]
   s.email       = ["ncantor@gmail.com"]
-  s.homepage    = "http://github.com/ncantor/capify-cloud"
+  s.homepage    = "http://github.com/forward/capify-cloud"
   s.summary     = %q{Grabs roles from clouds' meta-data and autogenerates capistrano tasks}
   s.description = %q{Grabs roles from clouds' meta-data and autogenerates capistrano tasks}
 

data/lib/capify-cloud.rb

@@ -6,8 +6,7 @@ require File.expand_path(File.dirname(__FILE__) + '/capify-cloud/server')
 
 class CapifyCloud
 
-  attr_accessor :load_balancer, :instances
-  SLEEP_COUNT = 5
+  attr_accessor :instances
   
   def initialize(cloud_config = "config/cloud.yml")
     case cloud_config
@@ -18,34 +17,31 @@ class CapifyCloud
     else
       raise ArgumentError, "Invalid cloud_config: #{cloud_config.inspect}"
     end
-
+  
     @cloud_providers = @cloud_config[:cloud_providers]
-    
     @instances = []
     @cloud_providers.each do |cloud_provider|
       config = @cloud_config[cloud_provider.to_sym]
-      case cloud_provider
-      when 'Brightbox'
-        servers = Fog::Compute.new(:provider => cloud_provider, :brightbox_client_id => config[:brightbox_client_id],
-          :brightbox_secret => config[:brightbox_secret]).servers
-        servers.each do |server|
-          @instances << server if server.ready?
-        end
-      else
+      config[:provider] = cloud_provider
         regions = determine_regions(cloud_provider)
-        regions.each do |region|
-          servers = Fog::Compute.new(:provider => cloud_provider, :aws_access_key_id => config[:aws_access_key_id], 
-            :aws_secret_access_key => config[:aws_secret_access_key], :region => region).servers
-          servers.each do |server|
-            @instances << server if server.ready?
+        config.delete(:regions)
+        if regions
+          regions.each do |region|
+            config.delete(:region)
+            config[:region] = region
+            populate_instances(config)
           end
-        end
+        else populate_instances(config)
       end
     end
   end 
   
+  def populate_instances(config)
+    Fog::Compute.new(config).servers.each {|server| @instances << server if server.ready? }
+  end
+  
   def determine_regions(cloud_provider = 'AWS')
-    @cloud_config[cloud_provider.to_sym][:params][:regions] || [@cloud_config[cloud_provider.to_sym][:params][:region]]
+    regions = @cloud_config[cloud_provider.to_sym][:regions]
   end
     
   def display_instances
@@ -81,66 +77,4 @@ class CapifyCloud
   def get_instance_by_name(name)
     desired_instances.select {|instance| instance.name == name}.first
   end
-    
-  def instance_health(load_balancer, instance)
-    elb.describe_instance_health(load_balancer.id, instance.id).body['DescribeInstanceHealthResult']['InstanceStates'][0]['State']
-  end
-    
-  def elb
-    Fog::AWS::ELB.new(:aws_access_key_id => @cloud_config[:aws_access_key_id], :aws_secret_access_key => @cloud_config[:aws_secret_access_key], :region => @cloud_config[:aws_params][:region])
-  end 
-  
-  def get_load_balancer_by_instance(instance_id)
-    hash = elb.load_balancers.inject({}) do |collect, load_balancer|
-      load_balancer.instances.each {|load_balancer_instance_id| collect[load_balancer_instance_id] = load_balancer}
-      collect
-    end
-    hash[instance_id]
-  end
-  
-  def get_load_balancer_by_name(load_balancer_name)
-    lbs = {}
-    elb.load_balancers.each do |load_balancer|
-      lbs[load_balancer.id] = load_balancer
-    end
-    lbs[load_balancer_name]
-
-  end
-     
-  def deregister_instance_from_elb(instance_name)
-    return unless @cloud_config[:load_balanced]
-    instance = get_instance_by_name(instance_name)
-    return if instance.nil?
-    @@load_balancer = get_load_balancer_by_instance(instance.id)
-    return if @@load_balancer.nil?
-
-    elb.deregister_instances_from_load_balancer(instance.id, @@load_balancer.id)
-  end
-  
-  def register_instance_in_elb(instance_name, load_balancer_name = '')
-    return if !@cloud_config[:load_balanced]
-    instance = get_instance_by_name(instance_name)
-    return if instance.nil?
-    load_balancer =  get_load_balancer_by_name(load_balancer_name) || @@load_balancer
-    return if load_balancer.nil?
-
-    elb.register_instances_with_load_balancer(instance.id, load_balancer.id)
-
-    fail_after = @cloud_config[:fail_after] || 30
-    state = instance_health(load_balancer, instance)
-    time_elapsed = 0
-    
-    while time_elapsed < fail_after
-      break if state == "InService"
-      sleep SLEEP_COUNT
-      time_elapsed += SLEEP_COUNT
-      STDERR.puts 'Verifying Instance Health'
-      state = instance_health(load_balancer, instance)
-    end
-    if state == 'InService'
-      STDERR.puts "#{instance.name}: Healthy"
-    else
-      STDERR.puts "#{instance.name}: tests timed out after #{time_elapsed} seconds."
-    end
-  end
 end

data/lib/capify-cloud/capistrano.rb

@@ -13,19 +13,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       capify_cloud.display_instances
     end
 
-    desc "Deregisters instance from its ELB"
-    task :deregister_instance do
-      instance_name = variables[:logger].instance_variable_get("@options")[:actions].first
-      capify_cloud.deregister_instance_from_elb(instance_name)
-    end
-
-    desc "Registers an instance with an ELB."
-    task :register_instance do
-      instance_name = variables[:logger].instance_variable_get("@options")[:actions].first
-      load_balancer_name = variables[:logger].instance_variable_get("@options")[:vars][:loadbalancer]
-      capify_cloud.register_instance_in_elb(instance_name, load_balancer_name)
-    end
-
     task :date do
       run "date"
     end
@@ -45,13 +32,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       exec(command)
     end
   end
-  
-  namespace :deploy do
-    before "deploy", "cloud:deregister_instance"
-    after "deploy", "cloud:register_instance"
-    after "deploy:rollback", "cloud:register_instance"
-  end
-    
+      
   def cloud_roles(*roles)
     server_name = variables[:logger].instance_variable_get("@options")[:actions].first unless variables[:logger].instance_variable_get("@options")[:actions][1].nil?
     

data/lib/capify-cloud/version.rb

@@ -1,6 +1,6 @@
 module Capify
   module Cloud
-    VERSION = "1.5.0.pre.1"
+    VERSION = "1.5.0.pre.3"
   end
 end
 

data/readme.md

@@ -72,23 +72,6 @@ will run the date command on all server's tagged with the web role
 
 Running
 
-```ruby
-cap server-1 cloud:register_instance -s loadbalancer=elb-1
-```
-
-will register server-1 to be used by elb-1
-
-Running
-
-```ruby
-cap server-1 cloud:deregister_instance
-```
-
-will remove server-1 from whatever instance it is currently
-registered against.
-
-Running
-
 ```ruby
 cap cloud:status
 ```
@@ -161,36 +144,30 @@ The yml file needs to look something like this:
   
 ```ruby
 :cloud_providers: ['AWS', 'Brightbox']
-
+:project_tag: "YOUR APP NAME"
+  
 :AWS:
   :aws_access_key_id: "YOUR ACCESS KEY"
   :aws_secret_access_key: "YOUR SECRET"
-  :params:
-    :region: 'eu-west-1'
-  :load_balanced: true
-  :project_tag: "YOUR APP NAME"
+  :regions: 'eu-west-1'
   
 :Brightbox:
   :brightbox_client_id: "YOUR CLIENT ID"
   :brightbox_secret: "YOUR SECRET"
 ```
-aws_access_key_id, aws_secret_access_key, and region are required for AWS. Other settings are optional.
+aws_access_key_id, aws_secret_access_key, and region are required for AWS.
 brightbox_client_id and brightbox_secret: are required for Brightbox.
+Other settings are optional.
 If you do not specify a cloud_provider, AWS is assumed.
 
-If :load_balanced is set to true, the gem uses pre and post-deploy
-hooks to deregister the instance, reregister it, and validate its
-health.
-:load_balanced only works for individual instances, not for roles.
-
 The :project_tag parameter is optional. It will limit any commands to
 running against those instances with a "Project" tag set to the value
 "YOUR APP NAME".
 
 ## Development
 
-Source hosted at [GitHub](http://github.com/ncantor/capify-cloud).
-Report Issues/Feature requests on [GitHub Issues](http://github.com/ncantor/capify-cloud/issues).
+Source hosted at [GitHub](http://github.com/forward/capify-cloud).
+Report Issues/Feature requests on [GitHub Issues](http://github.com/forward/capify-cloud/issues).
 
 ### Note on Patches/Pull Requests
 
@@ -204,4 +181,4 @@ Report Issues/Feature requests on [GitHub Issues](http://github.com/ncantor/capi
 
 ## Copyright
 
-Original version: Copyright (c) 2012 Forward. See [LICENSE](https://github.com/ncantor/capify-cloud/blob/master/LICENSE) for details.
+Original version: Copyright (c) 2012 Forward. See [LICENSE](https://github.com/forward/capify-cloud/blob/master/LICENSE) for details.

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: capify-cloud
 version: !ruby/object:Gem::Version 
-  hash: 2577870447
+  hash: -1081488662
   prerelease: 6
   segments: 
   - 1
   - 5
   - 0
   - pre
-  - 1
-  version: 1.5.0.pre.1
+  - 3
+  version: 1.5.0.pre.3
 platform: ruby
 authors: 
 - Noah Cantor
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-10 00:00:00 Z
+date: 2012-07-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -85,7 +85,7 @@ files:
 - lib/capify-cloud/server.rb
 - lib/capify-cloud/version.rb
 - readme.md
-homepage: http://github.com/ncantor/capify-cloud
+homepage: http://github.com/forward/capify-cloud
 licenses: []
 
 post_install_message: