git-deploy 0.3.0 → 0.4.0

data/lib/git_deploy.rb

@@ -75,8 +75,8 @@ Capistrano::Configuration.instance(true).load do
       
       command = ["#{try_sudo} mkdir -p #{deploy_to}"]
       command << "#{try_sudo} chown $USER #{deploy_to}" if :sudo == run_method
+      command << "chmod g+ws #{deploy_to}" if shared
       command << "cd #{deploy_to}"
-      command << "chmod g+w ." if shared
       command << "git init #{shared ? '--shared' : ''}"
       command << "sed -i'' -e 's/master/#{branch}/' .git/HEAD" unless branch == 'master'
       command << "git config --bool receive.denyNonFastForwards false" if shared

data/lib/hooks/post-receive.rb

@@ -7,10 +7,14 @@ if ENV['GIT_DIR'] == '.'
   ENV['GIT_DIR'] = '.git'
 end
 
+cmd = %(bash -c "[ -f /etc/profile ] && source /etc/profile; echo $PATH")
+envpath = IO.popen(cmd, 'r') { |io| io.read.chomp }
+ENV['PATH'] = envpath
+
 # find out the current branch
-head = File.read('.git/HEAD').chomp
+head = `git symbolic-ref HEAD`.chomp
 # abort if we're on a detached head
-exit unless head.sub!('ref: ', '')
+exit unless $?.success?
 
 oldrev = newrev = nil
 null_ref = '0' * 40
@@ -26,13 +30,19 @@ end
 exit if newrev.nil? or newrev == null_ref
 
 # update the working copy
-`git reset --hard`
+`umask 002 && git reset --hard`
+
+config = 'config/database.yml'
+logfile = 'log/deploy.log'
+restart = 'tmp/restart.txt'
 
 if oldrev == null_ref
   # this is the first push; this branch was just created
   require 'fileutils'
   FileUtils.mkdir_p %w(log tmp)
-  config = 'config/database.yml'
+  FileUtils.chmod 0775, %w(log tmp)
+  FileUtils.touch [logfile, restart]
+  FileUtils.chmod 0664, [logfile, restart]
   
   unless File.exists?(config)
     # install the database config from the example file
@@ -40,7 +50,6 @@ if oldrev == null_ref
     FileUtils.cp example, config if example
   end
 else
-  logfile = 'log/deploy.log'
   # log timestamp
   File.open(logfile, 'a') { |log| log.puts "==== #{Time.now} ====" }
   # start the post-reset hook in background

data/lib/hooks/post-reset.rb

@@ -68,12 +68,12 @@ end
 
 # run migrations when new ones added
 if new_migrations = added_files.any_in_dir?('db/migrate')
-  system %(rake db:migrate RAILS_ENV=#{RAILS_ENV})
+  system %(umask 002 && rake db:migrate RAILS_ENV=#{RAILS_ENV})
 end
 
 if modified_files.include?('.gitmodules')
   # initialize new submodules
-  system %(git submodule init)
+  system %(umask 002 && git submodule init)
   # sync submodule remote urls in case of changes
   config = parse_configuration('.gitmodules')
 
@@ -96,13 +96,19 @@ if modified_files.include?('.gitmodules')
   end
 end
 # update existing submodules
-system %(git submodule update)
+system %(umask 002 && git submodule update)
+
+if changed_files.include?('Gemfile')
+  # update bundled gems if manifest file has changed
+  system %(umask 002 && bundle install)
+end
 
 # clean unversioned files from vendor (e.g. old submodules)
 system %(git clean -d -f vendor)
 
 # determine if app restart is needed
-if cached_assets_cleared or new_migrations or changed_files.any_in_dir?(%w(app config lib public vendor))
+if cached_assets_cleared or new_migrations or !File.exists?('config/environment.rb') or
+    changed_files.any_in_dir?(%w(app config lib public vendor))
   require 'fileutils'
   # tell Passenger to restart this app
   FileUtils.touch 'tmp/restart.txt'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: git-deploy
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 +01:00
+date: 2010-04-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
+        - 9
         version: 2.5.9
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: A tool to install useful git hooks on your remote repository to enable push-based, Heroku-like deployment on your host.
 email: mislav.marohnic@gmail.com
 executables: []
@@ -36,7 +45,7 @@ files:
 - lib/hooks/post-reset.rb
 - README.markdown
 - LICENSE
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/mislav/git-deploy
 licenses: []
 
@@ -49,18 +58,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple git push-based application deployment