multidiff 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d524c113d3bd8161f42ec01aaee73ada4dba99d4
-  data.tar.gz: 2d1ecdcf106ccbc01dc0a2667b5a8f33f21d77b3
+  metadata.gz: d812370c102a82aedd3ae30a6c1102f29391f8bd
+  data.tar.gz: 4120193fd2c2d1bbb844bea137b3225a0579302f
 SHA512:
-  metadata.gz: 4f63fea304d251e76ce1b875ad092d26eef565b06c8a193dc659c43c6500725742a6140cec9019fed6ac8e85bbcec15163bc6f3c965046437917f8c2608dddb3
-  data.tar.gz: 39ba9a22c16dc08544cc4d8a0587b4bb52c85380d823b2054ca0733b635592633c218d7a5b228858ea52f74904855d7bb24f5fc08b4521cab8303dcc5112eaf9
+  metadata.gz: ff5c2c6113b1ba3d9f32e97e91f3d30ad4ad5aa2187eec64c9ba489b3fc2606e72fd624d863e41f502f8d1ac01e2b6df4d3aef313b5abee944760c74f7da1ff4
+  data.tar.gz: 5d65cb4cda0747750babc4605b818061c7cfd62241ab614d0ae6514c48237d5ea7bc542354b9eef193ae32ddcb764b1052305f066cadddd5390d4e954c55fe63

data/.travis.yml

@@ -1,8 +1,13 @@
 language: ruby
 
 rvm:
+  - 2.1.0
+  - 2.2.0
   - 2.3.1
 
+before_install:
+  - gem install bundler
+
 script:
   - bundle exec rubocop
   - bundle exec rspec

data/README.md

@@ -1,3 +1,4 @@
+[![Gem Version](https://badge.fury.io/rb/multidiff.svg)](https://badge.fury.io/rb/multidiff)
 [![Build Status](https://secure.travis-ci.org/mpugach/multidiff.png?branch=master)](https://travis-ci.org/mpugach/multidiff)
 [![Code Climate](https://codeclimate.com/github/mpugach/multidiff/badges/gpa.svg)](https://codeclimate.com/github/mpugach/multidiff)
 [![Test Coverage](https://codeclimate.com/github/mpugach/multidiff/badges/coverage.svg)](https://codeclimate.com/github/mpugach/multidiff/coverage)
@@ -12,7 +13,7 @@ A simple wrapper for the [diff-lcs](https://github.com/halostatue/diff-lcs) to c
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'multidiff', github: 'mpugach/multidiff', tag: '0.0.1'
+gem 'multidiff', github: 'mpugach/multidiff', tag: '0.1.0'
 ```
 
 And then execute:
@@ -25,17 +26,30 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Run from command line
+
+    $ multidiff path/to/file_1.txt path/to/file_2.txt [path/to/file_3.txt ...]
+
+Or from your app
+
+    require 'multidiff'
+
+    # To return Diff::LCS objects
+    Multidiff::Differ.diff([array_of_strings_1, array_of_strings_2, ...])
+
+    # To return array of strings
+    Multidiff::Differ.pretty_diff([array_of_strings_1, array_of_strings_2, ...])
+
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/rdiff. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/mpugach/multidiff. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/multidiff/differ.rb

@@ -7,8 +7,12 @@ module Multidiff
     def self.diff(files)
       base = files.shift
 
-      files.map do |file|
-        Diff::LCS.sdiff(base, file).each_with_index.map do |change, line|
+      files.map { |file| Diff::LCS.sdiff(base, file) }
+    end
+
+    def self.pretty_diff(files)
+      diff(files).map do |changes|
+        changes.each_with_index.map do |change, line|
           text = if change.action == '!'
                    "#{change.old_element}|#{change.new_element}"
                  else

data/lib/multidiff/runner.rb

@@ -5,7 +5,7 @@ module Multidiff
 
       abort 'Nothing to compare' if data.count < 2
 
-      puts Multidiff::Differ.diff(data).map { |diff| diff.join("\n") }.join("\n\n")
+      puts Multidiff::Differ.pretty_diff(data).map { |diff| diff.join("\n") }.join("\n\n")
     end
 
     class << self

data/lib/multidiff/version.rb

@@ -1,5 +1,5 @@
 module Multidiff
   module Version
-    STRING = '0.0.1'.freeze
+    STRING = '0.1.0'.freeze
   end
 end

data/multidiff.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.1.0'
+
   spec.add_dependency 'diff-lcs', '~> 1.2'
 
   spec.add_development_dependency 'bundler', '~> 1.11'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multidiff
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Maksym Pugach
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="