nb_util 0.3.5 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73911ac5699fe50ad82be4a093af9ab0b07896edf4c0e6c8cc5460f26a53bf0a
-  data.tar.gz: 0dcce44e514e0b8fd8129ce85944a5ad79102e2552e481e67427b2e0544d6415
+  metadata.gz: c481669cc7f54a88c0397da46a42150cb61b345dcdbc06d1a2a530b964249887
+  data.tar.gz: 63de0433b90627754c066286dfc7e8bb52a2b3b8584cbd82a5e7a71923649910
 SHA512:
-  metadata.gz: 8465d24905fdc79e476c94515e9ce81249a07be10fcef1629a29bc1ab3b3c02b7f2f1793a3df233c71a5cae4964c344296ade6234d4fb487e6d60d5045c3be76
-  data.tar.gz: 0dba5c2ce3abe994b3aa32b2bdaa720dfd782d2fd2fb725d8300288d611c327dbd4c1d258cf3296924460daa5bb8b433b3a6103c800e90965f85f3bc028f870a
+  metadata.gz: d9fe68971aeb2af907acf8474f8361618a7ece511ad0b145839bc58b99933df73fc9d6aecb8694b354e9c76784b861055899c280f429b65ad30a0a3400940231
+  data.tar.gz: a3a41d88b3979c2463cf40254c71988af2b91c0cc1e40e16dbf3b9f901e49c560b41d1bbb0e964b5c242688c7835ed9b131b778e59f7b1a9ca943592c54d340d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nb_util (0.3.4)
+    nb_util (0.3.7)
 
 GEM
   remote: https://rubygems.org/

data/lib/cli.rb

@@ -36,10 +36,10 @@ module NbUtil
     desc "ipynb2tex [filename]", "convert ipynb to tex" # コマンドの使用例と、概要
     def ipynb2tex(argv0) # コマンドはメソッドとして定義する
       NbUtil.ipynb2tex(ARGV[1])
-      NbUtil.revise_lines(ARGV[1])
-      NbUtil.split_files(ARGV[1])
-      NbUtil.replace_figs(ARGV[1])
-      NbUtil.your_informations(ARGV[1])
+      #  NbUtil.revise_lines(ARGV[1])
+      #  NbUtil.split_files(ARGV[1])
+      #  NbUtil.replace_figs(ARGV[1])
+      #  NbUtil.your_informations(ARGV[1])
     end
   end
 end

data/lib/nb_util/ipynb2tex.rb

@@ -11,21 +11,20 @@ module NbUtil
   def ipynb2tex(target)
     loop do
       your_informations(ARGV[1])
-
-      puts ">上記の情報で実行する場合は「Y」、終了する場合は「N」を入力して下さい。"
+      print "Are you ok with it?: "
       input = STDIN.gets.to_s.chomp
       if input == 'Y' || input == 'y'
         location = Open3.capture3("gem environment gemdir")
         versions = Open3.capture3("gem list nb_util")
         latest_version = versions[0].split(",")
-      p cp_lib_data_thesis_gem = File.join(location[0].chomp, "/gems/#{latest_version[0].chomp.gsub(' (','-').gsub(')','')}/lib/data/thesis")
-      p cp_lib_data_pieces_gem = File.join(location[0].chomp, "/gems/#{latest_version[0].chomp.gsub(' (','-').gsub(')','')}/lib/data/pieces")
+        p cp_lib_data_thesis_gem = File.join(location[0].chomp, "/gems/#{latest_version[0].chomp.gsub(' (','-').gsub(')','')}/lib/data/thesis")
+        p cp_lib_data_pieces_gem = File.join(location[0].chomp, "/gems/#{latest_version[0].chomp.gsub(' (','-').gsub(')','')}/lib/data/pieces")
         cp_lib_data_thesis_bundle = File.join(Dir.pwd, '/lib/data/thesis')
         cp_lib_data_pieces_bundle = File.join(Dir.pwd, '/lib/data/pieces')
         re_fig = /(.+\.jpg)|(.+\.jpeg)|(.+\.png)/
 
         print "\e[32minputfile: \e[0m"
-        target = ARGV[1]
+        target = File.expand_path(ARGV[1])
         print "\e[32m#{target}\n\e[0m"
         print "\e[32moutputfile: \e[0m"
         tex_src = target.sub('.ipynb', '.tex')
