git_undo 1.0.0 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aac96fa48b02f5d29aaba9d226f71d1b40639258
-  data.tar.gz: 78a41f2f818f03e83eee4477febdfd96a33bfb36
+  metadata.gz: 80b844dbe921e309545c109907cdbf20d345ed89
+  data.tar.gz: 85cc2756f7c94e49f9de5d03021daf58df24a24e
 SHA512:
-  metadata.gz: fdf1f74895bbb86627a3d98e96d39b14bb6eaed9012b1b9a7e3b3e6ad0af06545c5cdaf6f3afe863b4b2017e74b30f3a11da6e0ff71bc2ba27ccd3c25d4fb7ac
-  data.tar.gz: 34cebab2965d49e10244d927f0715891d89cd3acb0ce5351d29ae2acf4754782510d562ede8f42284d0289e015c009e625fa2eecc4b234cb2748f7ca448ab9b2
+  metadata.gz: d91b8218bfcab8c35a16ff07c1f2683a82d5c2f8e9d041b2f82a99fbd31c6da97bbf2e7aad9c5f76c9cfafd5a1b1576ef2cd6b43c60e845dc0af14dbba54b560
+  data.tar.gz: 952b107a5d9e28207d441dd9b7d7e0d563e769640497f9ae18a748710e21f9bad752066408caf7a75093e528aebb4384e3d86497289e454a1fab4d723168cfe5

data/config/environment.rb

@@ -1 +1 @@
-require_relative '../lib/git_undo/git_manager.rb'
+require_relative '../lib/git_undo.rb'

data/lib/git_undo.rb

@@ -0,0 +1,3 @@
+require "git_undo/git_manager"
+require "git_undo/git_reverser"
+require "git_undo/git_setup"

data/lib/git_undo/git_manager.rb

@@ -1,8 +1,4 @@
-require 'pry'
-
 class GitManager
-  VALID_COMMANDS = ['add','commit','merge','checkout','co']
-
   def initialize(history_file)
     @history_file = history_file
     @command_list = []
@@ -21,7 +17,7 @@ class GitManager
   def get_commands
     File.open(@history_file) do |file|
       file.each do |line|
-        # find last git command
+        # find all git commands
         if /\Agit / =~ line
           @command_list << line.chomp
         end
@@ -30,16 +26,10 @@ class GitManager
   end
 
   def last_command
-    last = ''
-    index = @command_list.length - 1
-    while last.empty? && index >= 0
-      command = parse_command(@command_list[index])[:action]
-      if VALID_COMMANDS.include?(command)
-        last = @command_list[index]
-      end
-      index -= 1
+    @command_list.reverse.detect do |raw_command|
+      command = parse_command(raw_command)[:action]
+      GitReverser::VALID_COMMANDS.include?(command)
     end
-    return last
   end
 
   def parse_command(command)
@@ -50,21 +40,19 @@ class GitManager
   end
 
   def undo_command(action, arguments)
+    reverser = GitReverser.new(arguments)
+
     case action
     when 'add'
-      "git reset #{arguments}"
+      reverser.reverse_add
     when 'commit'
-      "git reset --soft HEAD~"
+      reverser.reverse_commit
     when 'merge'
-      "git reset --merge ORIG_HEAD"
+      reverser.reverse_merge
     when 'checkout','co'
-      undo_command = "git checkout -"
-      if arguments.start_with?('-b')
-        #also delete branch
-        branch_name = arguments.split.last
-        undo_command += " && git branch -D #{branch_name}"
-      end
-      undo_command
+      reverser.reverse_checkout
+    when 'rebase'
+      reverser.reverse_rebase
     end
   end
 
@@ -82,5 +70,4 @@ class GitManager
       end
     end
   end
-
 end

data/lib/git_undo/git_reverser.rb

@@ -0,0 +1,44 @@
+class GitReverser
+  attr_reader :arguments
+
+  VALID_COMMANDS = ['add','commit','merge','checkout','co', 'rebase']
+
+  def initialize(arguments)
+    @arguments = arguments
+  end
+
+  def reverse_add
+    "git reset #{arguments}"
+  end
+
+  def reverse_commit
+    'git reset --soft HEAD~'
+  end
+
+  def reverse_merge
+    'git reset --merge ORIG_HEAD'
+  end
+
+  def reverse_checkout
+    undo_command = "git checkout -"
+    if arguments.start_with?('-b')
+      #also delete branch
+      branch_name = arguments.split.last
+      undo_command += " && git branch -D #{branch_name}"
+    end
+    undo_command
+  end
+
+  def reverse_rebase
+    if !arguments.include?('-i')
+      current_branch_command = 'git rev-parse --abbrev-ref HEAD'
+      branch_name = %x[ #{current_branch_command} ].chomp
+
+      fetch_old_state = "git checkout #{branch_name}@{1}"
+      delete_branch = "git branch -D #{branch_name}"
+      recreate_branch = "git checkout -b #{branch_name}"
+
+      "#{fetch_old_state} && #{delete_branch} && #{recreate_branch}"
+    end
+  end
+end

data/lib/git_undo/git_setup.rb

@@ -0,0 +1,54 @@
+class GitSetup
+
+  attr_reader :file
+
+  def initialize
+    @file = nil
+  end
+
+  def run
+    puts "It looks like you haven't run the initial setup. Would you like to do so now? (y/N)"
+    if gets.chomp.downcase == 'y'
+      puts "This will involve appending an alias to your .bash_profile. Okay to proceed? (y/N)"
+      if gets.chomp.downcase == 'y'
+        puts "Thanks!"
+        update_bash_profile
+      else
+        puts "Goodbye!"
+      end
+    else
+      puts "Goodbye!"
+    end
+  end
+
+  def update_bash_profile
+    @file = File.open(File.expand_path('~' + '/.bash_profile'),'r+')
+
+    unless alias_exists?
+      write_to_bash_profile
+      puts "Please run `source ~/.bash_profile && cd .` to reload configuration"
+    end
+    file.close
+  end
+
+  def alias_exists?
+    alias_exists = false
+
+    file.readlines.each do |line|
+      if /\A[\s]*alias/.match line
+        if /\A[\s]*alias git-undo="HISTFILE=\$HISTFILE git-undo"\n\z/.match line
+          alias_exists = true
+        end
+      end
+    end
+
+    return alias_exists
+  end
+
+  def write_to_bash_profile
+    file.write("# Git Undo\n")
+    file.write("alias git-undo=\"HISTFILE=$HISTFILE git-undo\"\n")
+    file.write("# Flush history immediately")
+    file.write("export PROMPT_COMMAND='history -a")
+  end
+end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: git_undo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.8
 platform: ruby
 authors:
 - Randall Reed, Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Command line utility to read from bash history, find last git command,
@@ -75,9 +75,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/git_undo/git_manager.rb
-- config/environment.rb
 - bin/git-undo
+- config/environment.rb
+- lib/git_undo.rb
+- lib/git_undo/git_manager.rb
+- lib/git_undo/git_reverser.rb
+- lib/git_undo/git_setup.rb
 homepage: https://github.com/randallreedjr/git_undo
 licenses:
 - MIT
@@ -88,17 +91,17 @@ 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.0.14.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Undo last git command