di 0.1.6 → 0.1.7

data/README.rdoc

@@ -35,6 +35,26 @@ default settings and some original features:
 
 Run di --help for help.
 
+== USAGE:
+
+Just use di(1) for diff(1).
+
+If you want to use this with svn, you should have a non-paginating
+version of di because svn calls the external diff for each changed
+file:
+
+    ln di ndi
+
+With a default option set in your shell's startup file:
+
+    NDI_OPTIONS=--no-pager
+    export NDI_OPTIONS
+
+Then finally set diff-cmd to the command in ~/.subversion/config.
+
+    [helpers]
+    diff-cmd = ndi
+
 == REQUIREMENTS:
 
 - Ruby 1.8.7 or later
@@ -45,6 +65,8 @@ Run di --help for help.
 
 gem install di
 
+Or just put bin/di to a directory in your PATH.
+
 == COPYRIGHT:
 
 Copyright (c) 2008, 2009, 2010 Akinori MUSHA

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'rake'
 
+load "bin/di"
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -17,6 +19,8 @@ EOS
     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

data/bin/di

@@ -28,11 +28,12 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-MYVERSION = "0.1.3"
+MYVERSION = "0.1.7"
 MYNAME = File.basename($0)
 MYCOPYRIGHT = "Copyright (c) 2008, 2009, 2010 Akinori MUSHA"
 
 DIFF_CMD = ENV.fetch('DIFF', 'diff')
+ENV_NAME = "#{MYNAME.tr('-a-z', '_A-Z')}_OPTIONS"
 EMPTYFILE = '/dev/null'
 
 RSYNC_EXCLUDE_GLOBS = %w(
@@ -369,10 +370,14 @@ Options marked as [!] sign are turned on by default.  To turn them off,
 specify -?- for short options and --no-??? for long options, respectively.
 
 Environment variables:
-    DIFF        Path to diff(1)
-    DI_OPTIONS  User's preferred default options
-    PAGER       Path to pager (more(1) is used if not defined)
 EOS
+      [
+        ['DIFF', 'Path to diff(1)'],
+        [ENV_NAME, 'User\'s preferred default options'],
+        ['PAGER', 'Path to pager (more(1) is used if not defined)'],
+      ].each { |name, description|
+        printf "    %-14s  %s\n", name, description
+      }
       exit 0
     }
   }
@@ -382,7 +387,7 @@ EOS
                '--pager', '--color',
                '-U3', '-N', '-r', '-p', '-d')
 
-    if value = ENV['DI_OPTIONS']
+    if value = ENV[ENV_NAME]
       require 'shellwords'
       opts.parse(*value.shellsplit)
     end
@@ -814,4 +819,4 @@ def colorize_context_diff(io)
   io.close
 end
 
-main(ARGV)
+main(ARGV) if $0 == __FILE__

data/di.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{di}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Akinori MUSHA"]
@@ -27,7 +27,6 @@ default settings and some original features.
      "LICENSE",
      "README.rdoc",
      "Rakefile",
-     "VERSION",
      "bin/di",
      "di.gemspec",
      "test/helper.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Akinori MUSHA
@@ -48,7 +48,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/di
 - di.gemspec
 - test/helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.1.6