ezgit 0.1.1 → 0.2.0

data/README.md

@@ -9,17 +9,19 @@
 
 ## DESCRIPTION
 
-EZGit is a command-line interface based on Ruby. The **goal** of **EZGit** is to simplify the daily git tasks used in a multi-team enterprise development environment without the need to fully understand the full complex beauty of Git. With EZGit, committers with any level of Git knowledge can work in the repo with confidence and consistency.
+I like the Git source control system. It's truly awesome. And like the first time you disassembled your dad's VCR only to be stumped by all those gears and wires, Git probably gave you a bit of a brain-bending whirl when you first looked at it too. There is so much that Git can do, but only so little that you really need it to do. **EZGit** wants to help.
 
-EZGit abstracts away many Git concepts that are consistent sources of confusion. Concepts such as...
-* _**Where do branches live? On my local machine or on the remote?**_ Who cares? EZGit handles it for you. 
-* _**What's the difference between the working directory, the stage(or index), and the local repo?**_ I could spend hours explaining it to you, but if you don't really want to know, EZGit is here to make that stuff go away.
+EZGit is a command-line interface written in Ruby and distributed as a gem. **The goal of EZGit** is to simplify your daily source control use cases without the need to fully gaze upon the complex beauty that is Git. With EZGit, committers with any level of Git knowledge can work in the repo with confidence and consistency.
 
-EZGit replaces git's complex and overloaded commands with simple, intentional, ruby-styled names. 
+EZGit abstracts away many Git concepts that are consistent sources of confusion. Concepts such as...
+* _**Where do branches live? On my local machine or on the remote?**_ Who cares? EZGit handles it for you.
+* _**What's the difference between the working directory, the stage(or index), and the local repo?**_ I could spend hours explaining it to you, but if you don't really want to know, EZGit is here to make those confusing thoughts go away.
+* _**When would I need to do a 'git reset --hard', as opposed to '--soft' or '--mixed'?**_ If you're asking about staging files, stop thinking about that. You have better things to do. Just make your files and folders look the way you want and EZGit will take care of the rest.
+* _**But I'm confused about the differences between git checkout, reset, revert, and other commands. Do some of these do more than one thing??**_  I know. I hear your pain. That's why EZGit replaces git's complex and overloaded commands with simple, clean, intentional, ruby-styled names. If any single git command has multiple, yet different _common_ uses, rest assured that EZGit provides an unique, easy-to-understand command for that task.
 
-In future updates, EZGit will implement a branching strategy that has been honed and refined over the last two years by a large agile enterprise development shop. The concepts of merging (and rebasing) will be equally simplified so that you can concentrate on your code, and not on, "how the heck do I merge these changes?!"
+Ready to try, EZGit? Hold on, Cowboy. It ain't done yet. Go ahead and use it, but be sure to check back often for updates. In the future, EZGit will implement a branching strategy that has been honed and refined over the last two years by a large agile enterprise development shop. The concepts of merging (and rebasing) will be equally simplified so that you can concentrate on your code, and not on, "how the heck do I rebase and then --no-ff merge my changes?!" And, hey, while you're checking things out, drop an occasional line if you find a bug. That'd be nice.
 
-Best of all, EZGit is still Git. So if you are a Git-Fu master, you can go back to using your favorite, obtuse Git commands at any time. They'll always be there waiting for you when you need to do the complex stuff.
+Best of all, EZGit is still Git. So if you are a Git-Fu master, you can always go back to using your favorite overloaded Git commands at any time. They'll always be there waiting for you at those times when you absolutely need to cherry-pick your fixes from branchB onto branchA, interactively rebase & squash directly from branchC in your buddy's repo, and finally, ours-merge them into master ...or other stuff like that.
 
 If you try EZGit and find that it doesn't quite work for you, drop me a line and let me know why. I'm happy to look at other use cases and consider including them in future updates.
 
@@ -43,38 +45,43 @@ EZGit changes a lot (especially during this development phase). To update your e
 
 Once installed, take a look at the help menu:
 
-    ez -h
+    ezgit -h
 
 
     EZGit is a simple interface for working with git repositories.
 
     Usage:
+            ezgit [<options>] <commands>
+                  - or -
             ez [<options>] <commands>
+                  - or -
+            eg [<options>] <commands>
+                  - or -
+            gt [<options>] <commands>
 
       commands are:
-        clean!  Wipes all untracked and ignored files.
-        clean Wipes all untracked files, but allows ignored files to remain.
-        clone Creates a copy of a repository.
-        commit  Creates a commit for all current file changes.
-        create  Create a new branch in the current state.
-        delete! Completely delete a given branch.
-        goto! Move to the location in the tree specified by a commit id. All changes will be lost.
-        info  Shows files status and current branches.
-        move  Switch and move changes to the given branch.
-        pull  Pulls the latest changes from the remote.
-        push  Pushes the current branch changes to the remote.
-        reset!  Deletes changes in all tracked files. Untracked files will not be affected.
-        switch! Abandon all changes and switch to the given branch.
-        switch  Switch to the given branch if there are not changes.
-        tree  Shows git tree history for the current branch
-        update  Attempts to self-update from rubygems.org.
+    	clean	Wipes untracked files unless they are marked as ignored(via .gitignore).
+    	clone	Creates a copy of a repository.
+    	commit	Creates a commit for all current file changes.
+    	create	Create a new branch in the current state.
+    	delete	Completely delete a given branch, both locally and on the remote.
+    	goto	Move to the location in the tree specified by a commit id. All changes will be lost.
+    	info	Shows files status and current branches.
+    	move	Switch and move changes to the given branch.
+    	pull	Pulls the latest changes from the remote.
+    	push	Pushes the current branch changes to the remote.
+    	reset	Deletes changes in all tracked files. Untracked files will not be affected.
+    	scrub	Wipes untracked files including ignored files.
+    	switch	Abandon all changes and switch to the given branch.
+    	tree	Shows git tree history for the current branch
+    	update	Attempts to self-update from rubygems.org.
 
        options are:
-      --dry-run-flag, -n:   Forces all commands to be passive.
-             --debug, -d:   Shows command level debug info.
-           --version, -v:   Print version and exit
-              --help, -h:   Show this message
-
+      --dry-run, -n:   Makes all commands passive.
+        --force, -f:   Forces all prompting off. Use ! at end of command name to do the same.
+        --debug, -d:   Shows command level debug info.
+      --version, -v:   Print version and exit
+         --help, -h:   Show this message
 
 ## EXAMPLE
 

data/bin/eg

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+require 'ezgit'

data/bin/ezgit

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+require 'ezgit'

data/bin/gt

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+require 'ezgit'

data/lib/ezgit/commands.rb

@@ -1,8 +1,6 @@
-require 'ezgit/git'
-
 class Commands
 
-  attr_accessor :all, :symbols, :names, :help_list, :options, :git
+  attr_accessor :all, :symbols, :names, :help_list, :options
 
 
   def initialize
@@ -28,7 +26,6 @@ class Commands
 
 
   def process
-    @git = Git.new(@options)
     @cmd = ARGV.shift
     matched = false
     @all.each do |current|
@@ -36,9 +33,9 @@ class Commands
         matched = true
         @cmd_opts = Trollop::options do
           usage = current[:usage]
-          usage ||= "ez #{current[:name].to_s} [<options>]"
+          usage ||= "ezgit #{current[:name].to_s} [<options>]"
           banner <<-HELP_DESCRIPTION
-command: ez #{current[:name].to_s}\n
+command: ezgit #{current[:name].to_s}\n
 #{current[:help].to_s}
 
 Usage:

data/lib/ezgit/commands/clean.rb

@@ -1,10 +1,21 @@
 $commands.all << {
-    name: 'clean',
-    help: 'Wipes all untracked files, but allows ignored files to remain.',
+    name: 'clean!',
+    help: 'Bypasses the prompt.',
+    usage: '',
     options: [
-        [:force, 'Automatically approve and bypass the confirmation prompt.', short: '-f']
+        [:force, 'Automatically approve and bypass the confirmation prompt.', short: '-f', default: true]
     ],
     action: lambda do |opts, args|
-      $commands.git.clean!(false, opts)
+      Processor.new(opts).clean!(false)
+    end
+}
+
+$commands.all << {
+    name: 'clean',
+    help: 'Wipes untracked files unless they are marked as ignored(via .gitignore).',
+    usage: '',
+    options: [],
+    action: lambda do |opts, args|
+      Processor.new(opts).clean!(false)
     end
 }

