githole 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4220029e0085bbb52488e09c867c56a8dd76df3
-  data.tar.gz: ce110439df62ef66ca010bdc0d62ac9bd0e8a555
+  metadata.gz: cf9e813cda8dd4a093678ce4daa99c0264a6f44b
+  data.tar.gz: 10b2641ad26cc0eb3936cc176a993fa2e92246a5
 SHA512:
-  metadata.gz: 69b7acad7b219d42b4d40abc1539b495af1c5413f7950aaf5229eefcdfce102603aabd44d96a62b0639619a05786cf17cc5e305b084331e385a5db310a6670b3
-  data.tar.gz: 31202a814481262714e8a1c04942170ec7b5dd28c1a93557223de327b7aa83e6eabcaa0f943041c0d106f6583bfc5974e4d9371df9aecd9be81d1ca08a697bc6
+  metadata.gz: 01a840bc71e8b286656a6c34639d7503af51a3e8bc955750266985771e2eba559aec2de285d884a3d4054c94e7cec483b5c073a48a35ae39cdb04bdffe2ca082
+  data.tar.gz: 31644ef0660500851f7e9c037636089cb5af43ecd7083536ac366627849fea316714960a52b2bee6bad21a5f3b25083da6875a18f6e2cdee27570aa69088a6ca

data/README.md

@@ -24,7 +24,7 @@ branches are rolled into one. In other words, every remote branch (other than
 master) reflects the bleeding edge relevant to the version after which that
 branch is named.
 
-### 2: No Merging to Master
+### 2: No Committing to Master
 
 There should be no commits to the master branch. Ever.
 
@@ -42,9 +42,10 @@ To bring a feature branch up to date (required before you merge into version
 branch), you need to bring in changes from master and the remote version branch
 that you might not have.
 
-Instead of *merging* these branches, I *rebase* them. This keeps your commit
-history nice and clean (it's not littered with all these *Merged branch ...*
-commits).
+To keep history clean, we *rebase* the version branch onto the feature branch.
+Unfortunately, to keep a consistent point in history, we need to *merge*
+updates from master onto the version branch (at least that's worked the best at
+the moment).
 
 Installation
 ----------------
@@ -93,12 +94,25 @@ This creates a *version branch* -- `v1.4.1` -- and a *local feature branch* --
 > branches. You only merge into them after you have rebased them to your loacl
 > branch.**
 
-This command runs the following commands:
+If the remote branch already exists, then we run the following commands:
 
 ```text
+$ git checkout master
+$ git fetch
+$ git checkout -b v1.4.1 origin/v1.4.1
+$ git pull origin v1.4.1
+$ git checkout -b local-v1.4.1
+```
+
+If the remote branch doesn't exist at the origin, we need to create it and push
+it.
+
+```text
+$ git checkout master
+$ git fetch
 $ git checkout -b v1.4.1
-$ git pull origin v1.4.1 # if remote branch already exists
 $ git push origin v1.4.1
+$ git branch -u origin/v1.4.1
 $ git checkout -b local-v1.4.1
 ```
 
@@ -117,15 +131,14 @@ you begin a dev session.
 $ githole update v1.4.1
 ```
 
-This runs the following commands
+This runs the following commands:
 
 ```text
 $ git checkout master
 $ git pull origin master
-$ git checkout local-v1.4.1
-$ git rebase master
 $ git checkout v1.4.1
 $ git pull origin v1.4.1
+$ git merge master
 $ git checkout local-v1.4.1
 $ git rebase v1.4.1
 ```
@@ -217,6 +230,15 @@ $ git push origin release
 $ git checkout master
 ```
 
+### Count
+
+This is the only action that doesn't require a version argument. It simply
+gives you the total number of commits in the current branch.
+
+```text
+$ githole count
+```
+
 Contributing
 ----------------
 

data/bin/githole

@@ -8,7 +8,7 @@ version = ARGV[1]
 if cmd.nil? || cmd == ''
   puts "Please specify your command."
   exit
-elsif version.nil? || version == ''
+elsif cmd != 'count' && (version.nil? || version == '')
   puts "Please specify the version you are working with."
 else
   githole = Githole::Git.new(version)

data/lib/githole/git.rb

@@ -6,29 +6,35 @@ module Githole
     end
 
     def respond_to?(cmd)
-      ['add','update','push','remove', 'tag','release'].include?(cmd)
+      ['add','update','push','remove','tag','release','count'].include?(cmd)
     end
 
     def add
       checkout master
       fetch
-      create remote
-      pull remote if branch_exists?("remotes/origin/#{remote}")
-      git_push remote
+      if branch_exists?("remotes/origin/#{remote}")
+        git "checkout -b #{remote} origin/#{remote}"
+        pull remote
+      else
+        create remote
+        git_push remote
+        git "branch -u origin/#{remote}"
+      end
       create local
     end
 
     def update
       verify remote
       verify local
-      # rebase master onto local
+      # update master
       checkout master
       pull master
-      checkout local
-      rebase master
-      # rebase remote onto local
+      # update remote
       checkout remote
       pull remote
+      # merge master into remote
+      merge master
+      # rebase remote onto local
       checkout local
       rebase remote
     end
@@ -63,6 +69,10 @@ module Githole
       checkout master
     end
 
+    def count
+      git "rev-list HEAD --count"
+    end
+
     private
 
       def git(cmd)

data/lib/githole/version.rb

@@ -1,3 +1,3 @@
 module Githole
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: githole
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Sean C Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A simple git workflow to help develop for multiple releases.