legit 0.0.1 → 0.0.2

data/bin/legit

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
+require 'legit'
+
+Legit.start

data/legit.gemspec

@@ -3,7 +3,7 @@ require File.expand_path("../lib/legit/version", __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Dillon Kearns"]
   gem.email         = ["dillon@dillonkearns.com"]
-  gem.description   = "A collection of scripts for common git tasks, to simplify and improve workflow."
+  gem.description   = "A collection of scripts for common git tasks to simplify and improve workflow."
   gem.summary       = gem.description
   gem.homepage      = "https://github.com/dillonkearns/legit"
 
@@ -18,4 +18,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake", "~> 10.0.3"
   gem.add_runtime_dependency     "colorize", "~> 0.5.8"
+  gem.add_runtime_dependency     "thor", "~> 0.16.0"
 end

data/lib/legit/version.rb

@@ -1,3 +1,3 @@
 module Legit
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/legit.rb

@@ -0,0 +1,44 @@
+require 'legit_helper'
+require 'thor'
+
+class Legit < Thor
+  desc "log", "print a graph-like log"
+  def log
+    system("git log --pretty=format:'%C(yellow)%h%Creset%C(bold cyan)%d%Creset %s %Cgreen(%cr)%Creset %C(bold magenta) <%an>%Creset' --graph --abbrev-commit --date=relative")
+  end
+
+  desc "catch-todos [TODO_FORMAT]", "Abort commit if any todos in TODO_FORMAT found"
+  method_options %w[warn -w] => :boolean, :desc => 'Warn and prompt the user to choose whether to abort the commit'
+  def catch_todos(todo_format = "TODO")
+    system("git diff --staged | grep '^+' | grep #{todo_format}")
+
+    if $?.success?
+      if options[:warn]
+        exit 1 unless positive_response?("[pre-commit hook] Found staged `#{todo_format}`s. Do you still want to continue?", :warning)
+      else
+        show("[pre-commit hook] Aborting commit... found staged `#{todo_format}`s.", :warning)
+        exit 1
+      end
+    else
+      show("Success: No #{todo_format}s staged.", :success)
+    end
+  end
+
+  desc "delete BRANCH", "Delete BRANCH both locally and remotely"
+  def delete(branch_name)
+    system("git branch -d #{branch_name}")
+
+    if $?.success?
+      delete_remote_branch(branch_name)
+    else
+      show("Force delete branch #{branch_name}? (y/n)", :warning)
+      if STDIN.gets.chomp =~ /^y/
+        system("git branch -D #{branch_name}")
+        delete_remote_branch(branch_name)
+      else
+        puts "Abort. #{branch_name} not deleted"
+      end
+    end
+  end
+
+end

data/lib/legit_helper.rb

@@ -15,6 +15,8 @@ def show(message, type = :success)
         :green
       when :warning
         :red
+      when :normal
+        :white
       else
         raise 'Unknown prompt type'
       end
@@ -22,3 +24,8 @@ def show(message, type = :success)
   puts message.send(color)
 end
 
+
+def positive_response?(message, type = :normal)
+  show("#{message} (y/n)", type)
+  STDIN.gets.chomp =~ /y/
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: legit
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Dillon Kearns
@@ -50,13 +50,27 @@ dependencies:
   prerelease: false
   name: colorize
   type: :runtime
-description: A collection of scripts for common git tasks, to simplify and improve workflow.
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 95
+        segments: 
+        - 0
+        - 16
+        - 0
+        version: 0.16.0
+  requirement: *id003
+  prerelease: false
+  name: thor
+  type: :runtime
+description: A collection of scripts for common git tasks to simplify and improve workflow.
 email: 
 - dillon@dillonkearns.com
 executables: 
-- git-catch-todos
-- git-delete
-- git-push-upstream
+- legit
 extensions: []
 
 extra_rdoc_files: []
@@ -67,10 +81,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/git-catch-todos
-- bin/git-delete
-- bin/git-push-upstream
+- bin/legit
 - legit.gemspec
+- lib/legit.rb
 - lib/legit/version.rb
 - lib/legit_helper.rb
 has_rdoc: true
@@ -108,6 +121,6 @@ rubyforge_project:
 rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
-summary: A collection of scripts for common git tasks, to simplify and improve workflow.
+summary: A collection of scripts for common git tasks to simplify and improve workflow.
 test_files: []
 

data/bin/git-catch-todos

@@ -1,14 +0,0 @@
-#! /usr/bin/ruby
-
-require 'lib/legit_helper'
-
-todo_string = ARGV[0] || 'TODO'
-system("git diff --staged | grep '^+' | grep #{todo_string}")
-
-if $?.success?
-  show("[pre-commit hook] Aborting commit... found staged `#{todo_string}`s.", :warning)
-  exit 1
-else
-  show("Success: No `#{todo_string}`s staged.", :success)
-  exit 0
-end

data/bin/git-delete

@@ -1,19 +0,0 @@
-#! /usr/bin/ruby
-
-require 'lib/legit_helper'
-
-branch_name = ARGV[0] or raise 'Must pass in branch name'
-
-system("git branch -d #{branch_name}")
-
-if $?.success?
-  delete_remote_branch(branch_name)
-else
-  show("Force delete branch #{branch_name}? (y/n)", :warning)
-  if STDIN.gets.chomp =~ /^y/
-    system("git branch -D #{branch_name}")
-    delete_remote_branch(branch_name)
-  else
-    puts "Abort. #{branch_name} not deleted"
-  end
-end

data/bin/git-push-upstream

@@ -1,19 +0,0 @@
-#! /usr/bin/ruby
-
-require 'lib/legit_helper'
-
-branch_name = ARGV[0] or raise 'Must pass in branch name'
-
-system("git branch -d #{branch_name}")
-
-if $?.success?
-  delete_remote_branch(branch_name)
-else
-  show("Force delete branch #{branch_name}? (y/n)", :warning)
-  if STDIN.gets.chomp =~ /^y/
-    system("git branch -D #{branch_name}")
-    delete_remote_branch(branch_name)
-  else
-    puts "Abort. #{branch_name} not deleted"
-  end
-end