hikiutils 0.2.3 → 0.2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 820810ad85670c7d8df9779f1edb5aeb2fbedacf
-  data.tar.gz: 143d10e7ff4d9682e6bceba891e4a0587587b886
+  metadata.gz: 81506266e388a01ba351b64fe66e457727ee7cd6
+  data.tar.gz: f78970f278ed761b7a00cee237710ecbec41bef6
 SHA512:
-  metadata.gz: c4d4607ef5a7cba3b13b98dad2f13e37fb3ce595dfff9a820197ac30fad3ab63639556318d2792c65e16ad01ae09ee7ef69bf4f03726bb45d10b6df057e6f4d6
-  data.tar.gz: 19af682ceb930e1f6a63c3d0ea59c8eb13113f1d049e05bfeeedafca397d77b7327cb83407ec551efc1fe283ef1540a3e0b852226868bc86574430f4987c2dd5
+  metadata.gz: c9c177e0cb6386e1bfcdba4419a053dc3543367edbd315c4fca8b89d08d0ef411fcb67701defa34f2b01b77eebedb9b8092662a03f9e21b3b50af53e15014d5e
+  data.tar.gz: 140726c03217b302d23d8d169eb4ce3b5c97cb29e7916460166ce3f89e98e09a92b396c22678b984fb77429a0f818811badb390fbf5f9847820a06f591dfc1d2

data/exe/hiki

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
 require "hikiutils"
+#require "hikiutils_thor"
 
 HikiUtils::Command.run(ARGV)
+#CLI::Command.run(ARGV)
+#Hikithor::CLI.start(ARGV)

data/exe/hiki_thor

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+#require "hikiutils"
+require "hikiutils_thor"
+
+#HikiUtils::Command.run(ARGV)
+#CLI::Command.run(ARGV)
+Hikithor::CLI.start(ARGV)

data/hikiutils.gemspec

@@ -38,4 +38,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "hiki2yard"
   spec.add_runtime_dependency "systemu"
   spec.add_runtime_dependency "hikidoc", "~> 0.1.0"
+  spec.add_runtime_dependency 'thor'
 end

data/hikiutils_yamane/.gitignore

@@ -0,0 +1 @@
+.hikirc

data/hikiutils_yamane/Rakefile

@@ -0,0 +1,66 @@
+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 "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_p(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

data/hikiutils_yamane/hiki_help.yml

@@ -0,0 +1,66 @@
+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 "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

data/hikiutils_yamane/hikiutils_yamane.hiki

@@ -0,0 +1 @@
+!test

data/lib/hikiutils/version.rb

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

data/lib/hikiutils_thor.rb

@@ -0,0 +1,308 @@
+# -*- coding: utf-8 -*-
+require 'thor'
+require 'kconv'
+require 'hikidoc'
+require 'erb'
+require "hikiutils/tmarshal"
+require "hikiutils/infodb"
+#require "hikiutils/hiki1"
+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
+=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')
+
+      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 display_format(id,name,local,global)
+      }
+    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
+        cont[name.to_sym] = tmp
+      }
+      @src[:srcs] << cont
+      show
+    end
+
+    desc 'target VAL', 'set target id'
+    def target(val)
+      @src[:target] = val.to_i
+      show
+    end
+=end
+    desc 'edit FILE', 'open file'
+    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')
+        file.close
+        File.chmod(0777,t_file)
+      end
+      p command="#{@editor_command} #{t_file}"
+      system command
+    end
+=begin
+    desc 'list [FILE]', 'list files'
+    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'
+    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 files'
+    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', 'read datebase file'
+    def database(file_name)
+      info=InfoDB.new(@l_dir)
+      p info.show(file_name)
+    end
+
+    desc 'display FILE', 'display converted hikifile'
+    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', 'check database file'
+    def checkdb
+      result= InfoDB.new(@l_dir).show_inconsist
+      print (result=='') ? "db agrees with text dir.\n" : result
+    end
+
+    desc 'remove [FILE]', 'remove files'
+    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'
+    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', 'translate file to 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
+  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
+

data/lib/templates/Rakefile_hiki_sync

@@ -10,6 +10,26 @@ 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]

data/lib/templates/hiki_help.yml

@@ -10,6 +10,26 @@ 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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hikiutils
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.3.1
 platform: ruby
 authors:
 - Shigeto R. Nishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,11 +150,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "."
 email:
 - shigeto_nishitani@me.com
 executables:
 - hiki
+- hiki_thor
 extensions: []
 extra_rdoc_files: []
 files:
@@ -220,6 +235,7 @@ files:
 - bin/console
 - bin/setup
 - exe/hiki
+- exe/hiki_thor
 - hikis/README.hiki
 - hikis/README.hiki.html
 - hikis/README_ja.hiki
@@ -230,10 +246,15 @@ files:
 - hikiutils.wiki/README.md
 - hikiutils.wiki/README_ja.md
 - hikiutils.wiki/yamane.md
+- hikiutils_yamane/.gitignore
+- hikiutils_yamane/Rakefile
+- hikiutils_yamane/hiki_help.yml
+- hikiutils_yamane/hikiutils_yamane.hiki
 - lib/hikiutils.rb
 - lib/hikiutils/infodb.rb
 - lib/hikiutils/tmarshal.rb
 - lib/hikiutils/version.rb
+- lib/hikiutils_thor.rb
 - lib/templates/Rakefile_hiki_sync
 - lib/templates/hiki_help.yml
 homepage: http://github.org/daddygongon/hikiutils