git-squash 0.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1c6bce93d7b1b948e4b38376f39203fab12d9d88
+  data.tar.gz: e14dee1d4497a07de18c17e47557c6424631fc2b
+SHA512:
+  metadata.gz: b1cd3c87c1c1265df407d3c7902faa07d409e6817deb7d58fdc0738bf0fd0dd19b44a9c18fea21b22481d06cf99e64c9f32e2bde7932d082fa9d1b1b4079c7af
+  data.tar.gz: e73c811e0b62e91a89dcc637aedade7ad997af774dc46fcf3604224654e0ce964ba222da623af9dc4b637512988de26db00f43b7f5ecf01f300db3b72b7c7a9f

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Adriano Tadao Sabadini Matsumoto
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -0,0 +1,62 @@
+###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:
+
+- get the MERGE_BASE_ID
+- `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.
+
+**The Script is similar to:**
+
+```bash
+#!/bin/bash
+
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+COMMIT_MESSAGE=$1
+FROM_BRANCH=${2-master}
+MERGE_BASE_ID=$(git merge-base HEAD $FROM_BRANCH)
+
+echo -e "$(tput setaf 2)** Executing reset command$(tput sgr0)"
+git reset --soft $MERGE_BASE_ID
+
+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"
+
+echo -e "$(tput setaf 2)\n** Executing push command$(tput sgr0)\n"
+git push origin -f $CURRENT_BRANCH
+```
+
+**How to install:**
+
+Run this command line:
+
+```bash
+$ gem install git-squash
+```
+
+**Usage:**
+
+At some git repository, just run:
+
+```bash
+git squash
+```
+
+or
+
+```bash
+git-squash "Commit Message"
+```
+
+or
+
+```bash
+git-squash "Commit Message" "branch_name_from_reset"
+```

data/bin/git-squash

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'git-squash'
+
+GitSquash.new.run(ARGV)

data/lib/git-squash/version.rb

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

data/lib/git-squash.rb

@@ -0,0 +1,73 @@
+require 'colored'
+require 'grit'
+require 'git-squash/version'
+
+class GitSquash
+  attr_accessor :argv
+
+  def run(argv)
+    @argv = argv
+    reset_command
+    add_command
+    commit_command
+    push_force_command
+  end
+
+  private
+
+  def push_force_command
+    puts "Executing push command".green
+    puts "git push origin -f #{ current_branch }".yellow
+    puts
+    %x(git push origin -f #{ current_branch })
+  end
+
+  def commit_command
+    puts "Executing commit command".green
+    puts "git commit -m #{ message }".yellow
+    puts
+    %x(git commit -m "#{ message }")
+  end
+
+  def add_command
+    puts "Executing add command".green
+    puts "git add .".yellow
+    puts
+    %x(git add .)
+  end
+
+  def reset_command
+    puts "Executing reset command from: #{ from_branch }".green
+    puts "git reset --soft #{ commit_id }".yellow
+    %x(git reset --soft #{ commit_id })
+  end
+
+  def commit_id
+    %x(git merge-base HEAD #{ from_branch })
+  end
+
+  def current_branch
+    @current_branch ||= repo.head.name
+  end
+
+  def repo
+    @repo ||= get_repo
+  end
+
+  def from_branch
+    @argv[1] || 'master'
+  end
+
+  def message
+    @argv[0] || 'no message commit'
+  end
+
+  def get_repo
+    repo_dir = `git rev-parse --show-toplevel`.chomp
+    begin
+      @repo = Grit::Repo.new(repo_dir)
+    rescue
+      raise "We don't seem to be in a git repository."
+    end
+  end
+end

metadata

@@ -0,0 +1,78 @@
+--- !ruby/object:Gem::Specification
+name: git-squash
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+platform: ruby
+authors:
+- Adriano Tadao Sabadini Matsumoto
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2015-10-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+description: Sometimes execute the basic git commands is very boring and repetitive
+  so, this shortcut will make your git repository be most clean.
+email: drianotadao@gmail.com
+executables:
+- git-squash
+extensions: []
+extra_rdoc_files: []
+files:
+- LICENSE
+- README.md
+- bin/git-squash
+- lib/git-squash.rb
+- lib/git-squash/version.rb
+homepage: https://github.com/adrianotadao/git-squash
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.4.8
+signing_key: 
+specification_version: 4
+summary: git shortcut to join all commits in just one
+test_files: []