git_commands 3.1.7 → 3.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b56d1810b535ad9bacd7d58b1dd1c68ef6f431f0
-  data.tar.gz: a1f27d3bf68f8f8c1293acc5f2ef24fc9faa83b1
+  metadata.gz: 67b5256b61bb6187f47f4b24fe7220750b022b55
+  data.tar.gz: 9a40a26fbfb14155999237513714678a379943df
 SHA512:
-  metadata.gz: c0ad1209c4c0e95e1814134fc64a25433fc7f62c8e584c49bbea69913df58b75826d548683db648bebc16712e006955bed6f8eda8b7987653bf85dcc7f6b2ee1
-  data.tar.gz: c0f56e29eb44e2f35113379f6f3a9cc7b58e2831d89183bcb3278020069a937a0e8ada519aaae40bce114ac1b33f31cadd7b4a46a2e670008bf4b97e2ba29432
+  metadata.gz: e3358e46e6c0a3f3d84709e4ed8cdb46503c47c23dc1f4bf6ac6dbad26650314b6d5c5c6cf8e8c1a0d77152ecc8e27f7e3e39b6950f5e8605c4f9d883e66fc22
+  data.tar.gz: b29fd122148138fc29b0a7ef6e3d53eb2c01630c363bc57afaf194b81ff0d89b7be4de91bdd2ce5d42a6dd3698fffb1e35d68d5f4a6edb48dc9cc85de35f4d86

data/README.md

@@ -2,16 +2,16 @@
 * [Workflow](#workflow)
 * [Scope](#scope)
 * [Installation](#installation)
-  * [git](#git)
+  * [GIT](#git)
 * [Usage](#usage)
   * [Arguments](#help)
     * [Help](#help)
     * [Repository](#repository)
     * [Branches](#branches)
   * [Commands](#commands)
-    * [rebase](#rebase)
-    * [purge](#purge)
-    * [aggregate](#aggregate)
+    * [Rebase](#rebase)
+    * [Purge](#purge)
+    * [Aggregate](#aggregate)
 
 ## Workflow
 This script will facilitate adopting a subset of the branch-featuring workflow characterised by:
@@ -31,8 +31,9 @@ Just install the gem to use the binaries commands.
 gem install git_commands
 ```
 
-### git
-The library uses the Ruby command line execution to invoke the **git** command. I assume you have the GIT program on your path.
+### GIT
+The library uses the Ruby command line execution to invoke the **git** command as a separate process.  
+I assume you have the GIT program on your path.
 
 ## Usage
 Here are the main commands:
@@ -108,10 +109,21 @@ Loading branches file...
 Branch 'noent' does not exist!
 ```
 
+##### Master branch
+Master branch cannot be included into the branches list for obvious reasons (from useless to dangerous ones).
+An error is raised in case master branch is specified:
+
+```
+rebase --repo=./Sites/greatest_hits --branches=master
+
+Loading branches file...
+Commands cannot interact directly with 'master' branch!
+```
+
 ### Commands
 Here are the available GIT commands:
 
-#### rebase
+#### Rebase
 This is probably the most useful command in case you have several branches to rebase with _origin/master_ frequently.
 A confirmation is asked to before rebasing.  
 
@@ -120,7 +132,7 @@ rebase --repo=./Sites/greatest_hits --branches=feature/love_me_tender,feature/te
 ...
 ```
 
-#### purge
+#### Purge
 This command remove the specified branches locally and remotely.  
 A confirmation is asked before removal.  
 
@@ -129,7 +141,7 @@ purge --repo=/temp/top_20 --branches=release/in_the_ghetto
 ...
 ```
 
-#### aggregate
+#### Aggregate
 This command aggregates all of the specified branches into a single one in case you want to create a release branch.  
 It uses the following naming convention: *release/yyyy_mm_dd*  
 A confirmation is asked before aggregating.  

data/lib/git_commands/command.rb

@@ -116,7 +116,7 @@ module GitCommands
 
     private def check_branch(branch)
       Dir.chdir(@repo) do
-        fail(GitError, "Master branch cannot be included into commands operations!") if branch == "master"
+        fail(GitError, "Commands cannot interact directly with 'master' branch!") if branch == "master"
         fail(GitError, "Branch '#{branch}' does not exist!") unless self.class.valid_branch?(branch)
       end
     end

data/lib/git_commands/version.rb

@@ -1,3 +1,3 @@
 module GitCommands
-  VERSION = "3.1.7"
+  VERSION = "3.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_commands
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.1.8
 platform: ruby
 authors:
 - costajob