diffy 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb3152afec5714e6d4d53141e64f7b38ff4d5d56
-  data.tar.gz: b62571f6f39522143e47dcd050a6d14ab58b8a24
+  metadata.gz: 8126b4d4207609139dafef922f5ac9079dbe775b
+  data.tar.gz: 9b7eb9af119aed244cf82e9caa2bc89340ac8f27
 SHA512:
-  metadata.gz: 263e73f0eca76d22efa7e31642a04a5c1ace9141d19b5a0a82e5f8f99ca0e5ae9765c277533d45562fd0d60115133440d2df16c218e732e3d858a9b10fe8fbf4
-  data.tar.gz: 56b3365be58e311517718a44bbf56561b61c1e82fb5538c55e667810e035c8a2004250dc98be655e4b13d6479d44c266cdc65cabee6af53979db89fddcd712c3
+  metadata.gz: b9a542ef87e8b5a4f7eaba863bb0cc6157d462e478153b3aa68fc0303fbd92367ec8fb8fe5a3ca215023d595164c97c7414355829c809deb511c96c5e614f60b
+  data.tar.gz: 0cd0450cda92e1c04283fa93122284abd027a9fe9ebffc86348228aa0c37c993781fa5faaf8cbe52e00cba1412f4100006e4873a3ba0bed11b3384dedefc921f

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 sudo: false
+cache: bundler
 rvm:
   - 1.8.7
   - 1.9.3-p551
@@ -8,12 +9,7 @@ rvm:
   - 2.2.6
   - 2.3.3
   - 2.4.0
-  - jruby-9.1.5.0
-  - rbx
-  - rbx-2
+  - jruby-9.1.12.0
 matrix:
   allow_failures:
     - rvm: 1.8.7
-    - rvm: jruby-9.1.5.0
-    - rvm: rbx
-    - rvm: rbx-2

data/CHANGELOG

@@ -1,3 +1,5 @@
+== 3.2.1 ==
+Fix default options on alpine linux.  Thanks @evgen!
 == 3.1.0 ==
 Side by side diffs.  Thanks Runar Skaare Tveiten!
 

data/CONTRIBUTORS

@@ -11,3 +11,4 @@
 * JasonBarnabe
 * Skye Shaw
 * Abinoam P. Marques Jr.
+* evgen

data/Gemfile

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

data/README.md

@@ -24,11 +24,11 @@ A default format can be set like so:
 Installation
 ------------
 
-###on Unix
+### on Unix
 
     gem install diffy
 
-###on Windows:
+### on Windows:
 
 1.  Ensure that you have a working `diff` on your machine and in your search path.
 
@@ -213,7 +213,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
-default is to show the complete diff'ed file (`diff -U 10000` is the default).
+default is to show the complete diff'ed file (`diff -U10000` is the default).
 
 Diffy does support full output, just use the `:include_diff_info => true`
 option when initializing:
@@ -270,7 +270,7 @@ file).
 ### Overriding the command line options passed to diff.
 
 You can use the `:diff` option to override the command line options that are
-passed to unix diff. They default to `-U 10000`.  This option will noop if
+passed to unix diff. They default to `-U10000`.  This option will noop if
 combined with the `:context` option.
 
     >> puts Diffy::Diff.new(" foo\nbar\n", "foo\nbar\n", :diff => "-w")
@@ -285,9 +285,9 @@ You can set the default options for new `Diffy::Diff`s using the
 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}
+    => {:diff=>"-U10000", :source=>"strings", :include_diff_info=>false, :include_plus_and_minus_in_html=>false}
     >> Diffy::Diff.default_options.merge!(:source => 'files')
-    => {:diff=>"-U 10000", :source=>"files", :include_diff_info=>false, :include_plus_and_minus_in_html=>false}
+    => {:diff=>"-U10000", :source=>"files", :include_diff_info=>false, :include_plus_and_minus_in_html=>false}
 
 
 Custom Formats

data/diffy.gemspec

@@ -20,4 +20,4 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-end
+end

data/lib/diffy/diff.rb

@@ -1,7 +1,7 @@
 module Diffy
   class Diff
     ORIGINAL_DEFAULT_OPTIONS = {
-      :diff => '-U 10000',
+      :diff => '-U10000',
       :source => 'strings',
       :include_diff_info => false,
       :include_plus_and_minus_in_html => false,

data/lib/diffy/format.rb

@@ -3,7 +3,7 @@ module Diffy
     # ANSI color output suitable for terminal output
     def color
       map do |line|
-        case line          
+        case line
         when /^(---|\+\+\+|\\\\)/
           "\033[90m#{line.chomp}\033[0m"
         when /^\+/

data/lib/diffy/version.rb

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

data/spec/diffy_spec.rb

@@ -590,7 +590,7 @@ end
 
 describe Diffy::SplitDiff do
   before do
-    ::Diffy::Diff.default_options.merge!(:diff => '-U 10000')
+    ::Diffy::Diff.default_options.merge!(:diff => '-U10000')
   end
 
   it "should fail with invalid format" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diffy
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2018-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A convenient way to diff string in ruby