hikiutils 0.2.3.1 → 0.2.3.2

data/abst/yamane_powerpoint_new.key/Metadata/BuildVersionHistory.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<string>pptx</string>
+	<string>M6.1-1769-1</string>
+</array>
+</plist>

data/abst/yamane_powerpoint_new.key/Metadata/DocumentIdentifier

@@ -0,0 +1 @@
+120BA139-C23B-4290-8A16-71ECA44979FB

data/hikiutils_yamane/command_table.hiki

@@ -0,0 +1,19 @@
+!コマンド名の検討
+bashあるいはtcshなどのshellコマンドの振る舞いに似た振る舞いをするコマンドはおなじ名前を振るべきと考えられる．そこで，次のように検討を加える．
+
+||現在のcommand||変える？||検討内容
+||add             || ||  add sources info
+||checkdb         || ||  check database file
+||datebase FILE   || ||  read datebase file
+||display FILE    ||?||  display converted hikifile
+||edit FILE       ||open||  open file
+||euc FILE        || ||  translate file to euc
+||help [COMMAND]  || ||  Describe available commands or one specific command
+||list [FILE]     ||ls||  list files
+||move [FILE]     ||mv|  move file
+||remove [FILE]   ||rm||  remove files
+||rsync           || ||  rsync files
+||show            ||??||lsとかぶる．
+||target VAL      ||cd||  set target id
+||update FILE     ||touch||  update file
+||version         || ||  show program version

data/lib/hikiutils/#tmarshal.rb#

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+# Original Copyright (C) Rubikichi
+# Modified by TAKEUCHI Hitoshi
+# You can redistribute it and/or modify it under the terms of
+# the Ruby's licence.
+
+module TMarshal
+  module_function
+  def dump(obj, port = nil)
+    dumped = dump_text(obj)
+    if port
+      port.write dumped
+    end
+    dumped
+  end
+
+  def load(port)
+#    p port
+    case port
+    when String
+      eval port.untaint
+    when IO, StringIO
+      eval port.read.untaint
+    else
+      raise 'Wrong type!'
+    end
+  end
+
+  def restore(port)
+    load(port)
+  end
+
+  def dump_text(obj)
+    case obj
+    when String
+      obj.dump
+    when Array
+      "[\n"+obj.collect{|x| dump_text(x)+",\n"}.join+"]"
+    when Hash
+      "{\n"+obj.sort_by{|e| e[0].inspect}.collect{|k,v| "#{dump_text(k)} => #{dump_text(v)},\n"}.join+"}"
+    when Numeric, Module, Regexp, Symbol, TrueClass, FalseClass, NilClass, Range
+      obj.inspect
+    when Time
+      "Time.at(#{obj.to_i})"
+    else
+      raise 'Wrong type!'
+    end
+  end
+end
+
+if __FILE__ == $0
+  puts TMarshal.dump({:age => 22, :lang => 'Ruby', :man => true, :day => Time.now})
+end

data/lib/hikiutils/version.rb

@@ -1,3 +1,3 @@
 module HikiUtils
-  VERSION = "0.2.3.1"
+  VERSION = "0.2.3.2"
 end

data/lib/hikiutils.rb

@@ -14,7 +14,7 @@ require 'pp'
 module HikiUtils
   DATA_FILE=File.join(ENV['HOME'],'.hikirc')
   attr_accessor :src, :target, :editor_command, :browser, :data_name, :l_dir
-
+  
   class Command
 
 
@@ -64,7 +64,7 @@ EOS
         opt.on('-r', '--rsync','rsync files') {rsync_files}
         opt.on('--database FILE','read database file') {|file| db_file(file)}
         opt.on('--display FILE','display converted hikifile') {|file| display(file)}
-        opt.on('-c', '--checkdb','check database file') {check_db}
+        opt.on('-c', '--checkdb','check database file') {check_db}       
         opt.on('--remove FILE','remove file') {|file| remove_file(file)}
         opt.on('--move FILES','move file1,file2',Array) {|files| move_file(files)}
         opt.on('--euc FILE','translate file to euc') {|file| euc_file(file) }

data/lib/hikiutils_thor.rb

@@ -5,7 +5,6 @@ require 'hikidoc'
 require 'erb'
 require "hikiutils/tmarshal"
 require "hikiutils/infodb"
-#require "hikiutils/hiki1"
 require 'systemu'
 require 'fileutils'
 require 'yaml'