data/lib/ezgit/commands/clone.rb

@@ -4,6 +4,6 @@ $commands.all << {
     usage: 'ez clone <source_url> [<destination_directory>]',
     options: [],
     action: lambda do |opts, args|
-      $commands.git.clone(args)
+      Processor.new(opts).clone(args)
     end
 }

data/lib/ezgit/commands/commit.rb

@@ -4,6 +4,6 @@ $commands.all << {
     usage: 'ez commit "message"',
     options: [],
     action: lambda do |opts, args|
-      $commands.git.commit(args)
+      Processor.new(opts).commit(args)
     end
 }

data/lib/ezgit/commands/create.rb

@@ -4,6 +4,6 @@ $commands.all << {
     usage: 'ez create <branch_name>',
     options: [],
     action: lambda do |opts, args|
-      $commands.git.create(opts,args)
+      Processor.new(opts).create(args)
     end
 }

data/lib/ezgit/commands/delete.rb

@@ -1,11 +1,21 @@
 $commands.all << {
     name: 'delete!',
-    help: 'Completely delete a given branch.',
-    usage: 'ez delete! <branch_name>',
+    help: 'Bypasses the prompt.',
+    usage: '',
     options: [
-        [:force, 'Automatically approve and bypass the confirmation prompt.', short: '-f']
+        [:force, 'Automatically approve and bypass the confirmation prompt.', short: '-f', default: true]
     ],
     action: lambda do |opts, args|
-      $commands.git.delete!(opts,args)
+      Processor.new(opts).delete!(args)
+    end
+}
+
+$commands.all << {
+    name: 'delete',
+    help: 'Completely delete a given branch, both locally and on the remote.',
+    usage: 'ez delete <branch_name>',
+    options: [],
+    action: lambda do |opts, args|
+      Processor.new(opts).delete!(args)
     end
 }

data/lib/ezgit/commands/goto.rb

@@ -1,11 +1,21 @@
 $commands.all << {
     name: 'goto!',
-    help: 'Move to the location in the tree specified by a commit id. All changes will be lost.',
-    usage: 'ez goto! <commit>',
+    help: 'Bypasses the prompt.',
+    usage: '',
     options: [
-        [:force, 'Automatically approve and bypass the confirmation prompt.', short: '-f']
+        [:force, 'Automatically approve and bypass the confirmation prompt.', short: '-f', default: true]
     ],
     action: lambda do |opts, args|
-      $commands.git.goto!(opts, args)
+      Processor.new(opts).goto!(args)
+    end
+}
+
+$commands.all << {
+    name: 'goto',
+    help: 'Move to the location in the tree specified by a commit id. All changes will be lost.',
+    usage: 'ez goto <commit>',
+    options: [],
+    action: lambda do |opts, args|
+      Processor.new(opts).goto!(args)
     end
 }

data/lib/ezgit/commands/info.rb

@@ -1,10 +1,11 @@
 $commands.all << {
     name: 'info',
     help: 'Shows files status and current branches.',
+    usage: '',
     options: [
         [:ignored, 'Lists the files are being ignored.', short: '-i']
     ],
     action: lambda do |opts, args|
-      $commands.git.info(opts)
+      Processor.new(opts).info
     end
 }

data/lib/ezgit/commands/move.rb

@@ -4,7 +4,6 @@ $commands.all << {
     usage: 'ez move <branch_name>',
     options: [],
     action: lambda do |opts, args|
-      opts[:move] = true
-      $commands.git.switch!(opts, args)
+      Processor.new(opts).switch!('move', args)
     end
 }

data/lib/ezgit/commands/pull.rb

@@ -3,6 +3,6 @@ $commands.all << {
     help: 'Pulls the latest changes from the remote.',
     options: [],
     action: lambda do |opts, args|
-      $commands.git.pull
+      Processor.new(opts).pull
     end
 }

data/lib/ezgit/commands/push.rb

@@ -3,6 +3,6 @@ $commands.all << {
     help: 'Pushes the current branch changes to the remote.',
     options: [],
     action: lambda do |opts, args|
-      $commands.git.push
+      Processor.new(opts).push
     end
 }

data/lib/ezgit/commands/reset.rb

