RubyGems - hikiutils - Versions diffs - 0.2.3.4 → 0.2.3.6 - Mend

hikiutils 0.2.3.4 → 0.2.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (70) hide show

checksums.yaml +4 -4
data/exe/hiki +1 -3
data/exe/hiki_thor +0 -3
data/exe/hiki_thor~ +8 -0
data/exe/hiki~ +8 -0
data/hikiutils.gemspec +1 -0
data/hikiutils_bob/Rakefile +10 -27
data/hikiutils_bob/figs/hikiutils_bob.004.jpeg +0 -0
data/hikiutils_bob/{private_dir.graffle → hikiutils_bob.graffle} +1 -1
data/hikiutils_bob/hikiutils_bob.key +0 -0
data/hikiutils_bob/hikiutils_bob/hikiutils_bob.004.jpeg +0 -0
data/hikiutils_bob/latex_all.hiki +7 -3
data/hikiutils_bob/latex_dir/hikiutils_bob.log +99 -84
data/hikiutils_bob/latex_dir/hikiutils_bob.pdf +0 -0
data/hikiutils_bob/latex_dir/hikiutils_bob.synctex.gz +0 -0
data/hikiutils_bob/latex_dir/hikiutils_bob.toc +14 -10
data/hikiutils_bob/latex_dir/latex_all.aux +10 -10
data/hikiutils_bob/latex_dir/latex_all.tex +14 -5
data/hikiutils_bob/latex_dir/sync.aux +14 -8
data/hikiutils_bob/latex_dir/sync.tex +70 -17
data/hikiutils_bob/sync.hiki +44 -7
data/hikiutils_yamane/Rakefile +32 -31
data/hikiutils_yamane/abstract.hiki +1 -0
data/hikiutils_yamane/backup/hikiutils%28optparse%E3%83%90%E3%83%BC%E3%82%B8%E3%83%A7%E3%83%B3%29 +309 -0
data/hikiutils_yamane/backup/hikiutils%28thor%E3%83%90%E3%83%BC%E3%82%B8%E3%83%A7%E3%83%B3%29 +1 -0
data/hikiutils_yamane/backup/hikiutils_yamane +703 -0
data/hikiutils_yamane/backup/hikiutils_yamane.hiki +0 -0
data/hikiutils_yamane/backup/hikiutils_yamane_#hikiutils_yamane +1 -0
data/hikiutils_yamane/backup/hikiutils_yamane_command_table +19 -0
data/hikiutils_yamane/backup/hikiutils_yamane_introduction +7 -0
data/hikiutils_yamane/figs/hikiutils_yamane.001.jpeg +0 -0
data/hikiutils_yamane/figs/hikiutils_yamane.001.jpg +0 -0
data/hikiutils_yamane/figs/hikiutils_yamane.002.jpeg +0 -0
data/hikiutils_yamane/figs/hikiutils_yamane.002.jpg +0 -0
data/hikiutils_yamane/figs/hikiutils_yamane.003.jpeg +0 -0
data/hikiutils_yamane/figs/hikiutils_yamane.003.jpg +0 -0
data/hikiutils_yamane/figs/hikiutils_yamane.004.jpeg +0 -0
data/hikiutils_yamane/figs/hikiutils_yamane.004.jpg +0 -0
data/hikiutils_yamane/figs/hikiutils_yamane.005.jpeg +0 -0
data/hikiutils_yamane/figs/hikiutils_yamane.005.jpg +0 -0
data/hikiutils_yamane/figs/hikiutils_yamane.006.jpeg +0 -0
data/hikiutils_yamane/figs/hikiutils_yamane.007.jpeg +0 -0
data/hikiutils_yamane/hikiutils_yamane.hiki +37 -1
data/hikiutils_yamane/hikiutils_yamane.key +0 -0
data/hikiutils_yamane/hikiutils_yamane.key~11b9dba1272d2104b420497d11c6eda206ace6c2 +0 -0
data/hikiutils_yamane/introduction.hiki +27 -0
data/hikiutils_yamane/latex_dir/abstract.aux +22 -0
data/hikiutils_yamane/latex_dir/abstract.tex +1 -0
data/hikiutils_yamane/latex_dir/command_table.tex +1 -1
data/hikiutils_yamane/latex_dir/head.tex +2 -2
data/hikiutils_yamane/latex_dir/hikiutils_yamane.aux +3 -0
data/hikiutils_yamane/latex_dir/hikiutils_yamane.log +224 -84
data/hikiutils_yamane/latex_dir/hikiutils_yamane.pdf +0 -0
data/hikiutils_yamane/latex_dir/hikiutils_yamane.synctex.gz +0 -0
data/hikiutils_yamane/latex_dir/hikiutils_yamane.tex +16 -2
data/hikiutils_yamane/latex_dir/hikiutils_yamane.toc +20 -0
data/hikiutils_yamane/latex_dir/introduction.aux +26 -0
data/hikiutils_yamane/latex_dir/introduction.tex +33 -0
data/hikiutils_yamane/latex_dir/results.aux +45 -0
data/hikiutils_yamane/latex_dir/results.tex +342 -0
data/hikiutils_yamane/latex_dir/system.tex +23 -0
data/hikiutils_yamane/results.hiki +376 -0
data/hikiutils_yamane/system.hiki +18 -0
data/lib/hikiutils.rb +7 -3
data/lib/hikiutils.rb~ +387 -0
data/lib/hikiutils/version.rb +1 -1
data/lib/hikiutils_thor.rb +36 -20
data/lib/hikiutils_thor.rb~ +324 -0
data/lib/templates/Rakefile_hiki_sync +35 -31
metadata +57 -3

