zashoku 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c9d68807a73e91e73c87ad6af21cc72de3ae449
-  data.tar.gz: e7e99cb91eba49934f4fb115a6f4bfaf0140ff74
+  metadata.gz: d711517f1114c2ab894274ee55ec0f1b77b5f14e
+  data.tar.gz: 425fe6cd0aa648c76dadb70beb16f9ade10109e2
 SHA512:
-  metadata.gz: 8383c221bd72be387f28c29c94105bc0d82a2b9926162bbe24bb9bb2f50e3104e7493216f75669e3fd9220a23d3c275ef91aa6b835ab7591c75bfe1832aa02e0
-  data.tar.gz: d47b1e76fe7e6cb8aea0e83fad13668cb5df52eb9f436235e2d80460d1cd1b7736b67f671bedbaef97dd9118404c320ba47aa76da243c27e2e0184b1477243b0
+  metadata.gz: 2903f26cff66c1dbc0515f66a89f5a1e35ec09af22adab661e754c1660feb083ad5f97112ac5d9bfbfb798898cb28b9641a69bd49ca0333d6da9efc2d967ac50
+  data.tar.gz: e9ff48aa435939b22b27ae07c7472a4c8cf8109d97984fb8b8f72eadea52ed0acb53a7b8a5010aae1bf9756e2d1d5459b6defd5b7ec6d5ba2c179392d985ce05

data/config/view.yml

@@ -10,3 +10,6 @@ keymaps:
     258: current_view move_cursor down
     " ": current_view expand $selected_group
     q: quit
+    ":": enter_command
+format:
+  statusline: " "

data/lib/core/config/config.rb

@@ -2,6 +2,7 @@
 
 require 'yaml'
 require 'fileutils'
+require 'pp'
 
 module Zashoku
   class Config < Controller
@@ -16,6 +17,7 @@ module Zashoku
 
     def reload
       @conf = merge!(default_conf, user_conf)
+      save
     end
 
     def merge!(this, that)
@@ -43,23 +45,27 @@ module Zashoku
     end
 
     def pref_model(title, value, trail)
-      Model.new(title: title, value: value, trail: trail)
+      Item.new('title' => title, 'value' => value, 'trail' => trail)
     end
 
-    def items
-      @conf.map do |title, pref|
-        next if IGNORE.key? title
+    def items(c = @conf, pre = '', path = [])
+      return pref_model(pre, c, path) unless c.respond_to?(:map)
+      c.map do |title, pref|
+        # next if IGNORE.key? title
+        t = "#{pre}_#{title}"
+        pth = path + [title]
         case pref
         when Hash
           pref.map do |subt, subpref|
-            pref_model("#{title}_#{subt}", subpref, [title, subt])
+            items(subpref, "#{pre}_#{title}_#{subt}", [title, subt])
+            #pref_model("#{title}_#{subt}", subpref, [title, subt])
           end
         when Array
-          pref_model(title, pref.join(':'), [title])
+          pref_model(t, pref.join(':'), pth)
         else
-          pref_model(title, pref, [title])
+          pref_model(t, pref, pth)
         end
-      end.flatten.compact
+      end.flatten #.compact
     end
 
     def parse_dir(path)

data/lib/core/config/daemon_config.rb

@@ -13,7 +13,10 @@ module Zashoku
     end
 
     def base_conf
-      Util.get_yaml(File.join(Zashoku::Root, 'config/daemon.yml'))
+      merge!(
+        Util.get_yaml(File.join(Zashoku::Root, 'config/daemon.yml')),
+        Util.get_yaml(File.join(Zashoku::AppRoot, 'config/daemon.yml')),
+      )
     end
   end
 end

data/lib/core/config/view_config.rb

@@ -13,7 +13,10 @@ module Zashoku
     end
 
     def base_conf
-      Util.get_yaml(File.join(Zashoku::Root, 'config/view.yml'))
+      merge!(
+        Util.get_yaml(File.join(Zashoku::Root, 'config/view.yml')),
+        Util.get_yaml(File.join(Zashoku::AppRoot, 'config/view.yml')),
+      )
     end
   end
 end

data/lib/core/item.rb

@@ -16,8 +16,8 @@ module Zashoku
     end
 
     def method_missing(m, *args, &block)
-      p @attributes[m.to_s]
       return @attributes[m.to_s] if @attributes.key?(m.to_s)