@@ -50,34 +49,20 @@ HTML_TEMPLATE = <<EOS
 </body>
 </html>
 EOS
-=begin
-    def initialize(*args)
-      @data_name=['nick_name','local_dir','local_uri','global_dir','global_uri']
-      data_path = File.join(ENV['HOME'], '.hikirc')
-      DataFiles.prepare(data_path)
 
-      file = File.open(DATA_FILE,'r')
-      @src = YAML.load(file.read)
-#      p @src
-      file.close
-      @target = @src[:target]
-#      p @target
-      @l_dir=@src[:srcs][@target][:local_dir]
-      browser = @src[:browser]
-#      p browser
-      @browser = (browser==nil) ? 'firefox' : browser
-      p editor_command = @src[:editor_command]
-      @editor_command = (editor_command==nil) ? 'open -a mi' : editor_command
-#      p @l_dir
-    end
-=end
-=begin
     desc 'show', 'show sources'
     def show()
       printf("target_no:%i\n",@src[:target])
       printf("editor_command:%s\n",@src[:editor_command])
-      check_display_size()
-      header = display_format('id','name','local directory','global uri')
+      @i_size,@n_size,@l_size,@g_size=3,5,30,15 #i,g_size are fixed      
+      n_l,l_l=0,0
+      @src[:srcs].each_with_index{|src,i|
+        n_l =(n_l= src[:nick_name].length)>@n_size? n_l:@n_size
+        l_l =(l_l= src[:local_dir].length)>@l_size? l_l:@l_size
+      }
+      @n_size,@l_size=n_l,l_l
+      command = Command.new
+      header = command.display_format('id','name','local directory','global uri',@i_size,@n_size,@l_size,@g_size)
 
       puts header
       puts '-' * header.size
@@ -88,22 +73,21 @@ EOS
         name=src[:nick_name]
         local=src[:local_dir]
         global=src[:global_uri]
-        puts display_format(id,name,local,global)
+        puts command.display_format(id,name,local,global,@i_size,@n_size,@l_size,@g_size)
       }
     end
-=end
+
     desc 'version', 'show program version'
     def version
       puts Hikithor::VERSION
     end
-=begin
+
     desc 'add', 'add sources info'
     def add
       cont = {}
-#      p @data_name
       @data_name.each{|name|
         printf("%s ? ", name)
-        tmp = gets.chomp
+        tmp = STDIN.gets.chomp
         cont[name.to_sym] = tmp
       }
       @src[:srcs] << cont
@@ -115,7 +99,7 @@ EOS
       @src[:target] = val.to_i
       show
     end
-=end
+
     desc 'edit FILE', 'open file'
     def edit(file)
       p @l_dir
@@ -128,7 +112,7 @@ EOS
       p command="#{@editor_command} #{t_file}"
       system command
     end
-=begin
+
     desc 'list [FILE]', 'list files'
     def list(file)
       file ='' if file==nil
@@ -273,7 +257,22 @@ EOS
       cont = File.readlines(file_path)
       cont.each{|line| puts line.toeuc }
     end
-=end
+  end
+  
+  class Command
+    def display_format(id, name, local, global, i_size, n_size, l_size, g_size)
+      name_length  = n_size-full_width_count(name)
+      local_length = l_size-full_width_count(local)
+      global_string= global.size < g_size ? global : global[0..g_size]
+      [id.to_s.rjust(i_size), name.ljust(name_length),
+               local.ljust(local_length),
+                          global_string.ljust(g_size)].join(' | ')
+    end
+    
+    def full_width_count(string)
+          string.each_char.select{|char| !(/[ -~｡-ﾟ]/.match(char))}.count
+    end
+
   end
 end
 

data/lib/templates/Rakefile_hiki_sync

@@ -1,9 +1,14 @@
+# -*- coding: utf-8 -*-
+require 'systemu'
+# -*- coding: utf-8 -*-
 begin
   target_dir = File.readlines('./.hikirc')[0].chomp
 rescue => e
   puts e
   exit
 end
+p dirnames=Dir.pwd.split('/')
+p basename = (dirnames[-1]=='hikis')? dirnames[-2] : dirnames[-1]
 p target_dir
 
 task :default do
@@ -44,11 +49,16 @@ task :convert do
   exit
 end
 
