epdiff 1.0.3 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a04e2cdb0bb85d84195582a0e4791b9d1ed2338312829d67c0f477cfb156dea
-  data.tar.gz: 305b919a6d3612489581c05fbe41fcc18e646bbdff38dac06fbf99ff002d9a09
+  metadata.gz: eafa093559fc567ce2560dbfd67aa6f9b712374167063319a0270002c1b0fcd7
+  data.tar.gz: 0a83e2294ad9e7058f9e386c16150141357596065455a08918d8d534cde40f3e
 SHA512:
-  metadata.gz: a3c12f092c348f65d384e87ad32d4b757760255041c7e87751c0a8c39e030e3024f3cca8a5077be97d3e6f89d891d3a7edf2bae4767668bf57a506611231c0ac
-  data.tar.gz: 2d3b836de8a987bf8da2fb3d6e3d25d3258fa846d8bb2e2a031dafdf3630ef0f5df75826a85e86d0bb74056d95890c8efcebca931ec355255510faaf2a3d94d0
+  metadata.gz: 49e7e7a25ae0ba32eb883f7e97b5d21ebffbd254c28ccee7527026be7ba68cf59a31e0b974acd4d75e10a465cbe55e17fae63a71e58129602f7f802c9486a4ce
+  data.tar.gz: 487381af5949d9f08889dc2a5f09c0974f277113368fd72aa2dc245bef4cc894583ce13842e0fe28773c055fe08cc42f6f4b0baa0e70ba7ad68dba915f8d3615

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Masayoshi Takahashi
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,24 @@
+# epdiff
+
+`epdiff` is a CLI tool to show diff of EPUB files.
+
+## usage
+
+    $ epdiff <file1> <file2>
+
+'file1' and 'file2' are EPUB files.
+
+
+## Note on Patches/Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+## Copyright
+
+Copyright (c) 2010 Masayoshi Takahashi. See LICENSE for details.

data/bin/epdiff

@@ -1,2 +1,4 @@
+#!/usr/bin/env ruby
+
 require 'epdiff'
 Epdiff.execute(*ARGV)

data/epdiff.gemspec

@@ -16,4 +16,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.add_runtime_dependency "rubyzip", "~> 2.3.0"
+  s.add_runtime_dependency "pastel"
+  s.add_runtime_dependency "tty-file"
 end

data/lib/epdiff.rb

@@ -3,30 +3,89 @@ require 'optparse'
 require 'tmpdir'
 require 'fileutils'
 require 'zip'
+require 'pastel'
+require 'tty/file'
 
-module Epdiff
-  extend self
+
+class Epdiff
+  TEXT_EXT = %w(xhtml html xml opf css txt)
+
+  def self.execute(*args)
+    new.execute(*args)
+  end
+
+  def initialize
+    @pastel = Pastel.new(enabled: true)
+    @green = @pastel.green.detach
+    @red = @pastel.red.detach
+    @cyan = @pastel.cyan.detach
+  end
 
   def unzip(filename, dir)
     Zip::InputStream.open(filename) do |zio|
       while entry = zio.get_next_entry
-        entry_filename = File.join(dir, entry.name)
-        if  entry.name_is_directory?
-          FileUtils.mkdir_p File.dirname(entry_filename)
-        elsif entry.file?
+        if  entry.file?
+          entry_filename = File.join(dir, entry.name)
           FileUtils.mkdir_p File.dirname(entry_filename)
-          File.open(entry_filename, "wb") do |f|
-            f.write zio.read
+          File.binwrite(entry_filename, zio.read)
+        end
+      end
+    end
+  end
+
+  def show_diff(file1, file2, work_dir)
+    Dir.chdir(work_dir) do
+      files1 = Dir.glob("file1/**/*")
+      files2 = Dir.glob("file2/**/*")
+      files1_s = files1.map{|d| d.sub(%r{^file1/}, '')}
+      files2_s = files2.map{|d| d.sub(%r{^file2/}, '')}
+      files_common = files1_s & files2_s
+      files_common.each do |path|
+        if File.file?("file1/#{path}")
+          if text_file?("file1/#{path}")
+            text_diff(path, "file1/#{path}", "file2/#{path}")
+          else
+            binary_diff(path, "file1/#{path}", "file2/#{path}")
           end
         end
       end
+      (files1_s - files2_s).each do |diff1|
+        print @red.call("DIFF: #{diff1} only exists in 1st.\n")
+      end
+      (files2_s - files1_s).each do |diff2|
+        print @green.call("DIFF: #{diff2} only exists in 2nd.\n")
+      end
+    end
+  end
+
+  def text_file?(path)
+    extname = File.extname(path).sub(/\A\./, '')
+    if TEXT_EXT.include?(extname)
+      extname
+    else
+      nil
+    end
+  end
+
+  def text_diff(_path, path1, path2)
+    diff = TTY::File.diff(path1, path2, verbose: false)
+    if diff != "No differences found\n"
+      print diff
+    end
+  end
+
+  def binary_diff(path, path1, path2)
+    content1 = File.binread(path1)
+    content2 = File.binread(path2)
+    if content1 != content2
+      print @cyan.call("DIFF: #{path} has some differences.\n")
     end
   end
 
   def execute(*args)
 
-    tmpdir = Dir.mktmpdir
-    diff_path = "diff"
+    tmpdir = work_dir = nil
+    diff_path = nil
     unzip_path = nil
 
     opts = OptionParser.new do |opts|
@@ -65,25 +124,35 @@ module Epdiff
         exit
       end
 
+      work_dir = tmpdir || Dir.mktmpdir
+
       file1, file2 = *args
-      FileUtils.mkdir_p(tmpdir+"/file1")
-      FileUtils.mkdir_p(tmpdir+"/file2")
+      FileUtils.mkdir_p(work_dir+"/file1")
+      FileUtils.mkdir_p(work_dir+"/file2")
 
       if unzip_path
-        %x("#{unzip_path}" "#{file1}" -d "#{tmpdir}/file1")
-        %x("#{unzip_path}" "#{file2}" -d "#{tmpdir}/file2")
+        %x("#{unzip_path}" "#{file1}" -d "#{work_dir}/file1")
+        %x("#{unzip_path}" "#{file2}" -d "#{work_dir}/file2")
       else
-        unzip(file1, "#{tmpdir}/file1")
-        unzip(file2, "#{tmpdir}/file2")
+        unzip(file1, "#{work_dir}/file1")
+        unzip(file2, "#{work_dir}/file2")
       end
 
-      IO.popen("'#{diff_path}' -r -u '#{tmpdir}/file1' '#{tmpdir}/file2'") do |io|
-        print io.read.gsub(/#{Regexp.escape(tmpdir)}/, "")
+      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
 
     rescue => e
       warn e
       puts opts
+    ensure
+      if work_dir && !tmpdir
+        FileUtils.rm_rf(work_dir)
+      end
     end
   end
 

data/lib/epdiff/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epdiff
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - takahashim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-file
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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
@@ -34,6 +62,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- LICENSE
+- README.md
 - Rakefile
 - bin/epdiff
 - epdiff.gemspec
@@ -53,9 +83,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key: