inploy 1.2.0 → 1.3.0

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 
 GEM = "inploy"
-GEM_VERSION = "1.2.0"
+GEM_VERSION = "1.3.0"
 SUMMARY = "Rails deployment made easy"
 AUTHOR = "Diego Carrion"
 EMAIL = "dc.rec1@gmail.com"

data/lib/inploy/deploy.rb

@@ -2,19 +2,29 @@ module Inploy
   class Deploy
     include Helper
 
-    attr_accessor :repository, :user, :application, :hosts, :path, :ssh_opts, :branch
+    attr_accessor :repository, :user, :application, :hosts, :path, :ssh_opts, :branch, :environment
 
     def initialize
+      self.server = :passenger
       @branch = 'master'
+      @environment = 'production'
     end
 
     def template=(template)
-      require "inploy/#{template}"
-      extend eval(camelize(template))
+      load_module("templates/#{template}")
+    end
+
+    def server=(server)
+      load_module("servers/#{server}")
     end
 
     def remote_setup
-      remote_run "cd #{path} && git clone --depth 1 #{repository} #{application} && cd #{application} && git checkout -f -b #{branch} origin/#{branch} && rake inploy:local:setup"
+      if branch.eql? "master"
+        checkout = ""
+      else
+        checkout = "&& $($(git branch | grep -vq #{branch}) && git checkout -f -b #{branch} origin/#{branch})"
+      end
+      remote_run "cd #{path} && git clone --depth 1 #{repository} #{application} && cd #{application} #{checkout} && rake inploy:local:setup environment=#{environment}"
     end
 
     def local_setup
@@ -24,24 +34,26 @@ module Inploy
     end
 
     def remote_update
-      remote_run "cd #{application_path} && rake inploy:local:update"
+      remote_run "cd #{application_path} && rake inploy:local:update environment=#{environment}"
     end
 
     def local_update
       run "git pull origin #{branch}"
       after_update_code
     end
-
+    
     private
 
     def after_update_code
+      run "git submodule update --init"
       copy_sample_files
       install_gems
       migrate_database
       run "rm -R -f public/cache"
       rake_if_included "more:parse"
       rake_if_included "asset:packager:build_all"
-      run "touch tmp/restart.txt"
-    end
+      rake_if_included "hoptoad:deploy TO=#{environment} REPO=#{repository} REVISION=#{`git log | head -1 | cut -d ' ' -f 2`}"
+      restart_server
+    end    
   end
 end

data/lib/inploy/helper.rb

@@ -1,17 +1,22 @@
 module Inploy
   module Helper
+    def load_module(filename)
+      require "inploy/#{filename}"
+      extend eval(filename.split("/").map { |word| camelize(word) }.join("::"))
+    end
+    
     def create_folders(*folders)
       folders.each { |folder| create_folder folder }
     end
-    
+
     def create_folder(path)
       run "mkdir -p #{path}"
     end
-    
+
     def host
       hosts.first
     end
-    
+
     def camelize(string)
       string.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
     end
@@ -27,12 +32,14 @@ module Inploy
     end
 
     def secure_copy(src, dest)
-      log "mv #{src} #{dest}"
-      FileUtils.cp src, dest unless File.exists?(dest)
+      unless File.exists?(dest)
+        log "mv #{src} #{dest}"
+        FileUtils.cp src, dest
+      end
     end
 
     def migrate_database
-      rake "db:migrate RAILS_ENV=production"
+      rake "db:migrate RAILS_ENV=#{environment}"
     end
 
     def tasks
@@ -40,7 +47,7 @@ module Inploy
     end
 
     def rake_if_included(command)
-      rake command if tasks.include?("rake #{command}")
+      rake command if tasks.include?("rake #{command.split[0]}")
     end
 
     def rake(command)
@@ -63,7 +70,7 @@ module Inploy
     end
 
     def install_gems
-      rake "gems:install"
+      rake "gems:install RAILS_ENV=#{environment}"
     end
   end
 end

data/lib/inploy/servers/passenger.rb

@@ -0,0 +1,9 @@
+module Inploy
+  module Servers
+    module Passenger
+      def restart_server
+        run "touch tmp/restart.txt"
+      end
+    end
+  end
+end

data/lib/inploy/servers/unicorn.rb

@@ -0,0 +1,9 @@
+module Inploy
+  module Servers
+    module Unicorn
+      def restart_server
+        run "kill -USR2 `cat tmp/pids/unicorn.pid`"
+      end
+    end
+  end
+end

data/lib/inploy/templates/locaweb.rb

@@ -0,0 +1,33 @@
+module Inploy
+  module Templates
+    module Locaweb
+      def remote_setup
+        run "rm -Rf #{tmp_path} && git clone . #{tmp_path} && tar czf - #{tmp_path} | ssh #{user}@#{host} 'tar xzfv - -C ~/ && mv ~#{tmp_path} #{path}/ && cd #{application_path} && rake inploy:local:setup'"
+      end
+
+      def remote_update
+        run "git push ssh://[#{user}@#{host}]#{application_path} master"
+        super
+      end
+
+      def local_setup
+        super
+        run "ln -s #{application_path}/public /home/#{user}/public_html/#{application}"
+      end
+
+      def local_update
+        after_update_code
+      end
+
+      def path
+        @path ||= "/home/#{user}/rails_app"
+      end
+
+      private
+
+      def tmp_path
+        "/tmp/#{application}"
+      end
+    end
+  end
+end

data/lib/tasks/inploy.rake

@@ -10,6 +10,9 @@ begin
 rescue Exception
 end
 
+
+deploy.environment = ENV['environment'] || deploy.environment
+
 namespace :inploy do
   namespace :local do
     desc "Local Setup"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: inploy
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Diego Carrion
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -02:00
+date: 2009-11-23 00:00:00 -02:00
 default_executable: 
 dependencies: []
 
@@ -22,13 +22,15 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/tasks/inploy.rake
 - lib/inploy/deploy.rb
+- lib/inploy/servers/unicorn.rb
+- lib/inploy/servers/passenger.rb
+- lib/inploy/templates/locaweb.rb
 - lib/inploy/helper.rb
-- lib/inploy/locaweb.rb
 - lib/inploy.rb
-- lib/tasks/inploy.rake
-- Rakefile
 - README.textile
+- Rakefile
 has_rdoc: true
 homepage: http://www.diegocarrion.com
 licenses: []

data/lib/inploy/locaweb.rb

@@ -1,31 +0,0 @@
-module Inploy
-  module Locaweb
-    def remote_setup
-      run "rm -Rf #{tmp_path} && git clone . #{tmp_path} && tar czf - #{tmp_path} | ssh #{user}@#{host} 'tar xzfv - -C ~/ && mv ~#{tmp_path} #{path}/ && cd #{application_path} && rake inploy:local:setup'"
-    end
-
-    def remote_update
-      run "git push ssh://[#{user}@#{host}]#{application_path} master"
-      super
-    end
-
-    def local_setup
-      super
-      run "ln -s #{application_path}/public /home/#{user}/public_html/#{application}"
-    end
-
-    def local_update
-      after_update_code
-    end
-
-    def path
-      @path ||= "/home/#{user}/rails_app"
-    end
-
-    private
-
-    def tmp_path
-      "/tmp/#{application}"
-    end
-  end
-end