+      #raise "error #{m} not found"
       super
     end
   end

data/lib/core/modules/conf/lib/conf.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Zashoku
+  module Conf
+    extend Zashoku::Module
+
+    Version = [1, 0, 0].freeze
+    Root    = File.expand_path('../', __dir__)
+
+    autoload :ConfigView, File.join(Root, 'lib/conf/config_view')
+
+    def self.view
+      ConfigView.new
+    end
+  end
+end

data/lib/core/modules/conf/lib/conf/config_view.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Zashoku
+  module Conf
+    class ConfigView < Zashoku::View
+      def refresh_attributes
+        @attributes = {
+          't' => Zashoku.conf.get(%w[title conf]),
+        }
+      end
+
+      def refresh_items
+        @items = Zashoku.conf.items
+      end
+
+      def get_format
+        Zashoku.conf.get(%w[format conf])
+      end
+    end
+  end
+end

data/lib/core/net/client.rb

@@ -52,7 +52,7 @@ module Zashoku
       def lost_connection
         @alive = false
         Zashoku.logger.debug('lost connection')
-        Zashoku.alert('no connection')
+        Util.alert('no connection')
         Thread.exit
       end
 

data/lib/core/options.rb

@@ -2,49 +2,51 @@
 
 require 'optparse'
 
-class Options
-  def self.parse(args)
-    options = {
-      daemon: false,
-      server: true,
-      server_command: nil,
-      generate: false,
-      template: nil,
-      generate_name: nil
-    }
-
-    parser = OptionParser.new do |opts|
-      opts.banner = 'Usage: zashoku [options]'
-
-      opts.on('-s [COMMAND]', '--server [COMMAND]', 'pass commands to the server') do |cmd|
-        options[:server] = true
-        options[:server_command] = cmd || 'start'
+module Zashoku
+  class Options
+    def self.parse(args)
+      options = {
+        daemon: false,
+        server: true,
+        server_command: nil,
+        generate: false,
+        template: nil,
+        generate_name: nil
+      }
+
+      parser = OptionParser.new do |opts|
+        opts.banner = 'Usage: zashoku [options]'
+
+        opts.on('-s [COMMAND]', '--server [COMMAND]', 'pass commands to the server') do |cmd|
+          options[:server] = true
+          options[:server_command] = cmd || 'start'
+        end
+
+        opts.on('-d', '--daemon', 'daemonize the server') do |d|
+          options[:daemonize] = true
+        end
+
+        opts.on('-g TEMPLATE', '--generate TEMPLATE', 'generate a template') do |template|
+          options[:template] = template
+          options[:generate] = true
+        end
+
+        opts.on_tail('-h', '--help', 'Show this message') do
+          puts opts
+          exit
+        end
+
+        opts.on_tail('--version', 'Show version') do
+          puts Zashoku::Version.join('.')
+          exit
+        end
       end
 
-      opts.on('-d', '--daemon', 'daemonize the server') do |d|
-        options[:daemonize] = true
-      end
-
-      opts.on('-g TEMPLATE', '--generate TEMPLATE', 'generate a template') do |template|
-        options[:template] = template
-        options[:generate] = true
-      end
+      parser.parse!(args)
 
-      opts.on_tail('-h', '--help', 'Show this message') do
-        puts opts
-        exit
-      end
+      options[:generate_name] = args.pop if options[:template]
 
-      opts.on_tail('--version', 'Show version') do
-        puts Zashoku::Version.join('.')
-        exit
-      end
+      options
     end
-
-    parser.parse!(args)
-
-    options[:generate_name] = args.pop if options[:template]
-
-    options
   end
 end

data/lib/core/statusline/statusline.rb

@@ -13,11 +13,10 @@ module Zashoku
       include Observable
 
       def initialize
-        Zashoku.logger.debug('hhh')
         @widgets = Zashoku.modules.keys.zip(Zashoku.modules.map do |_k, m|
           m.widgets if m.respond_to?(:widgets)
         end).to_h.compact
-        Zashoku.logger.debug(@widgets)
+        Zashoku.logger.debug("loaded widgets for #{@widgets.keys.join(', ')}")
         refresh
       end
 
@@ -36,15 +35,18 @@ module Zashoku
       end
 
       def refresh
-        @items = @widgets.map do |_k, m|
-          m.map { |_j, w| w.item }
-        end.flatten
+        @cl = Zashoku::conf.get(%w[color main])
+        @attrs = @widgets.map do |_k, m|
+          m.map { |j, w| w.attr }
+        end.flatten.reduce(&:merge)
 
