kaki-utils 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5a39e1bfe3e48aab4cc88c3b3168c468ba5c35092e33cdf28a3a14579585b13
-  data.tar.gz: e38a4c2feb70de6296fd6060b4d9e925449a7c8fada76e425f4aeacab2a31644
+  metadata.gz: 7d5d2f2816d7ba06f5e13facb8798434194bc13bd41c81177342cc84f75f76f7
+  data.tar.gz: e7fc93af05bd0319517ebd020c7e9e03e995821c2399ea84f980ee1cf2d71687
 SHA512:
-  metadata.gz: 8de911d38ce91d248524d32a251a2607bfdd9a41105f833d0afca2ab574f153e8756a95e3c4b2e4a3183217ca005b146fad5371d10369ada4c526a2b79a2bfc3
-  data.tar.gz: 3d45c2c8c9b77854a2b9735f9fe00b66e44ea6082862692974d3dda35d76d094e78c0d8019aaabe64be3243fe9f6a9836a4779799c26d6e5c6853d8ba7c388bc
+  metadata.gz: cd28126491e46ad6630b346b99c8328fd7d207a80148a709b0cd46a3e1c9b7a8cc912f647c8def6baf66581b417053dae16f695ae9e22728a18913f72d9f7a00
+  data.tar.gz: 63a830b5cc3deaa9aa9a67c8a1d5fa206de6826ddd92167b811af466fa3ff4b7b24d3360c657dd1c9106c0c3a4850edb3a6d6cdf57b3f4512af5baf79553cb9a

data/README.md

@@ -9,7 +9,6 @@ methods
 * Utils.imgexist?(url)
 * Utils.getfile(url, filename, max=0)
 * Utils.key_wait
-* Utils.progress_bar
 * Utils.delete\_non\_img(file_name)
 * Utils.delete\_empty\_folder(folder_name = './')
 * Utils.bell　　　　(only Ubuntu)
