inploy 1.1.0 → 1.2.0

data/README.textile

@@ -39,8 +39,16 @@ Actually, Inploy has four rake tasks:
 
 h2. INSTALLATION:
 
+As a plugin:
+
 <pre><code>script/plugin install git://github.com/dcrec1/inploy.git</code></pre>
 
+As a gem:
+
+<pre><code>sudo gem install inploy</code></pre>
+
+Please remember that when used as a gem, Inploy should be available in the deploy servers.
+
 h2. CONFIGURATION
 
 Create a config/deploy.rb file and configure it something like this:
@@ -49,9 +57,12 @@ Create a config/deploy.rb file and configure it something like this:
 deploy.repository = 'git://github.com/dcrec1/signal.git'
 deploy.user = 'dcrec1'
 deploy.hosts = ['hooters', 'geni']
-deploy.path = '/opt'</code></pre>
+deploy.path = '/opt'
+
+# OPTIONALS
 
-Path and user are optional, default values are /opt and root.
+deploy.ssh_opts = '-A'       # default empty
+deploy.branch = 'production' # default master</code></pre>
 
 h2. LICENSE:
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 
 GEM = "inploy"
-GEM_VERSION = "1.1.0"
+GEM_VERSION = "1.2.0"
 SUMMARY = "Rails deployment made easy"
 AUTHOR = "Diego Carrion"
 EMAIL = "dc.rec1@gmail.com"
@@ -28,7 +28,7 @@ end
 
 Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = %w(-fs --color)
+  t.spec_opts = %w(-fp --color)
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/lib/inploy/deploy.rb

@@ -1,8 +1,12 @@
 module Inploy
   class Deploy
     include Helper
-    
-    attr_accessor :repository, :user, :application, :hosts, :path
+
+    attr_accessor :repository, :user, :application, :hosts, :path, :ssh_opts, :branch
+
+    def initialize
+      @branch = 'master'
+    end
 
     def template=(template)
       require "inploy/#{template}"
@@ -10,11 +14,10 @@ module Inploy
     end
 
     def remote_setup
-      remote_run "cd #{path} && git clone --depth 1 #{repository} #{application} && cd #{application} && rake inploy:local:setup"
+      remote_run "cd #{path} && git clone --depth 1 #{repository} #{application} && cd #{application} && git checkout -f -b #{branch} origin/#{branch} && rake inploy:local:setup"
     end
 
     def local_setup
-      copy_sample_files
       create_folders 'tmp/pids', 'db'
       run "./init.sh" if File.exists?("init.sh")
       after_update_code
@@ -25,13 +28,14 @@ module Inploy
     end
 
     def local_update
-      run "git pull origin master"
+      run "git pull origin #{branch}"
       after_update_code
     end
-    
+
     private
-    
+
     def after_update_code
+      copy_sample_files
       install_gems
       migrate_database
       run "rm -R -f public/cache"

data/lib/inploy/helper.rb

@@ -49,7 +49,7 @@ module Inploy
 
     def remote_run(command)
       hosts.each do |host|
-        run "ssh #{user}@#{host} '#{command}'"
+        run "ssh #{ssh_opts} #{user}@#{host} '#{command}'"
       end
     end
 
@@ -66,4 +66,4 @@ module Inploy
       rake "gems:install"
     end
   end
-end
+end

metadata

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