inploy 1.6.8 → 1.7.0

data/README.textile

@@ -116,6 +116,8 @@ branch = 'production'                        # default master
 sudo = true                                  # default false
 cache_dirs = ['public/cache', 'tmp/cache']   # default ['public/cache']
 skip_steps = ['install_gems', 'clear_cache'] # default []
+app_folder = 'project_folder'                # default empty 
+login_shell = true                           # default false
 </code></pre>
 
 h2. SKIP STEPS

data/Rakefile

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

data/lib/inploy/cli.rb

@@ -16,7 +16,8 @@ module Inploy
 
     def self.parse(param)
       if param.include? '='
-        { :from => param.sub("from=", "") }
+        keys = param.split "="
+        { keys.first.to_sym => keys.last }
       else
         param
       end

data/lib/inploy/deploy.rb

@@ -3,8 +3,8 @@ module Inploy
     include Helper
     include DSL
 
-    attr_accessor :repository, :user, :application, :hosts, :path, :ssh_opts, :branch, :environment,
-      :port, :skip_steps, :cache_dirs, :sudo
+    attr_accessor :repository, :user, :application, :hosts, :path, :app_folder, :ssh_opts, :branch, :environment,
+      :port, :skip_steps, :cache_dirs, :sudo, :login_shell
 
     define_callbacks :after_setup, :before_restarting_server
 
@@ -15,6 +15,7 @@ module Inploy
       @environment = 'production'
       @user = "deploy"
       @path = "/var/local/apps"
+      @app_folder = nil
       configure
     end
 
@@ -40,7 +41,7 @@ module Inploy
     end
 
     def remote_setup
-      remote_run "cd #{path} && #{@sudo}git clone --depth 1 #{repository} #{application} && cd #{application} #{checkout}#{bundle} && #{@sudo}rake inploy:local:setup environment=#{environment}#{skip_steps_cmd}"
+      remote_run "cd #{path} && #{@sudo}git clone --depth 1 #{repository} #{application} && cd #{application_folder} #{checkout}#{bundle} && #{@sudo}rake inploy:local:setup environment=#{environment}#{skip_steps_cmd}"
     end
 
     def local_setup
@@ -60,6 +61,10 @@ module Inploy
       remote_run "cd #{application_path} && rake #{task} RAILS_ENV=#{environment}"
     end
 
+    def remote_reset(params)
+      remote_run "cd #{application_path} && git reset --hard #{params[:to]}"
+    end
+
     def local_update
       update_code
       after_update_code
@@ -80,7 +85,7 @@ module Inploy
     end
 
     def after_update_code
-      run "git submodule update --init"
+      run "cd #{path}/#{application} && git submodule update --init && cd #{path}/#{application}/#{app_folder}"
       copy_sample_files
       return unless install_gems
       migrate_database

data/lib/inploy/dsl.rb

@@ -69,10 +69,14 @@ module Inploy
     def remote_run(command)
       port_opts = port ? "-p #{port} " : ''
       hosts.each do |host|
-        run "ssh #{ssh_opts} #{port_opts}#{user}@#{host} '#{command}'", true
+        run "ssh #{ssh_opts} #{port_opts}#{user}@#{host} #{login_shell_wrap(command)}", true
       end
     end
 
+    def login_shell_wrap(cmd)
+      login_shell ? "\"sh -l -c '#{cmd}'\"" : "'#{cmd}'"
+    end
+
     def secure_copy(src, dest)
       unless file_exists?(dest)
         log "mv #{src} #{dest}"

data/lib/inploy/helper.rb

@@ -33,7 +33,11 @@ module Inploy
     end
 
     def application_path
-      "#{path}/#{application}"
+      app_folder.nil? ? "#{path}/#{application}" : "#{path}/#{application}/#{app_folder}"
+    end
+
+    def application_folder
+      app_folder.nil? ? application : "#{application}/#{app_folder}"
     end
 
     def copy_sample_files
@@ -53,7 +57,7 @@ module Inploy
     end
 
     def bundle_cmd
-      "bundle install ~/.bundle --without development test"
+      "bundle install --path ~/.bundle --without development test"
     end
 
     def bundle_install

data/lib/inploy/templates/rails3_push.rb

@@ -47,7 +47,7 @@ module Inploy
         command << "git reset --hard"
         command << "git clean -f -d"
         command << "git submodule update --init"
-        command << "bundle install"
+        command << "bundle install --deployment"
         remote_run command.join(' && ')
       end
 

data/lib/tasks/inploy.rake

@@ -6,6 +6,7 @@ deploy = Inploy::Deploy.new
 deploy.environment = ENV['environment'] || deploy.environment
 deploy.skip_steps = ENV['skip_steps'].split(',') unless ENV['skip_steps'].nil?
 
+
 namespace :inploy do
   namespace :local do
     desc "Local Setup"
@@ -39,3 +40,8 @@ namespace :inploy do
   desc "Alias to Remote Update"
   task :up => "remote:update"
 end
+
+namespace :in do
+  desc "Alias to Remote Update"
+  task :up => "remote:update"
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inploy
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 1
-  - 6
-  - 8
-  version: 1.6.8
+  - 7
+  - 0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Diego Carrion
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 -03:00
+date: 2010-10-16 23:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -57,6 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -65,6 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"