kindlegen 2.9.7 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7e7400818829dffd2338c4d127d6e43789a569c
-  data.tar.gz: 6cf970a403c55095a5527d17a978a36e77d47a8b
+  metadata.gz: 707247f6d1da7fa52714d305fd849a225bdc92cf
+  data.tar.gz: 220020653144f8108fa9e058d1ea5cf1bdff6348
 SHA512:
-  metadata.gz: 50ff699ca26f806d5844061f07f1945e508983f1c6c75f277c53f7fbab0bdcf87c9375ef113afcf459f99f6960cc50fa07ee90cd064cd29dcf918a8839c4cc2b
-  data.tar.gz: ee5a0ad3967af845a6fd8207de0df85f797bdfe5e15b9e5b7373770c1bc633d83dd9ef3f6067e38ea581a3df1712f05af07d1803d8188c40e1ea0fe1fec3b255
+  metadata.gz: a8b9a3f0705c9610f45e80a9dfdb15064c8770e54ed90af6bc3d207710629ddae4e860d44b765dce28112acedee5924cc1edb9819fc55ab831f7431865490f13
+  data.tar.gz: e6058f96cce126fb65c3378e899bb5ffc0269a5a4ddea4e11c22e184bb38c77f819303b7f698a1b0e7e8d41ee74449f6c09c4bb97d801fe8806f16b27c69f190

data/.gitignore

@@ -1,16 +1,13 @@
 *.gem
 *.swp
