geordi 0.10.0 → 0.11.0

data/README.md

@@ -62,6 +62,16 @@ Removes unnecessary files from your project directory:
 More information at http://makandracards.com/makandra/951-shell-script-to-clean-up-a-project-directory
 
 
+deploy-to-production
+-------------------
+
+Shows the commits between your `master` and `production` branch, then merges the changes and deploys to the production Capistrano stage:
+
+    deploy-to-production
+
+More information at https://makandracards.com/makandra/7971-shell-script-to-deploy-changes-to-production-and-not-shoot-yourself-in-the-foot
+
+
 dump-for
 --------
 
@@ -139,9 +149,9 @@ More information at http://makandracards.com/makandra/737-run-a-rake-task-in-all
 remotify-local-branch
 ---------------------
 
-Pushes the given branch to the remote `origin` and tracks it:
+Pushes the given branch (or current branch if no argument given) to the remote `origin` and tracks it:
 
-    remotify-local-branch redesign
+    remotify-local-branch <optional-branch-name>
 
 More information at http://makandracards.com/makandra/520-create-a-remote-branch-in-git
 

data/bin/deploy-to-production

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+
+def header(text)
+  puts colorize(text, 44), ''
+end
+
+def colorize(text, color_code)
+  "\e[#{color_code}m#{text}\e[0m"
+end
+
+def gray(text)
+  colorize(text, 35)
+end
+
+def call_or_fail(command)
+  puts gray(command), ''
+  result = system(command) or raise "Error while calling #{command}: #{$?}"
+  puts
+  result
+end
+
+def prompt(message, default)
+  print "#{message}"
+  print " [#{default}]" if default
+  print ": "
+  input = gets.strip
+  if input.empty? && default
+    input = default
+  end
+  puts
+  input
+end
+
+puts
+
+master_branch = prompt('master branch', 'master')
+production_branch = prompt('production branch', 'production')
+production_stage = prompt('production capistrano stage', 'production')
+
+header("Checking what's on #{production_stage} right now...")
+
+call_or_fail("git checkout #{production_branch} && git pull")
+
+header("You are about to deploy the following commits from #{master_branch} to #{production_branch}:")
+
+ENV['PAGER'] = 'cat'
+
+call_or_fail("git log #{production_branch}..#{master_branch}")
+
+if prompt("Go ahead with the deployment? (y/n)", "n") == 'y'
+  puts("git merge #{master_branch} && git push && cap #{production_stage} deploy:migrations")
+  call_or_fail("git merge #{master_branch} && git push && cap #{production_stage} deploy:migrations")
+  puts 'Deployment complete.', ''
+else
+  puts 'Deployment cancelled.', ''
+end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geordi
 version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: 
+  hash: 51
+  prerelease: false
   segments: 
   - 0
-  - 10
+  - 11
   - 0
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -28,6 +28,7 @@ executables:
 - cleanup-directory
 - console-for
 - cuc
+- deploy-to-production
 - dump-for
 - dumple
 - gitpt
@@ -56,6 +57,7 @@ files:
 - bin/cleanup-directory
 - bin/console-for
 - bin/cuc
+- bin/deploy-to-production
 - bin/dump-for
 - bin/dumple
 - bin/gitpt
@@ -106,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: geordi
-rubygems_version: 1.3.9.4
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.