everyday-cli-utils 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7897a11ac454ad40fbac503cbee4929c032052f2
-  data.tar.gz: 65d659f085bef676655c2c4c208c67cb63b8d55d
+  metadata.gz: 22981760ec07c6812935693a6ee28d02441e6bb1
+  data.tar.gz: f888f94e58a15d8bb2bfdb5ea04af6903dfe43b8
 SHA512:
-  metadata.gz: 86d3c40d13be8545c2542fc76fb83179ead683b6d5524afb0c337c7c9d221a1b3bf021d7f09552aa665db831ba92c2b631c1028858072b6176e8e1198b0c3194
-  data.tar.gz: 3b574b15dc95951a68f5241c7cf6aec251c514656f068589f47dce4e8b37f8325477e4ed0a2490e88bb82f082ec387f1696ea1cb18e5b99bc08b32b428bb9282
+  metadata.gz: 86fd47cad9ba83012945384c904870a346c374deda57a085221b1244cde553da9832473b66962aaa6c858549668f94937f1040149aa0ad8ae6ea6b591df1905f
+  data.tar.gz: 01344d8e1f8bbef5f4a4eb7d8da778474344dcdbfdbf8b948500b63c56e3cc991aeea1b6a7de48dca02dbc1f8d38bbad367d8b0f3e091b4938a54786e3d0a60b

data/everyday-cli-utils.gemspec

@@ -23,6 +23,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '>= 0.8.2'
   spec.add_development_dependency 'coveralls', '>= 0.7.0'
   spec.add_development_dependency 'rspec'
-
-  spec.add_dependency 'curses'
 end

data/lib/everyday-cli-utils/curses_utils.rb

@@ -1,40 +1,40 @@
-module EverydayCliUtils
-  module CursesUtils
-    COLOR_TO_CURSES = {
-        :black  => Curses::COLOR_BLACK,
-        :red    => Curses::COLOR_RED,
-        :green  => Curses::COLOR_GREEN,
-        :yellow => Curses::COLOR_YELLOW,
-        :blue   => Curses::COLOR_BLUE,
-        :purple => Curses::COLOR_MAGENTA,
-        :cyan   => Curses::COLOR_CYAN,
-        :white  => Curses::COLOR_WHITE,
-        :none   => -1,
-    }
-
-    def find_color(bgcolor, fgcolor)
-      @colors.find_index { |v| v[0] == (fgcolor || :none) && v[1] == (bgcolor || :none) }
-    end
-
-    def add_color(bgcolor, fgcolor)
-      Curses::init_pair(@colors.count + 1, COLOR_TO_CURSES[fgcolor || :none], COLOR_TO_CURSES[bgcolor || :none])
-      ind = @colors.count + 1
-      @colors << [fgcolor || :none, bgcolor || :none]
-      ind
-    end
-
-
-    private
-    def handle_color(fgcolor, bgcolor)
-      return 0 if (fgcolor.nil? || fgcolor == :none) && (bgcolor.nil? || bgcolor == :none)
-      ind = find_color(bgcolor, fgcolor)
-      ind = ind.nil? ? add_color(bgcolor, fgcolor) : ind + 1
-      Curses::color_pair(ind)
-    end
-
-    def get_format(str)
-      bold, underline, fgcolor, bgcolor = Format::parse_format(str)
-      (bold ? Curses::A_BOLD : 0) | (underline ? Curses::A_UNDERLINE : 0) | handle_color(fgcolor, bgcolor)
-    end
-  end
-end
+#module EverydayCliUtils
+#  module CursesUtils
+#    COLOR_TO_CURSES = {
+#        :black  => Curses::COLOR_BLACK,
+#        :red    => Curses::COLOR_RED,
+#        :green  => Curses::COLOR_GREEN,
+#        :yellow => Curses::COLOR_YELLOW,
+#        :blue   => Curses::COLOR_BLUE,
+#        :purple => Curses::COLOR_MAGENTA,
+#        :cyan   => Curses::COLOR_CYAN,
+#        :white  => Curses::COLOR_WHITE,
+#        :none   => -1,
+#    }
+#
+#    def find_color(bgcolor, fgcolor)
+#      @colors.find_index { |v| v[0] == (fgcolor || :none) && v[1] == (bgcolor || :none) }
+#    end
+#
+#    def add_color(bgcolor, fgcolor)
+#      Curses::init_pair(@colors.count + 1, COLOR_TO_CURSES[fgcolor || :none], COLOR_TO_CURSES[bgcolor || :none])
+#      ind = @colors.count + 1
+#      @colors << [fgcolor || :none, bgcolor || :none]
+#      ind
+#    end
+#
+#
+#    private
+#    def handle_color(fgcolor, bgcolor)
+#      return 0 if (fgcolor.nil? || fgcolor == :none) && (bgcolor.nil? || bgcolor == :none)
+#      ind = find_color(bgcolor, fgcolor)
+#      ind = ind.nil? ? add_color(bgcolor, fgcolor) : ind + 1
+#      Curses::color_pair(ind)
+#    end
+#
+#    def get_format(str)
+#      bold, underline, fgcolor, bgcolor = Format::parse_format(str)
+#      (bold ? Curses::A_BOLD : 0) | (underline ? Curses::A_UNDERLINE : 0) | handle_color(fgcolor, bgcolor)
+#    end
+#  end
+#end

