capazon 0.1.1 → 0.2.0

data/CHANGELOG.txt

@@ -1,3 +1,7 @@
+== 2007/04/30
+
+* Compatibility w/ Capistrano 2.0
+
 == 2007/03/28
 
 * Fix gem dependancies

data/Manifest.txt

@@ -6,7 +6,6 @@ setup.rb
 examples/deploy.rb
 lib/capazon/capistrano_plugin.rb
 lib/capazon/configuration.rb
-lib/capazon/meta_tasks.rb
 lib/capazon/tasks.rb
 lib/capazon/version.rb
 lib/capazon.rb

data/README.txt

@@ -34,18 +34,14 @@ Capistrano tasks to manage Amazon EC2 Images.
 * <em>All tasks <b>require</b> aws_access_key_id and aws_secret_access_key.</em>
 * <em>All tasks optionally take environment variables in lieu of capistrano configuration variables.</em>
 
-[+create_keypair+]                Create a keypair aws_keypair_name and write out the generate private key to aws_private_key_path.
-[+delete_keypair+]                Deletes keypair aws_keypair_name.                                                                
-[+describe_keypairs+]             Describes keypairs.
-[+describe_images+]               Describes AMIs you have privilege to execute.
-[+run_instance+]                  Runs an instance of aws_ami_id with access available via aws_keypair_name.
-[+terminate_instance+]            Terminates aws_instance_id.
-[+describe_instances+]            Describes running AMIs.                 
-[+authorize_web_and_ssh_access+]  Opens tcp access on port 80 and 22 to the aws_security_group.
-
-==== Experimental Tasks
-
-[+run_and_configure_instance+]    Runs an instance of aws_ami_id with access available via aws_keypair_name, and - very experimentally - changes the root password, adds a user, gives that user sudo rights, then writes out a new deploy.rb to allow this new instance to be used with the 'deprec' gem.
+[+ec2:create_keypair+]                Create a keypair aws_keypair_name and write out the generate private key to aws_private_key_path.
+[+ec2:delete_keypair+]                Deletes keypair aws_keypair_name.                                                                
+[+ec2:describe_keypairs+]             Describes keypairs.
+[+ec2:describe_images+]               Describes AMIs you have privilege to execute.
+[+ec2:run_instance+]                  Runs an instance of aws_ami_id with access available via aws_keypair_name.
+[+ec2:terminate_instance+]            Terminates aws_instance_id.
+[+ec2:describe_instances+]            Describes running AMIs.                 
+[+ec2:authorize_web_and_ssh_access+]  Opens tcp access on port 80 and 22 to the aws_security_group.
 
 == Meta
 

data/lib/capazon/configuration.rb

@@ -1,10 +1,7 @@
 # Author::    Jesse Newland (jnewland@gmail.com)
 # Copyright:: Copyright (c) 2007 Jesse Newland
 # License::   Distributes under the same terms as Ruby
-
-Capistrano.configuration(:must_exist).load do
-  require 'deprec/recipes'
-   
+Capistrano::Configuration.instance.load do
   set :aws_ami_id, "ami-e4b6538d"
   set :aws_security_group, "default"
 end

data/lib/capazon/tasks.rb

@@ -2,111 +2,111 @@
 # Author::    Jesse Newland (jnewland@gmail.com)
 # Copyright:: Copyright (c) 2007 Jesse Newland
 # License::   Distributes under the same terms as Ruby
+Capistrano::Configuration.instance.load do
+  namespace :ec2 do
+    desc <<-DESC
+    Create a keypair AWS_KEYPAIR_NAME and
+    write out the generate private key to AWS_PRIVATE_KEY_PATH.
+    Requires Amazon authorization credentials:
+    AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
+    DESC
+    task :create_keypair do
+      access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
+      secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
+      keypair_name = ENV['AWS_KEYPAIR_NAME'] || aws_keypair_name
+      private_key_path = ENV['AWS_PRIVATE_KEY_PATH'] || aws_private_key_path
+      capazon.setup_keypair({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key}, keypair_name, private_key_path)
+    end
 
