diffy 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4630bbb61fafc825f88c597d083f9e572922e6e4
-  data.tar.gz: f759b2c31ac7a77dfe8328ccef9eea52a837c377
+  metadata.gz: 2b046b2d411fcf289de53a9f8fde302d1d7ab5a5
+  data.tar.gz: d0b6638a247807c18afefef9f8cb9414581b1fc3
 SHA512:
-  metadata.gz: fea41f6fea9ef329bceb72d8057a6ab40027af3bf00a5b2ad3f35a3e6696b9ce8e28e24968cd8bfc8f573488aba6699e2787f6417a5953de8fea893986b102e6
-  data.tar.gz: 4bc4f2ab161a654d408a649b8efcef517d6604eb2be4d7ca343bb4c00b28f5ae05d11f0e99979fcb831846ee72bf638e931029832d62d6d154fdbf5874d067cb
+  metadata.gz: 8266ca734ad349afd9728e12b3d34ac226e6c993bd79bba16481018ec5d03836c9edb8d9f4bc93a845adbfd52c56bab8118259304d57ed37e70399472f5493cf
+  data.tar.gz: 0d3cf9397e5fba6d42fb9f60514a537a1003210695a5dd5eefd5ad15b69f55aa06f027ac5a83400badbf20dd2a8d4b24b92667178a472d4f907999831a5d9ab6

data/.gitignore

@@ -0,0 +1,5 @@
+*.gem
+*.swp
+Gemfile.lock
+tags
+.bundle

data/.travis.yml

@@ -4,3 +4,6 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - 2.1.1
+  - rbx

data/CONTRIBUTORS

@@ -7,3 +7,4 @@
 * Nigel Thorne
 * Richard Stiller
 * printercu
+* Bryan Ricker

data/Gemfile

@@ -1,6 +1,10 @@
-source :rubygems
+source 'https://rubygems.org'
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+end
+
 
 group :test, :development do
-  gem 'rspec', "~>2.0"
-  gem 'rake', '~>0.9.2'
+  gemspec
 end

data/README.md

@@ -14,7 +14,7 @@ It provides several built in format options which can be passed to
 
 * `:text`         - Plain text output
 * `:color`        - ANSI colorized text suitable for use in a terminal
-* `:html`         - HTML output.  Since version 2.0 this format does inline highlighting of the changes between two the changes within lines.
+* `:html`         - HTML output.  Since version 2.0 this format does inline highlighting of the character changes between lines.
 * `:html_simple`  - HTML output without inline highlighting.  This may be useful in situations where high performance is required or simpler output is desired.
 
 A default format can be set like so:
@@ -38,14 +38,14 @@ Installation
     1.  install unxutils <http://sourceforge.net/projects/unxutils>
 
         note that these tools contain diff 2.7 which has a different handling
-        of whitespace in the diff results. This makes diffy spec tests
-        yielding one fail on windows.
+        of whitespace in the diff results. This makes Diffy spec tests
+        yielding one fail on Windows.
 
     2.  install these two individually from the gnuwin32 project
         <http://gnuwin32.sourceforge.net/>
 
-        note that this delivers diff 2.8 which makes diffy spec pass
-        even on windows.
+        note that this delivers diff 2.8 which makes Diffy spec pass
+        even on Windows.
 
 
 2.   install the gem by
@@ -133,7 +133,7 @@ You can diff files instead of strings by using the `:source` option.
 
 ### Full Diff Output
 
-By default diffy removes the superfluous diff output.  This is because its
+By default Diffy removes the superfluous diff output.  This is because its
 default is to show the complete diff'ed file (`diff -U 10000` is the default).
 
 Diffy does support full output, just use the `:include_diff_info => true`
@@ -151,7 +151,7 @@ And even deals a bit with the formatting!
 
 ### Empty Diff Behavior
 
-By default diffy will return empty string if there are no
+By default Diffy will return empty string if there are no
 differences in inputs. In previous versions the full text of its first input
 was returned in this case. To restore this behaviour simply use the
 `:allow_empty_diff => false` option when initializing.
