di 0.3.1 → 0.3.2

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/HISTORY

@@ -1,3 +1,7 @@
+== 0.3.2 2013-01-09
+
+* Do not choke on encoding errors when colorizing on Ruby 1.9+.
+
 == 0.3.1 2012-05-21
 
 * Resurrect -L which Subversion still relies on.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008, 2009, 2010, 2011, 2012 Akinori MUSHA
+Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Akinori MUSHA
 
 All rights reserved.
 

data/README.rdoc

@@ -72,6 +72,6 @@ Or just install lib/di.rb as "di" to a directory in your PATH.
 
 == COPYRIGHT:
 
-Copyright (c) 2008, 2009, 2010, 2011, 2012 Akinori MUSHA
+Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Akinori MUSHA
 
 See LICENSE for license terms.

data/Rakefile

@@ -1,62 +1 @@
-require 'rubygems'
-require 'rake'
-
-load 'lib/di.rb'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "di"
-    gem.summary = %Q{A wrapper around GNU diff(1)}
-    gem.description = <<EOS
-The di(1) command wraps around GNU diff(1) to provide reasonable
-default settings and some original features.
-EOS
-    gem.email = "knu@idaemons.org"
-    gem.homepage = "https://github.com/knu/di"
-    gem.authors = ["Akinori MUSHA"]
-    gem.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-    gem.executables = ["di"]
-
-    gem.version = MYVERSION
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "di #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require "bundler/gem_tasks"

data/di.gemspec

@@ -1,50 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'di'
 
-Gem::Specification.new do |s|
-  s.name = "di"
-  s.version = "0.3.1"
+Gem::Specification.new do |gem|
+  gem.name          = "di"
+  gem.version       = MYVERSION
+  gem.authors       = ["Akinori MUSHA"]
+  gem.email         = ["knu@idaemons.org"]
+  gem.description   = <<EOS
+The di(1) command wraps around GNU diff(1) to provide reasonable
+default settings and some original features.
+EOS
+  gem.summary       = %q{A wrapper around GNU diff(1)}
+  gem.homepage      = "https://github.com/knu/di"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Akinori MUSHA"]
-  s.date = "2012-05-21"
-  s.description = "The di(1) command wraps around GNU diff(1) to provide reasonable\ndefault settings and some original features.\n"
-  s.email = "knu@idaemons.org"
-  s.executables = ["di"]
-  s.extra_rdoc_files = [
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
   ]
-  s.files = [
-    ".document",
-    "HISTORY",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "bin/di",
-    "di.gemspec",
-    "lib/di.rb",
-    "test/helper.rb",
-    "test/test_di.rb"
-  ]
-  s.homepage = "https://github.com/knu/di"
-  s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-  s.rubygems_version = "1.8.23"
-  s.summary = "A wrapper around GNU diff(1)"
+  gem.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-  end
+  gem.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 end
-

data/lib/di.rb

@@ -3,7 +3,7 @@
 #
 # di - a wrapper around GNU diff(1)
 #
-# Copyright (c) 2008, 2009, 2010, 2011, 2012 Akinori MUSHA
+# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Akinori MUSHA
 #
 # All rights reserved.
 #
@@ -28,9 +28,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-MYVERSION = "0.3.1"
+MYVERSION = "0.3.2"
 MYNAME = File.basename($0)
-MYCOPYRIGHT = "Copyright (c) 2008, 2009, 2010, 2011, 2012 Akinori MUSHA"
+MYCOPYRIGHT = "Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Akinori MUSHA"
 
 DIFF_CMD = ENV.fetch('DIFF', 'diff')
 ENV_NAME = "#{MYNAME.tr('-a-z', '_A-Z')}_OPTIONS"
@@ -95,6 +95,8 @@ def setup
     :unchanged	=> "",
     :whitespace	=> "\e[41m",
     :off	=> "\e[m",
+    :open_inv	=> "\e[7m",
+    :close_inv	=> "\e[27m",
   }
   $diff.reversed = false
 end
@@ -705,6 +707,7 @@ def colorize_unified_diff(io)
   state = :comment
   hunk_left = nil
   io.each_line { |line|
+    replace_invalid_bytes!(line)
     case state
     when :comment
       case line
@@ -769,6 +772,7 @@ def colorize_context_diff(io)
   state = :comment
   hunk_part = nil
   io.each_line { |line|
+    replace_invalid_bytes!(line)
     case state
     when :comment
       case line
@@ -844,4 +848,21 @@ def colorize_context_diff(io)
   io.close
 end
 
+def replace_invalid_bytes!(text)
+  colors = $diff.colors
+  text.replace(text.replace_invalid_bytes { |byte|
+      '%s<%02X>%s' % [colors[:open_inv], byte, colors[:close_inv]]
+    })
+end
+
+class String
+  def replace_invalid_bytes
+    return self if !defined?(Encoding) || valid_encoding?
+
+    each_char.inject('') { |s, c|
+      s << (c.valid_encoding? ? c : yield(*c.bytes))
+    }
+  end
+end
+
 main(ARGV) if $0 == __FILE__

metadata

@@ -1,50 +1,32 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: di
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Akinori MUSHA
 autorequire: 
 bindir: bin
 cert_chain: []
+date: 2013-01-09 00:00:00.000000000 Z
+dependencies: []
+description: ! 'The di(1) command wraps around GNU diff(1) to provide reasonable
 
-date: 2012-05-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-description: |
-  The di(1) command wraps around GNU diff(1) to provide reasonable
   default settings and some original features.
 
-email: knu@idaemons.org
-executables: 
+'
+email:
+- knu@idaemons.org
+executables:
 - di
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
+- .gitignore
 - HISTORY
 - LICENSE
 - README.rdoc
@@ -56,38 +38,28 @@ files:
 - test/test_di.rb
 homepage: https://github.com/knu/di
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A wrapper around GNU diff(1)
-test_files: []
-
+test_files:
+- test/helper.rb
+- test/test_di.rb