hikiutils 0.2.3.17 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 433ab36ff77eb9b1e13084265c88aa55527e5b60
-  data.tar.gz: 5c8fad21a3fec1cd7d7fd552e404055ab036940b
+  metadata.gz: 0e67db998d4626c5b62c8b4df5e2fe804eb8f559
+  data.tar.gz: 898c7a178f66ac5f66368180f1af33f3e8e505bf
 SHA512:
-  metadata.gz: e4be9d9a8cf003c343cf5d80cced5ed1a3640c23cbc3de3fed563cd3d49de4ff06cb4a517c0b2bdaf7ae6ca227308de77a400c9fb2368552f600ae096f9b4d90
-  data.tar.gz: 960be35ae9738a136d0b74d3aebca4647c88bc4c2b08aad378993c19bc33d907dac01783d392f244be8d591a68fc693701a1fb6d3569a08bad9a1048bd7b0041
+  metadata.gz: 3abbfa9ab4df92e99fdfa1c743772615dba24bbd20c6f8eda5c9cc10b5d70d199891ef429270a8fc52ac46413e6e7294930ab2d785e7577d58aad417754145ae
+  data.tar.gz: 7a564619d9c4f16f59da12e311db1eb577dd7aa584212438e1930ed0ce673938776a279b88ccb85513e4a193f793479478de8058ff970952b191d77c66d64aa7

data/.gitignore

@@ -1,3 +1,4 @@
+/.DS_Store/
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/Rakefile

@@ -1,7 +1,11 @@
+# -*- coding: utf-8 -*-
 require "bundler/gem_tasks"
 require 'yard'
-require "rake/testtask"
+#require "rake/testtask"
+require "rspec/core/rake_task"
 require 'fileutils'
+require 'cucumber/rake/task'
+
 p base_path = File.expand_path('..', __FILE__)
 p basename = File.basename(base_path)
 
@@ -9,11 +13,78 @@ task :default do
   system 'rake -T'
 end
 
+desc "cucumber with Japanese"
+task :cucumber do
+  Cucumber::Rake::Task.new do |t|
+    t.cucumber_opts = %w{--format pretty -l ja}
+  end
+end
+
+desc "rspec test for aruba"
+task :rspec do
+  RSpec::Core::RakeTask.new(:spec)
+end
+
+desc "auto re-install"
+task :auto_reinstall do
+  puts "[sudo] gem uninstall my_help"
+  puts "cd my_help"
+  puts "git remote add upstrem git@github.com:daddygongon/my_help.git"
+  puts "git pull upstrem master"
+  puts "rake clean_exe"
+  puts "rake to_yml"
+  puts "*cp lib/daddygongon/my_todo.yml ~/.my_help"
+  puts "[sudo] bundle exec exe/my_help -m"
+  puts "*source ~/.zshrc or source ~/.cshrc"
+  puts "*my_help -l"
+  puts "*rake add_yml"
+  puts "*--editで編集画面を開けてみて，色が付いてなかったら，"
+  puts "*mv ~/.emacs ~/.emacs.d/init.elを試してみる"
+end
+
+desc "add .yml mode on ~/.emacs.d/init.el"
+task :add_yml do
+  adds = <<EOS
+;; =================
+;;  .yml auto ruby-mode 
+;; =================
+(add-to-list 'auto-mode-alist '("\\.yml$" . ruby-mode))
+EOS
+  print adds
+  p Dir.chdir(File.join(ENV['HOME'],'.emacs.d'))
+  File.open('init.el','a+'){|file|
+    cont=file.read
+    cont.include?('.yml') ? break : file.write(adds)
+  }
+end
+
+desc "add .yml on all help files"
+task :to_yml do
+  p Dir.chdir(File.join(ENV['HOME'],'.my_help'))
+  Dir.entries('.').each{|file|
+    next if file == '.' or file=='..'
+    next if file[0]=='#' or file[-1]=='~'
+    next unless File.extname(file)==''
+    #FileUtils::DryRun.mv(file, file+'.yml',:verbose=>true)
+    FileUtils.mv(file, file+'.yml',:verbose=>true)
+  }
+end
+
 desc "make documents by yard"
 task :yard => [:hiki2md] do
   YARD::Rake::YardocTask.new
 end
 
+desc "clean up exe dir"
+task :clean_exe do
+  files = Dir.entries('exe')
+  files.each{|file|
+    next if ["my_help",".","..",".DS_Store",
+             "emacs_help","e_h","my_todo"].include?(file)
+    FileUtils.rm(File.join('./exe',file), :verbose=>true)
+  }
+end
+
 desc "transfer hikis/*.hiki to wiki"
 task :hiki2md do
   files = Dir.entries('hikis')