-/pkg/*
+/pkg
 /.bundle
 /vendor/bundle
 /Gemfile.lock
 /.ruby-version
 /.ruby-gemset
+ext/*
+!ext/Rakefile
+bin/
 *.tar.gz
-Makefile
-ext/kindlegen/Kindle*
-ext/kindlegen/Sample*
-ext/kindlegen/Multimedia*
-ext/kindlegen/Readme*
-ext/kindlegen/Release*
-ext/kindlegen/kindlegen
+*.zip

data/.travis.yml

@@ -2,7 +2,8 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 2.1.7
-  - 2.2.3
+  - 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

data/Gemfile

@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in kindlegen.gemspec
 gemspec
-
-group :development do
-  gem 'rake'
-end

data/exe/kindlegen

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'kindlegen'
+system(Kindlegen.command.to_s, *ARGV)

data/ext/Rakefile

@@ -0,0 +1,93 @@
+#
+# Rakefile to install kindlegen
+# (c) Copryright Toshihiko Ichida 2016
+#
+require 'rbconfig'
+require 'fileutils'
+
+AMAZON = 'http://kindlegen.s3.amazonaws.com'
+BINDIR = '../bin'
+
+def create_default_task(target)
+  task :default => :install
+
+  task :install => target do |t|
+    mkdir BINDIR unless File.exist?(BINDIR)
+    cp t.source, BINDIR
+  end
+end
+
+def create_task_for_unix(config)
+  tarball = config[:tarball]
+  unzip   = config[:unzip]
+  target  = config[:target]
+  url = "#{AMAZON}/#{tarball}"
+
+  create_default_task(target)
+
+  file target => tarball do
+    sh "#{unzip} #{tarball}"
+    sh "chmod +x #{target}"
+  end
+
+  file tarball do
+    sh "curl #{url} -o #{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)
+end
+
+# unzip for windows
+def unzip(tarball)
+  puts "win-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)
+  end
+end
+
+def create_task_for_windows(config)
+  require 'open-uri'
+  require 'zip'
+
+  tarball = config[:tarball]
+  target  = config[:target]
+  url = "#{AMAZON}/#{tarball}"
+
+  create_default_task(target)
+
+  file target => tarball do
+    unzip(tarball)
+  end
+
+  file tarball do
+    curl(url, tarball)
+  end
+end
+
+case RbConfig::CONFIG['host_os']
+when /mac|darwin/i
+  create_task_for_unix(
+    { tarball: 'KindleGen_Mac_i386_v2_9.zip',
+      unzip:   'unzip',
+      target:  'kindlgen' })
+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' })
+when /mingw32|mswin32/i
+  create_task_for_windows(
+    { tarball: 'kindlegen_win32_v2_9.zip',
+      target: 'kindlegen.exe' })
+else
+  STDERR.puts "Host OS unsupported!"
+  exit(1)
+end

data/kindlegen.gemspec

@@ -17,11 +17,15 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.bindir        = 'exe'
+  s.executables   = s.files.grep(%r{^exe/}){|f| File.basename(f)}
   s.require_paths = ["lib"]
-  s.extensions << 'ext/kindlegen/extconf.rb'
+  s.extensions    = ['ext/Rakefile']
+
+  s.add_dependency 'rubyzip'
 
   # 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.rb

@@ -1,5 +1,6 @@
 require "kindlegen/version"
 require 'pathname'
+require 'rbconfig'
 require 'open3'
 
 module Kindlegen
@@ -19,9 +20,10 @@ module Kindlegen
   # _params_:: array of command parameters.
   #
   def self.run( *params )
-    clean_env do
-      Open3.capture3("#{command} #{params.join(' ')}")
-    end
+    clean_env{Open3.capture3(command.to_s, *params)}.map do |r|
+    	r.force_encoding('UTF-8') if windows? && r.respond_to?(:force_encoding)
+		r
+	 end
   end
 
 private
@@ -32,4 +34,8 @@ private
     ENV.replace(env_backup)
     return ret
   end
+
+  def self.windows?
+    RbConfig::CONFIG['host_os'] =~ /mingw32|mswin32/i
+  end
 end

data/lib/kindlegen/version.rb

@@ -1,3 +1,3 @@
 module Kindlegen
-  VERSION = '2.9.7' unless const_defined?(:VERSION)
+  VERSION = '3.0.0' 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.new(gem_file).install
+	 result = Gem::Installer.at(gem_file).install rescue Gem::Installer.new(gem_file).install
     begin
       require 'kindlegen'
     rescue ::LoadError
@@ -21,7 +21,7 @@ class KindlegenTest < Test::Unit::TestCase
     output = %x(#{Kindlegen.command})
     assert output.include?('Amazon')
   ensure
-    Gem::Uninstaller.new('kindlegen', :force => true).uninstall rescue nil
+    Gem::Uninstaller.new('kindlegen', :executables => true).uninstall rescue nil
     $:.delete kindlegen_lib_dir if kindlegen_lib_dir
   end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: kindlegen
 version: !ruby/object:Gem::Version
-  version: 2.9.7
+  version: 3.0.0
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  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: 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'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -42,9 +70,10 @@ description: Installing kindlegen command, downloading tar.gz file from amazon.c
   and extracting it and copy kindlegen command to bin.
 email:
 - t@tdtds.jp
-executables: []
+executables:
+- kindlegen
 extensions:
-- ext/kindlegen/extconf.rb
+- ext/Rakefile
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -54,7 +83,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- ext/kindlegen/extconf.rb
+- exe/kindlegen
+- ext/Rakefile
 - kindlegen.gemspec
 - lib/kindlegen.rb
 - lib/kindlegen/version.rb
@@ -79,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Installing kindlegen command.

data/ext/kindlegen/extconf.rb

@@ -1,71 +0,0 @@
-#
-# making Makefile getting kindlegen from Amazon.com
-#
-
-require 'rbconfig'
-File::open('Makefile', 'w') do |w|
-  case RbConfig::CONFIG['host_os']
-  when /mac|darwin/i
-    unzip = 'unzip'
-    tarball = 'KindleGen_Mac_i386_v2_9.zip'
-    target = 'kindlegen'
-  when /linux|cygwin/i
-    unzip = 'tar -zx --no-same-owner -f'
-    tarball = 'kindlegen_linux_2.6_i386_v2_9.tar.gz'
-    target = 'kindlegen'
-  when /mingw32/i
-    unzip = 'unzip'
-    # Abort if either `unzip' or `curl' if not found
-    `where #{unzip}`
-    unless ($?.success?)
-      STDERR.puts "The program `unzip' not found. Aborting."
-      exit(1)
-    end
-    `where curl`
-    unless ($?.success?)
-      STDERR.puts "The program `curl` not found. Aborting."
-      exit(1)
-    end 
-    tarball = 'kindlegen_win32_v2_9.zip'
-    target = 'kindlegen.exe'
-  else
-    STDERR.puts "Host OS unsupported!"
-    exit(1)
-  end
-
-  bindir = File.join(File.expand_path('../../..', __FILE__), "bin")
-
-  config = RbConfig::CONFIG.merge({
-    "unzip" => unzip,
-    "tarball" => tarball,
-    "target" => target,
-    "bindir" => bindir,
-  })
-
-  w.puts RbConfig.expand(DATA.read, config)
-end
-
-
-__END__
-AMAZON = http://kindlegen.s3.amazonaws.com
-TARGET = $(target)
-BINDIR = $(bindir)
-TARBALL = $(tarball)
-CURL = curl
-UNZIP = $(unzip)
-CP = cp -a
-MKDIR = mkdir -p
-
-all:
-
-$(TARGET): $(TARBALL)
-	$(UNZIP) $(TARBALL)
-	touch $(TARGET)
-	chmod +x $(TARGET)
-
-$(TARBALL):
-	$(CURL) $(AMAZON)/$(TARBALL) -o $(TARBALL)
-
-install: $(TARGET)
-	$(MKDIR) $(BINDIR)
-	$(CP) $(TARGET) $(BINDIR)