midwire_common 0.1.6 → 0.1.7

data/CHANGELOG

@@ -1,3 +1,7 @@
+*0.1.7* (December 31, 2013)
+
+* Added branch checking to guard against bumping version on master branch
+
 *0.1.6* (December 31, 2013)
 
 * Handle nested modules

data/README.md

@@ -1,6 +1,6 @@
 # Midwire Common Gem
 
-**Version: 0.1.6**
+**Version: 0.1.7**
 
 A handy Ruby library for Midwire development
 

data/lib/midwire_common/version.rb

@@ -1,6 +1,6 @@
 original_verbosity = $VERBOSE
 $VERBOSE = nil
 module MidwireCommon
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end
 $VERBOSE = original_verbosity

data/lib/tasks/version.rake

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'readline'
 require 'fileutils'
+require 'pry'
 
 module Bundler
   class GemHelper
@@ -31,6 +32,7 @@ namespace :version do
 
   desc "Increment the patch version and write changes to the changelog"
   task :bump_patch do
+    exit unless check_branch
     major, minor, patch = read_version
     patch = patch.to_i + 1
     write_version([major, minor, patch])
@@ -44,6 +46,7 @@ namespace :version do
 
   desc "Increment the minor version and write changes to the changelog"
   task :bump_minor do
+    exit unless check_branch
     major, minor, patch = read_version
     minor = minor.to_i + 1
     patch = 0
@@ -53,6 +56,7 @@ namespace :version do
 
   desc "Increment the major version and write changes to the changelog"
   task :bump_major do
+    exit unless check_branch
     major, minor, patch = read_version
     major = major.to_i + 1
     minor = 0
@@ -120,4 +124,30 @@ namespace :version do
       end
       response
     end
+
+    def current_branch
+      `git rev-parse --abbrev-ref HEAD`.chomp
+    end
+
+    def check_branch
+      if current_branch == 'master'
+        puts "You typically do not want to bump versions on the 'master' branch"
+        puts "unless you plan to rebase or back-merge into the 'develop'."
+        puts ""
+        puts "If you don't care or don't know what I'm talking about just enter 'y'"
+        puts "and continue."
+        puts ""
+        puts "Optionally, you can hit 'n' to abort and switch your branch to 'develop'"
+        puts "or whatever branch you use for development, bump the version, merge to"
+        puts "'master' then 'rake release'."
+        puts ""
+        puts "Do you really want to bump the version on your 'master' branch? (y/n)"
+        while (line = $stdin.gets.chomp)
+          return true if line.match /[yY]/
+          puts "Aborting version bump."
+          return false
+        end
+      end
+      return true
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: midwire_common
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -197,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4180799989477412744
+      hash: -1122474148263051726
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4180799989477412744
+      hash: -1122474148263051726
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23