-Capistrano.configuration(:must_exist).load do
-  
-  desc <<-DESC
-  Create a keypair AWS_KEYPAIR_NAME and
-  write out the generate private key to AWS_PRIVATE_KEY_PATH.
-  Requires Amazon authorization credentials:
-  AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
-  DESC
-  task :create_keypair do
-    access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
-    secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
-    keypair_name = ENV['AWS_KEYPAIR_NAME'] || aws_keypair_name
-    private_key_path = ENV['AWS_PRIVATE_KEY_PATH'] || aws_private_key_path
-    capazon.setup_keypair({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key}, keypair_name, private_key_path)
-  end
-  
-  desc <<-DESC
-  Deletes keypair AWS_KEYPAIR_NAME.
-  Requires Amazon authorization credentials:
-  AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
-  DESC
-  task :delete_keypair do
-    access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
-    secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
-    keypair_name = ENV['AWS_KEYPAIR_NAME'] || aws_keypair_name
-    capazon.delete_keypair({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key}, keypair_name)
-  end
-  
-  desc <<-DESC
-  Runs an instance of AWS_AMI_ID with AWS_KEYPAIR_NAME.
-  Requires Amazon authorization credentials:
-  AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
-  DESC
-  task :run_instance do
-    access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
-    secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
-    ami_id = ENV['AWS_AMI_ID'] || aws_ami_id
-    keypair_name = ENV['AWS_KEYPAIR_NAME'] || aws_keypair_name
-    instance_desc = capazon.run_instance({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key},ami_id,keypair_name)
-    puts instance_desc.join("\t")
-  end
-  
-  desc <<-DESC
-  Opens tcp access on port 80 and 22 to the specified security group.
-  Requires Amazon authorization credentials:
-  AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
-  DESC
-  task :authorize_web_and_ssh_access do
-    access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
-    secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
-    group_name = ENV['AWS_SECURITY_GROUP'] || (aws_security_group rescue "default")
-    capazon.authorize_access({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key},group_name,"tcp","80","80","0.0.0.0/0")
-    capazon.authorize_access({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key},group_name,"tcp","22","22","0.0.0.0/0")
-  end
-  
-  desc <<-DESC
-  Terminates AWS_INSTANCE_ID.
-  Requires Amazon authorization credentials:
-  AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
-  DESC
-  task :terminate_instance do
-    access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
-    secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
-    instance_id = ENV['AWS_INSTANCE_ID'] || aws_instance_id
-    respnse = capazon.terminate_instance({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key}, instance_id)
-    puts respnse.join("\t")
-  end
-  
-  desc <<-DESC
-  Describes keypairs.
-  Requires Amazon authorization credentials:
-  AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
-  DESC
-  task :describe_keypairs do
-    access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
-    secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
-    capazon.describe_keypairs({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key}).each do |keypair|
-      puts keypair.join("\t")
+    desc <<-DESC
+    Deletes keypair AWS_KEYPAIR_NAME.
+    Requires Amazon authorization credentials:
+    AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
+    DESC
+    task :delete_keypair do
+      access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
+      secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
+      keypair_name = ENV['AWS_KEYPAIR_NAME'] || aws_keypair_name
+      capazon.delete_keypair({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key}, keypair_name)
     end
-  end
-  
-  desc <<-DESC
-  Describes running AMIs.
-  Requires Amazon authorization credentials:
-  AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
-  DESC
-  task :describe_instances do
-    access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
-    secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
-    capazon.describe_instances({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key}).each do |instance|
-      puts instance.join("\t")
+
+    desc <<-DESC
+    Runs an instance of AWS_AMI_ID with AWS_KEYPAIR_NAME.
+    Requires Amazon authorization credentials:
+    AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
+    DESC
+    task :run_instance do
+      access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
+      secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
+      ami_id = ENV['AWS_AMI_ID'] || aws_ami_id
+      keypair_name = ENV['AWS_KEYPAIR_NAME'] || aws_keypair_name
+      instance_desc = capazon.run_instance({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key},ami_id,keypair_name)
+      puts instance_desc.join("\t")
     end
