jnewland-capsize 0.5.1 → 0.5.2

data/History.txt

@@ -1,3 +1,15 @@
+== 2008/08/24 (0.5.2)
+
+* Fix bug in create_keypair so that setup task works again (Ches Martin)
+* Support availability zone specification in run_instance (Ches Martin)
+
+== 2008/07/13 (0.5.1)
+
+* Support for Elastic IP addresses (Brendan Schwartz)
+* Project home now on GitHub: http://github.com/jnewland/capsize
+
+== In the year that followed, dragons ate Hitler. History books were rewritten.
+
 == 2007/06/13
 
 * Re-branded Capsize 'Capsize' with 'Capazon' no more...
@@ -15,4 +27,4 @@
 == 2007/03/27
 
 * Initial Release
-* Provides Capistrano tasks wrapping the Amazon EC2 API
+* Provides Capistrano tasks wrapping the Amazon EC2 API

data/Manifest.txt

@@ -1,7 +1,7 @@
 History.txt
 License.txt
 Manifest.txt
-README.txt
+README.textile
 Rakefile
 config/hoe.rb
 config/requirements.rb

data/README.textile

@@ -32,8 +32,8 @@ require 'capsize'
 </code>
 </pre>
 
-* Run @cap deploy:setup@
-* Paste the generated config into @config/deploy.rb@
+* Run @cap ec2:setup@
+* Read the task's output for example usage.
 
 h2. Tasks
 

data/config/hoe.rb

@@ -35,7 +35,7 @@ VERS = Capsize::VERSION::STRING + (REV ? ".#{REV}" : "")
 RDOC_OPTS = ['--quiet', '--title', 'capsize documentation',
     "--opname", "index.html",
     "--line-numbers",
-    "--main", "README.txt",
+    "--main", "README.textile",
     "--inline-source"]
 
 class Hoe
@@ -60,11 +60,11 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\\n\\n")
   #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  p.extra_deps = [['capistrano', '>= 2.1.0'], ['amazon-ec2', '>= 0.2.6'], ['rcov', '>= 0.8.1.2.0'], ['SQS', '>= 0.1.5'], ['builder', '>= 2.1.2'], ['RedCloth', '>= 3.0.4']]
+  p.extra_deps = [['capistrano', '>= 2.1.0'], ['amazon-ec2', '>= 0.2.14'], ['rcov', '>= 0.8.1.2.0'], ['SQS', '>= 0.1.5'], ['builder', '>= 2.1.2'], ['RedCloth', '>= 3.0.4']]
 
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
   p.spec_extras = {
-    :extra_rdoc_files => ["README.txt", "History.txt"],
+    :extra_rdoc_files => ["README.textile", "History.txt"],
     :rdoc_options => RDOC_OPTS,
     :autorequire => "capsize"
   }

data/examples/capsize.yml.template

@@ -30,8 +30,9 @@ common: &common
   # SECURITY GROUP CONFIG
   ##########################################################
   # Set the default security group to apply firewall ingress rules to.
-  # Defaults, appropriately, to 'default' security group.
-  #group_name: 'default'
+  # Defaults to a group named from the 'application' Cap variable, and
+  # such a group is created by 'cap ec2:setup' by default as well.
+  #group_name: 'my_app'
 
   # Set the default security group ip protocol to apply firewall ingress rules to.
   # Defaults, appropriately, to 'tcp'.

data/lib/capsize/capsize.rb

@@ -55,7 +55,7 @@ module Capsize
     when :group_description
       # the :group_description should fall back to the application name if not provided.
       if fetch(:group_description, nil).nil?
-        set symbol, fetch(:application)
+        set symbol, "Security group for the #{fetch(:application)} application."
       end
     end
 

data/lib/capsize/configuration.rb

@@ -22,7 +22,7 @@ Capistrano::Configuration.instance.load do
 
   # defaults for new security groups
   set :group_name, nil
-  set :group_description, "Default security group for the application."
+  set :group_description, nil
 
   set :ip_protocol, 'tcp'
   set :from_port, nil
@@ -40,5 +40,6 @@ Capistrano::Configuration.instance.load do
 #  set :queue_name, "#{application}"
   set :user_data, nil
   set :addressing_type, 'public'
+  set :availability_zone, nil
 
 end

data/lib/capsize/ec2_plugin.rb

@@ -103,12 +103,7 @@ module Capsize
 
       key_file = get_key_file(:key_name => options[:key_name], :key_dir => options[:key_dir])
 
-      # Verify keypair doesn't already exist on EC2 servers...
-      unless amazon.describe_keypairs(:key_name => options[:key_name]).keySet.nil?
-        raise Exception, "Sorry, a keypair with the name \"#{options[:key_name]}\" already exists on EC2."
-      end
-
-      # and doesn't exist locally either...
+      # Verify local private key file doesn't already exist...
       file_exists_message = <<-MESSAGE
       \n
       Warning! A keypair with the name \"#{key_file}\"
@@ -118,8 +113,16 @@ module Capsize
       MESSAGE
       raise Exception, file_exists_message if File.exists?(key_file)
 
-      #All is good, so we create the new keypair
-      private_key = amazon.create_keypair(:key_name => options[:key_name])
+      # Try to create the new keypair
+      begin
+        private_key = amazon.create_keypair(:key_name => options[:key_name])
+      rescue EC2::InvalidKeyPairDuplicate
+        # keypair already exists with this :key_name
+        # Re-raising will provide a useful message, so we don't need to
+        raise
+      rescue EC2::InvalidKeyPairNotFound
+        # this is a new keypair, continue
+      end
 
       # write private key to file
       File.open(key_file, 'w') do |file|
@@ -208,7 +211,8 @@ module Capsize
                   :group_name => nil,
                   :user_data => get(:user_data),
                   :addressing_type => get(:addressing_type),
-                  :instance_type => get(:instance_type)
+                  :instance_type => get(:instance_type),
+                  :availability_zone => get(:availability_zone)
                 }.merge(options)
 
       # What security group should we run as?

data/lib/capsize/meta_tasks.rb

@@ -12,9 +12,10 @@ Capistrano::Configuration.instance.load do
       - Create :capsize_secure_config_dir
       - Copy capsize.yml.template to :capsize_config_dir/capsize.yml unless it already exists
       - Automatically generate :capsize_secure_config_dir/secure.yml unless it already exists
-      - Instruct user to test configuration with "cap ec2:images:describe"
-      - Instruct user how to create a new keypair
-      - Instruct user how to setup a new security group.
+      - Automatically test authentication configuration with "cap ec2:setup:check"
+      - Automatically create a new keypair named by :key_name, or default to :application
+      - Automatically create a new security group named by :group_name, or default to :application
+      - Add ingress rules for this security group permitting global access on ports 22, 80 and 443
       DESC
       task :default do
 
@@ -28,7 +29,7 @@ Capistrano::Configuration.instance.load do
           FileUtils.mkdir fetch(:capsize_secure_config_dir)
         end
 
-        # copy the standard config file template, unless the dest file alread exists
+        # copy the standard config file template, unless the dest file already exists
         unless File.exists?("#{fetch(:capsize_secure_config_dir)}/#{fetch(:capsize_secure_config_file_name)}")
           puts "Please enter your EC2 account information."
           puts "We'll then write it to a config file at #{fetch(:capsize_secure_config_dir)}/#{fetch(:capsize_secure_config_file_name)}"
@@ -117,7 +118,7 @@ EOF
           are likely most important).
 
           Now lets connect to it with SSH (this may take a few tries, sometimes it takes a
-          minute for the new instance to respond to SSH):
+          few minutes for the new instance to respond to SSH):
 
             cap ec2:instances:ssh INSTANCE_ID='i-xxxxxx'
 
@@ -149,8 +150,8 @@ EOF
 
       end
 
-    end
+    end # end namespace :setup
 
-  end
+  end # end namespace :ec2
 
 end

data/lib/capsize/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnewland-capsize
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Jesse Newland