@@ -203,7 +203,7 @@ Default Diff Options
 
 You can set the default options for new `Diffy::Diff`s using the
 `Diffy::Diff.default_options` and `Diffy::Diff.default_options=` methods.
-Options passed to Diffy::Diff.new will be merged into the default options.
+Options passed to `Diffy::Diff.new` will be merged into the default options.
 
     >> Diffy::Diff.default_options
     => {:diff=>"-U 10000", :source=>"strings", :include_diff_info=>false, :include_plus_and_minus_in_html=>false}
@@ -215,7 +215,7 @@ Custom Formats
 --------------
 
 Diffy tries to make generating your own custom formatted output easy.
-`Diffy::Diff` provides an enumberable interface which lets you iterate over
+`Diffy::Diff` provides an enumerable interface which lets you iterate over
 lines in the diff.
 
     >> Diffy::Diff.new("foo\nbar\n", "foo\nbar\nbaz\n").each do |line|
@@ -239,7 +239,7 @@ Use `#map`, `#inject`, or any of Enumerable's methods.  Go crazy.
 Ruby Version Compatibility
 -------------------------
 
-Support for Ruby 1.8.6 was dropped beggining at version 2.0 in order to support
+Support for Ruby 1.8.6 was dropped beginning at version 2.0 in order to support
 the chainable enumerators available in 1.8.7 and 1.9.
 
 If you want to use Diffy and Ruby 1.8.6 then:

data/Rakefile

@@ -1,9 +1,3 @@
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rake/rdoctask'
-end
-require 'rubygems/package_task'
 require 'rspec/core/rake_task'
 
 task :default => :spec
@@ -12,31 +6,3 @@ desc "Run all specs in spec directory"
 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|
-  rd.main = "README"
-  rd.rdoc_dir = 'doc'
-  rd.rdoc_files.include("README", "**/*.rb")
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = %q{diffy}
-
-    s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-    s.authors = ["Sam Goldstein"]
-    s.description = %q{Convenient diffing in ruby}
-    s.email = %q{sgrock@gmail.com}
-    s.has_rdoc = true
-    s.homepage = "http://github.com/samg/diffy/tree/master"
-    s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
-    s.require_paths = ["lib"]
-    s.summary = %q{A convenient way to diff string in ruby}
-    s.license = 'MIT'
-
-  end
-rescue LoadError
-  puts "Jeweler not available."
-end
-

data/diffy.gemspec

@@ -1,60 +1,23 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'diffy/version'
 
-Gem::Specification.new do |s|
-  s.name = "diffy"
-  s.version = "3.0.1"
+Gem::Specification.new do |spec|
+  spec.name          = "diffy"
+  spec.version       = Diffy::VERSION
+  spec.authors       = ["Sam Goldstein"]
+  spec.email         = ["sgrock@gmail.org"]
+  spec.description   = "Convenient diffing in ruby"
+  spec.summary       = "A convenient way to diff string in ruby"
+  spec.homepage      = "http://github.com/samg/diffy"
+  spec.license       = "MIT"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Sam Goldstein"]
-  s.date = "2013-07-16"
-  s.description = "Convenient diffing in ruby"
-  s.email = "sgrock@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    ".rspec",
-    ".travis.yml",
-    "CHANGELOG",
-    "CONTRIBUTORS",
-    "Gemfile",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "diffy.gemspec",
-    "lib/diffy.rb",
-    "lib/diffy/css.rb",
-    "lib/diffy/diff.rb",
-    "lib/diffy/format.rb",
-    "lib/diffy/html_formatter.rb",
-    "spec/demo_app.rb",
-    "spec/diffy_spec.rb"
-  ]
-  s.homepage = "http://github.com/samg/diffy/tree/master"
-  s.licenses = ["MIT"]
-  s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.2"
-  s.summary = "A convenient way to diff string in ruby"
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    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.9.2"])
-    else
-      s.add_dependency(%q<rspec>, ["~> 2.0"])
-      s.add_dependency(%q<rake>, ["~> 0.9.2"])
-    end
-  else
-    s.add_dependency(%q<rspec>, ["~> 2.0"])
-    s.add_dependency(%q<rake>, ["~> 0.9.2"])
-  end
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec", '~> 2.0'
 end
-

data/lib/diffy/diff.rb

@@ -49,7 +49,7 @@ module Diffy
 
         if WINDOWS
           # don't use open3 on windows
-          cmd = "\"#{diff_bin}\" #{diff_options.join(' ')} #{paths.join(' ')}"
+          cmd = "\"#{diff_bin}\" #{diff_options.join(' ')} #{paths.map{|s| "\"#{s}\""}.join(' ')}"
           diff = `#{cmd}`
         else
           diff = Open3.popen3(diff_bin, *(diff_options + paths)) { |i, o, e| o.read }

data/lib/diffy/html_formatter.rb

@@ -41,7 +41,7 @@ module Diffy
 
     def wrap_lines(lines)
       if lines.empty?
-        %'<div class="diff"/>'
+        %'<div class="diff"></div>'
       else
         %'<div class="diff">\n  <ul>\n#{lines.join("\n")}\n  </ul>\n</div>\n'
       end

data/lib/diffy/version.rb

@@ -0,0 +1,3 @@
+module Diffy
+  VERSION = '3.0.2'
+end

data/spec/diffy_spec.rb

@@ -4,8 +4,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'diffy')
 describe Diffy::Diff do
 
   describe "diffing two files" do
-    def tempfile(string)
-      t = Tempfile.new('diffy-spec')
+    def tempfile(string, fn = 'diffy-spec')
+      t = Tempfile.new(fn)
       # ensure tempfiles aren't unlinked when GC runs by maintaining a
       # reference to them.
       @tempfiles ||=[]
@@ -27,6 +27,36 @@ describe Diffy::Diff do
       DIFF
     end
 
+    it "should accept file paths with spaces as arguments" do
+      string1 = "foo\nbar\nbang\n"
+      string2 = "foo\nbang\n"
+      path1, path2 = tempfile(string1, 'path with spaces'), tempfile(string2, 'path with spaces')
+      Diffy::Diff.new(path1, path2, :source => 'files').to_s.should == <<-DIFF
+ foo
+-bar
+ bang
+      DIFF
+    end
+
+    it "should accept file paths with spaces as arguments on windows" do
+      begin
+
+        orig_verbose, $VERBOSE = $VERBOSE, nil #silence redefine constant warnings
+        orig_windows, Diffy::WINDOWS = Diffy::WINDOWS, true
+        string1 = "foo\nbar\nbang\n"
+        string2 = "foo\nbang\n"
+        path1, path2 = tempfile(string1, 'path with spaces'), tempfile(string2, 'path with spaces')
+        Diffy::Diff.new(path1, path2, :source => 'files').to_s.should == <<-DIFF
+ foo
+-bar
+ bang
+        DIFF
+      ensure
+        Diffy::WINDOWS, $VERBOSE = orig_windows, orig_verbose
+      end
+
+    end
+
     describe "with no line different" do
       before do
         string1 = "foo\nbar\nbang\n"

metadata

@@ -1,92 +1,92 @@
 --- !ruby/object:Gem::Specification
 name: diffy
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '2.0'
 description: Convenient diffing in ruby
-email: sgrock@gmail.com
+email:
+- sgrock@gmail.org
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.md
+extra_rdoc_files: []
 files:
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - diffy.gemspec
 - lib/diffy.rb
 - lib/diffy/css.rb
 - lib/diffy/diff.rb
 - lib/diffy/format.rb
 - lib/diffy/html_formatter.rb
+- lib/diffy/version.rb
 - spec/demo_app.rb
 - spec/diffy_spec.rb
-homepage: http://github.com/samg/diffy/tree/master
+homepage: http://github.com/samg/diffy
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
-rdoc_options:
-- --inline-source
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 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: 2.0.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A convenient way to diff string in ruby
-test_files: []
+test_files:
+- spec/demo_app.rb
+- spec/diffy_spec.rb

data/VERSION

@@ -1 +0,0 @@
-3.0.1