AppTower-ubistrano 1.1.0 → 1.2.1

data/README.markdown

@@ -50,13 +50,13 @@ set :ubistrano, {
   :repository   => 'git@github.com:user/my-app.git',
   
   :production => {
-    :domain => [ 'myapp.com', 'www.myapp.com' ],
-    :host   => '127.0.0.1'
+    :domains => [ 'myapp.com', 'www.myapp.com' ],
+    :host    => '127.0.0.1'
   },
   
   :staging => {
-    :domain => 'staging.myapp.com',
-    :host   => '127.0.0.1'
+    :domains => 'staging.myapp.com',
+    :host    => '127.0.0.1'
   }
 }
 

data/Rakefile

@@ -20,4 +20,12 @@ file 'ubistrano.gemspec' => FileList['{example,lib,templates}/**','Rakefile'] do
   spec = parts.join("  # = MANIFEST =\n")
   File.open(f.name, 'w') { |io| io.write(spec) }
   puts "Updated #{f.name}"
+end
+
+# sudo rake install
+task :install do
+  `gem uninstall ubistrano`
+  `gem build ubistrano.gemspec`
+  `gem install ubistrano*.gem`
+  `rm ubistrano*.gem`
 end

data/changelog.markdown

@@ -1,3 +1,9 @@
+Version 1.2.0
+-------------
+
+* New EC2 tasks
+* EC2 setup and `cap ubuntu` provision tested
+
 Version 1.1.0
 -------------
 

data/example/deploy.rb

@@ -1,17 +1,20 @@
 set :ubistrano, {
-  :application  => :my_app,
-  :platform     => :rails,  # :php, :rails, :sinatra
-  :repository   => 'git@github.com:user/my-app.git',
+  :application => :my_app,
+  :platform    => :rails,  # :php, :rails, :sinatra
+  :repository  => 'git@github.com:user/my-app.git',
+  
+  :ec2 => {
+    :access_key => '',
+    :secret_key => ''
+  },
   
   :production => {
-    :domain => [ 'myapp.com', 'www.myapp.com' ],
-    :host   => '127.0.0.1'
+    :domains => [ 'myapp.com', 'www.myapp.com' ],
+    :host    => '127.0.0.1'
   },
   
   :staging => {
-    :domain => 'staging.myapp.com',
-    :host   => '127.0.0.1'
+    :domains => [ 'staging.myapp.com' ],
+    :host    => '127.0.0.1'
   }
-}
-
-require 'ubistrano'
+}

data/lib/ubistrano.rb

@@ -1,4 +1,7 @@
 
+require 'EC2'
+require 'pp'
+
 # Require helpers and recipes
 Dir["#{File.dirname(__FILE__)}/ubistrano/*.rb"].each { |f| require f }
 
@@ -11,7 +14,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     :db_user          => 'app',
     :db_pass          => '',
     :deploy_via       => :remote_cache,
-    :domain           => [],
+    :domains          => [],
     :platform         => :rails,
     :plugins          => {},
     :port             => 22,

data/lib/ubistrano/ec2.rb

@@ -0,0 +1,111 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  
+  namespace :ec2 do
+    desc "Set up your machine to use EC2"
+    task :default, :roles => :web do
+      ec2.key_pair.install
+    end
+    
+    namespace :instance do      
+      desc "Create a fresh Hardy instance"
+      task :create do
+        options = {
+          :image_id => ask('Press enter for Ubuntu Hardy or enter an AMI image id: ', 'ami-1c5db975'),
+          :key_name => "#{application}"
+        }
+        instance = ec2_api.run_instances(options).instancesSet.item[0]
+        instance_id = instance.instanceId
+        pp instance
+        ip = ec2_api.allocate_address.publicIp
+        ec2_api.associate_address(:instance_id => instance_id, :public_ip => ip)
+        puts "Your instance id is: #{instance_id}"
+        puts "Your IP address  is: #{ip}"
+      end
+      
+      desc "Restart an instance"
+      task :restart do
+        ec2.instances
+        pp ec2_api.reboot_instances(:instance_id => ask("Restart which instance ids?"))
+      end
+      
+      desc "Destroy an instance"
+      task :destroy do
+        ec2.instances
+        instance_id = ask("Terminate which instance ids?")
+        ec2_api.terminate_instances(:instance_id => instance_id)
+        ip = ec2_api.describe_addresses.addressesSet.item.select { |x| x.instanceId == instance_id }.first
+        ec2_api.release_address(:public_ip => ip.publicIp) if ip
+      end
+    end
+    
+    desc "List your EC2 instances"
+    task :instances do
+      pp ec2_api.describe_instances
+    end
+    
+    desc "List IPs for this EC2 account"
+    task :ips do
+      pp ec2_api.describe_addresses
+    end
+    
+    namespace :key_pair do
+      desc "Install key pair for SSH"
+      task :install do
+        begin
+          out = ec2_api.create_keypair(:key_name => application.to_s)
+          pp out
+          key = out.keyMaterial
+        rescue EC2::InvalidKeyPairDuplicate
+          ec2.key_pair.remove
+          ec2.key_pair.install
+        end
+        File.open(File.expand_path("~/.ssh/id_rsa-#{application}"), 'w') { |f| f.write key }
+        "chmod 600 ~/.ssh/id_rsa-#{application}"
+      end
+
+      desc "Install key pair for SSH"
+      task :remove do
+        ec2_api.delete_keypair(:key_name => application.to_s)
+        `rm ~/.ssh/id_rsa-#{application}`
+      end
+    end
+    
+    namespace :security do
+      namespace :group do
+        desc "Open standard ports for default security group"
+        task :create do
+          [ 22, 80 ].each do |port|
+            ec2_api.authorize_security_group_ingress(
+              :group_name => 'default', :cidr_ip => '0.0.0.0/0', :from_port => port, :to_port => port, :ip_protocol => 'tcp'
+            )
+          end
+        end
+        
+        desc "Describe default security group"
+        task :describe do
+          pp ec2_api.describe_security_groups(:group_name => 'default')
+        end
+      end
+    end
+    
+    namespace :api_tools do
+      desc "Install ec2 api tools locally"
+      task :install, :roles => :web do
+        `cd ~ && curl http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip -O`
+        `cd ~ && unzip ec2-api-tools.zip`
+        `cd ~ && rm ec2-api-tools.zip`
+        `mv ~/ec2-api-tools-* ~/.ec2`
+      end
+      
+      desc "Install ec2 api tools locally"
+      task :remove, :roles => :web do
+        `rm -Rf ~/.ec2`
+      end
+    end
+    
+    def ec2_api
+      @ec2_api ||= EC2::Base.new(:access_key_id => ec2_access_key, :secret_access_key => ec2_secret_key)
+    end
+  end
+  
+end