data/lib/hikiutils/version.rb CHANGED

@@ -1,3 +1,3 @@
 module HikiUtils
-  VERSION = "0.2.3.4"
+  VERSION = "0.2.3.6"
 end

data/lib/hikiutils_thor.rb CHANGED

@@ -3,6 +3,7 @@ require 'thor'
 require 'kconv'
 require 'hikidoc'
 require 'erb'
+require "hikiutils/version"
 require "hikiutils/tmarshal"
 require "hikiutils/infodb"
 require 'systemu'
@@ -15,10 +16,9 @@ module Hikithor
   DATA_FILE=File.join(ENV['HOME'],'.hikirc')
   attr_accessor :src, :target, :editor_command, :browser, :data_name, :l_dir
   class CLI < Thor
    def initialize(*args)
-     super
+      super
       @data_name=['nick_name','local_dir','local_uri','global_dir','global_uri']
       data_path = File.join(ENV['HOME'], '.hikirc')
       DataFiles.prepare(data_path)
@@ -32,7 +32,7 @@ module Hikithor
       @browser = (browser==nil) ? 'firefox' : browser
       p editor_command = @src[:editor_command]
       @editor_command = (editor_command==nil) ? 'open -a mi' : editor_command
-    end
+   end
 HTML_TEMPLATE = <<EOS
 <!DOCTYPE html
     PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
@@ -50,8 +50,9 @@ HTML_TEMPLATE = <<EOS
 </html>
 EOS
-    desc 'show', 'show sources'
-    def show()
+    desc 'show,--show', 'show sources'
+    map "--show" => "show"
+    def show
       printf("target_no:%i\n",@src[:target])
       printf("editor_command:%s\n",@src[:editor_command])
       @i_size,@n_size,@l_size,@g_size=3,5,30,15 #i,g_size are fixed
@@ -77,12 +78,16 @@ EOS
       }
     end
-    desc 'version', 'show program version'
+    desc 'version,--version,-v', 'show program version'
+    map "--version" => "version"
+    map "-v" => "version"
     def version
-      puts Hikithor::VERSION
+      puts HikiUtils::VERSION
     end
