inploy 1.6.0 → 1.6.1

data/README.textile

@@ -1,14 +1,14 @@
 h2. ABOUT:
 
-Inploy was a born as an option to setup and deploy Rails applications in an easier and smarter way. 
+Inploy was born as an option to setup and deploy Rails applications in an easier and smarter way.
 
-It executes common tasks like migrate the database, install gems, package the assets, clean the cache, notified Hoptoad, restart the server, etc. automatically. This means you will not have a big deploy script calld 'recipe' like with other tools, only a simple deploy script with a few lines.
+It executes automatically common tasks like migrate the database, install gems, package the assets, clean the cache, notify Hoptoad, restart the server, etc. This means you will not have a big deploy script calld 'recipe' like with other tools, only a simple deploy script with a few lines.
 
-It uses Git to version the deploys and to pull only the modifications in each one. This means you will not have a lot of folders in the server (only one) with duplicated code and that ech deploy will be very fast.
+It uses Git to version the deploys and to pull or push only the modifications in each one. This means you will not have a lot of folders in the server (only one) with duplicated code and that ech deploy will be very fast.
 
-It is very flexible, meaning you can create templates specifing how specific tasks must behave. As today, there are templates for Locaweb and for Rails 3.
+It is very flexible, meaning you can create templates specifing how specific tasks must behave. As today, there are templates for Locaweb, for Rails 3 using git pull and Rails 3 using git push.
 
-It works by default with Passenger, but you can specified another servers like Mongrel, Thin and Unicorn.
+It works by default with Passenger, but you can specify another servers like Mongrel, Thin and Unicorn.
 
 You can execute Inploy from a remote machine or from the server machine, meaning anynone can go to the deployment path and with only one command update the code and execute all the tasks.
 
@@ -61,7 +61,7 @@ When using Inploy with Rake, there are five tasks:
 - migrates the database
 - updates the crontab from Whenever if being used
 - cleans the cache, default tmp/cache
-- cleans cached assets in public/assets if Jammit is installed 
+- cleans cached assets in public/assets if Jammit is installed
 - parses less files if more:parse tasks exists
 - package the assets if asset:packager:build_all task exists
 - notifies Hoptoad about the deploy, specifing the revision, repository and environment
@@ -77,7 +77,7 @@ When using Inploy with Rake, there are five tasks:
 - migrates the database
 - updates the crontab from Whenever if being used
 - cleans the cache, default tmp/cache
-- cleans cached assets in public/assets if Jammit is installed 
+- cleans cached assets in public/assets if Jammit is installed
 - parses less files if more:parse tasks exists
 - package the assets if asset:packager:build_all task exists
 - notifies Hoptoad about the deploy, specifing the revision, repository and environment
@@ -86,8 +86,9 @@ When using Inploy with Rake, there are five tasks:
 
 If you don't want to execute Rake, there are a few shortcuts:
 
-inploy = inploy update = rake inploy:remote:update
-inploy install from=url = rake inploy:remote:install from=url
+inploy => inploy update => rake inploy:remote:update
+inploy setup => rake inploy:remote:setup
+inploy install from=url => rake inploy:remote:install from=url
 
 When using inploy as a command, it looks first for config/deploy.rb and then for deploy.rb .
 
@@ -95,8 +96,7 @@ h2. CONFIGURATION
 
 Create a config/deploy.rb file and configure it something like this:
 
-<pre><code>
-application = "signal"
+<pre><code>application = "signal"
 repository = 'git://github.com/dcrec1/signal.git'
 hosts = ['hooters', 'geni']
 
@@ -125,6 +125,7 @@ Currently the steps available to skip are:
 - install_gems: skip rake gems:install
 - migrate_database: skip rake db:migrate
 - clear_cache: skip removing cache directories
+- update_crontab: skip updating the crontab with Whenever
 
 * Usage (params are comma separated):
 
@@ -151,6 +152,7 @@ Inploy is brought to you by:
  * alekenji
  * Erik Dahlstrand
  * Carlos Brando
+ * Thomas Ritz
 
 
 h2. LICENSE:

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 
 GEM = "inploy"
-GEM_VERSION = "1.6.0"
+GEM_VERSION = "1.6.1"
 SUMMARY = "Rails deployment made easy"
 AUTHOR = "Diego Carrion"
 EMAIL = "dc.rec1@gmail.com"
@@ -53,3 +53,9 @@ Spec::Rake::SpecTask.new('rcov') do |t|
   t.rcov = true
   t.rcov_opts = ['--no-html', '-T', '--exclude', 'spec']
 end
+
+desc "Run specs with all the Ruby versions supported"
+task :build do
+  system "rvm 1.8.7 specs"
+  system "rvm 1.9.2 specs"
+end

data/lib/inploy/deploy.rb

@@ -25,15 +25,14 @@ module Inploy
     end
 
     def configure
