hikiutils 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33c07102bf1780d15c581c527f94c1b8cd6b669a
-  data.tar.gz: ec11aaf32510e96bc9d85d53769279f8586039e2
+  metadata.gz: 820810ad85670c7d8df9779f1edb5aeb2fbedacf
+  data.tar.gz: 143d10e7ff4d9682e6bceba891e4a0587587b886
 SHA512:
-  metadata.gz: 366af89e6261ed389c5a5434311ef583a07d94c291b1b01dddec50dba88dd8e2c69acb73fb97ebc576941d3b1658fb03dde6222d2e53625a4737051718fb50dd
-  data.tar.gz: 405743baaf3740ed695cd89d1e047f4ee48031e8709b1d16b78440613d57e3007b3b7b4b6c03e77e179264ebf3c9186c84ada62d1d821167d563d9dcafb0aa77
+  metadata.gz: c4d4607ef5a7cba3b13b98dad2f13e37fb3ce595dfff9a820197ac30fad3ab63639556318d2792c65e16ad01ae09ee7ef69bf4f03726bb45d10b6df057e6f4d6
+  data.tar.gz: 19af682ceb930e1f6a63c3d0ea59c8eb13113f1d049e05bfeeedafca397d77b7327cb83407ec551efc1fe283ef1540a3e0b852226868bc86574430f4987c2dd5

data/lib/hikiutils/version.rb

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

data/lib/templates/Rakefile_hiki_sync

@@ -10,13 +10,17 @@ task :default do
   system 'rake -T'
 end
 
-desc "convert fig size"
+desc "convert fig size SCALE TARGET_DIR"
 task :convert do
-  source = ARGV[2]
   scale = ARGV[1]
-  target = File.join('figs',source)
-  p command = "convert #{source} -resize #{scale}\% #{target}"
-  system command
+  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
 
@@ -34,9 +38,10 @@ task :sync do
     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)
-    p target = File.join(target_dir,'cache','attach',basename)
     FileUtils.cp(source,target,:verbose=>true)
   }
   exit
@@ -46,13 +51,13 @@ 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}")
+#  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'),'hik_help.yml']]
+            [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])

data/lib/templates/hiki_help.yml

@@ -1,29 +1,66 @@
----
-:head:
-- hikiutil関連のヘルプ
-:initialize:
-  :opts:
-    :short: "-i"
-    :long: "--initialize"
-    :desc: localでの同期directoryの初期化
-  :title: localでの同期directoryの初期化
-  :cont:
-  - hiki --initializeで必要なファイル(Rakefile, ./.hikirc)がcopyされる
-  - rake syncによってhikiディレクトリーと同期が取られる
-  - rake convert 20 TARGET.pngによって，figs/TAERGET.pngに20%縮小して保存される
-  - hiki -u TARGETによってブラウザー表示される
-  - テキストの拡張子は'.hiki'
-  - hikiでのurlはテキスト前とディレクトリーから自動生成される
-  - 例えば，hiki2latex_saki/introduciton.hikiとするとhiki2latex_saki_introducitonと変換される
-  - |
-    attach_anchorでは
-    '{{attach_anchor(test.png, hiki2latex_saki)}}'
-    と，directory指定しなければならない.
-:syncpwd:
-  :opts:
-    :short: "-s"
-    :long: "--syncpwd"
-    :desc: syncpwd
-  :title: syncpwd
-  :cont:
-  - syncpwd
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hikiutils
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Shigeto R. Nishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -235,7 +235,6 @@ files:
 - lib/hikiutils/tmarshal.rb
 - lib/hikiutils/version.rb
 - lib/templates/Rakefile_hiki_sync
-- lib/templates/hik_help.yml
 - lib/templates/hiki_help.yml
 homepage: http://github.org/daddygongon/hikiutils
 licenses:

data/lib/templates/hik_help.yml

@@ -1,61 +0,0 @@
-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"
-task :convert do
-  source = ARGV[2]
-  scale = ARGV[1]
-  target = File.join('figs',source)
-  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
-  entries[2..-1].each{|file|
-    p source = File.join('./figs',file)
-    p target = File.join(target_dir,'cache','attach',basename)
-    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'),'hik_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