kindlegen 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: db82ec9b6513f04b3265919d8dea63278deabacd
-  data.tar.gz: a4f65d8568002721d6a5dd54cbbd9db85bb52641
+SHA256:
+  metadata.gz: aa25bd7075e56327aa57252627e4a6942304a962119ccf1dcc6b60db0d6e468c
+  data.tar.gz: 91d23647cfbb87f27343e961d656eac991d8384b7873bc9fdd784ad3d5dc96ed
 SHA512:
-  metadata.gz: 9f2d57d17bd1c916174e35444aecb13df59cc3abef1aaa8d66378914c983e2c9b5c5d5217ce98156f65ea2794c1f472cdb426ae591746fdbfc37b8f792bf46b6
-  data.tar.gz: 2c04d1de10bcf8c741b2c2b3f9155ae44359176577074ef1925b6192f2b13d44e8413ead3b337ce36b52833fc29eecd745952cca99dbe74b2f2a9ab703b968a5
+  metadata.gz: 72280f6dae8e5082161340c186d27946149f3236fd65b00d5c7e016efd9844e203ed649db55c8021608b0c44c089ce638bee7ffd2e4622f394b90b25e55ba772
+  data.tar.gz: c24c8be58fd34494fe4d4b0b80e5caec846053ff604e7d9fa693ca0af8fae798d4e532e11b9a3c355b210cc64b36bc0f564afba577c5b4a47903acef31acdbe7

data/.github/workflows/ci.yml

@@ -0,0 +1,19 @@
+name: CI
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        ruby: [2.4, 2.5, 2.6, 2.7]
+        # TODO: https://github.com/tdtds/kindlegen/issues/36
+        # Add macos-latest when kindlegen is fixed to work on Catalina
+        platform: [ubuntu-latest, windows-latest]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install --jobs 4 --retry 3
+      - run: bundle exec rake build test

data/.gitignore

@@ -2,6 +2,7 @@
 *.swp
 /pkg
 /.bundle
+/.idea
 /vendor/bundle
 /Gemfile.lock
 /.ruby-version

data/README.md

@@ -12,12 +12,15 @@ Require `kindlegen`, then run kindlegen commands.
 
 Returns the path of the kindlegen command.
 
-### Kindlegen.run( *args )
+### Kindlegen.run(*args)
 
 Runs the kindlegen command with specified parameters.
 
 ### Example
     require 'kindlegen'
-    Kindlegen.run("sample.opf", "-o", "sample.mobi")
- 
-
+    stdout, stderr, status = Kindlegen.run("sample.opf", "-o", "sample.mobi")
+    if status == 0
+      puts stdout
+    else
+      $stderr.puts stderr
+    end

data/ext/Rakefile

@@ -4,8 +4,8 @@
 #
 require 'rbconfig'
 require 'fileutils'
+require 'open-uri'
 
-AMAZON = 'http://kindlegen.s3.amazonaws.com'
 BINDIR = '../bin'
 
 def create_default_task(target)
@@ -18,29 +18,42 @@ def create_default_task(target)
 end
 
 def create_task_for_unix(config)
+  require 'rubygems/package'
+  require 'zlib'
+
   tarball = config[:tarball]
-  unzip   = config[:unzip]
   target  = config[:target]
-  url = "#{AMAZON}/#{tarball}"
+  url = ENV['KINDLEGEN_TARBALL_URL'] || config[:url]
 
   create_default_task(target)
 
   file target => tarball do
-    sh "#{unzip} #{tarball}"
-    sh "chmod +x #{target}"
+    Gem::Package::TarReader.new(Zlib::GzipReader.open(tarball)) do |tar|
+      tar.each do |entry|
+        next unless entry.file?
+        next if File.exist?(entry.full_name)
+
+        dir = File.dirname(entry.full_name)
+        FileUtils.mkpath(dir) if dir != '.' && !File.exist?(dir)
+        File.open(entry.full_name, 'wb') do |f|
+          f.write(entry.read)
+        end
+      end
+    end
+    File.chmod(0o755, target)
   end
 
   file tarball do
-    sh "curl #{url} -o #{tarball}"
+    curl(url, tarball)
   end
 end
 
-# curl for windows
 def curl(url, tarball)
   puts "open(#{url})"
   puts "save to #{tarball}"
-  data = open(url, 'rb').read
-  open(tarball, 'wb').write(data)
+  open(url) do |file|
+    IO.copy_stream(file, tarball)
+  end
 end
 
 # unzip for windows
@@ -49,17 +62,16 @@ def unzip(tarball)
   Zip::File.open(tarball).each do |entry|
     dir = File.dirname(entry.name)
     FileUtils.mkpath(dir) if dir != '.' && !File.exist?(dir)
-    entry.extract unless File.exist?(entry.name)
+    entry.extract(dest_path=entry.name) unless File.exist?(entry.name)
   end
 end
 
 def create_task_for_windows(config)
-  require 'open-uri'
   require 'zip'
 
   tarball = config[:tarball]
   target  = config[:target]
-  url = "#{AMAZON}/#{tarball}"
+  url = ENV['KINDLEGEN_TARBALL_URL'] || config[:url]
 
   create_default_task(target)
 
@@ -76,17 +88,18 @@ case RbConfig::CONFIG['host_os']
 when /mac|darwin/i
   create_task_for_unix(
     { tarball: 'KindleGen_Mac_i386_v2_9.zip',
-      unzip:   'unzip',
-      target:  'kindlegen' })
+      target: 'kindlegen',
+      url: 'https://web.archive.org/web/20200814013519/https://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v2_9.zip' })
 when /linux|cygwin/i
   create_task_for_unix(
     { tarball: 'kindlegen_linux_2.6_i386_v2_9.tar.gz',
-      unzip:   'tar -zx --no-same-owner -f',
-      target:  'kindlegen' })
+      target: 'kindlegen',
+      url: 'https://web.archive.org/web/20150803131026/https://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v2_9.tar.gz' })
 when /mingw32|mswin32/i
   create_task_for_windows(
     { tarball: 'kindlegen_win32_v2_9.zip',
-      target: 'kindlegen.exe' })
+      target: 'kindlegen.exe',
+      url: 'http://web.archive.org/web/20150407060917/http://kindlegen.s3.amazonaws.com/kindlegen_win32_v2_9.zip' })
 else
   STDERR.puts "Host OS unsupported!"
   exit(1)

data/kindlegen.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "kindlegen"
   s.version     = Kindlegen::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.4.0'
 
   s.authors     = ["TADA Tadashi"]
   s.email       = ["t@tdtds.jp"]
@@ -23,9 +23,9 @@ Gem::Specification.new do |s|
   s.extensions    = ['ext/Rakefile']
 
   s.add_dependency 'rubyzip'
+  s.add_dependency "rake"
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "rake"
   s.add_development_dependency "pry"
   s.add_development_dependency "test-unit"
 end

data/lib/kindlegen/version.rb

@@ -1,3 +1,3 @@
 module Kindlegen
-  VERSION = '3.0.1' unless const_defined?(:VERSION)
+  VERSION = '3.1.0' unless const_defined?(:VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kindlegen
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -31,7 +31,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -76,9 +76,9 @@ extensions:
 - ext/Rakefile
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".tachikoma.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -101,15 +101,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Installing kindlegen command.

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-rvm:
-  - 2.1.10
-  - 2.2.6
-  - 2.3.3
-# NOTE the build step is required to run the tests
-script: bundle exec rake build test