@@ -1,10 +1,22 @@
 $commands.all << {
     name: 'reset!',
-    help: 'Deletes changes in all tracked files. Untracked files will not be affected.',
+    help: 'Bypasses the prompt.',
+    usage: '',
     options: [
-        [:force, 'Automatically approve and bypass the confirmation prompt.', short: '-f']
+        [:force, 'Automatically approve and bypass the confirmation prompt.', short: '-f', default: true]
     ],
     action: lambda do |opts, args|
-      $commands.git.reset_hard!(opts)
+      Processor.new(opts).reset_hard!
+    end
+}
+
+
+$commands.all << {
+    name: 'reset',
+    help: 'Deletes changes in all tracked files. Untracked files will not be affected.',
+    usage: '',
+    options: [],
+    action: lambda do |opts, args|
+      Processor.new(opts).reset_hard!
     end
 }

data/lib/ezgit/commands/scrub.rb

@@ -0,0 +1,21 @@
+require 'ezgit/processor'
+
+$commands.all << {
+    name: 'scrub!',
+    help: 'Bypasses the prompt.',
+    options: [
+        [:force, 'Automatically approve and bypass the confirmation prompt.', short: '-f', default: true]
+    ],
+    action: lambda do |opts, args|
+      Processor.new(opts).clean!(true)
+    end
+}
+
+$commands.all << {
+    name: 'scrub',
+    help: 'Wipes untracked files including ignored files.',
+    options: [],
+    action: lambda do |opts, args|
+      Processor.new(opts).clean!(true)
+    end
+}

data/lib/ezgit/commands/switch.rb

@@ -1,10 +1,22 @@
+$commands.all << {
+    name: 'switch!',
+    help: 'Abandon all changes and switch to the given branch.',
+    usage: '',
+    options: [
+        [:force, 'Automatically approve and bypass the confirmation prompt.', short: '-f', default: true]
+    ],
+    action: lambda do |opts, args|
+      Processor.new(opts).switch!('switch!', args)
+    end
+}
+
+
 $commands.all << {
     name: 'switch',
-    help: 'Switch to the given branch if there are not changes.',
+    help: 'Abandon all changes and switch to the given branch.',
     usage: 'ez switch <branch_name>',
     options: [],
     action: lambda do |opts, args|
-      opts[:switch] = true
-      $commands.git.switch!(opts,args)
+      Processor.new(opts).switch!('switch!', args)
     end
 }

data/lib/ezgit/commands/tree.rb

@@ -7,7 +7,8 @@ $commands.all << {
         [:number, 'Number of entries to display.', short: '-n', default:20]
     ],
     action: lambda do |opts, args|
-      count = args[0] || 20
-      $commands.git.display_log_graph(opts[:number], !opts[:current])
+      count = opts[:number]
+      show_all = !opts[:current]
+      Processor.new(opts).display_log_graph(count, show_all)
     end
 }

data/lib/ezgit/{ez_command.rb → ezgit_command.rb}

@@ -1,6 +1,6 @@
 require 'ezgit/version'
 
-class EzCommand
+class EzgitCommand
 	def self.options(subcommand_names, subcommand_help_list)
 		return Trollop::options do
 		  version Ezgit::VERSION
@@ -8,13 +8,20 @@ class EzCommand
 EZGit is a simple interface for working with git repositories.
 
 Usage:
+        ezgit [<options>] <commands>
+              - or -
         ez [<options>] <commands>
+              - or -
+        eg [<options>] <commands>
+              - or -
+        gt [<options>] <commands>
 
   commands are:
 #{subcommand_help_list}
    options are:
 HELP_DESCRIPTION
-		  opt :dry_run_flag, 'Forces all commands to be passive.', short: '-n'
+		  opt :dry_run, 'Makes all commands passive.', short: '-n'
+      opt :force, 'Forces all prompting off. Use ! at end of command name to do the same.', short: '-f', default: false
 		  opt :debug, 'Shows command level debug info.', short: '-d'
 		  stop_on subcommand_names
 		end

data/lib/ezgit/{git.rb → processor.rb}

@@ -1,14 +1,15 @@
 require 'open3'
 
-class Git
+class Processor
 
-  attr_reader :current_branch, :remote_branch, :all_branches, :all_uniq_branches
+  attr_reader :current_branch, :remote_branch, :all_branches, :all_uniq_branches, :no_prompt, :dry_run, :dry_run_flag
   NO_BRANCH = '(nobranch)'
 
 
   def initialize(global_options)
-    @its_a_dry_run = global_options[:dry_run_flag]
-    @dry_run_flag = @its_a_dry_run ? '-n' : ''
+    @dry_run = global_options[:dry_run]
+    @dry_run_flag = @dry_run ? '-n' : ''
+    @no_prompt = global_options[:force]
   end
 
 
@@ -74,9 +75,9 @@ class Git
 
   def display_log_graph(count = 5, show_all = false)
     puts ''
-    puts "REPOSITORY TREE".white.bold + "(last #{count} commits)"
+    puts "REPOSITORY TREE".bold + "(last #{count} commits)"
     all = show_all ? '--all' : ''
-    stdin, stdout, stderr = Open3.popen3("git log --graph #{all} --format=format:\"#{CYAN}%h #{CLEAR + CYAN}(%cr) #{CYAN}%cn #{CLEAR + WHITE}%s#{CYAN + BOLD}%d#{CLEAR}\" --abbrev-commit --date=relative -n #{count}")
+    stdin, stdout, stderr = Open3.popen3("git log --graph #{all} --format=format:\"#{CYAN}%h #{CLEAR + CYAN}(%cr) #{CYAN}%cn #{CLEAR}%s#{CYAN + BOLD}%d#{CLEAR}\" --abbrev-commit --date=relative -n #{count}")
     err = stderr.readlines
     return puts 'There is no history yet.'.cyan.bold if err.any?
     puts err.join('') + stdout.readlines.join('')
@@ -96,12 +97,12 @@ class Git
   end
 
 
-  def info(opts=nil)
+  def info
     puts '________________________________'
-    $commands.git.display_log_graph
-    $commands.git.display_branch_list_with_current
-    $commands.git.display_current_changes(opts)
-    $commands.git.display_sync_status
+    display_log_graph
+    display_branch_list_with_current
+    display_current_changes
+    display_sync_status
     puts '________________________________'
   end
 
@@ -133,29 +134,29 @@ class Git
 
   def display_sync_status
     puts ''
-    puts '  SYNC STATUS:'.white.bold
+    puts '  SYNC STATUS:'.bold
     stat, count = check_remote_status
     commit_s = (count == 1) ? 'commit' : 'commits'
     case stat
       when :ahead
         puts "  Your #{current_branch.bold + CYAN} branch is ahead of the remote by #{count} #{commit_s}.".cyan
-        puts "  (Use 'ez pull' to update the remote.)".cyan
+        puts "  (Use 'ezgit pull' to update the remote.)".cyan
       when :behind
         puts "  Your #{current_branch.bold + YELLOW} branch is behind the remote by #{count} #{commit_s}.".yellow
-        puts "  (Use 'ez pull' to get the new changes.)".yellow
+        puts "  (Use 'ezgit pull' to get the new changes.)".yellow
       when :rebase
         puts "  Your #{current_branch} branch has diverged #{count} #{commit_s} from the remote.".red.bold
         puts "  (Use must use git directly to put them back in sync.)".red.bold
       when :no_remote
         puts "  Your #{current_branch.bold + CYAN} branch does not yet exist on the remote.".cyan
-        puts "  (Use 'ez pull' to update the remote.)".cyan
+        puts "  (Use 'ezgit pull' to update the remote.)".cyan
       when :headless
         puts "  You are in a headless state (not on a branch)".red.bold
-        puts "  (Use 'ez create <branch>' to create a branch at this commit,".red.bold
-        puts "   or use 'ez switch <branch>' to switch to a branch.)".red.bold
+        puts "  (Use 'ezgit create <branch>' to create a branch at this commit,".red.bold
+        puts "   or use 'ezgit switch <branch>' to switch to a branch.)".red.bold
       else
         puts "  Your #{current_branch.bold + GREEN} branch is in sync with the remote.".green
-        puts "  (Use 'ez pull' to ensure it stays in sync.)".green
+        puts "  (Use 'ezgit pull' to ensure it stays in sync.)".green
     end
   end
 
@@ -171,7 +172,7 @@ class Git
 
   def display_current_changes(opts = nil)
     puts ''
-    puts "  TO BE COMMITTED ON: #{current_branch}".white.bold
+    puts "  TO BE COMMITTED ON: #{current_branch}".bold
     has_changes, changes = check_local_changes(opts)
     puts "  No changes.".green unless has_changes
     changes.collect! { |line|
@@ -189,23 +190,22 @@ class Git
 
   def clone(args)
     return puts 'invalid number of arguments. Requires a source. (Destination is optional.)' if args.count < 1 || args.count > 2
-    return if @its_a_dry_run
+    return if @dry_run
     puts out = `git clone #{args.first} #{args[1]}`
     repo_name = args[1] || out.split('\'')[1]
     puts 'You have created a copy of ' + args.first.to_s.bold + ' in the ' + repo_name.bold + ' directory.' if $? == 0
   end
 
 
-  def clean!(wipe_ignored, opts)
-    x = wipe_ignored ? 'x' : ''
-    stdin, stdout, stderr = Open3.popen3("git clean -dfn#{x}")
-    out = stderr.readlines
-    err = stdout.readlines.join('')
-    puts err.red.bold unless opts[:force]
+  def clean!(wipe_ignored)
+    command = 'git clean -df'
+    command += 'x' if wipe_ignored
+    out, err = call_command_with_out_error(command + 'n')
+    puts err.red.bold unless no_prompt
     return puts 'Nothing to clean.'.green if err.empty?
-    return if @its_a_dry_run
-    run_lambda_with_force_option(opts) do
-      puts `git clean -df#{x} #{@dry_run}`
+    return if dry_run
+    run_lambda_with_prompt do
+      puts `#{command}`
     end
   end
 
@@ -223,48 +223,48 @@ class Git
   end
 
 
-  def run_lambda_with_force_option(opts)
-    unless opts[:force]
-      print 'proceed(y/n)? '.bold
+  def run_lambda_with_prompt(opts = nil)
+    unless no_prompt
+      puts 'proceed(y/n)? '.bold
       return unless prompt_for_y_n
     end
     yield
   end
 
 
-  def reset_hard!(opts)
-    return if @its_a_dry_run
-    puts 'All changes in tracked files will be lost.'.red.bold unless opts[:force]
-    run_lambda_with_force_option(opts) do
+  def reset_hard!
+    return if @dry_run
+    puts 'All changes in tracked files will be lost.'.red.bold unless no_prompt
+    run_lambda_with_prompt do
       puts `git reset --hard`
     end
   end
 
 
-  def goto!(opts, args)
+  def goto!(args)
     return puts "Please specify a commit id.".yellow.bold if args.count < 1
     return puts "Invalid number of arguments. Please specify only a commit id.".yellow.bold if args.count > 1
     commit_id = args[0].to_s
-    return puts "Would go to #{commit_id}" if @its_a_dry_run
-    puts "About to go to #{commit_id}. All changes in tracked files will be lost.".red.bold unless opts[:force]
-    run_lambda_with_force_option(opts) do
+    return puts "Would go to #{commit_id}" if dry_run
+    puts "About to go to #{commit_id}. All changes in tracked files will be lost.".red.bold unless no_prompt
+    run_lambda_with_prompt do
       puts `git reset --hard #{commit_id}`
     end
   end
 
 
-  def create(opts, args)
-    return puts "Please specify a branch name.".yellow.bold if args.count < 1
-    return puts "Invalid number of arguments. Please specify only a branch name.".yellow.bold if args.count > 1
+  def create(args)
+    return puts 'Please specify a branch name.'.yellow.bold if args.count < 1
+    return puts 'Invalid number of arguments. Please specify only a branch name.'.yellow.bold if args.count > 1
     branch_name = args[0].to_s
-    return puts "Would create branch: #{branch_name}" if @its_a_dry_run
+    return puts "Would create branch: #{branch_name}" if dry_run
     `git checkout -b #{branch_name}`
     display_branch_list_with_current
     display_current_changes
   end
 
 
-  def delete!(opts, args)
+  def delete!(args)
     return puts "Please specify a branch name.".yellow.bold if args.count < 1
     return puts "Invalid number of arguments. Please specify only a branch name.".yellow.bold if args.count > 1
     branch_name = args[0].to_s
@@ -278,9 +278,9 @@ class Git
     branches << remote_name if is_remote
     return puts "Cannot delete ".red + branch_name.red.bold + " while you are using it. Please switch to another branch and try again.".red if branches.include?(current_branch)
     return puts "Branch does not exist: ".red + branch_name.red.bold unless branches.any?
-    return puts "Would completely delete branches: #{branches.join(',')}" if @its_a_dry_run
-    print "  Are you sure you want to delete '#{branch_name}'(y/n)?".red.bold
-    return unless run_lambda_with_force_option(opts) do
+    return puts "Would completely delete branches: #{branches.join(',')}" if @dry_run
+    print "  Are you sure you want to delete '#{branch_name}'(y/n)?".red.bold unless no_prompt
+    return unless run_lambda_with_prompt do
       puts `git push --delete #{remote_name.sub('/', ' ')}` if is_remote
       puts `git branch -D #{branch_name}` if is_local
       refresh_branches
@@ -293,7 +293,7 @@ class Git
 #  :switch  - switch if there are not changes. Otherwise halt!
 #  :switch! - clobber all files before switching
 #  :move    - move files with switch
-  def switch!(opts, args)
+  def switch!(mode, args)
     return puts "Please specify a branch name.".yellow.bold if args.count < 1
     return puts "Invalid number of arguments. Please specify only a branch name.".yellow.bold if args.count > 1
     branch_name = args[0].to_s
@@ -301,28 +301,28 @@ class Git
     return puts "Already on branch: #{current_branch.bold}".green if current_branch.eql?(branch_name)
     has_changes, changes = check_local_changes
     #move files with switch
-    if opts[:move]
+    if mode == 'move'
       x = `git checkout #{branch_name}`
       return
     end
     #switch if there are not changes. Otherwise halt!
-    if has_changes && opts[:switch]
+    if has_changes && mode == 'switch'
       display_current_changes
       puts "  Cannot switch branches when you have unresolved changes".red
-      puts "  Use ".red + "'ez switch! <branch>'".red.bold + " to abandon your changes and switch anyway,".red
-      puts "  or use ".red + "'ez move <branch>'".red.bold + " to move your changes and switch.".red
+      puts "  Use ".red + "'ezgit switch! <branch>'".red.bold + " to abandon your changes and switch anyway,".red
+      puts "  or use ".red + "'ezgit move <branch>'".red.bold + " to move your changes and switch.".red
       return
     end
     #clobber all files before switching
     #respect the -f option
-    if has_changes && opts[:switch!]
-      unless opts[:force]
+    if has_changes && mode == 'switch!'
+      unless no_prompt
         display_current_changes
         puts ''
         print "  WARNING: You may lose changes if you switch branches without committing.".red.bold
       end
-      return unless run_lambda_with_force_option(opts) do
-        opts[:force] = true
+      return unless run_lambda_with_prompt do
+        @no_prompt = true
         x = `git clean -df`
         x = `git checkout -f #{branch_name}`
         return
@@ -356,7 +356,7 @@ class Git
     stat, count = check_remote_status
     case stat
       when :rebase
-        if @its_a_dry_run
+        if @dry_run
           puts 'would merge changes'
           display_sync_status
           return
@@ -365,7 +365,7 @@ class Git
         #TODO: CONFLICT HANDLING?
         puts 'TODO: CONFLICT HANDLING?'
       when :behind
-        if @its_a_dry_run
+        if @dry_run
           puts "would reset branch to #{remote_branch}"
           display_sync_status
           return
@@ -384,9 +384,10 @@ class Git
     stat, count = check_remote_status
     if stat.eql?(:rebase) || stat.eql?(:behind)
       puts "  The remote has been updated since you began this sync.".yellow.bold
-      puts "  Try running 'ez pull' again".yellow.bold
+      puts "  Try running 'ezgit pull' again".yellow.bold
     elsif stat.eql?(:no_remote) || stat.eql?(:ahead)
       puts `git push -u #{remote_branch.sub('/', ' ')}`
+      refresh_branches
     elsif stat.eql?(:headless)
       puts '  You cannot push unless you are on a branch.'.red.bold
     else
@@ -396,4 +397,14 @@ class Git
   end
 
 
+  private
+
+
+  def call_command_with_out_error(command)
+    stdin, stdout, stderr = Open3.popen3(command)
+    out = stderr.readlines.join('')
+    err = stdout.readlines.join('')
+    return out, err
+  end
+
 end

data/lib/ezgit/run.rb

@@ -1,9 +1,14 @@
-require 'ezgit/string'
+if RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /mingw32/
+  require 'ezgit/string_no_color'
+else
+  require 'ezgit/string'
+end
+
 require 'ezgit/trollop'
 require 'ezgit/commands'
-require 'ezgit/ez_command'
+require 'ezgit/ezgit_command'
 
 $commands = Commands.new
 $commands.read
-$commands.options = EzCommand::options($commands.names, $commands.help_list)
+$commands.options = EzgitCommand::options($commands.names, $commands.help_list)
 $commands.process

data/lib/ezgit/string_no_color.rb

@@ -0,0 +1,50 @@
+CLEAR   = ''
+BOLD    = ''
+BLACK   = ''
+GREEN   = ''
+RED     = ''
+YELLOW  = ''
+BLUE    = ''
+MAGENTA = ''
+CYAN    = ''
+WHITE   = ''
+
+class String
+
+  def bold
+    self
+  end
+
+  def black
+    self
+  end
+
+  def red
+    self
+  end
+
+  def green
+    self
+  end
+
+  def yellow
+    self
+  end
+
+  def blue
+    self
+  end
+
+  def magenta
+    self
+  end
+
+  def cyan
+    self
+  end
+
+  def white
+    self
+  end
+
+end

data/lib/ezgit/version.rb

@@ -1,3 +1,3 @@
 module Ezgit
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ezgit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,18 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies: []
 description: EZGit is a simple interface for working with git repositories
 email: ajjames@msn.com
 executables:
+- ezgit
 - ez
+- eg
+- gt
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ezgit/commands/clean!.rb
 - lib/ezgit/commands/clean.rb
 - lib/ezgit/commands/clone.rb
 - lib/ezgit/commands/commit.rb
@@ -30,21 +32,23 @@ files:
 - lib/ezgit/commands/pull.rb
 - lib/ezgit/commands/push.rb
 - lib/ezgit/commands/reset.rb
-- lib/ezgit/commands/switch!.rb
+- lib/ezgit/commands/scrub.rb
 - lib/ezgit/commands/switch.rb
 - lib/ezgit/commands/tree.rb
 - lib/ezgit/commands/update.rb
 - lib/ezgit/commands.rb
-- lib/ezgit/ez_command.rb
-- lib/ezgit/git.rb
+- lib/ezgit/ezgit_command.rb
+- lib/ezgit/processor.rb
 - lib/ezgit/run.rb
 - lib/ezgit/string.rb
+- lib/ezgit/string_no_color.rb
 - lib/ezgit/trollop.rb
 - lib/ezgit/version.rb
 - lib/ezgit.rb
+- bin/eg
 - bin/ez
-- bin/ez.bat
-- bin/wac.exe
+- bin/ezgit
+- bin/gt
 - README.md
 homepage: http://github.com/ajjames/ezgit
 licenses:
@@ -56,13 +60,13 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/bin/ez.bat

@@ -1,2 +0,0 @@
-@ECHO OFF
-ruby %~dp0ez %* | %~dp0\wac

data/lib/ezgit/commands/clean!.rb

@@ -1,10 +0,0 @@
-$commands.all << {
-    name: 'clean!',
-    help: 'Wipes all untracked and ignored files.',
-    options: [
-        [:force, 'Automatically approve and bypass the confirmation prompt.', short: '-f']
-    ],
-    action: lambda do |opts, args|
-      $commands.git.clean!(true, opts)
-    end
-}

data/lib/ezgit/commands/switch!.rb

@@ -1,12 +0,0 @@
-$commands.all << {
-    name: 'switch!',
-    help: 'Abandon all changes and switch to the given branch.',
-    usage: 'ez switch! <branch_name>',
-    options: [
-        [:force, 'Automatically approve and bypass the confirmation prompt.', short: '-f']
-    ],
-    action: lambda do |opts, args|
-      opts[:switch!] = true
-      $commands.git.switch!(opts, args)
-    end
-}