@@ -54,13 +53,14 @@ module NbUtil
 
         mk_xbb(target, re_fig)
 
-        if File.exist?(cp_lib_data_pieces_bundle)
+        if Dir.exist?(cp_lib_data_pieces_bundle.to_s)
           FileUtils.cp_r(cp_lib_data_pieces_bundle, target_parent)
           FileUtils.cp_r(cp_lib_data_thesis_bundle, target_parent)
         else
           FileUtils.cp_r(cp_lib_data_pieces_gem, target_parent)
           FileUtils.cp_r(cp_lib_data_thesis_gem, target_parent)
         end
+
 =begin
         if (Open3.capture3("bundle exec exe/nb_util ipynb2tex #{target}")) then
           FileUtils.cp_r(cp_lib_data_pieces_bundle, target_parent)
@@ -77,10 +77,9 @@ module NbUtil
         exit
         break
       elsif input == 'N' || input == 'n'
-        p '作業を中断します'
+        target_parent = File.dirname(target)
+        FileUtils.rm_r(File.join(target_parent.to_s, '/informations.tex'))
         break
-      else
-        p "「Y」又は「N」を入力して下さい"
       end
     end
   end
@@ -149,13 +148,11 @@ module NbUtil
         caption = lines[i + 1]
         label_name = file_name.to_s.gsub('figs', '').gsub('.png', '').gsub('/', '')
         wrap_figs = <<"EOS"
-\\begin{wrapfigure}{r}{#{size}mm}
 \\begin{center}
-\\includegraphics[bb= 0 0 1024 768, width=#{size}mm]{../../#{file_name}}
-#{caption}
-\\label{fig:#{label_name}}
+\\includegraphics[width=#{size}mm]{../../#{file_name}}
 \\end{center}
-\\end{wrapfigure}
+#{caption}
+\\label{fig:#{label}}
 EOS
         # \\vspace{#{top}\\baselineskip}
         # \\vspace{#{bottom}\\baselineskip}
@@ -187,11 +184,11 @@ EOS
   def your_informations(target)
     info = Array.new(3)
 
-    print "卒論の題目: "
+    print "thesis title: "
     info[0] = STDIN.gets.to_s.chomp
-    print "学籍番号（7桁）: "
+    print "student number(eight-digit): "
     info[1] = STDIN.gets.to_s.chomp
-    print "あなたの名前: "
+    print "your name: "
     info[2] = STDIN.gets.to_s.chomp
 
     target_parent = File.dirname(target)
@@ -211,17 +208,23 @@ EOS
   end
 
   def mk_latex_and_mv_to_latex(target, target_parent)
-    mk_latex = File.join(File.dirname(target),'/mk_latex')
     mk_latex = FileUtils.mkdir_p(File.join(File.dirname(target),'/mk_latex'))
-    FileUtils.rm_r(mk_latex[0])
+    if Dir.exist?(File.join(mk_latex[0].to_s, '/pieces'))
+      d = Date.today
+      old_file = File.join(File.dirname(target),"/old/#{d.year}#{d.month}#{d.day}")
+      FileUtils.mkdir_p(old_file)
+      FileUtils.cp_r(mk_latex[0], old_file)
+      FileUtils.rm_r(mk_latex[0])
+    end
     mk_latex = FileUtils.mkdir_p(File.join(File.dirname(target),'/mk_latex'))
+
     #p split_files = FileUtils.mkdir_p(File.join(File.dirname(target),'/mk_latex/split_files'))
     split_files = File.join(target_parent, '/split_files')
     pieces = File.join(target_parent, '/pieces')
     thesis = File.join(target_parent, '/thesis')
     latex = File.join(target_parent, '/latex')
 
-    FileUtils.mv(split_files, mk_latex[0]+'/split_files')
+    FileUtils.mv(split_files, File.join(mk_latex[0], "/split_files"))
     FileUtils.mv(pieces, mk_latex[0])
     FileUtils.mv(thesis, mk_latex[0])
     FileUtils.mv(latex, mk_latex[0])

data/lib/nb_util/version.rb

@@ -1,3 +1,3 @@
 module NbUtil
-  VERSION = "0.3.5"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nb_util
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.8
 platform: ruby
 authors:
 - Masatoshi Kowaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler