diffy 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 926beeabce14fc2e5d5faa98b5ce2254d41fc9c4
-  data.tar.gz: 3d6f3d718606ab9d2a264b6e2d32285f164fd047
+  metadata.gz: eb3152afec5714e6d4d53141e64f7b38ff4d5d56
+  data.tar.gz: b62571f6f39522143e47dcd050a6d14ab58b8a24
 SHA512:
-  metadata.gz: e2b63ca155a9eaa8360a2f17cb259aaf208ac1c7e84c36b1c7451a9bd0ebdbca4b110e12d286f7584018e011a6eed36eee520a2f5a44419300d0ba336acd8cb0
-  data.tar.gz: 6692ef85960a14e3e21e336760eb085991aa1bd480544146ec18241b3e2919807160f0e0e74cb60bda6c7f8bbab3de4b571379de79b80b8cff0759a5d8d84400
+  metadata.gz: 263e73f0eca76d22efa7e31642a04a5c1ace9141d19b5a0a82e5f8f99ca0e5ae9765c277533d45562fd0d60115133440d2df16c218e732e3d858a9b10fe8fbf4
+  data.tar.gz: 56b3365be58e311517718a44bbf56561b61c1e82fb5538c55e667810e035c8a2004250dc98be655e4b13d6479d44c266cdc65cabee6af53979db89fddcd712c3

data/.travis.yml

@@ -1,8 +1,19 @@
 language: ruby
+sudo: false
 rvm:
   - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
+  - 1.9.3-p551
+  - 2.0.0-p648
+  - 2.1.9
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+  - jruby-9.1.5.0
+  - rbx
+  - rbx-2
+matrix:
+  allow_failures:
+    - rvm: 1.8.7
+    - rvm: jruby-9.1.5.0
+    - rvm: rbx
+    - rvm: rbx-2

data/CONTRIBUTORS

@@ -10,3 +10,4 @@
 * Bryan Ricker
 * JasonBarnabe
 * Skye Shaw
+* Abinoam P. Marques Jr.

data/Gemfile

@@ -4,7 +4,4 @@ platforms :rbx do
   gem 'rubysl', '~> 2.0'
 end
 
-
-group :test, :development do
-  gemspec
-end
+gemspec

data/README.md

@@ -149,9 +149,9 @@ all default options such as full diff output are supported.  The output format
 may be changed by passing the format with the options hash (see below), and all
 default formats are supported.
 
-Unlinke `Diffy::Diff`, `Diffy::SplitDiff` does not use `#to_s` to output
+Unlike `Diffy::Diff`, `Diffy::SplitDiff` does not use `#to_s` to output
 the resulting diff.  Instead, two self-explanatory methods are used to output
-the diff; `#left` and `#right`.  Using the earlier example, this is what they
+the diff: `#left` and `#right`.  Using the earlier example, this is what they
 look like in action:
 
 ```
@@ -315,16 +315,6 @@ deletions, and unchanged in a diff.
 Use `#map`, `#inject`, or any of Enumerable's methods.  Go crazy.
 
 
-Ruby Version Compatibility
--------------------------
-
-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:
-
-    $ gem install diffy -v1.1.0
-
 Testing
 ------------
 

data/Rakefile

@@ -3,6 +3,8 @@ require 'rspec/core/rake_task'
 task :default => :spec
 
 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.
+  t.ruby_opts = "-w"
 end

data/diffy.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", '~> 2.14'
-end
+  spec.add_development_dependency "rspec"
+end

data/lib/diffy/diff.rb

@@ -12,7 +12,7 @@ module Diffy
     class << self
       attr_writer :default_format
       def default_format
-        @default_format || :text
+        @default_format ||= :text
       end
 
       # default options passed to new Diff objects
@@ -23,7 +23,7 @@ module Diffy
 
     end
     include Enumerable
-    attr_reader :string1, :string2, :options, :diff
+    attr_reader :string1, :string2, :options
 
     # supported options
     # +:diff+::    A cli options string passed to diff
@@ -67,15 +67,17 @@ module Diffy
       end
     ensure
       # unlink the tempfiles explicitly now that the diff is generated
-      Array(@tempfiles).each do |t|
-        begin
-          # check that the path is not nil and file still exists.
-          # REE seems to be very agressive with when it magically removes
-          # tempfiles
-          t.unlink if t.path && File.exist?(t.path)
-        rescue => e
-          warn "#{e.class}: #{e}"
-          warn e.backtrace.join("\n")
+      if defined? @tempfiles # to avoid Ruby warnings about undefined ins var.
+        Array(@tempfiles).each do |t|
+          begin
+            # check that the path is not nil and file still exists.
+            # REE seems to be very agressive with when it magically removes
+            # tempfiles
+            t.unlink if t.path && File.exist?(t.path)
+          rescue => e
+            warn "#{e.class}: #{e}"
+            warn e.backtrace.join("\n")
+          end
         end
       end
     end

data/lib/diffy/version.rb

@@ -1,3 +1,3 @@
 module Diffy
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/spec/diffy_spec.rb

@@ -115,7 +115,7 @@ describe Diffy::Diff do
   describe "handling temp files" do
     it "should unlink tempfiles after generating the diff" do
       before_tmpfiles = Dir.entries(Dir.tmpdir)
-      d = ::Diffy::Diff.new("a", "b").to_s
+      ::Diffy::Diff.new("a", "b").to_s
       after_tmpfiles = Dir.entries(Dir.tmpdir)
       expect(before_tmpfiles).to match_array(after_tmpfiles)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diffy
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,16 +28,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 description: Convenient diffing in ruby
 email:
 - sgrock@gmail.org
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A convenient way to diff string in ruby