standup 0.3.12 → 0.3.13

data/VERSION

@@ -1 +1 @@
-0.3.12
+0.3.13

data/scripts/shell.rb

@@ -7,8 +7,15 @@ Standup.script :node do
   
   def make_shell shell_command = ''
     return unless instance
-    command = "#{node.ssh_string} -t '#{shell_command}'"
+    command = "#{ssh_string} -t '#{shell_command}'"
     bright_p command
     Kernel.exec command
   end
+
+  protected
+
+  def ssh_string
+    return '' unless instance
+    "ssh -i #{Standup::Settings.aws.keypair_file} #{params.extra_options} #{scripts.ec2.params.ssh_user}@#{instance.external_ip}"
+  end
 end

data/scripts/webapp.rb

@@ -7,29 +7,30 @@ Standup.script :node do
   def run
     install_package 'git-core'
     install_gem 'bundler'
-    
+    install_package params.additional_packages if params.additional_packages.present?
+
     unless file_exists? scripts.webapp.app_path
       sudo "mkdir -p #{scripts.webapp.app_path}"
     end
-    
+
     sudo "chown -R ubuntu:ubuntu #{scripts.webapp.app_path}"
-    
+
     ensure_github_access
-    
+
     unless file_exists? "#{scripts.webapp.app_path}/.git"
       exec "rm -rf #{scripts.webapp.app_path}/*"
-      exec "git clone git@github.com:#{params.github_user}/#{params.github_repo}.git #{scripts.webapp.app_path}"
+      exec "git clone git@github.com:#{github_repo}.git #{scripts.webapp.app_path}"
     end
 
     bootstrap_db
 
     sudo "chown -R www-data:www-data #{scripts.webapp.app_path}"
-    
+
     with_processed_file script_file('webapp.conf') do |file|
       scripts.passenger.add_server_conf file, "#{params.name}.conf"
     end
   end
-  
+
   def app_path
     "/opt/#{params.name}"
   end
@@ -48,20 +49,20 @@ Standup.script :node do
   
   def ensure_github_access
     return unless exec('ssh -o StrictHostKeyChecking=no git@github.com') =~ /Permission denied \(publickey\)/
-    
+
     unless file_exists? '~/.ssh/id_rsa'
       exec "ssh-keygen -t rsa -f ~/.ssh/id_rsa -P '' -C `hostname`"
     end
-      
+
     password = bright_ask("Enter GitGub password for user #{params.github_user}:", false)
-      
+
     github_add_deploy_key params.github_user,
                           password,
-                          params.github_repo,
+                          github_repo,
                           exec('hostname').strip,
                           exec('cat ~/.ssh/id_rsa.pub').strip
   end
-  
+
   def bootstrap_db
     if db.create_database db_name
       in_dir scripts.webapp.app_path do
@@ -71,11 +72,15 @@ Standup.script :node do
       end
     end
   end
-  
+
+  def github_repo
+    params.github_repo.include?('/') ? params.github_repo : "#{params.github_user}/#{params.github_repo}"
+  end
+
   def github_add_deploy_key user, password, repo, title, key
     require 'net/http'
     Net::HTTP.start 'github.com' do |http|
-      req = Net::HTTP::Post.new "/api/v2/json/repos/key/#{user}/#{repo}/add"
+      req = Net::HTTP::Post.new "/api/v2/json/repos/key/#{repo}/add"
       req.form_data = {'title' => title, 'key' => key}
       req.basic_auth user, password
       response = http.request req

data/standup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{standup}
-  s.version = "0.3.12"
+  s.version = "0.3.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilia Ablamonov", "Artem Orlov", "Cloud Castle Inc."]
-  s.date = %q{2010-12-20}
+  s.date = %q{2010-12-21}
   s.default_executable = %q{standup}
   s.email = %q{ilia@flamefork.ru}
   s.executables = ["standup"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: standup
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 3
-  - 12
-  version: 0.3.12
+  - 13
+  version: 0.3.13
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +03:00
+date: 2010-12-21 00:00:00 +03:00
 default_executable: standup
 dependencies: 
 - !ruby/object:Gem::Dependency