githole 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d9734bc5107eee2dffcde9f00018fc92cde95e2
-  data.tar.gz: 4a31352513c1b2a97f5ebe579d22144282bf6f41
+  metadata.gz: a4220029e0085bbb52488e09c867c56a8dd76df3
+  data.tar.gz: ce110439df62ef66ca010bdc0d62ac9bd0e8a555
 SHA512:
-  metadata.gz: 81f3f2517718cb7a34fae7d014ece6e99420b2d8effd62981607ca761526c0b92a29c345959e78932aad0cef0c5feced68d1ad7ea39a8bc221087737a53f2782
-  data.tar.gz: 82af75c31c83368057adc9d349b02e66aa490bf90612d80aa97c231e4b2050c1082aff8d5ff49c7d0ce5596f0985d051502ed7366f1657de3e8983456f8ae683
+  metadata.gz: 69b7acad7b219d42b4d40abc1539b495af1c5413f7950aaf5229eefcdfce102603aabd44d96a62b0639619a05786cf17cc5e305b084331e385a5db310a6670b3
+  data.tar.gz: 31202a814481262714e8a1c04942170ec7b5dd28c1a93557223de327b7aa83e6eabcaa0f943041c0d106f6583bfc5974e4d9371df9aecd9be81d1ca08a697bc6

data/README.md

@@ -1,8 +1,8 @@
 Githole
 ================
 
-Githole is a command line script that serves as a wrapper for several git
-commands, which serve my git workflow.
+Githole is a wrapper for a specific versioning workflow using [Git](http://git-
+scm.com/).
 
 The Workflow
 ----------------
@@ -72,7 +72,7 @@ want as your second argument.
 Here's an example:
 
 ```text
-$ githole add 1.4.1
+$ githole add v1.4.1
 ```
 
 ### Add
@@ -83,14 +83,15 @@ version branches and figure out if it needs to pull or not.
 Let's say you're going to work on v1.4.1. You would set it up by running:
 
 ```text
-$ githole add 1.4.1
+$ githole add v1.4.1
 ```
 
 This creates a *version branch* -- `v1.4.1` -- and a *local feature branch* --
 `local-v1.4.1`.
 
 > **This workflow is specifically designed so you do not work in feature
-> branches. You only merge into them.**
+> branches. You only merge into them after you have rebased them to your loacl
+> branch.**
 
 This command runs the following commands:
 
@@ -113,7 +114,7 @@ While you can run this command at any time, I recommend at least doing it when
 you begin a dev session.
 
 ```text
-$ githole update 1.4.1
+$ githole update v1.4.1
 ```
 
 This runs the following commands
@@ -121,9 +122,10 @@ 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 rebase master
 $ git checkout local-v1.4.1
 $ git rebase v1.4.1
 ```
@@ -140,7 +142,7 @@ Push first runs the update action, then pushes up to origin. Therefore, *you
 don't have to run `update` before you run `push`.*
 
 ```text
-$ githole push 1.4.1
+$ githole push v1.4.1
 ```
 
 In addition to the update commands, we run:
@@ -159,7 +161,7 @@ delete remote branches through your app's UI, just so you can use it as another
 way to check yourself.
 
 ```text
-$ githole remove 1.4.1
+$ githole remove v1.4.1
 ```
 
 The remove action runs these commands:
@@ -179,7 +181,7 @@ This is a separate action because it has to happen **after the merge/pull
 request is accepted.**
 
 ```text
-$ githole tag 1.4.1
+$ githole tag v1.4.1
 ```
 
 The tag action runs these commands:
@@ -191,6 +193,30 @@ $ git tag -a v1.4.1 -m "v1.4.1"
 $ git push origin --tags
 ```
 
+### Release
+
+The `release` branch is used to maintain the latest stable (as `master` *could*
+be used for testing scenarios you can't test on the version branch).
+
+> `release` is to be used **in replacement to** `tag`, as it will also run
+> `tag`.
+
+The command is:
+
+```text
+$ githole release v1.4.1
+```
+
+In addition to the `tag` commands, this will run:
+
+```text
+$ git checkout [-b] release
+$ git pull origin release
+$ git merge master
+$ git push origin release
+$ git checkout master
+```
+
 Contributing
 ----------------
 
@@ -203,4 +229,8 @@ Contributing
 Changelog
 ----------------
 
+* **v1.2.0**: Remove the auto "v" prefix from the branch and tag names
+* **v1.1.2**: Never rebase onto a branch tracking a remote repository; always
+  rebase onto a local-only branch
+* **v1.1.1**: Switch to master before fetching
 * **v1.1.0**: Add a `tag` action that pulls and tags master, then pushes tag

data/lib/githole/git.rb

@@ -6,7 +6,7 @@ module Githole
     end
 
     def respond_to?(cmd)
-      ['add','update','push','remove', 'tag'].include?(cmd)
+      ['add','update','push','remove', 'tag','release'].include?(cmd)
     end
 
     def add
@@ -54,6 +54,15 @@ module Githole
       git_push "--tags"
     end
 
+    def release
+      tag
+      create "release"
+      pull "release"
+      merge master
+      git_push "release"
+      checkout master
+    end
+
     private
 
       def git(cmd)

data/lib/githole/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: githole
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Sean C Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler