inploy 1.9.5 → 1.9.6

data/README.textile

@@ -2,7 +2,7 @@ h2. ABOUT:
 
 Inploy was born as an option to setup and deploy Rails applications in an easier and smarter way.
 
-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 automatically executes 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 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.
 
@@ -61,7 +61,7 @@ When using Inploy with Rake, there are five tasks:
 * inploy:local:setup
 
 - creates directories db and tmp/pids
-- copies config/*.sample and config/*.example files to config/*
+- copies config/*.[example|sample|template] files to config/*
 - creates the database
 - executes init.sh file case it exists
 - inits and updates the git submodules
@@ -83,7 +83,7 @@ When using Inploy with Rake, there are five tasks:
 
 - pulls the repository
 - inits and updates the git submodules
-- copies config/*.sample and config/*.example files to config/*
+- copies config/*.[example|sample|template] files to config/*
 - installs gems
 - migrates the database
 - updates the crontab from Whenever if being used
@@ -131,15 +131,18 @@ 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
-bundler_path = 'another_path'                # default ~/.bundle
+bundler_opts = '--binstubs'                  # default '--deployment --without development test cucumber'
 </code></pre>
 
+The <code>bundler_path</code> option has been removed. To migrate your existing config/deploy.rb file simply replace <code>bundler_path = '/path/to/gems'</code> with <code>bundler_opts = '--path /path/to/gems'</code>
+
 h2. SKIP STEPS
 
 You can skip some steps when running a Rake task, just add "skip_steps" into your rake command line or add "skip_steps" to your deploy.rb to always skip those steps.
 
 Currently the steps available to skip are:
 
+- copy_sample_files: skip copying config/*.[example|sample|template] files to config/*
 - install_gems: skip rake gems:install
 - migrate_database: skip rake db:migrate
 - clear_cache: skip removing cache directories
@@ -151,9 +154,32 @@ Currently the steps available to skip are:
 
 h2. HOOKS
 
-Currently the only hook is called before restarting the server. If you need another hook, please fork the project and implemented it or created an issue, it's very easy.
+Currently, the following three hooks are available:
+
+- before_git (not called before initial git clone)
+- after_git
+- after_setup
+- before_restarting_server
+- after_restarting_server
+
+To show a "down for maintenance" page during the deployment, use the before_git and after_restarting_server hooks.
+
+If you need another hook, please fork the project and implement it. Or submit an issue, it's very easy.
+
+h3. say
 
-h2. CONTRIBUTORS:
+Use the <code>say</code> method to show messages issued by your hooks.
+
+<pre><code># Show a simple message
+say 'restart custom daemons'
+
+# Show a message (blank output lines are suppressed)
+say 'revert local changes' do |output|
+  output << `git checkout . 2>&1`
+end
+</pre></code>
+
+h2. CONTRIBUTORS
 
 Inploy is brought to you by:
 
@@ -171,7 +197,7 @@ Inploy is brought to you by:
  * Erik Dahlstrand
  * Carlos Brando
  * Thomas Ritz
-
+ * Sven Schwyn
 
 h2. LICENSE:
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'rubygems/package_task'
 require 'rspec/core/rake_task'
 
 GEM = "inploy"
-GEM_VERSION = "1.9.5"
+GEM_VERSION = "1.9.6"
 SUMMARY = "Rails and Sinatra deployment made easy"
 AUTHOR = "Diego Carrion"
 EMAIL = "dc.rec1@gmail.com"

data/lib/inploy.rb

@@ -8,4 +8,4 @@ module Inploy
       load 'tasks/inploy.rake'
     end
   end
-end if defined?(Rails) and Rails::VERSION::MAJOR == 3 
+end if defined?(Rails) and Rails::VERSION::MAJOR == 3

data/lib/inploy/deploy.rb

@@ -3,9 +3,9 @@ module Inploy
     include Helper
     include DSL
 
-    attr_accessor :repository, :user, :application, :hosts, :path, :app_folder, :ssh_opts, :branch, :environment, :port, :skip_steps, :cache_dirs, :sudo, :login_shell, :bundler_path
+    attr_accessor :repository, :user, :application, :hosts, :path, :app_folder, :ssh_opts, :branch, :environment, :port, :skip_steps, :cache_dirs, :sudo, :login_shell, :bundler_opts
 
-    define_callbacks :after_setup, :before_restarting_server
+    define_callbacks :before_git, :after_git, :after_setup, :before_restarting_server, :after_restarting_server
 
     def initialize
       self.server = :passenger
@@ -45,6 +45,7 @@ module Inploy
 
     def local_setup
       create_folders 'public', 'tmp/pids', 'db'
+      callback :after_git
       copy_sample_files
       rake "db:create RAILS_ENV=#{environment}"
       run "./init.sh" if file_exists?("init.sh")
@@ -61,7 +62,9 @@ module Inploy
     end
 
     def remote_reset(params)
+      callback :before_git
       remote_run "cd #{application_path} && git reset --hard #{params[:to]}"
+      callback :after_git
     end
 
     def local_update
@@ -70,13 +73,15 @@ module Inploy
     end
 
     def update_code
-      run "git pull origin #{branch}"
+      callback :before_git
+      raise "ERROR: git pull failed with error status = #{$?}" unless run "git pull origin #{branch}"
+      callback :after_git
     end
 
     private
 
     def checkout
-      branch.eql?("master") ? "" : "&& $(git branch | grep -vq #{branch}) && git checkout -f -b #{branch} origin/#{branch}"
+      branch.eql?("master") ? "" : "&& git checkout -f -b #{branch} origin/#{branch}"
     end
 
     def bundle
@@ -90,16 +95,18 @@ module Inploy
       migrate_database
       update_crontab
       run "rm -R -f public/assets" if jammit_is_installed?
-      run "RAILS_ENV=#{environment} script/delayed_job restart" if file_exists?("script/delayed_job")
+      run "script/delayed_job restart RAILS_ENV=#{environment}" if file_exists?("script/delayed_job")
       rake_if_included "more:parse"
       run "compass compile" if file_exists?("config/compass.rb")
       rake_if_included "barista:brew"
       rake_if_included "asset:packager:build_all"
       rake_if_included "hoptoad:deploy RAILS_ENV=#{environment} TO=#{environment} REPO=#{repository} REVISION=#{`git log | head -1 | cut -d ' ' -f 2`}"
+      rake_if_included "assets:precompile"
       notify_new_relic
       callback :before_restarting_server
       restart_server
       clear_cache
+      callback :after_restarting_server
     end
   end
 end

data/lib/inploy/dsl.rb

@@ -1,3 +1,5 @@
+require 'bundler'
+
 module Inploy
   module DSL
     module ClassMethods
@@ -32,10 +34,6 @@ module Inploy
       extend eval(filename.split("/").map { |word| camelize(word) }.join("::"))
     end
 
-    def log(command)
-      puts "Inploy => #{command}"
-    end
-
     def rake(command)
       run "rake #{command}"
     end
@@ -56,8 +54,15 @@ module Inploy
       file_exists?("Gemfile")
     end
 
+    def say(message)
+      puts "Inploy => #{message}"
+      output = []
+      yield output if block_given?
+      output.each {|o| puts o if o =~ /\S/ }
+    end
+
     def run(command, disable_sudo = false)
-      log command
+      say command
 
       Bundler.with_clean_env do
         if disable_sudo
@@ -81,7 +86,7 @@ module Inploy
 
     def secure_copy(src, dest)
       unless file_exists?(dest)
-        log "mv #{src} #{dest}"
+        say "cp #{src} #{dest}"
         FileUtils.cp src, dest
       end
     end

data/lib/inploy/helper.rb

@@ -41,9 +41,11 @@ module Inploy
     end
 
     def copy_sample_files
-      ["example", "sample"].each do |extension|
-        Dir.glob("config/*.#{extension}").each do |file|
-          secure_copy file, file.gsub(".#{extension}", '')
+      unless skip_step?('copy_sample_files')
+        ["example", "sample", "template"].each do |extension|
+          Dir.glob("config/*.#{extension}*").each do |file|
+            secure_copy file, file.gsub(".#{extension}", '')
+          end
         end
       end
     end
@@ -57,7 +59,7 @@ module Inploy
     end
 
     def bundle_cmd
-      "bundle install --path #{bundler_path || '~/.bundle'} --without development test cucumber"
+      "bundle install #{bundler_opts || '--deployment --without development test cucumber'}"
     end
 
     def bundle_install

metadata

@@ -1,32 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: inploy
-version: !ruby/object:Gem::Version 
-  hash: 57
+version: !ruby/object:Gem::Version
+  version: 1.9.6
   prerelease: 
-  segments: 
-  - 1
-  - 9
-  - 5
-  version: 1.9.5
 platform: ruby
-authors: 
+authors:
 - Diego Carrion
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-18 00:00:00 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: dc.rec1@gmail.com
-executables: 
+executables:
 - inploy
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- lib/inploy.rb
 - lib/inploy/cli.rb
 - lib/inploy/deploy.rb
 - lib/inploy/dsl.rb
@@ -39,46 +31,34 @@ files:
 - lib/inploy/templates/rails3.rb
 - lib/inploy/templates/rails3_push.rb
 - lib/inploy/templates/sinatra.rb
-- lib/inploy.rb
 - lib/tasks/inploy.rake
 - bin/inploy
 - Gemfile
 - Gemfile.lock
-- Rakefile
-- Rakefile.orig
 - README.textile
+- Rakefile
 homepage: http://www.diegocarrion.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: inploy
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails and Sinatra deployment made easy
 test_files: []
-

data/Rakefile.orig

@@ -1,63 +0,0 @@
-require 'rubygems'
-require 'rubygems/specification'
-require 'rake'
-require 'rake/gempackagetask'
-require 'rspec/core/rake_task'
-
-GEM = "inploy"
-<<<<<<< HEAD
-GEM_VERSION = "1.9.3"
-=======
-GEM_VERSION = "1.9.2"
->>>>>>> bumped to 1.9.2
-SUMMARY = "Rails and Sinatra deployment made easy"
-AUTHOR = "Diego Carrion"
-EMAIL = "dc.rec1@gmail.com"
-HOMEPAGE = "http://www.diegocarrion.com"
-
-spec = Gem::Specification.new do |s|
-  s.name = GEM
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.summary = SUMMARY
-  s.files = FileList['lib/**/*','bin/*', '[A-Z]*'].to_a
-  s.executables << "inploy"
-
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-
-  s.rubyforge_project = GEM # GitHub bug, gem isn't being build when this miss
-end
-
-RSpec::Core::RakeTask.new :spec do |t|
-  t.rspec_opts = %w(-fp --color)
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Install the gem locally"
-task :install => [:package] do
-  sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
-end
-
-desc "Create a gemspec file"
-task :make_spec do
-  File.open("#{GEM}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
-end
-
-desc "Run all examples with RCov"
-RSpec::Core::RakeTask.new :spec 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