version_tracker 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c9ccf35a8fd399ff71c248ef6c56e67cea3f3f8
-  data.tar.gz: 58f795cc7fc22539870662cbe709e6cd24ad280f
+  metadata.gz: b4adb628c383c9b7db13a434efa7ad8a5b5f12e3
+  data.tar.gz: df838bc2f082253c5ab5339b0fca1d09b77418a4
 SHA512:
-  metadata.gz: cbb5de30de51935ab5ee4b609113da30ddc11c381dd76d172b2dfa51e24dd7486e46b0e76f8db96ef25a9db9a7f547fb6f3374d41003b838f2286191ac95901a
-  data.tar.gz: 4ef94aef036c5a2ef1675ca0f783ef9fdc9e33727dcfb99a8f937bb1b6093e4514e4a2ee1379d503d0af362f276e38d865c75e5baf00f645929c07b40095fb8d
+  metadata.gz: 8c419dd6dcfb4fd26da5e69b00902d2adc3e25ddfcb166b32948ac9848870892b5a06a641077e1120d09ebbf9183eb5dec999070801cd2f781f92cdf69e3bc90
+  data.tar.gz: 70ef0b890972591ba6429d1043308fe3f229e44b82a4589c37c4853fb6223dde56213c3c57666e50a95d71e3b6ff83dd8caf67e6c223e0cf28a0d50aba2c1ed7

data/README.md

@@ -23,12 +23,13 @@ Or install it yourself as:
 
 ### Using Command Line
 ```
+version [read]        # Display current VERSION
 version init [value]  # Initialize VERSION File with provided value.
                       # Default: 0.0.0 if value is not provided and VERSION File does not exist
-version read          # Read current VERSION
-version bump [part]   # Bump VERSION based on part. Valid part: major, minor, patch. Default: patch
+version bump [part]   # Bump VERSION based on part.
+                      # Valid part: major, minor, patch (Default: patch)
 version tag           # Tag using current VERSION
-  
+
 OPTIONS:
   -r, --release                    Push to release branch using current version
   -m, --message=MESSAGE            Push with custom commit message

data/bin/version

@@ -11,9 +11,11 @@ option_parser =
 Version Tracker: Manages Rails Application Version
 
 USAGE:
-  version init [value]  # Initialize VERSION File with provided value. Default: 0.0.0 if value is not provided and VERSION File does not exist
-  version read          # Read current VERSION
-  version bump [part]   # Bump VERSION based on part. Valid part: major, minor, patch. Default: patch
+  version [read]        # Display current VERSION
+  version init [value]  # Initialize VERSION File with provided value.
+                        # Default: 0.0.0 if value is not provided and VERSION File does not exist
+  version bump [part]   # Bump VERSION based on part.
+                        # Valid part: major, minor, patch (Default: patch)
   version tag           # Tag using current VERSION
 
 OPTIONS:
@@ -46,6 +48,5 @@ option_parser.parse!
 result, status = VersionTracker::CommandLine.new.execute ARGV, options
 
 puts result
-puts option_parser if status == VersionTracker::CommandLine::RESULT_STATUS::ERROR
 
 exit status

data/lib/version_tracker/command_line.rb

@@ -85,20 +85,17 @@ module VersionTracker
 
 
     def release
+      origin_branch = self.current_branch
       branch = ['release', @version_tracker.version].join '/'
+      exists = system "git rev-parse --quiet --verify #{branch}"
 
-      exists = system "git rev-parse --verify #{branch}"
-      create_branch = '-b' unless exists
-
-      system ['git', 'checkout', create_branch, branch].join(' ')
-      self.git_commit branch
+      self.checkout branch, :create => !exists
+      self.git_push branch, origin_branch, :create => !exists
     end
 
 
     def push
-      result = `git rev-parse --abbrev-ref HEAD`
-      branch = result.gsub /\n/, ''
-      self.git_commit branch
+      self.git_push self.current_branch
     end
 
 
@@ -107,10 +104,37 @@ module VersionTracker
     end
 
 
-    def git_commit branch
+    def git_push branch, origin_branch = nil, options = {:create => false}
       system 'git add VERSION'
       system "git commit -m '#{self.message}'"
-      system "git push origin #{branch}"
+
+      return if system("git push origin #{branch}")
+
+      self.revert_branch(origin_branch) unless origin_branch == branch
+      self.delete_branch branch if !!options[:create]
+      raise VersionTrackerError, 'Error encountered while pushing to git'
+    end
+
+
+    def current_branch
+      result = `git rev-parse --abbrev-ref HEAD`
+      result.gsub /\n/, ''
+    end
+
+
+    def checkout branch, options = {:create => false}
+      create_branch = '-b' if !!options[:create]
+      system ['git', 'checkout', create_branch, branch].join(' ')
+    end
+
+
+    def revert_branch branch
+      self.checkout branch
+    end
+
+
+    def delete_branch branch
+      system "git branch -D #{branch}"
     end
 
   end

data/lib/version_tracker/version.rb

@@ -1,3 +1,3 @@
 module VersionTracker
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: version_tracker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Braymon Ramirez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler