git-squash 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c6bce93d7b1b948e4b38376f39203fab12d9d88
-  data.tar.gz: e14dee1d4497a07de18c17e47557c6424631fc2b
+  metadata.gz: 3d973605edf9cf14cb1011412c33cd97f6eebb1a
+  data.tar.gz: eb56a087023e359d595eb379f9009d6ce8309d87
 SHA512:
-  metadata.gz: b1cd3c87c1c1265df407d3c7902faa07d409e6817deb7d58fdc0738bf0fd0dd19b44a9c18fea21b22481d06cf99e64c9f32e2bde7932d082fa9d1b1b4079c7af
-  data.tar.gz: e73c811e0b62e91a89dcc637aedade7ad997af774dc46fcf3604224654e0ce964ba222da623af9dc4b637512988de26db00f43b7f5ecf01f300db3b72b7c7a9f
+  metadata.gz: ef7b0750a96b15d6f70b077154e34bd47d67b4f924c64ee367b4834d558ddbefd482469bace22ae1a5dbc453d9a0209b53f70e660fbb016540a6e8fff9ba5dbe
+  data.tar.gz: 36cac28373372a9da2aeefa56581170c78476064fb8c94df61d761b8e73226799723c5ee1acb68c42128067c97969762be455b85931144ec938cebe7adfc4c56

data/README.md

@@ -1,14 +1,16 @@
 ###Git shortcut to automate the commit, squash and push commands
 
-Sometimes execute the basic git commands is very boring and repetitive so, this shortcut is awesome. It will run these commands in this order:
+Sometimes executing basic git commands is very boring and repetitive so, this shortcut will help you a lot. It will run these commands in this sequence:
 
-- get the MERGE_BASE_ID
+- `git merge-base HEAD YOUR_CURRENT_BRANCH`
 - `git reset --soft MERGE_BASE_ID`
 - `git add .`
 - `git commit -m "YOUR_MESSAGE_COMMIT"`
 - `git push origin -f YOUR_CURRENT_BRANCH`
 
-Warning: This procedures clears the commits history. So do not run it if you'll need this history.
+Warnings:
+- #1: This procedures clears all the commit history. So do not run it if you'll need this history.
+- #2: This script run a force commit. So, be careful.
 
 **The Script is similar to:**
 
@@ -27,7 +29,7 @@ echo -e "$(tput setaf 2)\n** Executing add command$(tput sgr0)\n"
 git add .
 
 echo -e "$(tput setaf 2)\n** Executing commit command$(tput sgr0)\n"
-git commit -m "$COMMIT_MESSAGE"
+git commit -S -am "$COMMIT_MESSAGE"
 
 echo -e "$(tput setaf 2)\n** Executing push command$(tput sgr0)\n"
 git push origin -f $CURRENT_BRANCH
@@ -54,6 +56,7 @@ or
 ```bash
 git-squash "Commit Message"
 ```
+*Ps. The default branch is `master`*
 
 or
 

data/lib/git-squash.rb

@@ -24,9 +24,9 @@ class GitSquash
 
   def commit_command
     puts "Executing commit command".green
-    puts "git commit -m #{ message }".yellow
+    puts "git commit -S -am #{ message }".yellow
     puts
-    %x(git commit -m "#{ message }")
+    %x(git commit -S -am "#{ message }")
   end
 
   def add_command
@@ -59,7 +59,7 @@ class GitSquash
   end
 
   def message
-    @argv[0] || 'no message commit'
+    @argv[0] || 'no commit message'
   end
 
   def get_repo

data/lib/git-squash/version.rb

@@ -1,3 +1,3 @@
 class GitSquash
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-squash
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Adriano Tadao Sabadini Matsumoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2017-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: git shortcut to join all commits in just one