-    desc 'add', 'add sources info'
+    desc 'add,--add', 'add sources info'
+    map "--add" => "add"
+    option :add
     def add
       cont = {}
       @data_name.each{|name|
@@ -94,15 +99,16 @@ EOS
       show
     end
-    desc 'target VAL', 'set target id'
+    desc 'target VAL,--target VAL', 'set target id'
+    map "--target" => "target"
     def target(val)
       @src[:target] = val.to_i
       show
     end
-    desc 'edit FILE', 'open file'
+    desc 'edit FILE,--edit FILE', 'open file'
+    map "--edit" => "edit"
     def edit(file)
-      p @l_dir
       t_file=File.join(@l_dir,'text',file)
       if !File.exist?(t_file) then
         file=File.open(t_file,'w')
@@ -113,7 +119,8 @@ EOS
       system command
     end
-    desc 'list [FILE]', 'list files'
+    desc 'list [FILE],--list [FILE]', 'list files'
+    map "--list" => "list"
     def list(file)
       file ='' if file==nil
       t_file=File.join(@l_dir,'text')
@@ -121,7 +128,8 @@ EOS
       print `cd #{t_file} ; ls -lt #{file}*`
     end
-    desc 'update FILE', 'update file'
+    desc 'update FILE,--update FILE', 'update file'
+    map "--update" => "update"
     def update(file0)
       file = (file0==nil) ? 'FrontPage' : file0
       t_file=File.join(@l_dir,'cache/parser',file)
@@ -135,7 +143,9 @@ EOS
       p "If you get 整形式になっていません, try login as a valid user."
     end
-    desc 'rsync', 'rsync files'
+    desc 'rsync,--rsync', 'rsync files'
+    map "--rsync" => "rsync"
+    option :rsync
     def rsync
       p local = @l_dir
       p global = @src[:srcs][@target][:global_dir]
@@ -143,13 +153,15 @@ EOS
       system command
     end
-    desc 'datebase FILE', 'read datebase file'
+    desc 'datebase FILE,--database FILE', 'read datebase file'
+    map "--database" => "database"
     def database(file_name)
       info=InfoDB.new(@l_dir)
       p info.show(file_name)
     end
-    desc 'display FILE', 'display converted hikifile'
+    desc 'display FILE,--display FILE', 'display converted hikifile'
+    map "--display" => "display"
     def display(file)
       body = HikiDoc.to_html(File.read(file))
       source = HTML_TEMPLATE
@@ -161,13 +173,15 @@ EOS
       system "open #{t.path}"
     end
-    desc 'checkdb', 'check database file'
+    desc 'checkdb,--checkdb', 'check database file'
+    map "--checkdb" => "checkdb"
     def checkdb
       result= InfoDB.new(@l_dir).show_inconsist
       print (result=='') ? "db agrees with text dir.\n" : result
     end
-    desc 'remove [FILE]', 'remove files'
+    desc 'remove [FILE],--remove [FILE]', 'remove files'
+    map "--remove" => "remove"
     def remove(file_name)
       p text_path = File.join(@l_dir,'text',file_name)
       p attach_path = File.join(@l_dir,'cache/attach',file_name)
@@ -189,7 +203,8 @@ EOS
       info.dump
     end
-    desc 'move [FILE]', 'move file'
+    desc 'move [FILE],--move [FILE]', 'move file'
+    map "--move" => "move"
     def move(files)
       begin
         p file1_path = File.join(@l_dir,'text',files[0])
@@ -251,7 +266,8 @@ EOS
       info.dump
     end
-    desc 'euc FILE', 'translate file to euc'
+    desc 'euc FILE,--euc FILE', 'translate file to euc'
+    map "--euc" => "euc"
     def euc(file)
       p file_path = File.join(@l_dir,'text',file)
       cont = File.readlines(file_path)

data/lib/hikiutils_thor.rb~ ADDED

@@ -0,0 +1,324 @@
+# -*- coding: utf-8 -*-
+require 'thor'
+require 'kconv'
+require 'hikidoc'
+require 'erb'
+require "hikiutils/version"
+require "hikiutils/tmarshal"
+require "hikiutils/infodb"
+require 'systemu'
+require 'fileutils'
+require 'yaml'
+require 'pp'
+module Hikithor
+  DATA_FILE=File.join(ENV['HOME'],'.hikirc')
+  attr_accessor :src, :target, :editor_command, :browser, :data_name, :l_dir
+  class CLI < Thor
+   def initialize(*args)
+      super
+      @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)
+      file.close
+      @target = @src[:target]
+      @l_dir=@src[:srcs][@target][:local_dir]
+      browser = @src[:browser]
+      @browser = (browser==nil) ? 'firefox' : browser
+      p editor_command = @src[:editor_command]
+      @editor_command = (editor_command==nil) ? 'open -a mi' : editor_command
+   end
+HTML_TEMPLATE = <<EOS
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="ja">
+<html>
+<head>
+  <meta http-equiv="Content-Language" content="ja">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title><%= title %></title>
+</head>
+<body>
+  <%= body %>
+</body>
+</html>
+EOS
+    desc 'show,--show', 'show sources'
+    map "--show" => "show"
+    def show
+      printf("target_no:%i\n",@src[:target])
+      printf("editor_command:%s\n",@src[:editor_command])
+      @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
+      @src[:srcs].each_with_index{|src,i|
+        target = i==@src[:target] ? '*':' '
+        id = target+i.to_s
+        name=src[:nick_name]
+        local=src[:local_dir]
+        global=src[:global_uri]
+        puts command.display_format(id,name,local,global,@i_size,@n_size,@l_size,@g_size)
+      }
+    end
+    desc 'version,--version,-v', 'show program version'
+    map "--version" => "version"
+    map "-v" => "version"
+    def version
+      puts HikiUtils::VERSION
+    end
+    desc 'add,--add', 'add sources info'
+    map "--add" => "add"
+    option :add
+    def add
+      cont = {}
+      @data_name.each{|name|
+        printf("%s ? ", name)
+        tmp = STDIN.gets.chomp
+        cont[name.to_sym] = tmp
+      }
+      @src[:srcs] << cont
+      show
+    end
+    desc 'target VAL,--target VAL', 'set target id'
+    map "--target" => "target"
+    def target(val)
+      @src[:target] = val.to_i
+      show
+    end
+    desc 'edit FILE,--edit FILE', 'open file'
+    map "--edit" => "edit"
+    def edit(file)
+      t_file=File.join(@l_dir,'text',file)
+      if !File.exist?(t_file) then
+        file=File.open(t_file,'w')
+        file.close
+        File.chmod(0777,t_file)
+      end
+      p command="#{@editor_command} #{t_file}"
+      system command
+    end
+    desc 'list [FILE],--list [FILE]', 'list files'
+    map "--list" => "list"
+    def list(file)
+      file ='' if file==nil
+      t_file=File.join(@l_dir,'text')
+      print "target_dir : "+t_file+"\n"
+      print `cd #{t_file} ; ls -lt #{file}*`
+    end
+    desc 'update FILE,--update FILE', 'update file'
+    map "--update" => "update"
+    def update(file0)
+      file = (file0==nil) ? 'FrontPage' : file0
+      t_file=File.join(@l_dir,'cache/parser',file)
+      FileUtils.rm(t_file,:verbose=>true)
+      info=InfoDB.new(@l_dir)
+      info.update(file0)
+      l_path = @src[:srcs][@target][:local_uri]
+      p command="open -a #{@browser} \'#{l_path}/?#{file}\'"
+      system command
+      p "If you get open error, try rackup from the src_dir."
+      p "If you get 整形式になっていません, try login as a valid user."
+    end
+    desc 'rsync,--rsync', 'rsync files'
+    map "--rsync" => "rsync"
+    option :rsync
+    def rsync
+      p local = @l_dir
+      p global = @src[:srcs][@target][:global_dir]
+      p command="rsync -auvz -e ssh #{local}/ #{global}"
+      system command
+    end
+    desc 'datebase FILE,--database FILE', 'read datebase file'
+    map "--database" => "database"
+    def database(file_name)
+      info=InfoDB.new(@l_dir)
+      p info.show(file_name)
+    end
+    desc 'display FILE,--display FILE', 'display converted hikifile'
+    map "--display" => "display"
+    def display(file)
+      body = HikiDoc.to_html(File.read(file))
+      source = HTML_TEMPLATE
+      title = File.basename(file)
+      erb = ERB.new(source)
+      t = File.open(file+".html",'w')
+      t.puts(erb.result(binding))
+      t.close
+      system "open #{t.path}"
+    end
+    desc 'checkdb,--checkdb', 'check database file'
+    map "--checkdb" => "checkdb"
+    def checkdb
+      result= InfoDB.new(@l_dir).show_inconsist
+      print (result=='') ? "db agrees with text dir.\n" : result
+    end
+    desc 'remove [FILE],--remove [FILE]', 'remove files'
+    map "--remove" => "remove"
+    def remove(file_name)
+      p text_path = File.join(@l_dir,'text',file_name)
+      p attach_path = File.join(@l_dir,'cache/attach',file_name)
+      begin
+        File.delete(text_path)
+      rescue => evar
+        puts evar.to_s
+      end
+      begin
+        Dir.rmdir(attach_path)
+      rescue => evar
+        puts evar.to_s
+      end
+      info=InfoDB.new(@l_dir)
+      p "delete "
+      del_file=info.delete(file_name)
+      info.show_link(file_name)
+      info.dump
+    end
+    desc 'move [FILE],--move [FILE]', 'move file'
+    map "--move" => "move"
+    def move(files)
+      begin
+        p file1_path = File.join(@l_dir,'text',files[0])
+        p file2_path = File.join(@l_dir,'text',files[1])
+      rescue => evar
+        puts evar.to_s
+        puts "error on move_files, check the input format, especially comma separation."
+        exit
+      end
+      return if file1_path==file2_path
+      if File.exist?(file2_path) then
+        print ("moving target #{files[1]} exists.\n")
+        print ("first remove#{files[1]}.\n")
+        return
+      else
+        File.rename(file1_path,file2_path)
+      end
+      info=InfoDB.new(@l_dir)
+      db = info.db
+      pp file0=db[files[0]]
+      db.delete(files[0])
+      db[files[1]]=file0
+      db[files[1]][:title]=files[1] if db[files[1]][:title]==files[0]
+      pp db[files[1]]
+      db.each{|ele|
+        ref = ele[1][:references]
+        if ref.include?(files[0]) then
+          p link_file=ele[0]
+          link_path = File.join(@l_dir,'text',link_file)
+          cont = File.read(link_path)
+          if Kconv.iseuc(cont) then
+            print "euc\n"
+            utf8_cont=cont.toutf8
+            utf8_cont.gsub!(/#{files[0]}/,"#{files[1]}")
+            cont = utf8_cont.toeuc
+          else
+            cont.gsub!(/#{files[0]}/,"#{files[1]}")
+          end
+          File.write(link_path,cont)
+          ref.delete(files[0])
+          ref << files[1]
+          p cache_path = File.join(@l_dir,'cache/parser',link_file)
+          begin
+            File.delete(cache_path)
+          rescue => evar
+            puts evar.to_s
+          end
+        end
+      }
+      info.dump
+    end
+    desc 'euc FILE,--euc FILE', 'translate file to euc'
+    map "--euc" => "euc"
+    def euc(file)
+      p file_path = File.join(@l_dir,'text',file)
+      cont = File.readlines(file_path)
+      cont.each{|line| puts line.toeuc }
+    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
+module DataFiles
+  def self.prepare(data_path)
+    create_file_if_not_exists(data_path)
+  end
+  def self.create_file_if_not_exists(data_path)
+    return if File::exists?(data_path)
+    create_data_file(data_path)
+  end
+  def self.create_data_file(data_path)
+    print "make #{data_path}\n"
+    init_data_file(data_path)
+  end
+  # initialize source file by dummy data
+  def self.init_data_file(data_path)
+    @src = {:target => 0, :editor_command => 'open -a mi',
+      :srcs=>[{:nick_name => 'hoge', :local_dir => 'hogehoge',
+                :local_uri => 'http://localhost/~hoge',
+                :global_dir => 'hoge@global_host:/hoge',
+                :global_uri => 'http://hoge'}]}
+    file = File.open(data_path,'w')
+    YAML.dump(@src,file)
+    file.close
+  end
+  private_class_method :create_file_if_not_exists, :create_data_file, :init_data_file
+end