@@ -75,8 +74,8 @@ require "kaki/utils/add_methods"
 ```
 methods
 
-* Object#add_methods(module_to_include, *method_names)
-* Module#register_all_methods
+* Object#add\_methods(module\_to\_include, *method\_names)
+* Module#register\_all\_methods
 
 ## instance method of "p"
 
@@ -86,3 +85,33 @@ require "kaki/utils/p"
 method
 
 * Object#p
+
+## safe making directory
+
+```ruby
+require "kaki/utils/safe_mkdir"
+```
+method
+
+* Dir.safe\_mkdir(dname)
+
+## handle escape sequence
+
+```ruby
+require "kaki/utils/es"
+```
+methods
+
+* ES.color(col, opt = nil)
+* ES.csi(*args)
+* ES.cmd(given)
+* ES.esc(str)
+* ES.clear, down, up, reset, top, home, push, pop
+* ES.cursor(x, y = nil)
+* ES.cursor\_r(x, y)
+* ES.console\_size, cursor_position
+* ES.scroll(rn = nil)
+* ES.safe_scroll(n)
+* ES.scroll\_up(n)
+* ES.clear\_below
+

data/lib/kaki/utils/es.rb

@@ -0,0 +1,147 @@
+require 'io/console'
+
+module ES
+  S = "\e["
+  Col = %i(black red green yellow blue magenta cyan white ex_c ex_b reset style code)
+  Cmd1 = %i(CUU CUD CUF CUB CNL CPL CHA CHT CBT ECH DCH IL DL SU SD REP DSR)
+  Do1  = %w(A B C D E F G I Z X P L M S T b n)
+  Cmd2 = %i(DECSC DECRC RIS DECALN IND NEL HTS VTS PLD PLU RI DSC SOS ST)
+  Do2  = %w(7 8 c #8 D E H J K L M P X /)
+  
+  def color(col, opt = nil)
+    ch = Col.map.with_index {|c, i| [c, i + 30]}.to_h[col]
+    case ch
+    when 38
+      return S + "38;5;#{opt.to_i}m"
+    when 39
+      return S + "48;5;#{opt.to_i}m"
+    when 40
+      return S + "39;40m"
+    when 41
+      n = case opt
+          when :bold           then 1
+          when :italic         then 3
+          when :blink          then 5
+          when :reverse        then 7
+          when :blink_stop     then 25
+          when :underline      then 4
+          when :bold_stop      then 22
+          when :underline_stop then 24
+          else opt
+          end
+      return S + "#{n}m"
+    when 42
+      return S + "#{opt}m"
+    end
+    raise "Undefind color name: #{col}" unless ch
+    m = case opt
+        when :background then        10
+        when :bright     then        60
+        when :bright_background then 70
+        else 0
+        end
+    S + (ch + m).to_s + "m"
+  end
+  
+  def csi(*args)
+    cm = Cmd1.zip(Do1).to_h
+    if (a = cm[args[0]])
+      S + args[1].to_s + a
+    else
+      case args[0]
+      when :CUP then S + "#{args[1]};#{args[2]}H"
+      when :ED  then S + (args[1] ? args[1].to_s : "") + "J"
+      when :EL  then S + (args[1] ? args[1].to_s : "") + "K"
+      when :TBC then S + (args[1] ? args[1].to_s : "") + "g"
+      when :DECSTBM
+        S + (args[1] ? "#{args[1]};#{args[2]}" : "") + "r"
+      when :DECTCEM
+        S + "?25" + args[1]
+      else
+        raise "#{args[0]} is undefined CSI."
+      end
+    end
+  end
+  
+  def cmd(given)
+    cm = Cmd2.zip(Do2).to_h[given]
+    cm ? "\e" + cm : raise("#{given} is undefined command.")
+  end
+  
+  def esc(str)
+    "\e" + str
+  end
+  
+  def clear() ES.csi(:ED, 2) + ES.csi(:CUP, 1, 1) end
+  def down()  ES.cmd(:NEL) end
+  def up()    ES.cmd(:RI) end
+  def reset() S + "0m" end
+  def top()   ES.csi(:CHA, 1) end
+  def home()  ES.cursor(0, 0) end
+  def push()  ES.cmd(:DECSC) end
+  def pop()   ES.cmd(:DECRC) end
+  
+  def cursor(x, y = nil)
+    y ? ES.csi(:CUP, y, x) : ES.csi(:CHA, x)
+  end
+  
+  def cursor_r(x, y)
+    st = ""
+    st += if x > 0
+      ES.csi(:CUF, x)
+    elsif x < 0
+      ES.csi(:CUB, -x)
+    else
+      ""
+    end
+    st += if y > 0
+      ES.csi(:CUD, y)
+    elsif y < 0
+      ES.csi(:CUU, -y)
+    else
+      ""
+    end
+  end
+  
+  def console_size
+    [`tput cols`, `tput lines`].map(&:to_i)
+  end
+  
+  def cursor_position
+    puts "\x1B[6n"
+    res = ""
+    STDIN.raw do |io|
+      until (c = io.getc) == 'R'
+        res << c if c
+      end
+    end
+    m = /(\d+);(\d+)/.match(res)
+    [m[2], m[1]].map(&:to_i)
+  end
+  
+  def scroll(rn = nil)
+    return case rn
+           when Range then ES.csi(:DECSTBM, rn.first, rn.max)
+           when 0     then ES.csi(:DECSTBM)
+           else ES.push + ES.csi(:DECSTBM) + ES.pop
+           end
+  end
+  
+  def safe_scroll(n)
+    return "" if n <= 0
+    str = ""
+    y = ES.cursor_position[1]
+    if (h = ES.console_size[1]) < y + n
+      str = ES.scroll_up(n - 1)
+      y = h - n
+    end
+    str + ES.cursor(1, y)
+  end
+  
+  def scroll_up(n)  "\n" * n end
+  def clear_below() ES.csi(:ED) end
+  
+  module_function :color, :csi, :cmd, :clear, :down, :up, :reset, :top,
+    :cursor, :cursor_r, :home, :push, :pop, :esc, :console_size, :scroll,
+    :scroll_up, :cursor_position, :clear_below, :safe_scroll
+end

data/lib/kaki/utils/safe_mkdir.rb

@@ -0,0 +1,10 @@
+class Dir
+  #名前がdnameのファイルかディレクトリが存在していれば何もしない　でなければディレクトリdnameを作る
+  # @return [Boolean]
+  def self.safe_mkdir(dname)
+    return false if File.exist?(dname)
+    Dir.mkdir(dname)
+    true
+  end
+end
+

data/lib/kaki/utils.rb

@@ -2,7 +2,6 @@ require 'open-uri'
 require 'fileutils'
 require 'fastimage'
 require "io/console"
-require 'gtk2'
 require 'set'
 
 module Utils
@@ -14,11 +13,12 @@ module Utils
   
   #Web上のバイナリファイルの保存
   # @return [Boolean]
-  def getfile(url, filename, max=0)
+  def getfile(url, filename, max = 0, ua = nil)
     count = 0
+    opt = ua ? {'User-Agent' => ua} : {}
     begin
       open(filename, 'wb') do |file|
-        open(url) {|data| file.write(data.read)}
+        open(url, opt) {|data| file.write(data.read)}
       end
       true 
     rescue
@@ -45,27 +45,6 @@ module Utils
   module_function :key_wait
   
   
-  #プログレスバーの表示
-  def progress_bar
-    w = Gtk::Window.new
-    w.signal_connect("destroy") {Gtk.main_quit}
-    w.set_size_request(300, 50)
-    w.border_width = 10
-    w.title = "Progress"
-    
-    bar = Gtk::ProgressBar.new
-    w.add(bar)
-  
-    Thread.new(bar) do |bar|
-      yield(bar)
-    end
-      
-    w.show_all
-    Gtk.main
-  end
-  module_function :progress_bar
-  
-  
   #画像ファイルでなければ削除
   # @return [Boolean]
   def delete_non_img(fname)

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kaki-utils
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - obelisk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-12-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: gtk2
-  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'
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -48,11 +34,13 @@ files:
 - lib/kaki/utils.rb
 - lib/kaki/utils/add_methods.rb
 - lib/kaki/utils/check_fname_overlapping.rb
+- lib/kaki/utils/es.rb
 - lib/kaki/utils/imgsuffix.rb
 - lib/kaki/utils/nest_loop.rb
 - lib/kaki/utils/p.rb
 - lib/kaki/utils/rec_decimal.rb
 - lib/kaki/utils/retry.rb
+- lib/kaki/utils/safe_mkdir.rb
 homepage: 
 licenses:
 - MIT