epdiff 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eafa093559fc567ce2560dbfd67aa6f9b712374167063319a0270002c1b0fcd7
-  data.tar.gz: 0a83e2294ad9e7058f9e386c16150141357596065455a08918d8d534cde40f3e
+  metadata.gz: 48f072768d70f69bb8390ee6fcb2b9261a2eee8df99084a7d162ec7cf0827ea5
+  data.tar.gz: 97a0b665572c96e42f72d3a0c27f15cab7354814bac786b93d44163b76ca899f
 SHA512:
-  metadata.gz: 49e7e7a25ae0ba32eb883f7e97b5d21ebffbd254c28ccee7527026be7ba68cf59a31e0b974acd4d75e10a465cbe55e17fae63a71e58129602f7f802c9486a4ce
-  data.tar.gz: 487381af5949d9f08889dc2a5f09c0974f277113368fd72aa2dc245bef4cc894583ce13842e0fe28773c055fe08cc42f6f4b0baa0e70ba7ad68dba915f8d3615
+  metadata.gz: '092f898933263c56d975e02cb50be1881e043817a79ddf7b54abf1c5a849ab0d259075048d03bab8ddf336a48b34a9dfb3b0efc5a38bb922a18949c9e358b4de'
+  data.tar.gz: 0f3f84ecae7a44c54e5b263969c4e64cb558d73ca1c167d39dea2211ed4fa24fe76fa28ed1f230b3b2c6b7f327b5839e610730dea5baf45eeff5c6e71afc18c2

data/epdiff.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "rubyzip", "~> 2.3.0"
   s.add_runtime_dependency "pastel"
   s.add_runtime_dependency "tty-file"
+  s.add_development_dependency "rake"
 end

data/lib/epdiff.rb

@@ -19,6 +19,7 @@ class Epdiff
     @green = @pastel.green.detach
     @red = @pastel.red.detach
     @cyan = @pastel.cyan.detach
+    @color = true
   end
 
   def unzip(filename, dir)
@@ -50,10 +51,14 @@ class Epdiff
         end
       end
       (files1_s - files2_s).each do |diff1|
-        print @red.call("DIFF: #{diff1} only exists in 1st.\n")
+        @exit_code = 1
+        message = "DIFF: #{diff1} only exists in 1st.\n"
+        print @color ? @red.call(message) : message
       end
       (files2_s - files1_s).each do |diff2|
-        print @green.call("DIFF: #{diff2} only exists in 2nd.\n")
+        @exit_code = 1
+        message = "DIFF: #{diff2} only exists in 2nd.\n"
+        print @color ? @green.call(message) : message
       end
     end
   end
@@ -68,8 +73,9 @@ class Epdiff
   end
 
   def text_diff(_path, path1, path2)
-    diff = TTY::File.diff(path1, path2, verbose: false)
-    if diff != "No differences found\n"
+    diff = @color ? TTY::File.diff(path1, path2, verbose: false) : TTY::File.diff(path1, path2, verbose: false, color: nil)
+    if diff != "No differences found\n" && diff.strip != ""
+      @exit_code = 1
       print diff
     end
   end
@@ -78,7 +84,9 @@ class Epdiff
     content1 = File.binread(path1)
     content2 = File.binread(path2)
     if content1 != content2
-      print @cyan.call("DIFF: #{path} has some differences.\n")
+      @exit_code = 1
+      message = "DIFF: #{path} has some differences.\n"
+      print @color ? @cyan.call(message) : message
     end
   end
 
@@ -95,19 +103,15 @@ class Epdiff
         tmpdir = dir
       end
 
-      opts.on('--diff-command PATH', 'Specify diff command path') do |path|
-        diff_path = path
-      end
-
-      opts.on('--unzip-command PATH', 'Specify unzip command path') do |path|
-        unzip_path = path
-      end
-
       opts.on('-h', '--help', 'Show this help message') do
         puts opts
         exit
       end
 
+      opts.on('-C', '--no-color', 'Not use color diff') do
+        @color = false
+      end
+
       opts.on('-v', '--version', 'Show version number') do
         puts Epdiff::VERSION
         exit
@@ -130,22 +134,12 @@ class Epdiff
       FileUtils.mkdir_p(work_dir+"/file1")
       FileUtils.mkdir_p(work_dir+"/file2")
 
-      if unzip_path
-        %x("#{unzip_path}" "#{file1}" -d "#{work_dir}/file1")
-        %x("#{unzip_path}" "#{file2}" -d "#{work_dir}/file2")
-      else
-        unzip(file1, "#{work_dir}/file1")
-        unzip(file2, "#{work_dir}/file2")
-      end
-
-      if diff_path
-        IO.popen("'#{diff_path}' -r -u '#{work_dir}/file1' '#{work_dir}/file2'") do |io|
-          print io.read.gsub(/#{Regexp.escape(work_dir)}/, "")
-        end
-      else
-        show_diff(file1, file2, work_dir)
-      end
+      unzip(file1, "#{work_dir}/file1")
+      unzip(file2, "#{work_dir}/file2")
 
+      @exit_code = 0
+      show_diff(file1, file2, work_dir)
+      exit(@exit_code)
     rescue => e
       warn e
       puts opts

data/lib/epdiff/version.rb

@@ -1,3 +1,3 @@
 class Epdiff
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: epdiff
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - takahashim
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2021-01-25 00:00:00.000000000 Z
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: diff command for EPUB files.
 email:
 - maki@rubycolor.org
@@ -72,7 +86,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -87,8 +101,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: diff command for EPUB files.
 test_files: []