-desc "sync hikis and figs to hiki directory"
-task :sync do
-  p dirnames=Dir.pwd.split('/')
-  p basename = (dirnames[-1]=='hikis')? dirnames[-2] : dirnames[-1]
-  p entries=Dir.entries('.')
+desc "normal sync hikis and figs to hiki directory"
+task :sync => [:check_previous,:sync0]
+
+
+desc "force_sync hikis and figs to hiki directory"
+task :force_sync => [:sync0]
+
+desc "sync0 hikis and figs to hiki directory"
+task :sync0 do
+  entries=Dir.entries('.')
   entries[2..-1].each{|source| #cp *.hiki
     next unless source.include?('.hiki')
     next if source.include?('.hikirc')
@@ -64,6 +74,14 @@ task :sync do
     p source = File.join('./figs',file)
     FileUtils.cp(source,target,:verbose=>true)
   }
+
+  File.open('./.hikirc','w'){|file|
+    status, stdout, stderr =systemu "hiki -l #{basename}*"
+    file.print(target_dir+"\n")
+    stdout.split("\n")[3..-1].each{|line|
+      file.print line+"\n"
+    }
+  }
   exit
 end
 
@@ -76,11 +94,42 @@ end
 
 desc "self copy to hikiutils template directory"
 task :self_copy do