-        @items_formatted = @items.join(' | ')
+        format = Zashoku::conf.get(%w[format statusline])
+
+        @items_formatted = Zashoku::Formatter.format_line(format, @attrs)
       end
 
       def draw
-        print "\e[#{Util::Term.rows - 1};1H\e[0m#{@items_formatted}\e[K"
+        print "\e[#{Util::Term.rows - 1};1H\e[0m#{@cl}#{@items_formatted}\e[K"
       end
     end
   end

data/lib/core/statusline/widget.rb

@@ -4,14 +4,14 @@ module Zashoku
   module Statusline
     class Widget
       def initialize
-        @item = ''
+        @attr = {}
         refresh
       end
 
       def refresh; end
 
-      def item
-        @item
+      def attr
+        @attr
       end
     end
   end

data/lib/core/util/readline.rb

@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+require 'amatch'
+
+module Zashoku
+  module Util
+    class Readline
+      attr_accessor :ac_index, :hy_index, :ac_sorted, :prompt, :x, :y, :history
+
+      def initialize(prompt = '', ac_tree: {}, history: [])
+        @prompt    = prompt
+        @ac_index  = 0
+        @history   = history
+        @hy_index  = 0
+        @ac_sorted = []
+        @tree = ac_tree
+        @y = Term.rows
+      end
+
+      def draw(string)
+        print "\e[#{y};0H#{prompt}#{string}\e[K\e[#{y};#{@x + 1}H"
+      end
+
+      def read(string = '')
+        @x = prompt.length
+        Curses.curs_set(1)
+        max = Term.cols
+
+        loop do
+          draw(string)
+          c = Curses.getch
+          @ac_index = 0 unless c == 9
+          case c
+          when Curses::KEY_LEFT
+            @x = [prompt.length, x-1].max
+          when Curses::KEY_RIGHT
+            @x = [prompt.length + string.length, x+1].min
+          when Curses::KEY_UP
+            @history.unshift(string) if hy_index == 0
+            @hy_index += 1
+            if hy_index >= history.length
+              @hy_index = history.length - 1
+              Curses.beep
+            end
+            string = history[hy_index]
+            @x = string.length + prompt.length
+          when Curses::KEY_DOWN
+            if hy_index == 1
+              @hy_index = 0
+              string = @history.shift
+            elsif hy_index > 1
+              string = history[@hy_index -= 1] || ''
+            else
+              @hy_index = 0
+              Curses.beep
+            end
+            @x = string.length + prompt.length
+          when 10, ?\n, ?\r
+            break
+          when 127 #backspace
+            print "\e[#{y};#{x}H "
+            @x -= 1
+            break if @x < prompt.length
+            rx = @x - prompt.length
+            string = string[0...rx] + string[rx..-1]
+            string[x - prompt.length] = ''
+          when 9 #tab
+            if @ac_index == 0
+              acl = ac_list(string)
+              @ac_sorted = sort_ac_list(acl, string)
+            end
+            string = @ac_sorted[@ac_index] || ''
+            @x = @prompt.length + string.length
+            @ac_index += 1
+            @ac_index = 0 if @ac_index >= ac_sorted.length
+          when /[[:print:]]/
+            if (@x < max)
+              rx = @x - prompt.length
+              string = string[0...rx] + c.chr + string[rx..-1]
+              @x += 1
+            else
+              Curses.beep
+            end
+          else
+            Curses.beep
+          end
+          @history[@hy_index] = string
+        end
+
+        Curses.curs_set(0)
+        print "\e[#{y};0H\e[2K"
+
+        @hy_index = 0
+        @history.unshift(string)
+        @history.reject! { |e| e.empty? }
+        string
+      end
+
+      def safe_dig(tree, path)
+        l = @tree.dig(path.shift)
+        return l if l.class != Hash || path.empty?
+        safe_dig(tree, path)
+      end
+
+      def ac_list(string)
+        path = string.split
+        path << '' if string[-1] == ' '
+        if path.length > 1
+          ac = safe_dig(@tree, path[0...-1])
+          return [string] unless ac
+          ac.map { |n| (path[0...-1] + [n]).join(' ') }
+        else
+          @tree.keys
+        end
+      end
+
+      def sort_ac_list(list, string)
+        m = Amatch::JaroWinkler.new(string)
+        list.map { |e| [m.match(e.to_s), e] }.sort.map { |a| a[1] }.reverse
+      end
+    end
+  end
+end

data/lib/core/util/util.rb

@@ -1,30 +1,10 @@
 # frozen_string_literal: true
 
 require 'base64'
-require 'readline'
+require_relative 'readline'
 
 module Zashoku
   module Util
-    def self.readline(prompt = '', default = '')
-      Term.bold.echo_on
-      print "\033[" + String(Term.rows) + ';1H'
-      Term.show_cursor
-      Readline.completion_append_character = ''
-      Readline.pre_input_hook = lambda do
-        Readline.insert_text default.to_s
-        Readline.redisplay
-        Readline.pre_input_hook = nil
-      end
-      input = Readline.readline(prompt, false)
-      Term.hide_cursor.nobold.echo_off.clear
-      input
-    end
-
-    def self.error_message(message)
-      # use statusline to show error messages
-      print "\e[#{Term.rows - 1};1H\e[31m #{message}\e[K"
-    end
-
     def self.encode_object(d)
       Base64.strict_encode64(Marshal.dump(d))
     end
@@ -37,10 +17,18 @@ module Zashoku
       {}
     end
 
-    def self.get_yaml(file)
-      YAML.safe_load(File.open(file, 'r', &:read)) || {}
+    def self.get_yaml(file, nil_value = {})
+      YAML.safe_load(File.open(file, 'r', &:read)) || nil_value
     rescue Errno::ENOENT
-      {}
+      nil_value
+    end
+
+    def self.put_yaml(file, data)
+      File.open(file, 'w') { |f| f.puts YAML.dump(data) }
+    end
+
+    def self.alert(msg)
+      print "\e[#{Term.rows};0H\e[31m#{msg}\e[K"
     end
   end
 end

data/lib/core/view.rb

@@ -75,6 +75,7 @@ module Zashoku
 
     def refresh
       @items = refresh_items
+      @children = @items.class == Hash
       refresh_attributes
       refresh_formats
       dirty_all_lines

data/lib/viewer.rb

@@ -6,6 +6,7 @@ require 'io/console'
 require 'logger'
 require 'observer'
 require 'thread'
+require 'json'
 
 require_relative 'core/controller'
 require_relative 'core/config/view_config'
@@ -18,6 +19,8 @@ require_relative 'core/item'
 require_relative 'core/module'
 require_relative 'core/view'
 
+require_relative 'core/modules/conf/lib/conf'
+
 $stdout.sync = true
 
 module Zashoku
@@ -35,19 +38,19 @@ module Zashoku
         modules[message[:mod]].send(message[:meth], *message[:args])
       end
     end
-
-    def alert(message)
-      print "\e[#{Util::Term.rows - 2};0H #{message}"
-    end
   end
 
   # Main class for the zashoku application
   class Viewer
     include Util
 
+    HISTORY = File.join(Zashoku::Config::CONF_DIR, 'cmd_history.yml')
+
     COMMANDS = {
-      'quit' => :cleanup,
-      'enter_command' => :get_user_command
+      'quit'          => :cleanup,
+      'enter_command' => :get_user_command,
+      'change_view'   => :change_view,
+      'map_key'       => :map_key
     }.freeze
 
     def initialize
@@ -60,20 +63,35 @@ module Zashoku
       Zashoku.conf = ViewConfig.new
 
       Zashoku.modules = Zashoku::Module.load(Zashoku::ViewerModules)
+      Zashoku.modules.merge!('conf' => Conf)
       Zashoku.conf.reload
 
       # note: start daemon if not running
       Zashoku.client = Net::Client.new(Zashoku::Port)
       Zashoku.client.callbacks << method(:handle_event)
 
+      @server_modules = Zashoku.client.command('modules')
+
       @views = Zashoku.modules.keys.zip(Zashoku.modules.map do |_k, m|
         m.view
       end).to_h
       @view = @views.keys.first
 
+      Zashoku.logger.debug('initializing statusline')
       @statusline = Statusline.new
+      Zashoku.logger.debug(@statusline)
       @statusline.add_observer(self, :draw_statusline)
 
