episopass 0.2.2 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84f4a312a4e679bd3ec6de04ed968dadc344799083943370d670c230d97cc7ff
-  data.tar.gz: 820c09522dba34702b012332afb010573b21510f03652fb3c47c42013c2efdce
+  metadata.gz: 45b3474978095a864424909ed2dc0d7f939317ade6f3275ed6e483f6453340c2
+  data.tar.gz: feeb25585b1a3dec0029fc711812b677121d1fd196f0f3e5ec1a56e172b144e8
 SHA512:
-  metadata.gz: fdedb95e684847f4f4003fbdc803b8cd6af7d87b992aec6625d8d9fc01d5716a1117112353ed3ffb67a4a92de6fcee1eb113fb12e3e4ceb3ddf164893ee81e0c
-  data.tar.gz: 1c2b05f9e1ee63eea15139c664a9daa4eb93b7321c49230ad005b579de9d2000e0f9d4a63c50f2b777a1362f2ff8d303a8e31e431705179d8c19312f2bb0c0a6
+  metadata.gz: 05eae7a56af97afe039894ab2977877503eae4eb0ab0ddd567327697901b4311a119b2a3d51c05c099157d285ea828af7edf587c15435b3ef72c6889638c3e75
+  data.tar.gz: 13b98de889c292bb8ee196c4cc1a5c68cddccb8bca678b228b00f39de608331f486c52fe31168d29834a2b9bf82fa480fb68fcc875594465c979830ce20d1677

data/exe/episounzip

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 #
-# % epunzip out.episopass
+# % epunzip out.zip
 #
 
 epfile = ARGV[0]
 if !epfile || !File.exist?(epfile)
-  STDERR.puts "% epunzip file.episopass"
+  STDERR.puts "% epunzip file.zip"
   exit
 end
 
@@ -17,9 +17,11 @@ end
 Dir.mkdir(dir)
 
 path = File.expand_path(epfile)
-system "pushd #{dir} > /dev/null; unzip #{path} ; unzip -P `episopass episopass.html` episopass.zip; rm episopass.zip episopass.html ; popd > /dev/null"
+# system "pushd #{dir} > /dev/null; unzip #{path} ; unzip -P `episopass episopass.html` episopass.zip; rm episopass.zip episopass.html ; popd > /dev/null"
+system "cd #{dir} ; unzip #{path} ; unzip -P `episopass episopass.html` episopass.zip; rm episopass.zip episopass.html"
+
+system "(cd #{dir}; tar cf - .) | tar xvf -"
 
-system "/bin/mv #{dir}/* ."
 system "/bin/rm -r #{dir}"
 
 

data/exe/episozip

@@ -1,12 +1,22 @@
 #!/usr/bin/env ruby
 #
-# % episozip [-P episopassのHTML] out.episopass file1 file2
+# % episozip [-P episopassのHTML] out.zip file1 file2
 #
 
 path = "#{__dir__}/../data/sample.html" # gemのファイル指定する方法は?
 localpath = File.expand_path("~/.episopass.html")
 path = localpath if File.exist?(localpath)
 
+def dir
+  "/tmp/EpisoPassDir#{$$}"
+end
+
+def usage
+  STDERR.puts "% episozip [-P episopassのHTML] out.zip file1 file2 ..."
+  system "/bin/rm -r #{dir}"
+  exit
+end
+
 if ARGV[0] == "-P"
   path = ARGV[1]
   ARGV.shift 2
@@ -21,13 +31,12 @@ end
 
 if html == ''
   STDERR.puts "EpisoPass問題(#{path})がみつかりません"
-  exit
+  usage
 end
 
-dir = "/tmp/EpisoPassDir#{$$}"
 if File.exist?(dir)
   STDERR.puts "もう一度試してください"
-  exit
+  usage
 end
 
 system "mkdir #{dir}"
@@ -39,25 +48,19 @@ File.open("#{dir}/episopass.html","w"){ |f|
 zipfile = ARGV.shift
 if !zipfile
   STDERR.puts "出力ファイル名を指定してください"
-  system "/bin/rm -r #{dir}"
-  exit
+  usage
 end
-if zipfile !~ /\.episopass$/
-  STDERR.puts "出力ファイルの拡張子は.episopassにしてください"
-  system "/bin/rm -r #{dir}"
-  exit
+if zipfile !~ /\.zip$/
+  STDERR.puts "出力ファイルの拡張子は.zipにしてください"
+  usage
 end
 if File.exist?(zipfile)
   STDERR.puts "#{zipfile}が既に存在します"
-  system "/bin/rm -r #{dir}"
-  exit
+  usage
 end
 
 system "zip -e -P `episopass #{dir}/episopass.html` #{dir}/episopass.zip #{ARGV.join(' ')}"
-system "pushd #{dir} > /dev/null; zip #{zipfile} episopass.zip episopass.html; popd > /dev/null"
-system "/bin/mv #{dir}/#{zipfile} ."
-system "/bin/rm -r #{dir}"
-
-
-
 
+system "cd #{dir} ; zip out.zip episopass.zip episopass.html"
+system "/bin/mv #{dir}/out.zip #{zipfile}"
+system "/bin/rm -r #{dir}"

data/lib/episopass/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EpisoPass
-  VERSION = "0.2.2" # episozip追加
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: episopass
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.7
 platform: ruby
 authors:
 - Toshiyuki Masui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-02-28 00:00:00.000000000 Z
 dependencies: []
 description: Run EpisoPass from CLI
 email: