git-ui 0.0.1

data/Rakefile

@@ -0,0 +1,51 @@
+require 'rake/gempackagetask'
+require 'rake/rdoctask'
+
+$: << "#{File.dirname(__FILE__)}/lib"
+
+spec = Gem::Specification.new { |s|
+	s.platform = Gem::Platform::RUBY
+
+	s.author = "Pete Elmore"
+	s.email = "1337p337@gmail.com"
+	s.files = Dir["{lib,doc,bin,ext}/**/*"].delete_if {|f| 
+		/\/rdoc(\/|$)/i.match f
+	} + %w(Rakefile)
+	s.require_path = 'lib'
+	s.has_rdoc = true
+	s.extra_rdoc_files = Dir['doc/*'].select(&File.method(:file?))
+	s.extensions << 'ext/extconf.rb' if File.exist? 'ext/extconf.rb'
+	Dir['bin/*'].map(&File.method(:basename)).map(&s.executables.method(:<<))
+
+	s.name = 'git-ui'
+	s.summary = 'Hacky attempt at a workable UI for git, modeled slightly on '\
+		'darcs.'
+	s.homepage = "http://debu.gs/#{s.name}"
+	%w(colorize escape).each &s.method(:add_dependency)
+	s.version = '0.0.1'
+}
+
+Rake::RDocTask.new(:doc) { |t|
+	t.main = 'doc/README'
+	t.rdoc_files.include 'lib/**/*.rb', 'doc/*', 'bin/*', 'ext/**/*.c', 
+		'ext/**/*.rb'
+	t.options << '-S' << '-N'
+	t.rdoc_dir = 'doc/rdoc'
+}
+
+Rake::GemPackageTask.new(spec) { |pkg|
+	pkg.need_tar_bz2 = true
+}
+desc "Cleans out the packaged files."
+task(:clean) {
+	FileUtils.rm_rf 'pkg'
+}
+
+task(:install => :package) { 
+	g = "pkg/#{spec.name}-#{spec.version}.gem"
+	system "sudo gem install -l #{g}"
+}
+
+task(:irb) {
+	exec "irb -Ilib -r#{spec.name}"
+}

data/bin/git-i

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+
+require 'git_ui'
+include GitUI
+
+args = ARGV.dup
+
+if args.empty? || %w(-h --help -help help).any?(&args.method(:include?))
+	puts "Available commands:",
+		"add:  Add files to the repository",
+		"record:  Record changes (stages and commits) interactively"
+	exit 0
+end
+
+cmd = determine_cmd args
+
+if cmd.nil?
+	$stderr.puts "Command doesn't make sense:  #{args}"
+	exit 1
+end
+
+# git usually gives paths relative to the repo's root, but sometimes requires
+# paths relative to the working directory.
+dotgit = GitUI.find_dotgit
+if File.expand_path('.') != dotgit
+	puts "Looks like the root of this repo is #{dotgit}..."
+	Dir.chdir dotgit
+end
+
+cmd[]

data/doc/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2009 Peter Elmore (pete.elmore at gmail.com)
+
+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/lib/git_ui.rb

@@ -0,0 +1,205 @@
+require 'rubygems'
+%w(colorize escape).each &method(:require)
+
+module GitUI
+	class Action
+		attr_accessor :key, :desc, :block
+		def initialize(k, d, &b)
+			@key = k
+			@desc = d
+			@block = b
+		end
+	end
+
+	def act *a, &b
+		Action.new(*a, &b)
+	end
+
+	def compose *lambdas
+		lambda { |*args|
+			lambdas.reverse.inject(args) { |acc, f| f.call *acc }
+		}
+	end
+
+	def pager
+		@pager ||= %w(GIT_UI_PAGER GIT_PAGER PAGER
+					 ).map { |e| ENV[e] }.compact.first || 'less'
+	end
+
+	def editor
+		@editor ||= %w(GIT_UI_EDITOR GIT_EDITOR VISUAL EDITOR
+					  ).map { |e| ENV[e] }.compact.first || 'vi'
+	end
+
+	def find_dotgit(path = '.')
+		path = original_path = File.expand_path(path)
+		loop {
+			return path if File.directory?(File.join(path, '.git'))
+			p = File.expand_path File.join(path, '..')
+			if p == path
+				raise RuntimeError, "#{original_path} does not appear " \
+					"to be inside a git repository."
+			end
+			path = p
+		}
+	end
+
+	def changes
+		IO.popen('git diff --raw', 'r').readlines.grep(/^:/).map { |l|
+			src_mode, dst_mode, src_sha1, dst_sha1, status, src_path, dst_path =
+				l.sub(/^:/, '').split(/\s+/)
+			{ :status => status,
+			  :filename => (dst_path || src_path).chomp,
+			}
+		}
+	end
+
+	def untracked_files
+		IO.popen('git ls-files -o --exclude-standard', 'r').readlines.map { |f|
+			{ :filename => f.chomp }
+		}
+	end
+
+	def add_untracked
+		cs = untracked_files
+		color = :yellow
+
+		if cs.empty?
+			puts "No new files; try your .gitignore, maybe?".colorize(color)
+			return []
+		end
+
+		i = 0
+		acts = [
+			act('y', "Yes, add this file.") { 
+				cs[i][:action] = :add; i += 1 },
+			act('n', 'No, don\'t add this file.') {
+				cs[i][:action] = nil; i += 1 },
+			act('v', 'View the file') {
+				print File.read(cs[i][:filename]) },
+			act('p', "View this file in a pager (#{pager})") {
+				system "#{pager} #{cs[i][:filename]}" },
+			act('e', "Edit this file using \"#{editor}\"") {
+				edit cs[i][:filename] },
+			act('d', 'Done, skip to commit step.') { i = cs.size },
+			act('a', 'Add all remaining') {
+				cs[i..-1].each { |c| c[:action] = :add }
+				i = cs.size },
+			act('q', 'Quit, skip commit step.') { cs.clear },
+			act('j', 'Jump to next file in list') { i += 1 },
+			act('k', 'Go back to previous file in list') { 
+				i -= 1; i = 0 if i < 0 },
+		]
+
+		while i < cs.size
+			puts "#{cs[i][:filename]} (#{i + 1}/#{cs.size})"
+			decide "Add?", acts, color
+		end
+
+		cs
+	end
+
+	def decide prompt, acts, color = :default
+		keys = acts.map { |act| act.key } << '?'
+		prompt = "#{prompt} [#{keys.join('')}]: ".colorize(color)
+
+		act = nil
+		loop {
+			print prompt
+			$stdout.flush
+			inp = $stdin.read(1)
+			print "\n"
+			if inp == '?'
+				puts acts.map { |a|
+					"  #{a.key}: #{a.desc}"
+				}
+			elsif a = acts.find { |a| inp == a.key }
+				return a.block.call
+			else
+				puts "No such action:  #{inp}"
+			end
+		}
+	end
+
+	def edit filename
+		system "#{editor} #{Escape.shell_single_word filename}"
+	end
+
+	def record *args
+		cs = changes
+		if cs.empty?
+			puts "No changes to record!".colorize(:cyan)
+			return []
+		end
+		i = 0
+
+		acts = [
+			act('y', "Yes, commit this change.") { 
+				cs[i][:action] = :commit; i += 1 },
+			act('n', 'No, don\'t commit this change.') {
+				cs[i][:action] = nil; i += 1 },
+			act('v', 'View this patch') {
+				system "git diff #{cs[i][:filename]}" },
+			act('p', "View this patch in a pager (#{pager})") {
+				system "git diff #{cs[i][:filename]} | #{pager}" },
+			act('e', "Edit this file using \"#{editor}\"") {
+				edit cs[i][:filename] },
+			act('d', 'Done, skip to commit step.') { i = cs.size },
+			act('a', 'Record all remaining') {
+				cs[i..-1].each { |c| c[:action] = :record }
+				i = cs.size },
+			act('q', 'Quit, skip commit step.') { cs.clear },
+			act('j', 'Jump to next patch in list') { i += 1 },
+			act('k', 'Go back to previous patch in list') { 
+				i -= 1; i = 0 if i < 0 },
+		]
+
+		while i < cs.size
+			puts "#{cs[i][:filename]} #{cs[i][:status]} (#{i + 1}/#{cs.size})"
+			decide "Record?", acts, :cyan
+		end
+
+		cs
+	end
+
+	def commit(*cs)
+		fs = cs.select { |c| 
+			[:commit, :add].include? c[:action]
+		}.map { |c| c[:filename] }
+		if fs.empty?
+			puts "Nothing to commit.".colorize(:red)
+			return
+		end
+		puts "Committing #{fs.join(', ')}...".colorize(:green)
+		system 'git', 'add', *fs
+		system 'git', 'commit', *fs
+	end
+
+	def determine_cmd args
+		stty_cooked = lambda { |*args| system "stty sane"; args }
+		stty_raw = lambda { |*args| system "stty -icanon min 1"; args }
+
+		cmd, *args = args
+
+		case cmd
+		when /^rec/i
+			lambda {
+				compose(method(:commit),
+						stty_cooked, 
+						method(:record), 
+						stty_raw)[*args]
+			}
+		when /^add/i
+			lambda {
+				compose(method(:commit),
+						stty_cooked,
+						method(:add_untracked),
+						stty_raw)[*args]
+			}
+		else
+			nil
+		end
+	end
+
+	extend self
+end

metadata

@@ -0,0 +1,79 @@
+--- !ruby/object:Gem::Specification 
+name: git-ui
+version: !ruby/object:Gem::Version 
+  version: 0.0.1
+platform: ruby
+authors: 
+- Pete Elmore
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-04-28 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: colorize
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: escape
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: 
+email: 1337p337@gmail.com
+executables: 
+- git-i
+extensions: []
+
+extra_rdoc_files: 
+- doc/LICENSE
+- doc/TODO
+- doc/README
+files: 
+- lib/git_ui.rb
+- doc/LICENSE
+- doc/TODO
+- doc/README
+- bin/git-i
+- Rakefile
+has_rdoc: true
+homepage: http://debu.gs/git-ui
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: Hacky attempt at a workable UI for git, modeled slightly on darcs.
+test_files: []
+