data/lib/everyday-cli-utils/mycurses.rb

@@ -1,199 +1,199 @@
-require 'curses'
-require_relative 'format'
-require_relative 'curses_utils'
-
-module EverydayCliUtils
-  class MyCurses
-    include CursesUtils
-    #region External
-    def initialize(use_curses, linesh, linesf)
-      @use_curses = use_curses
-      @linesh     = linesh
-      @linesf     = linesf
-      @colors     = []
-      @headers    = []
-      @bodies     = []
-      @footers    = []
-      @cur_l      = 0
-      @max_l      = 0
-      @ch         = nil
-      setup_curses(linesf, linesh) if @use_curses
-    end
-
-    def setup_curses(linesf, linesh)
-      Curses::noecho
-      Curses::init_screen
-      @subpad_start = linesh
-      update_subpad_size
-      @padh = Curses::Pad.new(linesh, Curses::cols)
-      @padb = Curses::Pad.new(Curses::lines - linesh - linesf, Curses::cols)
-      @padf = Curses::Pad.new(linesf, Curses::cols)
-      configure_curses
-    end
-
-    def configure_curses
-      @padh.keypad(true)
-      @padh.clear
-      @padh.nodelay = true
-      @padb.keypad(true)
-      @padb.clear
-      @padb.nodelay = true
-      @padf.keypad(true)
-      @padf.clear
-      @padf.nodelay = true
-      Curses::cbreak
-      Curses::start_color
-      Curses::use_default_colors
-    end
-
-    def clear
-      @headers = []
-      @bodies  = []
-      @footers = []
-    end
-
-    def myprints
-      @use_curses ? print_curses : print_normal
-    end
-
-    def print_normal
-      @headers.each { |v| puts v }
-      @bodies.each { |v| puts v }
-      @footers.each { |v| puts v }
-    end
-
-    def print_curses
-      resize_curses
-      myprint(@headers.join("\n"), @padh)
-      myprint(@bodies.join("\n"), @padb)
-      myprint(@footers.join("\n"), @padf)
-      update_max_l
-      @cur_l = [@cur_l, @max_l].min
-      padh_refresh
-      padb_refresh
-      padf_refresh
-    end
-
-    def resize_curses
-      @padh.resize(@headers.count, Curses::cols)
-      @padb.resize(@bodies.count, Curses::cols)
-      @padf.resize(@footers.count, Curses::cols)
-      @padh.clear
-      @padb.clear
-      @padf.clear
-      @padh.setpos(0, 0)
-      @padb.setpos(0, 0)
-      @padf.setpos(0, 0)
-    end
-
-    def read_ch
-      @ch = @padf.getch
-    end
-
-    def clear_ch
-      read_ch
-      while @ch == 10 || @ch == Curses::Key::ENTER || @ch == Curses::Key::UP || @ch == Curses::Key::DOWN
-        read_ch
-      end
-    end
-
-    def scroll_iteration
-      old_subpad_size = @subpad_size
-      update_subpad_size
-      update_max_l
-      update_scroll(@subpad_size != old_subpad_size)
-      sleep(0.05)
-      read_ch
-    end
-
-    def header_live_append(str)
-      @padh << str
-      padh_refresh
-    end
-
-    def body_live_append(str)
-      @padb << str
-      padb_refresh
-    end
-
-    def footer_live_append(str)
-      @padf << str
-      padf_refresh
-    end
-
-    def dispose
-      Curses::close_screen if @use_curses
-    end
-
-    #endregion
-
-    #region Internal
-    def myputs(text, pad)
-      myprint("#{text}\n", pad)
-    end
-
-    def myprint(text, pad)
-      if @use_curses
-        if text.include?("\e")
-          pieces = text.scan(/#{"\e"}\[(.+?)m([^#{"\e"}]+?)#{"\e"}\[0m|([^#{"\e"}]+)/)
-          pieces.each { |v|
-            if v[2].nil?
-              pad.attron(get_format(v[0])) {
-                pad << v[1]
-              }
-            else
-              pad << v[2]
-            end
-          }
-        else
-          pad << text
-        end
-      else
-        print text
-      end
-    end
-
-    def update_max_l
-      @max_l = [0, @bodies.count - @subpad_size].max
-    end
-
-    def update_subpad_size
-      Curses::refresh
-      @subpad_size = Curses::lines - @linesh - @linesf
-    end
-
-    def padh_refresh
-      @padh.refresh(0, 0, 0, 0, @subpad_start - 1, Curses::cols - 1)
-    end
-
-    def padb_refresh
-      @padb.refresh(@cur_l, 0, @subpad_start, 0, @subpad_start + @subpad_size - 1, Curses::cols - 1)
-    end
-
-    def padf_refresh
-      @padf.refresh(0, 0, @subpad_start + [@subpad_size, @bodies.count].min, 0, @subpad_start + [@subpad_size, @bodies.count].min + @footers.count, Curses::cols - 1)
-    end
-
-    def update_scroll(force_refresh = false)
-      if @ch == Curses::Key::UP
-        @cur_l = [0, @cur_l - 1].max
-      elsif @ch == Curses::Key::DOWN
-        @cur_l = [@max_l, @cur_l + 1].min
-      end
-      @cur_l = [@cur_l, @max_l].min
-      if @ch == Curses::Key::UP || @ch == Curses::Key::DOWN || force_refresh
-        Curses::refresh
-        padh_refresh
-        padb_refresh
-        padf_refresh
-      end
-      @cur_l
-    end
-
-    #endregion
-
-    attr_reader :ch
-    attr_accessor :bodies, :headers, :footers
-    private :myputs, :myprint, :update_max_l, :update_subpad_size, :padh_refresh, :padb_refresh, :padf_refresh, :update_scroll
-  end
-end
+#require 'curses'
+#require_relative 'format'
+#require_relative 'curses_utils'
+#
+#module EverydayCliUtils
+#  class MyCurses
+#    include CursesUtils
+#    #region External
+#    def initialize(use_curses, linesh, linesf)
+#      @use_curses = use_curses
+#      @linesh     = linesh
+#      @linesf     = linesf
+#      @colors     = []
+#      @headers    = []
+#      @bodies     = []
+#      @footers    = []
+#      @cur_l      = 0
+#      @max_l      = 0
+#      @ch         = nil
+#      setup_curses(linesf, linesh) if @use_curses
+#    end
+#
+#    def setup_curses(linesf, linesh)
+#      Curses::noecho
+#      Curses::init_screen
+#      @subpad_start = linesh
+#      update_subpad_size
+#      @padh = Curses::Pad.new(linesh, Curses::cols)
+#      @padb = Curses::Pad.new(Curses::lines - linesh - linesf, Curses::cols)
+#      @padf = Curses::Pad.new(linesf, Curses::cols)
+#      configure_curses
+#    end
+#
+#    def configure_curses
+#      @padh.keypad(true)
+#      @padh.clear
+#      @padh.nodelay = true
+#      @padb.keypad(true)
+#      @padb.clear
+#      @padb.nodelay = true
+#      @padf.keypad(true)
+#      @padf.clear
+#      @padf.nodelay = true
+#      Curses::cbreak
+#      Curses::start_color
+#      Curses::use_default_colors
+#    end
+#
+#    def clear
+#      @headers = []
+#      @bodies  = []
+#      @footers = []
+#    end
+#
+#    def myprints
+#      @use_curses ? print_curses : print_normal
+#    end
+#
+#    def print_normal
+#      @headers.each { |v| puts v }
+#      @bodies.each { |v| puts v }
+#      @footers.each { |v| puts v }
+#    end
+#
+#    def print_curses
+#      resize_curses
+#      myprint(@headers.join("\n"), @padh)
+#      myprint(@bodies.join("\n"), @padb)
+#      myprint(@footers.join("\n"), @padf)
+#      update_max_l
+#      @cur_l = [@cur_l, @max_l].min
+#      padh_refresh
+#      padb_refresh
+#      padf_refresh
+#    end
+#
+#    def resize_curses
+#      @padh.resize(@headers.count, Curses::cols)
+#      @padb.resize(@bodies.count, Curses::cols)
+#      @padf.resize(@footers.count, Curses::cols)
+#      @padh.clear
+#      @padb.clear
+#      @padf.clear
+#      @padh.setpos(0, 0)
+#      @padb.setpos(0, 0)
+#      @padf.setpos(0, 0)
+#    end
+#
+#    def read_ch
+#      @ch = @padf.getch
+#    end
+#
+#    def clear_ch
+#      read_ch
+#      while @ch == 10 || @ch == Curses::Key::ENTER || @ch == Curses::Key::UP || @ch == Curses::Key::DOWN
+#        read_ch
+#      end
+#    end
+#
+#    def scroll_iteration
+#      old_subpad_size = @subpad_size
+#      update_subpad_size
+#      update_max_l
+#      update_scroll(@subpad_size != old_subpad_size)
+#      sleep(0.05)
+#      read_ch
+#    end
+#
+#    def header_live_append(str)
+#      @padh << str
+#      padh_refresh
+#    end
+#
+#    def body_live_append(str)
+#      @padb << str
+#      padb_refresh
+#    end
+#
+#    def footer_live_append(str)
+#      @padf << str
+#      padf_refresh
+#    end
+#
+#    def dispose
+#      Curses::close_screen if @use_curses
+#    end
+#
+#    #endregion
+#
+#    #region Internal
+#    def myputs(text, pad)
+#      myprint("#{text}\n", pad)
+#    end
+#
+#    def myprint(text, pad)
+#      if @use_curses
+#        if text.include?("\e")
+#          pieces = text.scan(/#{"\e"}\[(.+?)m([^#{"\e"}]+?)#{"\e"}\[0m|([^#{"\e"}]+)/)
+#          pieces.each { |v|
+#            if v[2].nil?
+#              pad.attron(get_format(v[0])) {
+#                pad << v[1]
+#              }
+#            else
+#              pad << v[2]
+#            end
+#          }
+#        else
+#          pad << text
+#        end
+#      else
+#        print text
+#      end
+#    end
+#
+#    def update_max_l
+#      @max_l = [0, @bodies.count - @subpad_size].max
+#    end
+#
+#    def update_subpad_size
+#      Curses::refresh
+#      @subpad_size = Curses::lines - @linesh - @linesf
+#    end
+#
+#    def padh_refresh
+#      @padh.refresh(0, 0, 0, 0, @subpad_start - 1, Curses::cols - 1)
+#    end
+#
+#    def padb_refresh
+#      @padb.refresh(@cur_l, 0, @subpad_start, 0, @subpad_start + @subpad_size - 1, Curses::cols - 1)
+#    end
+#
+#    def padf_refresh
+#      @padf.refresh(0, 0, @subpad_start + [@subpad_size, @bodies.count].min, 0, @subpad_start + [@subpad_size, @bodies.count].min + @footers.count, Curses::cols - 1)
+#    end
+#
+#    def update_scroll(force_refresh = false)
+#      if @ch == Curses::Key::UP
+#        @cur_l = [0, @cur_l - 1].max
+#      elsif @ch == Curses::Key::DOWN
+#        @cur_l = [@max_l, @cur_l + 1].min
+#      end
+#      @cur_l = [@cur_l, @max_l].min
+#      if @ch == Curses::Key::UP || @ch == Curses::Key::DOWN || force_refresh
+#        Curses::refresh
+#        padh_refresh
+#        padb_refresh
+#        padf_refresh
+#      end
+#      @cur_l
+#    end
+#
+#    #endregion
+#
+#    attr_reader :ch
+#    attr_accessor :bodies, :headers, :footers
+#    private :myputs, :myprint, :update_max_l, :update_subpad_size, :padh_refresh, :padb_refresh, :padf_refresh, :update_scroll
+#  end
+#end

data/lib/everyday-cli-utils/version.rb

@@ -1,3 +1,3 @@
 module EverydayCliUtils
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/everyday-cli-utils.rb

@@ -1,7 +1,7 @@
 require_relative 'everyday-cli-utils/version'
 
 module EverydayCliUtils
-  AVAILABLE_MODULES  = [:ask, :format, :format_safe, :histogram, :histogram_safe, :kmeans, :kmeans_safe, :maputil, :maputil_safe, :mycurses, :option]
+  AVAILABLE_MODULES  = [:ask, :format, :format_safe, :histogram, :histogram_safe, :kmeans, :kmeans_safe, :maputil, :maputil_safe, :option]
   MODULE_TO_RELATIVE = {
       ask:            'everyday-cli-utils/ask',
       format:         'everyday-cli-utils/format',
@@ -12,7 +12,6 @@ module EverydayCliUtils
       kmeans_safe:    'everyday-cli-utils/safe/kmeans',
       maputil:        'everyday-cli-utils/maputil',
       maputil_safe:   'everyday-cli-utils/safe/maputil',
-      mycurses:       'everyday-cli-utils/mycurses',
       option:         'everyday-cli-utils/option'
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: everyday-cli-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Eric Henderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-26 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: curses
-  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: A few CLI and general utilities.  Includes a numbered-menu select loop
   utility, a ANSI formatting escape code handler, a text-based histogram maker, k-means
   and n-means (k-means with minimum optimal k) calculators, various collection utility