git-deploy 0.5.0 → 0.5.4

data/lib/git_deploy/configuration.rb

@@ -1,30 +1,23 @@
+require 'uri'
+require 'cgi'
+require 'forwardable'
+
 class GitDeploy
   module Configuration
     private
 
-    def host
-      extract_host_and_user unless defined? @host
-      @host
-    end
+    extend Forwardable
+    def_delegator :remote_url, :host
+    def_delegator :remote_url, :port, :remote_port
+    def_delegator :remote_url, :path, :deploy_to
 
     def remote_user
-      extract_host_and_user unless defined? @user
-      @user
-    end
-
-    def extract_host_and_user
-      info = remote_url.split(':').first.split('@')
-      if info.size < 2
-        @user, @host = `whoami`.chomp, info.first
-      else
-        @user, @host = *info
+      @user ||= begin
+        user = remote_url.user
+        user ? CGI.unescape(user) : `whoami`.chomp
       end
     end
 
-    def deploy_to
-      @deploy_to ||= remote_url.split(':').last
-    end
-
     def branch
       'master'
     end
@@ -50,8 +43,15 @@ class GitDeploy
         url = remote_urls(remote).first
         if url.nil?
           abort "Error: Remote url not found for remote #{remote.inspect}"
-        elsif url =~ /\bgithub\.com\b/
+        elsif url =~ /(^|@)github\.com\b/
           abort "Error: Remote url for #{remote.inspect} points to GitHub. Can't deploy there!"