-  p cp_files=[['Rakefile','Rakefile_hiki_sync'],
+  p cp_files=[[File.join(Dir.pwd,'Rakefile'),'Rakefile_hiki_sync'],
             [File.join(ENV['HOME'],'.my_help','hiki_help.yml'),'hiki_help.yml']]
   cp_files.each{|files|
-    p source = File.join(Dir.pwd,'Rakefile')
+    p source = files[0]
     p target = File.join('/Users/bob/Github/hikiutils/lib/templates/',files[1])
     FileUtils.cp(source,target,:verbose=>true)
   }
 end
+
+desc "check previou and current sync"
+task :check_previous do
+  current={}
+  status, stdout, stderr = systemu("hiki -l #{basename}*")
+  stdout.split("\n")[3..-1].each{|line|
+    p file=   line.split(/\s+/)[-1]
+    current[file]=line
+  }
+  previous={}
+  File.readlines('.hikirc')[1..-1].each{|line|
+    p file=   line.split(/\s+/)[-1]
+    previous[file]=line.chomp
+  }
+  added,changed = [],[]
+  current.each_pair{|key,val|
+    if !previous.include?(key)
+      added[key]=val
+    elsif previous[key]!=val
+      changed << val+"\n"
+    else
+
+    end
+  }
+  if changed.size != 0 or added.size !=0
+    print("hiki dirで変更が発生しています．\n")
+    changed.each{|line| print line+"\n"}
+    added.each{|line| print line+"\n"}
+    exit
+  end
+end

data/lib/templates/hiki_help.yml

@@ -1,86 +1,53 @@
-begin
-  target_dir = File.readlines('./.hikirc')[0].chomp
-rescue => e
-  puts e
-  exit
-end
-p target_dir
-
-task :default do
-  system 'rake -T'
-end
-
-desc "increment fig NUBERS in FILE"
-task :increment do
-  number=ARGV[1]
-  file = ARGV[2]
-  dir = ARGV[3] || nil
-  lines = File.readlines(file)
-  cont = ""
-  lines.each{|line|
-    if m=line.match(/\{\{attach_view\((\w+|_).(\d+).jpeg\)\}\}/)
-      new_num=sprintf("%03d",m[2].to_i+number.to_i)
-      line="\{\{attach_view\(#{m[1]}.#{new_num}.jpeg,#{dir}\)\}\}\n"
-      cont << line
-    else
-      cont << line
-    end
-  }
-  print cont
-  exit
-end
-
-desc "convert fig size SCALE TARGET_DIR"
-task :convert do
-  scale = ARGV[1]
-  target_dir=ARGV[2]
-  Dir.entries(target_dir)[2..-1].each{|file|
-    p file
-    source = File.join(target_dir,file)
-    target = File.join('figs',file)
-    p command = "convert #{source} -resize #{scale}\% #{target}"
-    system command
-  }
-  exit
-end
-
-desc "sync hikis and figs to hiki directory"
-task :sync do
-  p dirnames=Dir.pwd.split('/')
-  p basename = (dirnames[-1]=='hikis')? dirnames[-2] : dirnames[-1]
-  p entries=Dir.entries('.')
-  entries[2..-1].each{|source| #cp *.hiki
-    next unless source.include?('.hiki')
-    next if source.include?('.hikirc')
-    p base = source.split('.')[0]
-    name = (base==basename)? base : basename+'_'+base
-    p target = File.join(target_dir,'text',name)
-    FileUtils.cp(source,target,:verbose=>true)
-  }
-  p entries=Dir.entries('./figs') #cp files in figs
-  p target = File.join(target_dir,'cache','attach',basename)
-  FileUtils.mkdir(target,:verbose=>true) unless File.exists?(target)
-  entries[2..-1].each{|file|
-    p source = File.join('./figs',file)
-    FileUtils.cp(source,target,:verbose=>true)
-  }
-  exit
-end
-
-desc "For hiki Errno::ENOENT, Errno::EACCES"
-task :chenv do
-  p user = ENV['USER']
-  system("sudo chmod -R a+w #{target_dir}")
-#  system("sudo chown -R #{user} #{target_dir}")
-end
-
-desc "self copy to hikiutils template directory"
-task :self_copy do
-  p cp_files=[['Rakefile','Rakefile_hiki_sync'],
-            [File.join(ENV['HOME'],'.my_help','hiki_help.yml'),'hiki_help.yml']]
-  cp_files.each{|files|
-    p source = File.join(Dir.pwd,'Rakefile')
-    p target = File.join('/Users/bob/Github/hikiutils/lib/templates/',files[1])
-    FileUtils.cp(source,target,:verbose=>true)
-  }
-end
+# -*- coding: utf-8 -*-
+---
+:head:
+- hikiutil関連のヘルプ
+:initialize:
+  :opts:
+    :short: "-i"
+    :long: "--initialize"
+    :desc: hikiで卒論を書くときの初期化と掟
+  :title: hikiで卒論を書くときの初期化と掟
+  :cont:
+  - 開発メモ:figs,dataも作成
+  - 目的：西谷が後で迷わないように決まったファイル構造を堅持すべし
+  - 文書：hikiで書く.のちには，latexに変換するプログラムを提供します
+  - 図表：すべての図表をkeynoteにまとめる，タイトルを分かりやすく書く
+  - データ：dataディレクトリにまとめる．ファイル名をkeynoteの対応する図表中に記す
+  - hiki --initializeで初期ファイル(Rakefile, ./.hikirc, hiki_help.yml)がcopyされる
+  - hiki_help.ymlを適宜~/.my_helpにcopyしてhiki_helpとして利用，(my_help参照)
+  - Errno::EACCESやpermission errorがでたときはrake chenvを試してみる（報告して）
+  - rake syncによってhikiディレクトリーと同期が取られる
+  - hiki -u TARGETによってブラウザー表示される
+  - テキストの拡張子は'.hiki'
+  - hikiでのurlはテキスト前とディレクトリーから自動生成される
+  - 例えば，hiki2latex_saki/introduciton.hikiとするとhiki2latex_saki_introducitonと変換される
+:error:
+  :opts:
+    :short: "-e"
+    :long: "--error"
+    :desc: error対応
+  :title: error対応
+  :cont:
+  - Permission denied - ./data/text/boundary_narita (Errno::EACCES)->テキストにhikiが書き込めない，chmod
+    a+w FILE
+:figs:
+  :opts:
+    :short: "-f"
+    :long: "--figs"
+    :desc: 図表：すべての図表をkeynoteにまとめる，タイトルを分かりやすく書く
+  :title: 図表：すべての図表をkeynoteにまとめる，タイトルを分かりやすく書く
+  :cont:
+  - keynoteに書いたスライドはイメージに書き出して，rake convert 80 TARGET_DIRでfigsに変換
+  - rake syncでfigsにあるfilesはhiki/target_dirにcpされる
+  - 'convert #{source} -resize 20% #{target}によって，target=figs/TAERGET.pngに20%に縮小して保存される'
+  - convert -density 300 view.svg view.pngで300dpiで変換
+  - |
+    attach_anchorでは
+    '{{attach_anchor(test.png, hiki2latex_saki)}}'
+    と，directory指定しなければならない.
+  - keynoteであとで図を挿入して番号が変わった時の原稿の一括変換 
+  - rake increment 2 boundary_bob.hiki boundary_bob > tmp.hiki
+  - rake convert 60 boundary_bob
+  - rake sync
+  - hiki -u boundary_bob_tmp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hikiutils
 version: !ruby/object:Gem::Version
-  version: 0.2.3.1
+  version: 0.2.3.2
 platform: ruby
 authors:
 - Shigeto R. Nishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -195,12 +195,17 @@ files:
 - abst/out4.pdf
 - abst/out4.synctex.gz
 - abst/out4.tex
+- abst/speed.png
 - abst/testhiki
 - abst/testhiki2
+- abst/tmp.hiki
+- abst/tmp.html
+- abst/work.png
 - abst/yamane_abst.pdf
 - abst/yamane_abst.tex
 - abst/yamane_abst_new.pdf
 - abst/yamane_powerpoint.key
+- abst/yamane_powerpoint.pptx/.DS_Store
 - abst/yamane_powerpoint.pptx/Data/PresetImageFill0-1.jpg
 - abst/yamane_powerpoint.pptx/Data/PresetImageFill1-2.jpg
 - abst/yamane_powerpoint.pptx/Data/PresetImageFill2-3.jpg
@@ -232,6 +237,37 @@ files:
 - abst/yamane_powerpoint.pptx/preview-micro.jpg
 - abst/yamane_powerpoint.pptx/preview-web.jpg
 - abst/yamane_powerpoint.pptx/preview.jpg
+- abst/yamane_powerpoint_new.key/Data/PresetImageFill0-1.jpg
+- abst/yamane_powerpoint_new.key/Data/PresetImageFill1-2.jpg
+- abst/yamane_powerpoint_new.key/Data/PresetImageFill2-3.jpg
+- abst/yamane_powerpoint_new.key/Data/PresetImageFill3-4.jpg
+- abst/yamane_powerpoint_new.key/Data/PresetImageFill4-5.jpg
+- abst/yamane_powerpoint_new.key/Data/PresetImageFill5-6.jpg
+- abst/yamane_powerpoint_new.key/Data/image1-12.png
+- abst/yamane_powerpoint_new.key/Data/image1-9.png
+- abst/yamane_powerpoint_new.key/Data/mt0@2x-13.jpg
+- abst/yamane_powerpoint_new.key/Data/mt10@2x-22.jpg
+- abst/yamane_powerpoint_new.key/Data/mt1@2x-14.jpg
+- abst/yamane_powerpoint_new.key/Data/mt2@2x-15.jpg
+- abst/yamane_powerpoint_new.key/Data/mt3@2x-16.jpg
+- abst/yamane_powerpoint_new.key/Data/mt4@2x-17.png
+- abst/yamane_powerpoint_new.key/Data/mt5@2x-18.jpg
+- abst/yamane_powerpoint_new.key/Data/mt6@2x-19.jpg
+- abst/yamane_powerpoint_new.key/Data/mt7@2x-20.png
+- abst/yamane_powerpoint_new.key/Data/mt8@2x-21.jpg
+- abst/yamane_powerpoint_new.key/Data/st0-381.jpg
+- abst/yamane_powerpoint_new.key/Data/st1-493.jpg
+- abst/yamane_powerpoint_new.key/Data/st2-495.jpg
+- abst/yamane_powerpoint_new.key/Data/st3-481.jpg
+- abst/yamane_powerpoint_new.key/Data/st4-485.jpg
+- abst/yamane_powerpoint_new.key/Data/st5-372.jpg
+- abst/yamane_powerpoint_new.key/Index.zip
+- abst/yamane_powerpoint_new.key/Metadata/BuildVersionHistory.plist
+- abst/yamane_powerpoint_new.key/Metadata/DocumentIdentifier
+- abst/yamane_powerpoint_new.key/Metadata/Properties.plist
+- abst/yamane_powerpoint_new.key/preview-micro.jpg
+- abst/yamane_powerpoint_new.key/preview-web.jpg
+- abst/yamane_powerpoint_new.key/preview.jpg
 - bin/console
 - bin/setup
 - exe/hiki
@@ -248,9 +284,11 @@ files:
 - hikiutils.wiki/yamane.md
 - hikiutils_yamane/.gitignore
 - hikiutils_yamane/Rakefile
+- hikiutils_yamane/command_table.hiki
 - hikiutils_yamane/hiki_help.yml
 - hikiutils_yamane/hikiutils_yamane.hiki
 - lib/hikiutils.rb
+- lib/hikiutils/#tmarshal.rb#
 - lib/hikiutils/infodb.rb
 - lib/hikiutils/tmarshal.rb
 - lib/hikiutils/version.rb