-      if file = configuration_file
-        deploy = self
-        eval file.read
-        local_variables.each do |variable| 
-          send "#{variable}=", eval(variable) rescue nil 
-        end
-      end
+      configure_from configuration_file if configuration_file
+    end
+
+    def configure_from(file) 
+      deploy = self
+      eval file.read + ';local_variables.each { |variable| deploy.send "#{variable}=", eval(variable.to_s) rescue nil }'
     end
-    
+
     def remote_install(opts)
       remote_run "bash < <(wget -O- #{opts[:from]})"
     end
@@ -60,7 +59,7 @@ module Inploy
     end
 
     def local_update
-      run "git pull origin #{branch}"
+      update_code
       after_update_code
     end
 
@@ -68,6 +67,10 @@ module Inploy
       @before_restarting_server = block
     end
 
+    def update_code
+      run "git pull origin #{branch}"
+    end
+
     private
 
     def after_update_code
@@ -75,7 +78,7 @@ module Inploy
       copy_sample_files
       install_gems
       migrate_database
-      run "whenever --update-crontab #{application} --set 'environment=#{environment}'" if File.exists?("config/schedule.rb")
+      update_crontab
       clear_cache
       run "rm -R -f public/assets" if jammit_is_installed?
       rake_if_included "more:parse"

data/lib/inploy/helper.rb

@@ -11,7 +11,7 @@ module Inploy
     def skip_steps_cmd
       " skip_steps=#{skip_steps.join(',')}" unless skip_steps.nil?
     end
-    
+
     def clear_cache
       unless skip_step?('clear_cache')
         cache_dirs.each do |dir|
@@ -37,7 +37,7 @@ module Inploy
     end
 
     def copy_sample_files
-      ["example", "sample"].each do |extension| 
+      ["example", "sample"].each do |extension|
         Dir.glob("config/*.#{extension}").each do |file|
           secure_copy file, file.gsub(".#{extension}", '')
         end
@@ -55,5 +55,9 @@ module Inploy
     def install_gems
       rake "gems:install RAILS_ENV=#{environment}" unless skip_step?('install_gems')
     end
+
+    def update_crontab
+      run "whenever --update-crontab #{application} --set 'environment=#{environment}'" if File.exists?("config/schedule.rb") unless skip_step?('update_crontab')
+    end
   end
 end

data/lib/inploy/servers/thin.rb

@@ -5,7 +5,7 @@ module Inploy
         run "thin --pid tmp/pids/thin.pid stop"
         run "thin --rackup config.ru --daemonize\
         --log log/thin.log --pid tmp/pids/thin.pid --environment production\
-        --port 4500 start" 
+        --port 4500 start"
       end
     end
   end

data/lib/inploy/templates/rails3_push.rb

@@ -0,0 +1,56 @@
+module Inploy
+  module Templates
+    module Rails3Push
+
+      def remote_setup
+        command = []
+        command << "mkdir -p #{application_path}"
+        command << "cd #{application_path}"
+        command << "git init"
+        command << "sed -i'' -e 's/master/#{branch}/' .git/HEAD" unless branch == 'master'
+        command << "git config --bool receive.denyNonFastForwards false"
+        command << "git config receive.denyCurrentBranch ignore"
+        remote_run command.join(' && ')
+
+        push_code
+
+        command = []
+        command << "cd #{application_path}"
+        command << "rake inploy:local:setup environment=#{environment}#{skip_steps_cmd}"
+        remote_run command.join(' && ')
+      end
+
+      def remote_update
+        push_code
+
+        command = []
+        command << "cd #{application_path}"
+        command << "rake inploy:local:update environment=#{environment}#{skip_steps_cmd}"
+        remote_run command.join(' && ')
+      end
+
+      def install_gems
+      end
+
+      def update_code
+      end
+
+      private
+
+      def push_code
+        hosts.each do |host|
+          run "git push -f #{user}@#{host}:#{application_path} #{branch}"
+        end
+
+        command = []
+        command << "cd #{application_path}"
+        command << "git reset --hard"
+        command << "git clean -f -d"
+        command << "git submodule update --init"
+        command << "bundle install"
+        remote_run command.join(' && ')
+      end
+
+    end
+  end
+end

data/lib/tasks/inploy.rake

@@ -31,7 +31,7 @@ namespace :inploy do
     end
 
     desc "Remote Update"
-    task :update do 
+    task :update do
       deploy.remote_update
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 0
-  version: 1.6.0
+  - 1
+  version: 1.6.1
 platform: ruby
 authors: 
 - Diego Carrion
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 -03:00
+date: 2010-06-12 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +37,7 @@ files:
 - lib/inploy/servers/unicorn.rb
 - lib/inploy/templates/locaweb.rb
 - lib/inploy/templates/rails3.rb
+- lib/inploy/templates/rails3_push.rb
 - lib/inploy.rb
 - lib/tasks/inploy.rake
 - bin/inploy
@@ -52,6 +53,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -59,6 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -68,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: inploy
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails deployment made easy