+        else
+          url = 'ssh://' + url.sub(%r{:/?}, '/') unless url =~ %r{^[\w-]+://}
+          begin
+            url = URI.parse url
+          rescue
+            abort "Error parsing remote url #{url}"
+          end
         end
         url
       end

data/lib/git_deploy/ssh_methods.rb

@@ -90,7 +90,7 @@ class GitDeploy
 
     def ssh_connection
       @ssh ||= begin
-        ssh = Net::SSH.start(host, remote_user)
+        ssh = Net::SSH.start(host, remote_user, :port => remote_port)
         at_exit { ssh.close }
         ssh
       end

data/lib/git_deploy/templates/before_restart.rb

@@ -9,13 +9,27 @@ RAILS_ENV   = ENV['RAILS_ENV'] || 'production'
 use_bundler = File.file? 'Gemfile'
 rake_cmd    = use_bundler ? 'bundle exec rake' : 'rake'
 
-# update gem bundle
-run "bundle install --deployment" if use_bundler
+if use_bundler
+  bundler_args = ['--deployment']
+  BUNDLE_WITHOUT = ENV['BUNDLE_WITHOUT'] || 'development:test'
+  bundler_args << '--without' << BUNDLE_WITHOUT unless BUNDLE_WITHOUT.empty?
+
+  # update gem bundle
+  run "bundle install #{bundler_args.join(' ')}"
+end
 
 if File.file? 'Rakefile'
-  num_migrations = `git diff #{oldrev} #{newrev} --diff-filter=A --name-only`.split("\n").size
+  tasks = []
+
+  num_migrations = `git diff #{oldrev} #{newrev} --diff-filter=A --name-only -z db/migrate`.split("\0").size
   # run migrations if new ones have been added
-  run "#{rake_cmd} db:migrate RAILS_ENV=#{RAILS_ENV}" if num_migrations > 0
+  tasks << "db:migrate" if num_migrations > 0
+
+  # precompile assets
+  changed_assets = `git diff #{oldrev} #{newrev} --name-only -z app/assets`.split("\0")
+  tasks << "assets:precompile" if changed_assets.size > 0
+
+  run "#{rake_cmd} #{tasks.join(' ')} RAILS_ENV=#{RAILS_ENV}" if tasks.any?
 end
 
 # clear cached assets (unversioned/ignored files)

data/lib/git_deploy.rb

@@ -25,9 +25,10 @@ class GitDeploy < Thor
   def setup
     sudo = options.sudo? ? "#{sudo_cmd} " : ''
 
-    if run_test("test -x #{deploy_to}")
+    unless run_test("test -x #{deploy_to}")
       run ["#{sudo}mkdir -p #{deploy_to}"] do |cmd|
         cmd << "#{sudo}chown $USER #{deploy_to}" if options.sudo?
+        cmd
       end
     end
 
@@ -63,9 +64,12 @@ class GitDeploy < Thor
     invoke :restart
   end
 
-  desc "log [n=20]", "Shows the last part of the deploy log on the server"
-  def log(n = 20)
-    run "tail -n#{n} #{deploy_to}/log/deploy.log"
+  desc "log", "Shows the last part of the deploy log on the server"
+  method_option :tail, :aliases => '-t', :type => :boolean, :default => false
+  method_option :lines, :aliases => '-l', :type => :numeric, :default => 20
+  def log(n = nil)
+    tail_args = options.tail? ? '-f' : "-n#{n || options.lines}"
+    run "tail #{tail_args} #{deploy_to}/log/deploy.log"
   end
 
   desc "upload <files>", "Copy local files to the remote app"

data/lib/hooks/post-receive.sh

@@ -1,9 +1,10 @@
-#!/usr/bin/env bash
+#!/bin/bash
+set -e
+
 if [ "$GIT_DIR" = "." ]; then
   # The script has been called as a hook; chdir to the working copy
   cd ..
-  GIT_DIR=.git
-  export GIT_DIR
+  unset GIT_DIR
 fi
 
 # try to obtain the usual system PATH
@@ -14,16 +15,17 @@ fi
 
 # get the current branch
 head="$(git symbolic-ref HEAD)"
-# abort if we're on a detached head
-[ "$?" != "0" ] && exit 1
 
 # read the STDIN to detect if this push changed the current branch
 while read oldrev newrev refname
 do
   [ "$refname" = "$head" ] && break
 done
+
 # abort if there's no update, or in case the branch is deleted
-[ -z "${newrev//0}" ] && exit
+if [ -z "${newrev//0}" ]; then
+  exit
+fi
 
 # check out the latest code into the working copy
 umask 002

data/spec/configuration_spec.rb

@@ -0,0 +1,48 @@
+require 'rspec'
+require 'git_deploy/configuration'
+
+describe GitDeploy::Configuration do
+
+  subject {
+    mod = described_class
+    obj = Object.new
+    opt = options
+    (class << obj; self; end).class_eval do
+      include mod
+      mod.private_instance_methods.each {|m| public m }
+      define_method(:options) { opt }
+    end
+    obj
+  }
+
+  let(:options) { {:remote => 'production'} }
+
+  def stub_git_config(cmd, value)
+    subject.git_config[cmd] = value
+  end
+
+  def stub_remote_url(url, remote = options[:remote])
+    stub_git_config("config --get-all remote.#{remote}.url", url)
+  end
+
+  describe "extracting user/host from remote url" do
+    context "ssh url" do
+      before { stub_remote_url 'ssh://jon%20doe@example.com:88/path/to/app' }
+
+      its(:host)        { should eq('example.com') }
+      its(:remote_port) { should eq(88) }
+      its(:remote_user) { should eq('jon doe') }
+      its(:deploy_to)   { should eq('/path/to/app') }
+    end
+
+    context "scp-style" do
+      before { stub_remote_url 'git@example.com:/path/to/app' }
+
+      its(:host)        { should eq('example.com') }
+      its(:remote_port) { should be_nil }
+      its(:remote_user) { should eq('git') }
+      its(:deploy_to)   { should eq('/path/to/app') }
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-deploy
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70292395458180 !ruby/object:Gem::Requirement
+  requirement: &70233531184120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292395458180
+  version_requirements: *70233531184120
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70292395455260 !ruby/object:Gem::Requirement
+  requirement: &70233531200000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292395455260
+  version_requirements: *70233531200000
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &70292395453880 !ruby/object:Gem::Requirement
+  requirement: &70233531199500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292395453880
+  version_requirements: *70233531199500
 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
@@ -61,6 +61,7 @@ files:
 - lib/git_deploy/templates/restart.sh
 - lib/git_deploy.rb
 - lib/hooks/post-receive.sh
+- spec/configuration_spec.rb
 - README.markdown
 - LICENSE
 homepage: https://github.com/mislav/git-deploy
@@ -83,8 +84,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Simple git push-based application deployment
 test_files: []
+has_rdoc: