rake-deploy 0.1 → 0.2

data/README.md

@@ -2,6 +2,8 @@
 
 A deploy system using rake. Maybe a light version of capistrano
 
+You may prefer to see the [updated wiki](http://wiki.github.com/guillermo/rake-deploy/)
+
 ## Motivation
 
 Capistrano is a great project, maybe a little big in some cases, but with one big problem: it aims to cover all possible use cases.
@@ -22,7 +24,6 @@ In your Rakefile add:
 
 In any of your task files (for example, for rails: lib/tasks/deploy.rake)
 
-    deploy.application = "app_name"
     deploy.deploy_to   = "/apps/app_name"
     deploy.repository  = "ssh://user@github.com/myrepo.git"
     deploy.host        = "esther.cientifico.net"
@@ -45,9 +46,8 @@ Or you want to make a backup of your database in each deploy
       deploy.run("db.my_company.com", "mysqldump -u root my_app_db_production | gzip > /var/backups/#{deploy.release_name}.db.sql.bz2")
     end
     
-You can see more recipes, that you most copy and paste and edit in your files in the wiki:
+You can see more [recipes](http://wiki.github.com/guillermo/rake-deploy/recipes), that you most copy and paste and edit in your files in the wiki:
 
-http://wiki.github.com/guillermo/rake-deploy/recipes
 
 ## Conventions
 
@@ -64,7 +64,7 @@ Guillermo Álvarez <guillermo@cientifico.net>
 
 ## Web
 
-http://github.com/guillermo/rake-deploy
+[Github rake-deploy](http://github.com/guillermo/rake-deploy)
 
 ## Date of writing 
   

data/Rakefile

@@ -0,0 +1,10 @@
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "lib"
+  t.test_files = FileList['test/test*.rb']
+  t.verbose = true
+end
+
+
+task :default => :test

data/lib/rake/deploy.rb

@@ -1,5 +1,3 @@
-require 'net/ssh'
-require 'ostruct'
 require 'rake/hooks'
 require 'rake/deploy/deploy'
 require 'rake/deploy/object'
@@ -7,55 +5,50 @@ require 'rake/deploy/object'
 desc 'Deploy the application'
 task :deploy => ["deploy:symlink"]
 
-
 namespace :deploy do 
   
   desc 'Generate timestamp for revision name'
   task :generate_timestamp do
     deploy.release_name ||= Time.now.utc.strftime("%Y%m%d%H%M.%S")
     deploy.release_path ||= "#{deploy.deploy_to}/releases/#{deploy.release_name}"
+    deploy.current_path ||= "#{deploy.deploy_to}/current"
   end
   
   desc 'Update remote repo'
   task :update_repo do
     puts "=> update_repo"
-    deploy.run(deploy.host, "cd #{deploy.deploy_to}/shared/repo && git fetch")
+    deploy.run("cd #{deploy.deploy_to}/shared/repo && git fetch")
   end
   
   desc 'Checkout newer version'
   task :checkout => [:generate_timestamp,:update_repo] do
     puts "=> checkout"
-    deploy.run(deploy.host, "mkdir -p #{deploy.deploy_to}/releases/")
-    deploy.run(deploy.host, "git clone -s #{deploy.deploy_to}/shared/repo #{deploy.release_path} && cd #{deploy.release_path} && git checkout #{deploy.branch}")
+    deploy.run("mkdir -p #{deploy.deploy_to}/releases/")
+    deploy.run("git clone -s #{deploy.deploy_to}/shared/repo #{deploy.release_path} && cd #{deploy.release_path} && git checkout #{deploy.branch}")
     deploy.shared.each do |shared_path|
-      deploy.run(deploy.host, "rm -rf #{deploy.release_path}#{shared_path}")
-      deploy.run(deploy.host, "ln -s #{deploy.deploy_to}/shared/scaffold#{shared_path} #{deploy.release_path}#{shared_path}")
+      deploy.run("rm -rf #{deploy.release_path}#{shared_path}")
+      deploy.run("ln -s #{deploy.deploy_to}/shared/scaffold#{shared_path} #{deploy.release_path}#{shared_path}")
     end
   end
   
   desc 'Symlink to new version'
   task :symlink => [:checkout] do
     puts "=> symlink"
-    deploy.run(deploy.host, "unlink #{deploy.deploy_to}/current")
-    deploy.run(deploy.host, "ln -s #{deploy.release_path} #{deploy.deploy_to}/current")
+    deploy.run("unlink #{deploy.deploy_to}/current")
+    deploy.run("ln -s #{deploy.release_path} #{deploy.deploy_to}/current")
   end  
 
   desc 'Setup' 
   task :setup do
     puts "=> setup"
     %w(/releases /shared/scaffold/tmp /shared/scaffold/log).each do |path|
-      deploy.run(deploy.host, "mkdir -p #{deploy.deploy_to}#{path}")
+      deploy.run("mkdir -p #{deploy.deploy_to}#{path}")
     end
     
-    deploy.run(deploy.host, "ln -s #{deploy.deploy_to}/shared/scaffold/tmp #{deploy.deploy_to}/shared/tmp ")
-    deploy.run(deploy.host, "ln -s #{deploy.deploy_to}/shared/scaffold/log #{deploy.deploy_to}/shared/log ")
+    deploy.run("ln -s #{deploy.deploy_to}/shared/scaffold/tmp #{deploy.deploy_to}/shared/tmp ")
+    deploy.run("ln -s #{deploy.deploy_to}/shared/scaffold/log #{deploy.deploy_to}/shared/log ")
     
-    deploy.run(deploy.host, "git clone --bare #{deploy.repository} #{deploy.deploy_to}/shared/repo")
+    deploy.run("git clone --bare #{deploy.repository} #{deploy.deploy_to}/shared/repo")
   end
   
 end
-
-after :deploy do
-  puts "=> restart"
-  deploy.run(deploy.host, "touch #{deploy.deploy_to}/current/tmp/restart.txt")
-end

data/lib/rake/deploy/deploy.rb

@@ -1,3 +1,6 @@
+require 'net/ssh'
+require 'ostruct'
+
 class Deploy < OpenStruct
   def initialize
     super
@@ -8,11 +11,30 @@ class Deploy < OpenStruct
     self.user   = `who am i`.split(" ").first
   end
   
-  def run(host,command)
-    puts "    #{host}$ #{command}"
-    @ssh_sessions["#{host}#{user}"] ||= Net::SSH.start(host, user)
-    output = @ssh_sessions["#{host}#{user}"].exec!(command)
-    puts output.split("\n").map{|l| "    #{host}> #{l}"}.join("\n") if output
+  # Run a command in a remote server:
+  # run("ls") Run ls in current deploy.host
+  # run("my_host.com", "ls") run ls in "my_host.com"
+  # run("my_host.com", "guillermo", "ls") run ls in "my_shot.com" as user "guillermo"
+  def run(*args)
+    case args.size
+    when 3
+      ssh_host, ssh_user, ssh_command = args 
+    when 2
+      ssh_host, ssh_command = args
+      ssh_user = self.user
+    when 1
+      ssh_host, ssh_user = self.host, self.user
+      ssh_command = args.first
+    else
+      raise ArgumentError
+    end
+    return ssh_host.map{|host| run(host, ssh_user, ssh_command)} if ssh_host.is_a? Array
+    
+    key = "#{ssh_user}@#{ssh_host}"
+    puts "    #{key}$ #{ssh_command}"
+    @ssh_sessions[key] ||= Net::SSH.start(ssh_host, ssh_user)
+    output = @ssh_sessions[key].exec!(ssh_command)
+    puts output.split("\n").map{|l| "    #{key}> #{l}"}.join("\n") if output
     output
   end
   

data/rake-deploy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "rake-deploy"
-  s.version = "0.1"
+  s.version = "0.2"
   s.date = Time.now.strftime("%Y-%m-%d")
   s.authors = ["Guillermo Álvarez"]
   s.email = "guillermo@cientifico.net"

data/test/test_deploy.rb

@@ -0,0 +1,33 @@
+require 'rubygems'
+require 'test/unit'
+require 'rake/deploy/deploy'
+
+# As you see this is a integration test as Net::SSH is not mocked.
+# It was easy for me test in real machines.
+# If you make a mock for Net::SSH fot this tests cases, please send it to me.
+class TestDeployClass < Test::Unit::TestCase
+  def setup
+    @deploy = Deploy.new
+    @deploy.host = 'esther'
+    @deploy.user = 'guillermo'
+  end
+  
+  def test_run_one_argument
+    assert_equal "wadus", @deploy.run("echo wadus").strip
+  end
+  
+  def test_with_host
+    assert_equal "superwadus", @deploy.run("yolanda","echo superwadus").strip
+  end
+  
+  def test_with_host_and_user
+    assert_equal "argh", @deploy.run("esther", "sessiondeo","echo argh").strip
+  end
+  
+  def test_with_more_than_one_host
+    assert_equal ["argh\n","argh\n"], @deploy.run(["esther","yolanda"], "guillermo","echo argh")
+    assert_equal ["toma\n","toma\n"], @deploy.run(["esther","yolanda"], "echo toma")
+    @deploy.host = ["esther","yolanda"]
+    assert_equal ["mola\n","mola\n"], @deploy.run("echo mola")
+  end
+end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rake-deploy
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - "Guillermo \xC3\x81lvarez"
@@ -72,11 +72,13 @@ extra_rdoc_files: []
 files: 
 - LICENSE
 - README.md
+- Rakefile
 - lib/rake/deploy/deploy.rb
 - lib/rake/deploy/object.rb
 - lib/rake/deploy.rb
 - rake-deploy-0.1.gem
 - rake-deploy.gemspec
+- test/test_deploy.rb
 has_rdoc: true
 homepage: http://github.com/guillermo/rake-deploy
 licenses: []