@@ -25,18 +96,15 @@ task :hiki2md do
       system command
     when 'gif','png','pdf'
       p command="cp hikis/#{file} #{basename}.wiki/#{file}"
-      #      system command
+#      system command
       FileUtils.cp("hikis/#{file}","#{basename}.wiki/#{file}",:verbose=>true)
       FileUtils.cp("hikis/#{file}","doc/#{file}",:verbose=>true)
     end
   }
   readme_en="#{basename}.wiki/README_en.md"
   readme_ja="#{basename}.wiki/README_ja.md"
-  if File.exists?(readme_en)
-    FileUtils.cp(readme_en,"./README.md",:verbose=>true)
-  elsif File.exists?(readme_ja)
-    FileUtils.cp(readme_ja,"./README.md",:verbose=>true)
-    FileUtils.cp(readme_ja,"#{basename}.wiki/Home.md",:verbose=>true)
-  end
+  FileUtils.cp(readme_en,"./README_en.md",:verbose=>true)
+  FileUtils.cp(readme_ja,"./README.md",:verbose=>true)
+  FileUtils.cp(readme_ja,"#{basename}.wiki/Home.md",:verbose=>true)
 end
 

data/exe/hiki

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

data/hikiutils.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "yard", "~> 0.8"
+  spec.add_development_dependency "yard", "~> 0.9.11"
   spec.add_development_dependency "hiki2md"
   spec.add_development_dependency "mathjax-yard"
   spec.add_development_dependency "hiki2yard"

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
 
 
@@ -95,15 +95,15 @@ EOS
         end
       }
       # cp default files
-      cp_files=[['Rakefile_hiki_sync','Rakefile'],
-                ['hiki_help.yml','hiki_help.yml'],
-                ['head.tex','latex_dir/head.tex'],
-                ['pre.tex','latex_dir/pre.tex'],
-                ['jlisting.sty','latex_dir/jlisting.sty'],
+      cp_files=[['Rakefile_hiki_sync',File.join(Dir.pwd,'Rakefile')],
+                ['hiki_help.yml',File.join(ENV['HOME'],'.my_help','hiki_help.yml')],
+                ['head.tex',File.join(Dir.pwd,'latex_dir/head.tex')],
+                ['pre.tex',File.join(Dir.pwd,'latex_dir/pre.tex')],
+                ['jlisting.sty',File.join(Dir.pwd,'latex_dir/jlisting.sty')],
                ]
       cp_files.each_with_index{|files,i|
         p source = File.join(File.expand_path('..', __FILE__),'templates',files[0])
-        p target = File.join(Dir.pwd,files[1])
+        p target = files[1]
         if i==0 #force cp of new Rakefile
           FileUtils.cp(source,target,:verbose=>true)
         else #avoid latex files overwritten
@@ -114,10 +114,10 @@ EOS
       begin
         p cont=File.read('./.gitignore')
         unless cont.include?('.hikirc')
-          File.open('./.gitignore','w'){|file| file.print(".hikirc\n")}
+          File.open('./.gitignore','a+'){|file| file.print(".hikirc\n")}
         end
       rescue
-        File.open('./.gitignore','w'){|file| file.print(".hikirc\n")}
+        File.open('./.gitignore','a+'){|file| file.print(".hikirc\n")}
       end
     end
 

data/lib/hikiutils/version.rb

@@ -1,3 +1,3 @@
 module HikiUtils
-  VERSION = "0.2.3.17"
+  VERSION = "0.2.4"
 end

data/lib/hikiutils_thor.rb

@@ -17,23 +17,7 @@ module Hikithor
   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
+    HTML_TEMPLATE = <<EOS
 <!DOCTYPE html
     PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
     "http://www.w3.org/TR/html4/loose.dtd">
@@ -50,20 +34,35 @@ HTML_TEMPLATE = <<EOS
 </html>
 EOS
 
-    desc 'pwd', 'show nick_names'
-#    map "--show" => "show"
+    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.open(DATA_FILE,'r'){|file| @src = YAML.load(file.read)}
+
+      @target = @src[:target]
+      @l_dir=@src[:srcs][@target][:local_dir]
+      browser = @src[:browser]
+      @browser = (browser==nil) ? 'firefox' : browser
+      editor_command = @src[:editor_command]
+      @editor_command = (editor_command==nil) ? 'open -a mi' : editor_command
+      printf("target_no:%i\n",@target)
+      printf("editor_command:%s\n",@editor_command)
+    end
+
+    desc 'pwd', 'list nick_names and print working dir'
+    #    map "--show" => "show"
     def pwd
-      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      
+      @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)
+      header = display_format('id','name','local directory','global uri',@i_size,@n_size,@l_size,@g_size)
 
       puts header
       puts '-' * header.size
@@ -74,20 +73,20 @@ EOS
         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)
