git-ui 0.0.1 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 77391e733d2cbee2262a875174fec4ee2aabbc6b
+  data.tar.gz: af80577a11b1ade2589884746c055b7225a2fab5
+SHA512:
+  metadata.gz: fe9c96a88f0b86c5fa5a74c3c9b3e90c145a56b1298e4e03d03ae7e4621ab7047cee617b6e61630446408324316056d6d9e8379d6ec8c6095c915b021f8faef5
+  data.tar.gz: 1c26b7990f6a4fe5193aeadb2ae08f4ddbab9dc2afa4e095dc759cd809d4e451b0d87cdc8e017a27a1f244644f30c88052b25546ec0f47405bcc4a6d77e53af7

data/Rakefile

@@ -1,5 +1,5 @@
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
+require 'rubygems/package_task'
+require 'rdoc/task'
 
 $: << "#{File.dirname(__FILE__)}/lib"
 
@@ -7,7 +7,7 @@ spec = Gem::Specification.new { |s|
 	s.platform = Gem::Platform::RUBY
 
 	s.author = "Pete Elmore"
-	s.email = "1337p337@gmail.com"
+	s.email = "pete@debu.gs"
 	s.files = Dir["{lib,doc,bin,ext}/**/*"].delete_if {|f| 
 		/\/rdoc(\/|$)/i.match f
 	} + %w(Rakefile)
@@ -20,22 +20,15 @@ spec = Gem::Specification.new { |s|
 	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}"
+	s.homepage = "http://github.com/pete/#{s.name}"
 	%w(colorize escape).each &s.method(:add_dependency)
-	s.version = '0.0.1'
+	s.version = '0.1.0'
 }
 
-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|
+Gem::PackageTask.new(spec) { |pkg|
 	pkg.need_tar_bz2 = true
 }
+
 desc "Cleans out the packaged files."
 task(:clean) {
 	FileUtils.rm_rf 'pkg'
@@ -43,7 +36,7 @@ task(:clean) {
 
 task(:install => :package) { 
 	g = "pkg/#{spec.name}-#{spec.version}.gem"
-	system "sudo gem install -l #{g}"
+	system "gem install -l #{g}"
 }
 
 task(:irb) {

data/lib/git_ui.rb

@@ -92,7 +92,7 @@ module GitUI
 		]
 
 		while i < cs.size
-			puts "#{cs[i][:filename]} (#{i + 1}/#{cs.size})"
+			puts "#{cs[i][:filename]} (#{fsz(cs[i][:filename])}, #{i + 1}/#{cs.size})"
 			decide "Add?", acts, color
 		end
 
@@ -105,6 +105,7 @@ module GitUI
 
 		act = nil
 		loop {
+			uncook_stty!
 			print prompt
 			$stdout.flush
 			inp = $stdin.read(1)
@@ -114,6 +115,7 @@ module GitUI
 					"  #{a.key}: #{a.desc}"
 				}
 			elsif a = acts.find { |a| inp == a.key }
+				cook_stty!
 				return a.block.call
 			else
 				puts "No such action:  #{inp}"
@@ -155,13 +157,26 @@ module GitUI
 		]
 
 		while i < cs.size
-			puts "#{cs[i][:filename]} #{cs[i][:status]} (#{i + 1}/#{cs.size})"
+			puts "#{cs[i][:filename]} #{cs[i][:status]} (#{fsz(cs[i][:filename])}, #{i + 1}/#{cs.size})"
 			decide "Record?", acts, :cyan
 		end
 
 		cs
 	end
 
+	def fsz fn
+		sz = File.stat(fn).size rescue 0
+		st = sz.to_s
+		us = %w(kB MB GB)
+		u = 'B'
+		while sz > 1024 && !us.empty?
+			sz /= 1024.0
+			u = us.shift
+			st = '%0.2f' % sz
+		end
+		st << u
+	end
+
 	def commit(*cs)
 		fs = cs.select { |c| 
 			[:commit, :add].include? c[:action]
@@ -172,7 +187,11 @@ module GitUI
 		end
 		puts "Committing #{fs.join(', ')}...".colorize(:green)
 		system 'git', 'add', *fs
-		system 'git', 'commit', *fs
+		unless system('git', 'commit', *fs)
+			# Put things where they were if the commit failed.
+			puts "Commit failed!  Resetting #{fs.join(', ')}.".colorize(:red)
+			system 'git', 'reset', *fs
+		end
 	end
 
 	def determine_cmd args
@@ -201,5 +220,13 @@ module GitUI
 		end
 	end
 
+	def cook_stty!
+		system "stty sane"
+	end
+
+	def uncook_stty!
+		system "stty -icanon min 1"
+	end
+
 	extend self
 end

metadata

@@ -1,79 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: git-ui
-version: !ruby/object:Gem::Version 
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Pete Elmore
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-04-28 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-12-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: escape
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: 1337p337@gmail.com
-executables: 
+email: pete@debu.gs
+executables:
 - git-i
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - doc/LICENSE
 - doc/TODO
-- doc/README
-files: 
+files:
 - lib/git_ui.rb
 - doc/LICENSE
 - doc/TODO
-- doc/README
 - bin/git-i
 - Rakefile
-has_rdoc: true
-homepage: http://debu.gs/git-ui
+homepage: http://github.com/pete/git-ui
+licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+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: 
+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: 1.3.1
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: Hacky attempt at a workable UI for git, modeled slightly on darcs.
 test_files: []
-