-  end
- 
-  desc <<-DESC
-  Describes AMIs you have privilege to execute.
-  Requires Amazon authorization credentials:
-  AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
-  DESC
-  task :describe_images do
-    access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
-    secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
-    capazon.describe_images({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key}).each do |image|
-      puts image.join("\t")
+
+    desc <<-DESC
+    Opens tcp access on port 80 and 22 to the specified security group.
+    Requires Amazon authorization credentials:
+    AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
+    DESC
+    task :authorize_web_and_ssh_access do
+      access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
+      secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
+      group_name = ENV['AWS_SECURITY_GROUP'] || (aws_security_group rescue "default")
+      capazon.authorize_access({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key},group_name,"tcp","80","80","0.0.0.0/0")
+      capazon.authorize_access({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key},group_name,"tcp","22","22","0.0.0.0/0")
+    end
+
+    desc <<-DESC
+    Terminates AWS_INSTANCE_ID.
+    Requires Amazon authorization credentials:
+    AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
+    DESC
+    task :terminate_instance do
+      access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
+      secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
+      instance_id = ENV['AWS_INSTANCE_ID'] || aws_instance_id
+      respnse = capazon.terminate_instance({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key}, instance_id)
+      puts respnse.join("\t")
+    end
+
+    desc <<-DESC
+    Describes keypairs.
+    Requires Amazon authorization credentials:
+    AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
+    DESC
+    task :describe_keypairs do
+      access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
+      secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
+      capazon.describe_keypairs({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key}).each do |keypair|
+        puts keypair.join("\t")
+      end
     end
-  end  
+
+    desc <<-DESC
+    Describes running AMIs.
+    Requires Amazon authorization credentials:
+    AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
+    DESC
+    task :describe_instances do
+      access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
+      secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
+      capazon.describe_instances({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key}).each do |instance|
+        puts instance.join("\t")
+      end
+    end
+
+    desc <<-DESC
+    Describes AMIs you have privilege to execute.
+    Requires Amazon authorization credentials:
+    AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAME
+    DESC
+    task :describe_images do
+      access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
+      secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
+      capazon.describe_images({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key}).each do |image|
+        puts image.join("\t")
+      end
+    end  
+  end
 end

data/lib/capazon/version.rb

@@ -1,8 +1,8 @@
 module Capazon #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
-    TINY  = 1
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: capazon
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-03-28 00:00:00 -04:00
+  version: 0.2.0
+date: 2007-04-30 00:00:00 -04:00
 summary: A Capistrano extension library to manage Amazon EC2 instances
 require_paths: 
 - lib
@@ -37,7 +37,6 @@ files:
 - examples/deploy.rb
 - lib/capazon/capistrano_plugin.rb
 - lib/capazon/configuration.rb
-- lib/capazon/meta_tasks.rb
 - lib/capazon/tasks.rb
 - lib/capazon/version.rb
 - lib/capazon.rb

data/lib/capazon/meta_tasks.rb

@@ -1,82 +0,0 @@
-# Author::    Jesse Newland (jnewland@gmail.com)
-# Copyright:: Copyright (c) 2007 Jesse Newland
-# License::   Distributes under the same terms as Ruby
-
-Capistrano.configuration(:must_exist).load do
-  desc <<-DESC
-  Runs an instance of AWS_AMI_ID with AWS_KEYPAIR_NAME, and - very experimentally - changes the root password, adds a user, gives that user sudo rights, then writes out a new deploy.rb to allow this new instance to be used with the 'deprec' gem.
-  Requires Amazon authorization credentials:
-  AWS_ACCESS_KEY_ID, AWS_KEYPAIR_NAMEE
-  DESC
-  task :run_and_configure_instance do
-    create_keypair
-  
-    access_key_id = ENV['AWS_ACCESS_KEY_ID'] || aws_access_key_id
-    secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] || aws_secret_access_key
-    ami_id = ENV['AWS_AMI_ID'] || aws_ami_id
-    keypair_name = ENV['AWS_KEYPAIR_NAME'] || aws_keypair_name
-    private_key_path = ENV['AWS_PRIVATE_KEY_PATH'] || aws_private_key_path
-    instance_desc = capazon.run_instance({:AWS_ACCESS_KEY_ID => access_key_id, :AWS_SECRET_ACCESS_KEY => secret_access_key},ami_id,keypair_name)
-  
-    authorize_web_and_ssh_access
-      
-    puts "Waiting one additional minute for startup..."
-    sleep 60
-  
-    #change password
-    puts "Connecting to #{instance_desc[3]}..."
-    puts "Please create a secure root password"
-    system "ssh -o StrictHostKeyChecking=no -i #{private_key_path} root@#{instance_desc[3]} passwd"
-    puts "Creating #{user} user"
-    system "ssh -o StrictHostKeyChecking=no -i #{private_key_path} root@#{instance_desc[3]} 'groupadd wheel;useradd -m -G wheel -s /bin/bash #{user};passwd #{user}'"
-    puts "Adding wheel group to sudoers"
-    system "ssh -o StrictHostKeyChecking=no -i #{private_key_path} root@#{instance_desc[3]} 'chmod 640 /etc/sudoers; echo -e \"#{user}\tALL=(ALL)\tALL\" >> /etc/sudoers;chmod 440 /etc/sudoers'"
-    # puts "Setting up loopback interface"
-    #     system "ssh -o StrictHostKeyChecking=no -i #{private_key_path} root@#{instance_desc[3]} 'echo -e \"127.0.0.1\tlocalhost\" > /etc/hosts;echo -e \"iface lo inet loopback\" >> /etc/network/interfaces;ifup lo'"
-    #     puts "Appending source list"
-    #     system "ssh -o StrictHostKeyChecking=no -i #{private_key_path} root@#{instance_desc[3]} 'echo -e \"deb http://archive.ubuntu.com/ubuntu edgy main restricted universe multiverse\ndeb http://archive.ubuntu.com/ubuntu/ edgy-updates main restricted universe multiverse\" >/etc/apt/sources.list'"
-  
-    #append capazon config info
-      
-    original = File.open("config/deploy.rb")
-    backup = File.open("config/deploy.rb.capazon", "w")
-    while original.gets do
-        backup.print $_
-    end
-    backup.close
-    original.close
-  
-    puts "Overwriting capistrano configuration..."
-    system "yes | deprec --apply-to . --name #{application} --domain #{instance_desc[3]}"
-  
-    puts "Updating deprec config with amazon information..."
-
-    deprec = File.open("config/deploy.rb")
-    capazon = File.open("config/deploy.rb.capazon")
-    deprec_capazon = File.open("config/deploy.rb.deprec_capazon", "w")
-  
-    while deprec.gets do
-        if $. == 1 then
-            deprec_capazon.print "#Capazon Configuration\n"
-            deprec_capazon.print "\nset :aws_instance_id, '#{instance_desc[1]}'\n\n"
-            while capazon.gets do
-                unless $. == 1 || $_ == nil
-                  deprec_capazon.print $_
-                end
-            end
-        end
-        unless $_ == nil || /^set :repository/.match($_) || /^set :application/.match($_) || /XXX/.match($_)
-          deprec_capazon.print $_
-        end 
-    end
-  
-    capazon.close
-    deprec.close
-    deprec_capazon.close
-    File.rename("config/deploy.rb", "config/deploy.rb.deprec")
-    File.rename("config/deploy.rb.deprec_capazon", "config/deploy.rb")
-  
-    puts "Done!"
-  end
-  
-end