+        puts display_format(id,name,local,global,@i_size,@n_size,@l_size,@g_size)
       }
     end
 
     desc '-v', 'show program version'
-#    map "--version" => "version"
+    #    map "--version" => "version"
     map "-v" => "version"
     def version
       puts HikiUtils::VERSION
     end
 
     desc 'add', 'add sources info'
-#    map "--add" => "add"
-#    option :add
+    #    map "--add" => "add"
+    #    option :add
     def add
       cont = {}
       @data_name.each{|name|
@@ -100,17 +99,18 @@ EOS
     end
 
     desc 'cd VAL', 'set target id'
-#    map "--target" => "target"
+    #    map "--target" => "target"
     def cd(val)
       @src[:target] = val.to_i
-      show
+      pwd
+      dump_sources
     end
 
-    desc 'open', 'open file'
-#    map "--edit" => "edit"
+    desc 'open FILE', 'open file for editing'
+    #    map "--edit" => "edit"
     def open(file)
       t_file=File.join(@l_dir,'text',file)
-      if !File.exist?(t_file) then
+      unless File.exist?(t_file)
         file=File.open(t_file,'w')
         file.close
         File.chmod(0777,t_file)
@@ -120,7 +120,7 @@ EOS
     end
 
     desc 'ls [FILE]', 'list files'
-#    map "--list" => "list"
+    #    map "--list" => "list"
     def ls(file)
       file ='' if file==nil
       t_file=File.join(@l_dir,'text')
@@ -128,14 +128,19 @@ EOS
       print `cd #{t_file} ; ls -lt #{file}*`
     end
 
-    desc 'touch', 'update file'
-#    map "--update" => "update"
+    desc 'touch FILE', 'update FILE'
+    #    map "--update" => "update"
     def touch(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)
+      begin
+        FileUtils.rm(t_file,:verbose=>true)
+        info=InfoDB.new(@l_dir)
+        info.update(file0)
+      rescue
+        print "some errors on touch, but dont mind...\n"
+      end
+
       l_path = @src[:srcs][@target][:local_uri]
       p command="open -a #{@browser} \'#{l_path}/?#{file}\'"
       system command
@@ -144,8 +149,8 @@ EOS
     end
 
     desc 'rsync', 'rsync files'
-#    map "--rsync" => "rsync"
-#    option :rsync
+    #    map "--rsync" => "rsync"
+    #    option :rsync
     def rsync
       p local = @l_dir
       p global = @src[:srcs][@target][:global_dir]
@@ -154,14 +159,14 @@ EOS
     end
 
     desc 'db FILE', 'read datebase file'
-#    map "--database" => "database"
+    #    map "--database" => "database"
     def db(file_name)
       info=InfoDB.new(@l_dir)
       p info.show(file_name)
     end
 
     desc 'show FILE', 'display converted hikifile'
-#    map "--display" => "display"
+    #    map "--display" => "display"
     def show(file)
       body = HikiDoc.to_html(File.read(file))
       source = HTML_TEMPLATE
@@ -174,14 +179,14 @@ EOS
     end
 
     desc 'checkdb', 'check database file'
-#    map "--checkdb" => "checkdb"
+    #    map "--checkdb" => "checkdb"
     def checkdb
       result= InfoDB.new(@l_dir).show_inconsist
       print (result=='') ? "db agrees with text dir.\n" : result
     end
 
     desc 'rm [FILE]', 'remove files'
-#    map "--remove" => "remove"
+    #    map "--remove" => "remove"
     def rm(file_name)
       p text_path = File.join(@l_dir,'text',file_name)
       p attach_path = File.join(@l_dir,'cache/attach',file_name)
@@ -204,7 +209,7 @@ EOS
     end
 
     desc 'mv [FILE]', 'move file'
-#    map "--move" => "move"
+    #    map "--move" => "move"
     def mv(files)
       begin
         p file1_path = File.join(@l_dir,'text',files[0])
@@ -267,29 +272,36 @@ EOS
     end
 
     desc 'euc FILE', 'translate file to euc'
-#    map "--euc" => "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
+
+    no_commands do
+      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
+
+      def dump_sources
+        file = File.open(DATA_FILE,'w')
+        YAML.dump(@src, file)
+        file.close
+      end
     end
 
   end
+
 end
 
 module DataFiles