madowu 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44189e5d16442234da611b91060a05d1bc3cd732
-  data.tar.gz: 093a5bbf14f4baa1cae59749cfdcb28b3748d8b3
+  metadata.gz: decfbfaf61dffe9a4ba5fee8ada06b22f80c5dd1
+  data.tar.gz: c4d98b1223c6bc20c5fa9fda7dffff29e5c6713b
 SHA512:
-  metadata.gz: f8d0a69c5ab29f7bace895e8aa75b99f106b87b0a55b7edde46b75a113b7016687b3a7e56aa05685cc5d0b47dff75a656a501287389023d5765c704accc726cf
-  data.tar.gz: 3429b1f6be911870920be080cbc64cd7e79e0078c723d39fdb7ddee885533cc597920015b2ab07eaf2970caa3d5eac1b26b6b98d448082d7cc3d2b6ea5f1a5c2
+  metadata.gz: 560b45d6783bb1cc40099412fe804c06837ffdab0f8468597556cb5d4f1fe25bc77516285e840c455693d1eaf3da9e539990e89bd7362a9311edaf06506758d1
+  data.tar.gz: ba320592204afc4e654be3e312d2cc51a449cb63e173904dab919eca046f961219e532c2ae0ac456e61c23e0eddc1c385c69ce21c6e03288e7943eb99aff960d

data/CHANGES

@@ -2,6 +2,16 @@
 
 <!-- Master -->
 
+== Version 0.0.8 [2017-04-11]
+
+* Apply escape_zsh to string for kakasi command
+* Add example/doc
+* Add bin/figchange
+* add bin/tex2image --background white
+* Add bin/dirmap --index-link
+* Rename Madowu::Isbn to Madowu::BookInfo
+* Bugfix of bin/isbninfo
+
 == Version 0.0.7 [2016-07-14]
 
 * /bin/madowu is abolished

data/Gemfile

@@ -13,4 +13,5 @@ group :development do
   gem "simplecov", "~> 0.11"
   gem 'amazon-ecs', "~> 2.4"
   gem 'tefil', "~> 0.1"
+  gem 'builtinextension', "~> 0.1"
 end

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/bin/dirmap

