git_undo 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1853641d4fa2c27843cd182b10778d67b8858275
-  data.tar.gz: d653f3b5f5e7be2bc42cad3f8aa4d44772202163
+  metadata.gz: aac96fa48b02f5d29aaba9d226f71d1b40639258
+  data.tar.gz: 78a41f2f818f03e83eee4477febdfd96a33bfb36
 SHA512:
-  metadata.gz: 66aca25a347e2c1e0fbc5d3a2fc16af236679780c3dab97dfeb29ee8637ad0d6f52c5a1cce5d1b4fbc9369bd73cd2ea340dde8e9c03abbb15c0bf08c3feffbcf
-  data.tar.gz: 309266bd6ddc9b052b5dd4bd0d51b7e8debc3f14a9fbb04661d3c2b0abfbf0d2c41137a857f5a395153d572ba7ef480e5451d1e80c302daa87956de624871dbd
+  metadata.gz: fdf1f74895bbb86627a3d98e96d39b14bb6eaed9012b1b9a7e3b3e6ad0af06545c5cdaf6f3afe863b4b2017e74b30f3a11da6e0ff71bc2ba27ccd3c25d4fb7ac
+  data.tar.gz: 34cebab2965d49e10244d927f0715891d89cd3acb0ce5351d29ae2acf4754782510d562ede8f42284d0289e015c009e625fa2eecc4b234cb2748f7ca448ab9b2

data/bin/{gitundo → git-undo}

@@ -5,5 +5,5 @@ require_relative '../config/environment.rb'
 if history_file = ENV['HISTFILE']
   GitManager.new(history_file).run
 else
-  GitManager.setup
+  GitSetup.new.run
 end

data/lib/git_undo/git_manager.rb

@@ -1,9 +1,23 @@
+require 'pry'
+
 class GitManager
+  VALID_COMMANDS = ['add','commit','merge','checkout','co']
+
   def initialize(history_file)
     @history_file = history_file
     @command_list = []
   end
 
+  def run
+    get_commands
+    if last_command
+      puts "Last git command was: `#{last_command}`"
+      undo_message(last_command)
+    else
+      puts "No git commands found!"
+    end
+  end
+
   def get_commands
     File.open(@history_file) do |file|
       file.each do |line|
@@ -16,57 +30,57 @@ class GitManager
   end
 
   def last_command
-    @command_list.last
+    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
+    end
+    return last
   end
 
-  def run
-    get_commands
-    puts "Last git command was: `#{last_command}`"
+  def parse_command(command)
+    tokens = command.split(' ')
+    action = tokens[1]
+    arguments = tokens[2..-1].join(' ')
+    return { action: action, arguments: arguments }
   end
 
-  def self.setup
-    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?"
-      if gets.chomp.downcase == 'y'
-        puts "Thanks!"
-        update_bash_profile
-      else
-        puts "Goodbye!"
+  def undo_command(action, arguments)
+    case action
+    when 'add'
+      "git reset #{arguments}"
+    when 'commit'
+      "git reset --soft HEAD~"
+    when 'merge'
+      "git reset --merge ORIG_HEAD"
+    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
-    else
-      puts "Goodbye!"
+      undo_command
     end
   end
 
-  def self.update_bash_profile
-    alias_exists = false
-    # last_line_alias = false
-    # position = 0
-    # line_count = 0
-    # index = 0
-    # max_line_count = 0
-    file = File.open(File.expand_path('~' + '/.bash_profile'),'r+')
-
-    file.readlines.each do |line|
-      # line_count += 1
-      if /\A[\s]*alias/.match line
-        if /\A[\s]*alias gitundo="HISTFILE=\$HISTFILE gitundo"\n\z/.match line
-          alias_exists = true
-        end
-        # max_line_count = line_count
-      # elsif last_line_alias
-      #   position = file.pos
-      #   last_line_alias = false
+  def undo_message(command)
+    command_hash = parse_command(command)
+    undo = undo_command(command_hash[:action], command_hash[:arguments])
+    if !undo
+      puts "Sorry, I don't know how to undo that command"
+    else
+      puts "To undo, run `#{undo}`\nWould you like to automatically run this command now? (y/N)"
+      option = gets.chomp.downcase
+      if option == 'y'
+        puts undo
+        %x[ #{undo} ]
       end
     end
-    unless alias_exists
-      file.write("# Git Undo\n")
-      file.write("alias gitundo=\"HISTFILE=$HISTFILE gitundo\"\n")
-      puts "Please run `source ~/.bash_profile && cd .` to reload configuration"
-    end
-    file.close
-    # puts max_line_count + 1
-    # puts position
   end
+
 end

metadata

@@ -1,69 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: git_undo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Randall Reed, Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-06-08 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,
   and output command to undo that operation.
 email:
 - randallreedjr@gmail.com
 executables:
-- gitundo
+- git-undo
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/gitundo
-- config/environment.rb
 - lib/git_undo/git_manager.rb
+- config/environment.rb
+- bin/git-undo
 homepage: https://github.com/randallreedjr/git_undo
 licenses:
 - MIT
@@ -74,17 +88,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.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Undo last git command