data/lib/ubistrano/stage.rb

@@ -18,13 +18,12 @@ Capistrano::Configuration.instance(:must_exist).load do
     set :db_table,  "#{application}#{stage == :staging ? "_#{stage}" : ''}"    
     
     ubistrano[stage].each do |key, value|
-      value = [ value ].flatten if key == :domain
       set key, value
     end
 
     role :app, host, :primary => true
-    role :web, host
-    role :db,  host
+    role :web, host, :primary => true
+    role :db,  host, :primary => true
   end
   
 end

data/lib/ubistrano/ubuntu.rb

@@ -223,7 +223,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         if yes("May I install Passenger (mod_rails)?")
           sudo_puts 'aptitude install apache2-prefork-dev -q -y'
           gem_install :passenger
-          apache.reload if yes(msg(:passenger))
+          ROOT.apache.reload if yes(msg(:passenger))
         end
       end
       

data/templates/apache/virtual_host.erb

@@ -1,7 +1,7 @@
 <VirtualHost *:80>
-<% unless domain.empty? %>
-  ServerName  <%= domain.first %>
-  ServerAlias <%= domain[1..-1].join ' ' %>
+<% unless domains.empty? %>
+  ServerName  <%= domains.first %>
+  ServerAlias <%= domains[1..-1].join ' ' %>
 <% end %>
   DocumentRoot <%= deploy_to %>/current/public
 </VirtualHost>

data/ubistrano.gemspec

@@ -1,16 +1,17 @@
 Gem::Specification.new do |s|
   s.name    = 'ubistrano'
-  s.version = '1.1.0'
-  s.date    = '2008-12-14'
+  s.version = '1.2.1'
+  s.date    = '2008-01-20'
   
   s.summary     = "Provision and deploy to an Ubuntu/God/Apache/Passenger stack using Capistrano"
   s.description = "Provision and deploy to an Ubuntu/God/Apache/Passenger stack using Capistrano"
   
-  s.author   = 'AppTower'
-  s.email    = 'apptower@wintoni.us'
+  s.author   = 'Winton Welsh'
+  s.email    = 'mail@wintoni.us'
   s.homepage = 'http://github.com/AppTower/ubistrano'
   
   s.has_rdoc = false
+  s.add_dependency 'amazon-ec2', '>= 0.3.2'
   
   # = MANIFEST =
   s.files = %w[
@@ -22,6 +23,7 @@ Gem::Specification.new do |s|
     lib/ubistrano.rb
     lib/ubistrano/apache.rb
     lib/ubistrano/deploy.rb
+    lib/ubistrano/ec2.rb
     lib/ubistrano/gems.rb
     lib/ubistrano/helpers.rb
     lib/ubistrano/log.rb

metadata

@@ -1,20 +1,28 @@
 --- !ruby/object:Gem::Specification 
 name: AppTower-ubistrano
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors: 
-- AppTower
+- Winton Welsh
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-12-14 00:00:00 -08:00
+date: 2008-01-20 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: amazon-ec2
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.2
+    version: 
 description: Provision and deploy to an Ubuntu/God/Apache/Passenger stack using Capistrano
-email: apptower@wintoni.us
+email: mail@wintoni.us
 executables: []
 
 extensions: []
@@ -30,6 +38,7 @@ files:
 - lib/ubistrano.rb
 - lib/ubistrano/apache.rb
 - lib/ubistrano/deploy.rb
+- lib/ubistrano/ec2.rb
 - lib/ubistrano/gems.rb
 - lib/ubistrano/helpers.rb
 - lib/ubistrano/log.rb