@@ -19,6 +19,7 @@ op.banner = [
 op.on("-v"    , "--verbose"    , "Output to stdout too"){ options[:verbose] = true}
 op.on("-f"    , "--force"      , "Force output"){ options[:force] = true}
 op.on("-k"    , "--kakasi"     , "Sort by Japanese yomi"){ options[:kakasi] = true}
+op.on("-i"    , "--index-link" , "Link to index.html even when not exist"){ options[:index] = true}
 op.parse!(ARGV)
 
 if ARGV.size > 1
@@ -42,7 +43,10 @@ def should_update?(options, outfile, new_contents)
 end
 
 outfile = DEFAULT_OUTFILE
-contents = Madowu::DirectoryMapper.dirmap(dir, options[:kakasi])
+contents = Madowu::DirectoryMapper.dirmap(path: dir,
+                                          kakasi: options[:kakasi],
+                                          index: options[:index],
+                                         )
 
 if should_update?(options, outfile, contents)
   io = File.open(outfile, 'w')

data/bin/figchange

@@ -0,0 +1,56 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require "optparse"
+require "pp"
+require "string/escapezsh"
+
+USAGE = <<HERE
+  Usage: #{File.basename("#{__FILE__}")} [options] old_name new_name
+HERE
+
+## option analysis
+options = {}
+op = OptionParser.new
+op.banner = USAGE
+op.on("-g" , "--git" , "git mv"){options[:git] = true}
+op.parse!(ARGV)
+
+old_name = ARGV.shift
+new_name = ARGV.shift
+
+def execute(command)
+  puts command
+  system command
+end
+
+if Dir.glob("#{new_name}*").empty?
+  option = ''
+  option += " --git " if options[:git]
+  command = "rensub --global #{option} -y #{old_name} #{new_name}"
+  execute(command)
+else
+  puts "already exist: #{ Dir.glob("#{new_name}*").join(' ')}"
+  exit
+end
+
+targets = ARGV
+if targets.empty?
+  targets += Dir.glob("*.md")
+  targets += Dir.glob("*.tex")
+  targets += Dir.glob("Rakefile")
+  targets.flatten
+end
+
+targets.each do |file|
+  execute("linesub --global --overwrite #{old_name} #{new_name} #{file}")
+
+  old_label = "#fig:#{old_name}".escape_zsh
+  new_label = "#fig:#{new_name}".escape_zsh
+  execute("linesub --global --overwrite #{old_label} #{new_label} #{file}")
+
+  old_label = "#fig:#{old_name.sub(/^fig/, '')}".escape_zsh
+  new_label = "#fig:#{new_name.sub(/^fig/, '')}".escape_zsh
+  execute("linesub --global --overwrite #{old_label} #{new_label} #{file}")
+end
+

data/bin/isbninfo

@@ -6,17 +6,31 @@ require 'nokogiri'
 require "madowu"
 
 ARGF.each do |isbn|
-  book = Madowu::Isbn.new(isbn)
+  begin
+    #book = Madowu::Isbn.new(isbn, true)
+    book = Madowu::BookInfo.load_isbn(isbn)
+  end
 
-  puts <<HERE
-[ ![#{book.title}](#{book.img_url})
-  #{book.title},
-  #{book.author},
-  ISBN:#{book.isbn},
-  #{book.publisher},
-  #{book.publication_date}
-](#{book.url})
-HERE
+  printf("[ ![%s](%s)\n%s,\n%s,\nISBN:\n%s,%s,\n%s\n](%s)\n",
+    book.title,
+    book.img_url,
+    book.title,
+    book.author,
+    book.isbn,
+    book.publisher,
+    book.publication_date,
+    book.url
+  )
+
+#  puts <<HERE
+#[ ![#{book.title}](#{book.img_url})
+#  #{book.title},
+#  #{book.author},
+#  ISBN:#{book.isbn},
+#  #{book.publisher},
+#  #{book.publication_date}
+#](#{book.url})
+#HERE
 
 
 

data/bin/tex2image

@@ -60,7 +60,7 @@ img_file = Pathname(tex_file).sub_ext(".#{img_ext}").to_s
 
 commands = []
 commands << "#{LATEX} #{tex_file} > /dev/null"
-commands << "#{CONVERT} -trim -density #{density}x#{density} #{dvi_file} #{img_file}"
+commands << "#{CONVERT} -background white -alpha deactivate -trim -density #{density}x#{density} #{dvi_file} #{img_file}"
 execute(commands)
 commands = []
 

data/example/Rakefile

@@ -1,16 +1,17 @@
 # coding: utf-8
 # Rakefile for Markdown documents.
 
-DIRMAP_MD = '.dirmap.md'
-ENCODING = "UTF-8"
-HTML2PDF = "wkhtmltopdf"
-TEX2IMAGE = "tex2image"
-HTML2PDF_OPTIONS = "-B 1cm -L 1.5cm -R 1.5cm -T 1.5cm -s A4 --encoding #{ENCODING} "
-CONVERT_COMMAND = "convert -alpha deactivate -density 150x150"
+DIRMAP_MD   = '.dirmap.md'
+HTML2PDF    = "wkhtmltopdf -B 1cm -L 1.5cm -R 1.5cm -T 1.5cm -s A4 --encoding UTF-8 "
+TEX2IMAGE   = "tex2image"
+IMAGEMAGICK = "convert -alpha deactivate -density 144x144"
+INKSCAPE    = "inkscape"
 
 require "pp"
 require "fileutils"
 require "pathname"
+require "tempfile"
+require "rake/clean"
 
 ## .dirmap.md
 # dirmap コマンドは必ず実行なので task タスク。
@@ -22,7 +23,7 @@ require "pathname"
 desc "update .dirmap.md if directory changed."
 file DIRMAP_MD => :dirmap_command
 task :dirmap_command do
-  sh "dirmap" # You can use --kakasi option if the command installed
+  sh "dirmap --kakasi"
 end
 
 ## *.html
@@ -35,75 +36,86 @@ html_files.each do |html_file|
   dirpath = md_path.dirname
   src = FileList[md_file, DIRMAP_MD]
   file html_file => [DIRMAP_MD, md_file] do
-    sh "madowu -O -s .dirmap.md -c madowu.css -C UTF-8 #{md_file}"
+    puts "Update: #{md_file} -> #{html_file}"
+
+    side_lines = `pandoc #{DIRMAP_MD}`.split("\n")
+    side_lines.unshift "<div class='sidebar'>"
+    side_lines.push "</div>"
+
+    line = `pandoc -s -N --toc -c madowu.css --mathjax --filter pandoc-crossref #{md_file}`
+    lines = line.split("\n")
+    end_body = lines.index('</body>')
+    lines.insert(end_body, side_lines)
+    lines.flatten
+      # -N = --number-sections
+      # -s = --standalone
+    File.open(html_file, "w") {|io| io.puts lines}
   end
   html_tasks << html_file
 end
-
+CLEAN.include(html_files)
 desc "make *.html from *.md"
 task :md2html => [DIRMAP_MD, * html_tasks]
 
-
-desc "make *.pdf from *.html"
-pdf_files = html_files.ext("pdf")
-task :html2pdf => FileList[pdf_files]
-pdf_files.each do |pdf_file|
-  html_file = pdf_file.ext("html")
-  file pdf_file => html_file do
-    sh "#{HTML2PDF} #{HTML2PDF_OPTIONS} #{html_file} #{pdf_file}"
-  end
-end
-
-
-desc "make .png from .eps."
-eps_files = FileList["*.eps"]
-png_files = eps_files.ext("png")
-task :eps2png => FileList[png_files]
-png_files.each do |png_file|
-    eps_file = png_file.ext("eps")
-    t = [eps_file]
-    file png_file => t do
-        sh "#{CONVERT_COMMAND} #{eps_file} #{png_file}"
-    end
-end
-
-
-desc "make *.png from *.tex"
-tex_files = FileList["*.tex"]
-png_files = tex_files.ext("png")
-task :tex2png => FileList[png_files]
-png_files.each do |png_file|
-  tex_file = png_file.ext("tex")
-  file png_file => tex_file do
-    #pp png_file, tex_file; exit
-    sh "#{TEX2IMAGE} #{tex_file}"
-  end
-end
-
-
 # recursive だと、サブディレクトリの Rakefile も
 # recursive ターゲットを持っているという前提が必要。
 desc "execute 'rake' in all subdirs with Rakefile"
 rakefiles = FileList["**/Rakefile"]
 dirs = rakefiles.map{|path| Pathname.new(path).dirname.to_s}
-dirs.delete_if {|i| i == '.' } 
+#dirs.delete_if {|i| i == '.' }
 dirs.map!{|path| File.absolute_path(path)}
+#pp dirs; exit
 task :subdir do
   dirs.each do |dir|
+    puts "■" + dir
     Dir.chdir dir
     system "rake"
   end
 end
 
-task :all => [:md2html, :subdir]
-
-task :pdf => :html2pdf
-#task :default => [:tree, :tex2png, :eps2png]
-task :default => [:md2html, :tex2png, :eps2png]
+############################################################
+## extension rules
+## src_exts: array of the extentions that the destination file depends on.
+## src_exts[0] is used as a 'src' of rake target.
+def rule_src2dst(src_exts, dst_ext)
+  desc "convert from .#{src_exts[0]} to #{dst_ext}."
+  dst_files = []
+  FileList["*.#{src_exts[0]}"].each do |src_file|
+    dst_file = src_file.ext(dst_ext)
+    basename = File.basename(src_file, ".#{src_exts[0]}")
+    src_files = src_exts.map {|ext| FileList["#{basename}.#{ext}"]}.flatten
+    src_files.select!{|path| FileTest.exist? path }
+    file dst_file => src_files do
+      yield(src_files, dst_file)
+    end
+    dst_files << dst_file
+  end
+  task "#{src_exts[0]}2#{dst_ext}".to_sym => dst_files
+  CLEAN.include(dst_files)
+end
 
-require "rake/clean"
-CLEAN.include( [
-  html_files,
-  pdf_files,
-])
+rule_src2dst(['pov'], 'png') { |srcs, dst| sh "povray -D #{srcs[0]}"}
+rule_src2dst(['eps'], 'png') { |srcs, dst| sh "#{IMAGEMAGICK} #{srcs[0]} #{dst}"}
+rule_src2dst(['dot'], 'png') { |srcs, dst| sh "dot -Tpng #{srcs[0]} -o #{dst}"}
+rule_src2dst(['tex'], 'png') { |srcs, dst| sh "#{TEX2IMAGE} #{srcs[0]}" }
+rule_src2dst(['svg'], 'eps') { |srcs, dst| sh "#{INKSCAPE} -T -z -E #{dst} #{srcs[0]}" }
+rule_src2dst(['svg'], 'png') { |srcs, dst| 
+  #直接 png にすると、透明背景で余白ありになる。
+  eps_file = Tempfile.new.path
+  sh "#{INKSCAPE} -T -z -E #{eps_file} #{srcs[0]}"
+  sh "#{IMAGEMAGICK} #{srcs[0]} #{dst}"
+  FileUtils.rm eps_file
+}
+rule_src2dst(['rb', 'dat'] , 'png') { |srcs, dst| sh "ruby #{srcs[0]}" }
+rule_src2dst(['rb', 'dat'] , 'eps') { |srcs, dst| sh "ruby #{srcs[0]} --eps"}
+rule_src2dst(['plt', 'dat'] , 'eps') { |srcs, dst| sh "gnuplot ./#{srcs[0]}"}
+rule_src2dst(['html'], 'pdf') { |srcs, dst| sh "#{HTML2PDF} #{srcs[0]} #{dst}"}
+
+############################################################
+
+#task :all => [:md2html, :subdir]
+task :default => [:md2html, :tex2png, :svg2png, :rb2png, :pov2png, :dot2png]
+# 基本方針として、html を生成するのをデフォルトとする。
+# :eps2png は、rb2eps と rb2png の関係に干渉する
+# :plt2eps
 

data/example/doc/.gitignore

@@ -0,0 +1,2 @@
+*.png
+*.eps

data/example/doc/Rakefile

@@ -0,0 +1,121 @@
+# coding: utf-8
+# Rakefile for Markdown documents.
+
+DIRMAP_MD   = '.dirmap.md'
+HTML2PDF    = "wkhtmltopdf -B 1cm -L 1.5cm -R 1.5cm -T 1.5cm -s A4 --encoding UTF-8 "
+TEX2IMAGE   = "tex2image"
+IMAGEMAGICK = "convert -alpha deactivate -density 144x144"
+INKSCAPE    = "inkscape"
+
+require "pp"
+require "fileutils"
+require "pathname"
+require "tempfile"
+require "rake/clean"
+
+## .dirmap.md
+# dirmap コマンドは必ず実行なので task タスク。
+# これを file にすると存在するときに実行されない。
+# 生成物の .dirmap.md から task タスクへの依存を設定すると、
+# .dirmap.md に依存する file タスクに「必ず実行」が伝播して必ず実行になってしまう。
+# DIRMAP_MD というファイルに対する file タスクへの依存として扱うことで、
+# .dirmap.md に依存する file タスクに「必ず実行」が伝播するのを防いでいる。
+desc "update .dirmap.md if directory changed."
+file DIRMAP_MD => :dirmap_command
+task :dirmap_command do
+  sh "dirmap --kakasi"
+end
+
+## *.html
+md_files = FileList["*.md"]
+html_files = md_files.ext("html")
+html_tasks = []
+html_files.each do |html_file|
+  md_file = html_file.ext("md")
+  md_path = Pathname.new( md_file)
+  dirpath = md_path.dirname
+  src = FileList[md_file, DIRMAP_MD]
+  file html_file => [DIRMAP_MD, md_file] do
+    puts "Update: #{md_file} -> #{html_file}"
+
+    side_lines = `pandoc #{DIRMAP_MD}`.split("\n")
+    side_lines.unshift "<div class='sidebar'>"
+    side_lines.push "</div>"
+
+    line = `pandoc -s -N --toc -c madowu.css --mathjax --filter pandoc-crossref #{md_file}`
+    lines = line.split("\n")
+    end_body = lines.index('</body>')
+    lines.insert(end_body, side_lines)
+    lines.flatten
+      # -N = --number-sections
+      # -s = --standalone
+    File.open(html_file, "w") {|io| io.puts lines}
+  end
+  html_tasks << html_file
+end
+CLEAN.include(html_files)
+desc "make *.html from *.md"
+task :md2html => [DIRMAP_MD, * html_tasks]
+
+# recursive だと、サブディレクトリの Rakefile も
+# recursive ターゲットを持っているという前提が必要。
+desc "execute 'rake' in all subdirs with Rakefile"
+rakefiles = FileList["**/Rakefile"]
+dirs = rakefiles.map{|path| Pathname.new(path).dirname.to_s}
+#dirs.delete_if {|i| i == '.' }
+dirs.map!{|path| File.absolute_path(path)}
+#pp dirs; exit
+task :subdir do
+  dirs.each do |dir|
+    puts "■" + dir
+    Dir.chdir dir
+    system "rake"
+  end
+end
+
+############################################################
+## extension rules
+## src_exts: array of the extentions that the destination file depends on.
+## src_exts[0] is used as a 'src' of rake target.
+def rule_src2dst(src_exts, dst_ext)
+  desc "convert from .#{src_exts[0]} to #{dst_ext}."
+  dst_files = []
+  FileList["*.#{src_exts[0]}"].each do |src_file|
+    dst_file = src_file.ext(dst_ext)
+    basename = File.basename(src_file, ".#{src_exts[0]}")
+    src_files = src_exts.map {|ext| FileList["#{basename}.#{ext}"]}.flatten
+    src_files.select!{|path| FileTest.exist? path }
+    file dst_file => src_files do
+      yield(src_files, dst_file)
+    end
+    dst_files << dst_file
+  end
+  task "#{src_exts[0]}2#{dst_ext}".to_sym => dst_files
+  CLEAN.include(dst_files)
+end
+
+rule_src2dst(['pov'], 'png') { |srcs, dst| sh "povray -D #{srcs[0]}"}
+rule_src2dst(['eps'], 'png') { |srcs, dst| sh "#{IMAGEMAGICK} #{srcs[0]} #{dst}"}
+rule_src2dst(['dot'], 'png') { |srcs, dst| sh "dot -Tpng #{srcs[0]} -o #{dst}"}
+rule_src2dst(['tex'], 'png') { |srcs, dst| sh "#{TEX2IMAGE} #{srcs[0]}" }
+rule_src2dst(['svg'], 'eps') { |srcs, dst| sh "#{INKSCAPE} -T -z -E #{dst} #{srcs[0]}" }
+rule_src2dst(['svg'], 'png') { |srcs, dst| 
+  #直接 png にすると、透明背景で余白ありになるので eps を経由する
+  eps_file = Tempfile.new.path
+  sh "#{INKSCAPE} -T -z -E #{eps_file} #{srcs[0]}"
+  sh "#{IMAGEMAGICK} #{srcs[0]} #{dst}"
+  FileUtils.rm eps_file
+}
+rule_src2dst(['rb' , 'dat'], 'png') { |srcs, dst| sh "ruby #{srcs[0]}" }
+rule_src2dst(['rb' , 'dat'], 'eps') { |srcs, dst| sh "ruby #{srcs[0]} --eps"}
+rule_src2dst(['plt', 'dat'], 'eps') { |srcs, dst| sh "gnuplot ./#{srcs[0]}"}
+rule_src2dst(['html'      ], 'pdf') { |srcs, dst| sh "#{HTML2PDF} #{srcs[0]} #{dst}"}
+
+############################################################
+
+#task :all => [:md2html, :subdir]
+task :default => [:md2html, :tex2png, :svg2png, :rb2png, :pov2png, :dot2png]
+# 基本方針として、html を生成するのをデフォルトとする。
+# :eps2png は、rb2eps と rb2png の関係に干渉する
+# :plt2eps
+