diffy 2.0.2 → 2.0.3

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--profile

data/Gemfile

@@ -1,4 +1,6 @@
+source :rubygems
 
 group :test, :development do
   gem 'rspec', "~>2.0"
+  gem 'rake', '0.8.7'
 end

data/Rakefile

@@ -1,13 +1,12 @@
-require 'spec/rake/spectask'
 require 'rake/rdoctask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
+require 'rspec/core/rake_task'
 
 task :default => :spec
 
 desc "Run all specs in spec directory"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = %w{--color --format profile}
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
 end
 
 Rake::RDocTask.new do |rd|

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/diffy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{diffy}
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2011-06-20}
+  s.date = %q{2011-07-20}
   s.description = %q{Convenient diffing in ruby}
   s.email = %q{sgrock@gmail.com}
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".rspec",
     "CHANGELOG",
     "Gemfile",
     "LICENSE",
@@ -41,11 +42,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, ["~> 2.0"])
+      s.add_development_dependency(%q<rake>, ["= 0.8.7"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.0"])
+      s.add_dependency(%q<rake>, ["= 0.8.7"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.0"])
+    s.add_dependency(%q<rake>, ["= 0.8.7"])
   end
 end
 

data/lib/diffy/diff.rb

@@ -29,9 +29,8 @@ module Diffy
           when 'files'
             [string1, string2]
           end
-        diff ||= Open3.popen3(
-          *[ diff_bin, options[:diff], *paths ]
-        ) { |i, o, e| o.read }
+        diff_opts = options[:diff].is_a?(Array) ? options[:diff] : [options[:diff]]
+        diff = Open3.popen3(diff_bin, *(diff_opts + paths)) { |i, o, e| o.read }
         if diff =~ /\A\s*\Z/
           diff = case options[:source]
           when 'strings' then string1

data/spec/diffy_spec.rb

@@ -39,6 +39,25 @@ describe Diffy::Diff do
     end
   end
 
+  describe "options[:diff]" do
+    it "should accept an option to diff" do
+      @diff = Diffy::Diff.new(" foo\nbar\n", "foo\nbar\n", :diff => "-w")
+      @diff.to_s.should == <<-DIFF
+  foo
+ bar
+      DIFF
+    end
+
+    it "should accept multiple arguments to diff" do
+      @diff = Diffy::Diff.new(" foo\nbar\n", "foo\nbaz\n", :diff => ["-w", "-U 3"])
+      @diff.to_s.should == <<-DIFF
+  foo
+-bar
++baz
+      DIFF
+    end
+  end
+
   describe "#to_s" do
     describe "with no line different" do
       before do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: diffy
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 -07:00
+date: 2011-07-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,6 +33,22 @@ dependencies:
   prerelease: false
   type: :development
   requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  prerelease: false
+  type: :development
+  requirement: *id002
 description: Convenient diffing in ruby
 email: sgrock@gmail.com
 executables: []
@@ -43,6 +59,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
+- .rspec
 - CHANGELOG
 - Gemfile
 - LICENSE