git-deploy 0.6.1 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 0a6cd9239e4c0ed5487001d0b032bcc75dad6b1ee47ffff60c007f1779cd28aa
+  data.tar.gz: acdc7b0a118ecd76d582a794fe578f0b55c5290a959cb7f24fcb6a6f3f8e1183
+SHA512:
+  metadata.gz: 6d15238e1f83ab539f5571915ee574ab9afc7654a0548111ea768fbec1f053e4c950c9fbdbefe8a1a63e401a4fbb1488363757a9085a5dc013897884aa1d107b
+  data.tar.gz: 317303faddb9a98b0a12341a32d245eebcaebb3294b7820010d5937ca968343872edddab97bd51fa0d80b686c9b163cadecafa42cbe32325736331e06b223672

data/README.markdown

@@ -125,7 +125,7 @@ Extra commands
 * `git deploy restart` - Runs the `deploy/restart` callback
 
 * `git deploy rollback` - Undo a deploy by checking out the previous revision,
-  runs `deploy/callback` if exists instead of `deploy/after_push`
+  runs `deploy/rollback` if exists instead of `deploy/after_push`
 
 * `git deploy upload <files>` - Copy local files to the remote app
 

data/lib/git_deploy/configuration.rb

@@ -9,7 +9,16 @@ class GitDeploy
     extend Forwardable
     def_delegator :remote_url, :host
     def_delegator :remote_url, :port, :remote_port
-    def_delegator :remote_url, :path, :deploy_to
+
+    def deploy_to
+      @deploy_to ||= begin
+        if remote_url.path.start_with? '/~/'
+          remote_url.path[1..-1]
+        else
+          remote_url.path 
+        end
+      end
+    end
 
     def remote_user
       @user ||= begin
@@ -35,7 +44,7 @@ class GitDeploy
 
     def remote_urls(remote)
       git_config["remote -v"].to_s.split("\n").
-        select {|l| l =~ /^#{remote}\t/ }.
+        select {|l| l =~ /^#{remote}\t.+/ }.
         map {|l| l.split("\t")[1].sub(/\s+\(.+?\)$/, '') }
     end
 

data/lib/git_deploy/ssh_methods.rb

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

data/lib/git_deploy/templates/before_restart.rb

@@ -21,12 +21,17 @@ end
 if File.file? 'Rakefile'
   tasks = []
 
-  num_migrations = `git diff #{oldrev} #{newrev} --diff-filter=A --name-only -z db/migrate`.split("\0").size
+  if File.exist?('db/migrate')
+    num_migrations = `git diff #{oldrev} #{newrev} --diff-filter=A --name-only -z -- db/migrate`.split("\0").size
+  else
+    num_migrations = 0
+  end
+
   # run migrations if new ones have been added
   tasks << "db:migrate" if num_migrations > 0
 
   # precompile assets
-  changed_assets = `git diff #{oldrev} #{newrev} --name-only -z app/assets`.split("\0")
+  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?

data/spec/configuration_spec.rb

@@ -43,6 +43,26 @@ describe GitDeploy::Configuration do
       its(:remote_user) { should eq('git') }
       its(:deploy_to)   { should eq('/path/to/app') }
     end
+
+    context "scp-style with home" 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
+
+    context "pushurl only" do
+      before {
+        remote = options.fetch(:remote)
+        url = 'git@example.com:/path/to/app'
+        stub_git_config("remote -v", "#{remote}\t\n#{remote}\t#{url} (push)")
+      }
+
+      its(:host)        { should eq('example.com') }
+      its(:remote_user) { should eq('git') }
+    end
   end
 
 end

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: git-deploy
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.14.6
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.14.6
-- !ruby/object:Gem::Dependency
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.6
+        version: 0.14.6
+- !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.6
-- !ruby/object:Gem::Dependency
-  prerelease: false
+        version: '5.0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '5.0'
+- !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 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
@@ -67,41 +60,40 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.markdown
 - bin/git-deploy
+- lib/git_deploy.rb
 - lib/git_deploy/configuration.rb
 - lib/git_deploy/generator.rb
 - lib/git_deploy/ssh_methods.rb
 - lib/git_deploy/templates/after_push.sh
 - lib/git_deploy/templates/before_restart.rb
 - 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#readme
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.6
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.7.6.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple git push-based application deployment
 test_files: []