capistrano-gity 0.2.0 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 3ce3ce5cf90ffe153fc387d45c34d90eef26b0adc0442ba3722c1137f52023b8
+  data.tar.gz: 2e846cccc39deb0369fca8b8bfbdfbdd5799180f717c74a0f0a87b29442fd1e3
+SHA512:
+  metadata.gz: a007f565d9bfb1f714f7fb27397a04763328bbd438fe1fecb2c91a346724766f1b32cb326ebd2850004b9f00e8cedf370e3be0f14b11a19ce1eff2c9ed799d05
+  data.tar.gz: bac8db57f85c994aec2d346862b7d4070fbe9ea5268772aaea418ab0d3d8070b4cbfef113bb52e1b4c3a8fd45f323f9905961346177c6279f26112b12b9269f3

data/capistrano-gity.gemspec

@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "capistrano-gity"
+  s.version = "0.6.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Skroutz.gr Team"]
+  s.date = "2012-05-21"
+  s.email = "yatiohi@ideopolis.gr"
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    "LICENSE",
+    "README.rdoc",
+    "capistrano-gity.gemspec",
+    "lib/capistrano-gity.rb"
+  ]
+  s.homepage = "http://github.com/ctrochalakis/capistrano-gity"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Git helpers for capistrano deployments"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/lib/capistrano-gity.rb

@@ -7,6 +7,19 @@ Capistrano::Configuration.instance.load do
       set :remote,  git_remote.empty? ? 'origin' : git_remote
     end
 
+    unless exists?(:check_master)
+      check_master = case `git config deploy.check-master`.strip
+      when 'false', 'f', '0'
+        false
+      when 'true', 't', '1'
+        true
+      else
+        true
+      end
+
+      set :check_master,  check_master
+    end
+
     desc "Push HEAD to the central repo"
     task :push do
       system "git push --force #{remote} HEAD:#{branch}"
@@ -62,12 +75,33 @@ Capistrano::Configuration.instance.load do
       uptip
     end
 
+    def quit?
+      return false if !check_master
+
+      current_branch = `git symbolic-ref --short HEAD`.strip
+      branch_diff_cmd = "git log #{current_branch} ^#{remote}/master --pretty=format:%h%x09%an%x09%ad%x09%s"
+      unpushed_commits = `#{branch_diff_cmd}`
+      if !unpushed_commits.empty?
+        puts <<-MSG
+        The following commits are not included in #{remote} master.
+        This means that a subsequent deploy might not include your work.
+        Consider pushing to master now or later.
+        MSG
+        puts unpushed_commits
+        answer = Capistrano::CLI.ui.ask("Do you want to continue? (y/n)")
+        return !answer.downcase.start_with?('y')
+      end
+      return false
+    end
+
     task :prepare_deploy do
+      sync
+      exit 127 if quit?
       push
       uptip
     end
 
-    before 'deploy', 'gity:prepare_deploy'
+    before 'deploy:update_code', 'gity:prepare_deploy'
 
   end
 end

metadata

@@ -1,68 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capistrano-gity
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.6.0
 platform: ruby
-authors: 
+authors:
 - Skroutz.gr Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-03-17 00:00:00 +02:00
-default_executable: 
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: yatiohi@ideopolis.gr
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
-- .gitignore
+files:
 - LICENSE
 - README.rdoc
-- Rakefile
-- VERSION
+- capistrano-gity.gemspec
 - lib/capistrano-gity.rb
-has_rdoc: true
 homepage: http://github.com/ctrochalakis/capistrano-gity
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      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
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 3
 summary: Git helpers for capistrano deployments
 test_files: []
-

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/Rakefile

@@ -1,16 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "capistrano-gity"
-    gem.summary = "Git helpers for capistrano deployments"
-    gem.email = "yatiohi@ideopolis.gr"
-    gem.homepage = "http://github.com/ctrochalakis/capistrano-gity"
-    gem.authors = ["Skroutz.gr Team"]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end

data/VERSION

@@ -1 +0,0 @@
-0.2.0