+      @cmdline = Util::Readline.new(
+        ':',
+        ac_tree:
+            @views.map { |k, v| [k, v.methods - Object.methods] }.to_h
+            .merge(COMMANDS.map { |k, _v| [k, nil] }.to_h)
+            .merge({'conf' => Zashoku.conf.methods - Object.methods })
+            .merge(@server_modules.map { |m| ['remote::' + m, nil] }.to_h),
+        history: Util.get_yaml(HISTORY, [])
+      )
+
       init_screen
       lay_traps!
       Thread.abort_on_exception = true
@@ -84,9 +102,19 @@ module Zashoku
       sleep
     end
 
+    def change_view(new_view)
+      Zashoku.logger.debug("Changing view to #{new_view}")
+      @views[@view].delete_observers
+      #@views[new_view].change_screen_size(redraw: false)
+      #@views[new_view].expand(-1)
+      @view = new_view
+      init_view(@view)
+    end
+
     def init_view(view)
-      @views[@view].add_observer(self, :draw_view)
-      @views[@view].refresh
+      @views[view].add_observer(self, :draw_view)
+      @views[view].refresh
+      @views[view].dirty_all_lines
       draw_view
     end
 
@@ -103,6 +131,15 @@ module Zashoku
       end
     end
 
+    def cleanup
+      Zashoku.client.disconnect
+      @key_thread&.exit
+      Curses.close_screen
+      Util.put_yaml(HISTORY, @cmdline.history)
+      Term.show_cursor
+      exit
+    end
+
     def init_screen
       Curses.noecho
       Curses.init_screen
@@ -119,7 +156,13 @@ module Zashoku
     end
 
     def get_user_command
-      Util.readline
+      cmd = @cmdline.read
+      return unless cmd
+      return builtin_command(*cmd.split) if COMMANDS.key?(cmd.split.first)
+
+      command(*cmd.split) unless cmd.empty?
+    rescue
+      Util.alert('Error')
     end
 
     def handle_event(event)
@@ -131,6 +174,15 @@ module Zashoku
       end
     end
 
+    def builtin_command(cmd, *args)
+      Zashoku.logger.debug("executing builtin #{cmd}(#{args})")
+      send(COMMANDS[cmd], *args)
+    end
+
+    def map_key(key, mod, command, *args)
+      Zashoku.conf.set(['keymaps', mod, key], "#{command} #{args.join(' ')}")
+    end
+
     def scan_keyboard!
       loop do
         key  = Curses.getch
@@ -144,7 +196,10 @@ module Zashoku
             ''
           end
 
-        return send(COMMANDS[cmd]) if COMMANDS.key?(cmd)
+        if COMMANDS.key?(cmd.split.first)
+          builtin_command(*cmd.split)
+          next
+        end
 
         mod, meth, *args = cmd.split
         mod = mod == 'current_view' ? @view : mod
@@ -163,24 +218,6 @@ module Zashoku
       end
     end
 
-    def cleanup
-      Zashoku.client.disconnect
-      @key_thread&.exit
-      Curses.close_screen
-      Term.show_cursor
-      exit
-    end
-
-    def change_view(new_view:)
-      @view.delete_observers
-      @view.pause
-      new_view.add_observer(self, :draw_view)
-      new_view.change_screen_size(redraw: false)
-      new_view.expand(-1)
-      new_view.unpause
-      @view = view
-    end
-
     def draw_view
       @views[@view].draw
     end

data/lib/zashoku.rb

@@ -3,7 +3,7 @@
 require_relative 'core/options'
 
 module Zashoku
-  Version = [1, 2, 2].freeze
+  Version = [1, 3, 0].freeze
   Root    = File.expand_path('../', __dir__)
 
   AppRoot = Root      unless const_defined?(:AppRoot)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zashoku
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - annacrombie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-15 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -107,12 +107,15 @@ files:
 - "./lib/core/formatter.rb"
 - "./lib/core/item.rb"
 - "./lib/core/module.rb"
+- "./lib/core/modules/conf/lib/conf.rb"
+- "./lib/core/modules/conf/lib/conf/config_view.rb"
 - "./lib/core/net/client.rb"
 - "./lib/core/net/server.rb"
 - "./lib/core/options.rb"
 - "./lib/core/statusline/statusline.rb"
 - "./lib/core/statusline/widget.rb"
 - "./lib/core/util/folder_listen.rb"
+- "./lib/core/util/readline.rb"
 - "./lib/core/util/term.rb"
 - "./lib/core/util/util.rb"
 - "./lib/core/view.rb"