kindlegen 3.0.2 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 954381b740829273dcc51f45cba3843514d5d7e2
-  data.tar.gz: 87b5468e96c2e5b182e4b7dd682cc3ba69c9a43e
+SHA256:
+  metadata.gz: 429e8b1357f7cfccb98126e33cce7949b61263ce1739b3785b3fa7e8cf54adfd
+  data.tar.gz: e5e7a6adf9ea504443f7032ebfbf6912a3475a47562ed9ce07238340ea535be4
 SHA512:
-  metadata.gz: 3e5944a39a3d9de49e378b29b6afac8f4c9267a6df5f8deb544ff5196b474d1f3e1e6cdf34f1143077f6bba22776a17464e0e3f320215cd1f30763b0f3e0d58d
-  data.tar.gz: f23ec67c5f42262b7260567e024274c7bd10eb35bbb75ff3073462519c272506dacfe19d42dc61ba47bd11db4f9aacb363bee636b5de39e4e54d207c7eda9d1a
+  metadata.gz: 0c5ce8434ec59ade59563f0e76ed2ca6f27a89a411295e828d4149f8770e1907c23964ef7dbf943927cfa0f3085a4db8c237ad57e26bf05507dae6a9f6f80661
+  data.tar.gz: 5de495290ee07d96d8a0e72fa2bb235e5787e7a954cd745c5a41cfe6262521521d5539414c256d192be8b96b957882bc4b0ac2929b83c0dd53e25b5707338288

data/.github/workflows/ci.yml

@@ -0,0 +1,19 @@
+name: CI
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        ruby: [2.5, 2.6, 2.7, 3.0]
+        # 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/.github/workflows/release.yml

@@ -0,0 +1,18 @@
+name: Publish to RubyGems.org
+on:
+  push:
+    tags:
+      - '*'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.0'
+    - name: Publish to RubyGems.org
+      uses: dawidd6/action-publish-gem@v1
+      with:
+        api_key: ${{ secrets.RUBYGEMS_API_KEY }}

data/.gitignore

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

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} -L -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)
+  URI.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: 'https://web.archive.org/web/20150407060917/https://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.5.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.2' unless const_defined?(:VERSION)
+  VERSION = '3.1.1' unless const_defined?(:VERSION)
 end

data/test/test_kindlegen.rb

@@ -9,7 +9,7 @@ class KindlegenTest < Test::Unit::TestCase
     kindlegen_lib_dir = nil
     gem_version = File.read(File.join(KINDLEGEN_PROJECT_DIR, 'lib/kindlegen/version.rb')).match(/VERSION = ["'](.*?)["']/)[1]
     gem_file = File.join(KINDLEGEN_PROJECT_DIR, 'pkg', %(kindlegen-#{gem_version}.gem))
-	 result = Gem::Installer.at(gem_file).install rescue Gem::Installer.new(gem_file).install
+	 result = Gem::Installer.at(gem_file).install rescue Gem::Installer.new(gem_file).install rescue Gem::Installer.new(Gem::Package.new gem_file).install
     begin
       require 'kindlegen'
     rescue ::LoadError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kindlegen
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.1
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2021-04-28 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,10 @@ extensions:
 - ext/Rakefile
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".tachikoma.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -101,15 +102,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.5.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.2.15
 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