csv-diff-report 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c9a403ac0808911b994a8d1ecc167144d7c66d9
-  data.tar.gz: 9a8a75226e7845440c668375b3e57f919fe8510a
+  metadata.gz: 56cdc0f5cb3e6c6032e8cbd9de325bceede2a895
+  data.tar.gz: 729b39b7a6373da8fd499d228930a01fbce695d0
 SHA512:
-  metadata.gz: caf42e6d6dbcbea5243d416a8165d2dcb49b07dbab81d1e2e61092c7dbdc058350746753374701628153645e60241669b7880bdf591c921545888154ac011121
-  data.tar.gz: 66a15dfc2bcf8376ccca15135d457ab1f4669c7f70d667078f644a6312520e6284c4d1143b67e8c7d101fbd613b52ee2d4e0e5d3f9e4c798c81bb9f5aa6865e1
+  metadata.gz: 3650d3644596522ee283c80c792d3c3d35832ed630843ef02492708911e09683c1c3d58fe8023664b995e3dd5c4d46eeec347b8c991df15cf8c1006f9f82355b
+  data.tar.gz: 1747526e29d2dd0fabe3a20bc8dbadaa405d506ab56ccb822610f516b383897c697cf3407f7ed5cd5cc5868106f621b2c4a3b2894faf95a0f60632b78435a045

data/lib/csv-diff-report/cli.rb

@@ -43,7 +43,7 @@ class CSVDiff
             'Requires the presence of a .csvdiff file in the FROM or current directory to define ' +
             'the file type patterns.',
             short_key: 't', on_parse: :split_to_array
-        keyword_arg :exclude, 'A file name pattern of files to exclude from the diff if a directory ' +
+        keyword_arg :exclude_pattern, 'A file name pattern of files to exclude from the diff if a directory ' +
             'diff is being performed.',
             short_key: 'x'
         keyword_arg :field_names, 'A comma-separated list of field names for each field in the source files.' +

data/lib/csv-diff-report/report.rb

@@ -242,7 +242,8 @@ class CSVDiff
                     end
                 end
                 if hsh[:matched_files].include?(left.to_s)
-                    settings.merge!(hsh)
+                    echo "Matched file #{left} to file type #{file_type}"
+                    settings = settings.merge(hsh)
                     [:pattern, :exclude_pattern, :matched_files].each{ |k| settings.delete(k) }
                     break
                 end
@@ -257,14 +258,20 @@ class CSVDiff
         # @param options [Hash] An options hash to be passed to CSVSource.
         def open_source(src, left_right, options)
             out = ["Opening #{left_right.to_s.upcase} file '#{File.basename(src)}'..."]
-            csv_src = CSVDiff::CSVSource.new(src.to_s, options)
-            out << ["  #{csv_src.lines.size} lines read", :white]
-            if csv_src.skip_count > 0
-                out << [" (#{csv_src.skip_count} lines skipped)", :yellow]
+            begin
+                csv_src = CSVDiff::CSVSource.new(src.to_s, options)
+                out << ["  #{csv_src.lines.size} lines read", :white]
+                if csv_src.skip_count > 0
+                    out << [" (#{csv_src.skip_count} lines skipped)", :yellow]
+                end
+                echo(*out)
+                csv_src.warnings.each{ |warn| echo [warn, :yellow] }
+                csv_src
+            rescue Object => ex
+                echo(*out)
+                echo(["An error occurred opening file #{src}: #{ex}", :red])
+                raise
             end
-            echo(*out)
-            csv_src.warnings.each{ |warn| echo [warn, :yellow] }
-            csv_src
         end
 
 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: csv-diff-report
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Adam Gardiner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv-diff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: arg-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: color-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: axlsx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 description: |2
@@ -88,16 +88,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - LICENSE
+- README.md
+- bin/csvdiff
+- lib/csv-diff-report.rb
 - lib/csv-diff-report/cli.rb
 - lib/csv-diff-report/excel.rb
 - lib/csv-diff-report/html.rb
 - lib/csv-diff-report/report.rb
 - lib/csv-diff-report/text.rb
-- lib/csv-diff-report.rb
 - lib/csv_diff_report.rb
-- bin/csvdiff
 homepage: https://github.com/agardiner/csv-diff-report
 licenses: []
 metadata: {}
@@ -107,17 +107,17 @@ 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.14.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: CSV Diff Report is a library for generating diff reports using the CSV Diff