zashoku 1.3.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 293949927ade60de5f383df77ee37dec6c24dab1
-  data.tar.gz: eda30013219a99aa1045aec09f90d326b674c517
+  metadata.gz: 859618076e68ab5194ed1cf1dd81b712fee21bd1
+  data.tar.gz: fe04a7bd55c690282a93f3f489ebeb000e80f943
 SHA512:
-  metadata.gz: 4be47481a6d80651cb4534152e34515c3c31e69e20d194257080524dd13d53a24c845236c48a6892a113c63a4d73e9f292feedc00d05338fc94828ede23ba54c
-  data.tar.gz: b16bfe03e5cfedf4f9cb4205565eedf821f90d5c7889773ea806afe8ab21aebecd2166ee96c3bcbee44cf3956b136e1d06304d19880e77823b0eac821d6bc56d
+  metadata.gz: 1a4f5813981d126ec306ef852b202153c2feb0761c9a37b317df4c8f562c6336ca4954e641fa8a86e538e6d8b2088ed2aa20f316a1aeef48cc0437df7f8421e5
+  data.tar.gz: 0da1b091ab566af7da57af4d8e5fc4c47c6373907048e6aa6400179a8ad9b87bc5db9f9faea4c5430f955313c696a2e41b065e3c61b49b2423f7eab7cd2bb75a

data/README.md

@@ -9,13 +9,14 @@
 
 # zashoku座食 [![Maintainability][mb]][m] [![Gem Version][gb]][g] ![座食][c]
 command line application framework
-![screenshot](img/screenshot.png)
+[![screenshot](img/screenshot.png)](examples/hello/modules/hello/lib/hello/hello_controller.rb)
 
 ## features
 + good for lazy people
 + generators
 + optimized view
 + mvc
++ simple?!
 + client / server model
 + rendering support for asian characters
 

data/config/daemon.yml

@@ -1 +1,2 @@
 ---
+daemon_log: $conf_dir/daemon.log

data/config/view.yml

@@ -6,10 +6,16 @@ color:
   main: "\e[0m\e[34m"
 keymaps:
   global:
-    259: current_view move_cursor up
-    258: current_view move_cursor down
-    " ": current_view expand $selected_group
+    259: $current_view move_cursor up
+    258: $current_view move_cursor down
+    k: $current_view move_cursor up
+    j: $current_view move_cursor down
+    h: $current_view select $selected_group 0
+    " ": $current_view expand $selected_group
     q: quit
     ":": enter_command
+    "/": search $current_view
+    n: $current_view next_match
+    N: $current_view previous_match
 format:
   statusline: " "

data/lib/constants.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require_relative 'core/util/util'
+
+module Zashoku
+  Version = [1, 5, 0].freeze
+
+  Root    = File.expand_path('../', __dir__)
+
+  DefConf = {
+    app: {
+      root: Root,
+      name: 'zashoku',
+      commands: {},
+      modules: {
+        viewer: [],
+        daemon: [],
+      },
+      save_config: false,
+      save_history: false,
+      persistent_daemon: false,
+      net: {
+        host: 'localhost',
+        port: 26_119
+      }
+    },
+    core: {
+      commands: {
+        'quit'          => :cleanup,
+        'q'             => :cleanup,
+        'enter_command' => :get_user_command,
+        'change_view'   => :change_view,
+        'map_key'       => :map_key,
+        'search'        => :search,
+        'zv'            => :print_version
+      }
+    }
+  }.freeze
+
+  CConf = const_defined?(:AppConf) ? Zashoku::Util.deep_merge(DefConf, AppConf) : DefConf
+
+  LoadPaths = [
+    File.join(Zashoku::CConf[:app][:root], 'modules')
+  ].freeze
+end

data/lib/core/config/config.rb

@@ -5,24 +5,22 @@ require 'fileutils'
 
 module Zashoku
   class Config < Controller
-    CONF_DIR  = File.join(Dir.home, '.config/', Zashoku::AppName)
+    CONF_DIR  = File.join(Dir.home, '.config/', Zashoku::CConf[:app][:name])
     CONF_FILE = File.join(CONF_DIR, '/conf.yml')
 
     def initialize
-      FileUtils.mkdir_p(CONF_DIR) unless File.directory?(CONF_DIR)
+      FileUtils.mkdir_p(CONF_DIR) if save? && !File.directory?(CONF_DIR)
       reload
       save unless File.exist?(self.class::CONF_FILE)
     end
 
-    def reload
-      @conf = merge!(default_conf, user_conf)
-      save
+    def save?
+      Zashoku::CConf[:app][:save_config]
     end
 
-    def merge!(this, that)
-      this&.merge(that || {}) do |_k, old, nu|
-        old.class == Hash ? merge!(old, nu) : nu
-      end
+    def reload
+      @conf = Zashoku::Util.deep_merge(default_conf, user_conf)
+      save
     end
 
     def base_conf
@@ -31,7 +29,7 @@ module Zashoku
 
     def default_conf
       module_conf.reduce(base_conf) do |mem, mc|
-        merge!(mem, mc)
+        Zashoku::Util.deep_merge(mem, mc)
       end
     end
 
@@ -69,8 +67,7 @@ module Zashoku
 
     def parse_dir(path)
       {
-        # '$airing_dir' => @conf['airing_dir'],
-        # '$conf_dir'   => @conf['conf_dir'],
+        '$conf_dir'   => CONF_DIR,
         '~' => Dir.home
       }.inject(path) { |p, r| p.gsub(r[0], r[1]) }
     end
@@ -89,6 +86,7 @@ module Zashoku
     end
 
     def save
+      return unless save?
       File.open(self.class::CONF_FILE, 'w') { |f| f.write(YAML.dump(@conf)) }
     end
   end

data/lib/core/config/daemon_config.rb

@@ -13,9 +13,9 @@ module Zashoku
     end
 
     def base_conf
-      merge!(
+      Zashoku::Util.deep_merge(
         Util.get_yaml(File.join(Zashoku::Root, 'config/daemon.yml')),
-        Util.get_yaml(File.join(Zashoku::AppRoot, 'config/daemon.yml')),
+        Util.get_yaml(File.join(Zashoku::CConf[:app][:root], 'config/daemon.yml')),
       )
     end
   end

data/lib/core/config/view_config.rb

@@ -13,9 +13,9 @@ module Zashoku
     end
 
     def base_conf
-      merge!(
+      Zashoku::Util.deep_merge(
         Util.get_yaml(File.join(Zashoku::Root, 'config/view.yml')),
-        Util.get_yaml(File.join(Zashoku::AppRoot, 'config/view.yml')),
+        Util.get_yaml(File.join(Zashoku::CConf[:app][:root], 'config/view.yml')),
       )
     end
   end

data/lib/core/net/client.rb

@@ -4,13 +4,16 @@ require 'socket'
 require 'json'
 require 'thread'
 
+require 'pry'
+
 module Zashoku
   module Net
     class Client
       attr_accessor :callbacks
 
-      def initialize(port, host = Zashoku::Host)
-        @socket = connect(host, port)
+      def initialize(port, host = Zashoku::CConf[:app][:net][:host])
+        @host, @port = host, port
+        @socket = connect(@host, @port)
         @alive = true
 
         @callbacks = []
@@ -19,11 +22,21 @@ module Zashoku
         @result_queue = Queue.new
         @event_queue = Queue.new
 
+        start_threads
+
+        @semaphore = Mutex.new
+      end
+
+      def start_threads
         @command_thread = Thread.new { pump_commands! }
         @results_thread = Thread.new { pump_results! }
         @events_thread = Thread.new { dispatch_events! }
+      end
 
-        @semaphore = Mutex.new
+      def stop_threads
+        @command_thread&.exit
+        @results_thread&.exit
+        @events_thread&.exit
       end
 
       def self.command(host, port, msg, args = {})
@@ -31,18 +44,31 @@ module Zashoku
         sock.puts(JSON.generate({'msg' => msg}.merge(args)))
         result = sock.readline
         sock.close
-        JSON.parse(result).map { |k, v| "#{k}: #{v}\n" }.join
+        {
+          payload: JSON.parse(result).map { |k, v| "#{k}: #{v}\n" }.join,
+          status: true
+        }
       rescue Errno::ECONNREFUSED
-        "error: could not connect connect to server\n"
+        {
+          payload: "error: could not connect connect to #{host}:#{port}\n",
+          status: false
+        }
       rescue EOFError
-        nil
+        {
+          payload: nil,
+          status: false
+        }
       end
 
-      def connect(host, port)
+      def connect(host, port, loud_fail: true)
         TCPSocket.new(host, port)
       rescue Errno::ECONNREFUSED
-        puts "error: could not connect to #{host}:#{port}"
-        exit
+        if loud_fail
+          puts "error: could not connect to #{host}:#{port}"
+          Thread.exit
+        end
+        @alive = false
+        nil
       end
 
       def alive?
@@ -51,9 +77,10 @@ module Zashoku
 
       def lost_connection
         @alive = false
+        @socket.close
         Zashoku.logger.debug('lost connection')
         Util.alert('no connection')
-        Thread.exit
+        stop_threads
       end
 
       def disconnect
@@ -67,12 +94,11 @@ module Zashoku
       def command(msg, args = {})
         return unless alive?
         @semaphore.synchronize {
+          payload = { 'msg' => msg }.merge(args)
+          @command_queue << JSON.generate(payload)
 
-        payload = { 'msg' => msg }.merge(args)
-        @command_queue << JSON.generate(payload)
-
-        result = @result_queue.pop
-        result.keys.length == 1 ? result['response'] : result
+          result = @result_queue.pop
+          result.keys.length == 1 ? result['response'] : result
         }
       end
 
@@ -102,7 +128,12 @@ module Zashoku
       rescue JSON::ParserError
         Zashoku.logger.debug("discarding #{response}, JSON::ParserError")
       rescue EOFError
+        Zashoku.logger.debug('eof error')
         lost_connection
+      rescue IOError
+        Util.alert("error: socket#{@socket}")
+        #binding.pry
+        #exit
       end
 
       def dispatch_events!

data/lib/core/options.rb

@@ -23,7 +23,7 @@ module Zashoku
         end
 
         opts.on('-d', '--daemon', 'daemonize the server') do |d|
-          options[:daemonize] = true
+          options[:daemon] = true
         end
 
         opts.on('-g TEMPLATE', '--generate TEMPLATE', 'generate a template') do |template|

data/lib/core/statusline/statusline.rb

@@ -20,6 +20,11 @@ module Zashoku
         refresh
       end
 
+      def change_screen_size
+        refresh
+        changed!
+      end
+
       def changed!
         changed
         notify_observers

data/lib/core/util/readline.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
-
-require 'amatch'
+# encoding: utf-8
 
 module Zashoku
   module Util
     class Readline
+      COLOR = "\e[0m"
       attr_accessor :ac_index, :hy_index, :ac_sorted, :prompt, :x, :y, :history
 
       def initialize(prompt = '', ac_tree: {}, history: [])
@@ -14,11 +14,15 @@ module Zashoku
         @hy_index  = 0
         @ac_sorted = []
         @tree = ac_tree
-        @y = Term.rows
+        #@y = Term.rows
+      end
+
+      def y
+        Term.rows
       end
 
       def draw(string)
-        print "\e[#{y};0H#{prompt}#{string}\e[K\e[#{y};#{@x + 1}H"
+        print "#{COLOR}\e[#{y};0H#{prompt}#{string}\e[K\e[#{y};#{@x + 1}H"
       end
 
       def read(string = '')
@@ -65,6 +69,7 @@ module Zashoku
             string = string[0...rx] + string[rx..-1]
             string[x - prompt.length] = ''
           when 9 #tab
+            next if @tree.empty?
             if @ac_index == 0
               acl = ac_list(string)
               @ac_sorted = sort_ac_list(acl, string)
@@ -82,6 +87,7 @@ module Zashoku
               Curses.beep
             end
           else
+            Zashoku.logger.debug("unknown key #{c}")
             Curses.beep
           end
           @history[@hy_index] = string
@@ -115,8 +121,7 @@ module Zashoku
       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
+        list.select { |e| /^#{string}.*/i.match?(e.to_s) }
       end
     end
   end

data/lib/core/util/util.rb

@@ -17,6 +17,19 @@ module Zashoku
       {}
     end
 
+    def self.deep_merge(this, that)
+      this&.merge(that || {}) do |_k, old, nu|
+        case old
+        when Hash
+          deep_merge(old, nu)
+        #when Array
+        #  old + nu
+        else
+          nu
+        end
+      end
+    end
+
     def self.get_yaml(file, nil_value = {})
       YAML.safe_load(File.open(file, 'r', &:read)) || nil_value
     rescue Errno::ENOENT

data/lib/core/view.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-# require 'benchmark'
-
-# require_relative 'color'
-# require_relative '../util/util'
-
 module Zashoku
   class View
     include Zashoku::Util
@@ -19,6 +14,9 @@ module Zashoku
       @expanded = -1
       @selected = 0
 
+      @matches = []
+      @match_i = -1
+
       @items_formatted  = {}
 
       @old_rows = Term.rows
@@ -29,7 +27,47 @@ module Zashoku
     end
 
     def dirty_all_lines
-      @dirty_lines = 0.step(get_len).to_a
+      @dirty_lines = 0.step(Term.rows-2).to_a
+    end
+
+    def next_match
+      return if @matches.empty?
+      @match_i += 1
+
+      if @match_i >= @matches.length
+        @match_i = 0
+      end
+
+      select(*@matches[@match_i])
+    end
+
+    def previous_match
+      return if @matches.empty?
+
+      @match_i -= 1
+
+      if @match_i < 0
+        @match_i = @matches.length - 1
+      end
+      select(*@matches[@match_i])
+    end
+
+    def search(term)
+      re = /.*#{term}.*/i
+      @match_i = -1
+      outer = -1
+      @matches = @items_formatted.map do |parent, children|
+        inner = 0
+        outer += 1
+        matches = re.match?(parent) ? [[outer, 0]] : []
+        matches += children.map do |c|
+          [outer, inner+=1] if re.match?(c)
+        end.compact
+
+        matches
+      end.flatten(1) #.sort.reverse
+      Zashoku.logger.debug(@matches)
+      next_match
     end
 
     def unpause; end
@@ -42,21 +80,6 @@ module Zashoku
       notify_observers
     end
 
-    def auto_update(s: :start)
-      case s
-      when :start
-        @update_thread = Thread.new do
-          loop do
-            refresh
-            changed!
-            sleep 1
-          end
-        end
-      when :stop
-        @update_thread.exit if @update_thread
-      end
-    end
-
     def change_screen_size(redraw: true)
       @items_formatted = {}
       refresh_formats
@@ -144,6 +167,27 @@ module Zashoku
       changed!
     end
 
+    def select(out, inr)
+      out = out.to_i
+      inr = inr.to_i
+
+      #return if out >= @items.length
+      #return if inr >= @items[@expanded].length
+      unless inr == 0 ||  @expanded == out
+        oexpanded = @expanded
+        @expanded = out
+        arr = [@expanded, oexpanded] - [-1]
+        @dirty_lines += arr.min.step(@view[1]).to_a
+      end
+      os = @selected
+      @selected = out + inr
+
+      @dirty_lines += [os, @selected]
+
+      adjust_view
+      changed!
+    end
+
     def fix_cursor
       @selected = 0 if @selected < 0
       @selected = get_len - 1 if @selected >= get_len

data/lib/daemon.rb

@@ -39,7 +39,7 @@ module Zashoku
       # Load conf
       Zashoku.conf = DaemonConfig.new
       # Load modules
-      Zashoku.modules = Zashoku::Module.load(Zashoku::DaemonModules)
+      Zashoku.modules = Zashoku::Module.load(Zashoku::CConf[:app][:modules][:daemon])
       # Update conf with module defaults
       Zashoku.conf.reload
 
@@ -47,16 +47,11 @@ module Zashoku
         Zashoku.modules.keys.zip(Zashoku.modules.values.map(&:controller)).to_h
 
       Zashoku.controllers.each_value { |c| c.add_observer(self) }
-
-      # $stdout.reopen(file, 'w')
-      # $stderr.reopen(file, 'w')
-      # $stdout.sync = true
-      # $stderr.sync = true
     end
 
     def listen
       lay_traps!
-      @server = Net::Server.new(Zashoku::Port)
+      @server = Net::Server.new(Zashoku::CConf[:app][:net][:port])
       @server.handler = method(:respond)
       Zashoku.logger.debug('server listening')
       sleep
@@ -80,6 +75,8 @@ module Zashoku
         nil
       when 'stop'
         cleanup
+      when 'up?'
+        true
       else
         'what?'
       end

data/lib/viewer.rb

@@ -33,7 +33,9 @@ module Zashoku
       if /^remote::.*/.match?(message[:mod])
         message[:mod] = message[:mod].gsub('remote::', '')
         Zashoku.logger.debug("sending message #{message}")
-        Zashoku::Util.decode_object(client.command('fwd', message))
+        msg = Zashoku::Util.decode_object(client.command('fwd', message))
+        Zashoku.logger.debug('got it')
+        msg
       else
         modules[message[:mod]].send(message[:meth], *message[:args])
       end
@@ -44,30 +46,26 @@ module Zashoku
   class Viewer
     include Util
 
-    HISTORY = File.join(Zashoku::Config::CONF_DIR, 'cmd_history.yml')
+    CMD_HISTORY = File.join(Zashoku::Config::CONF_DIR, 'cmd_history.yml')
+    SRCH_HISTORY = File.join(Zashoku::Config::CONF_DIR, 'srch_history.yml')
 
-    COMMANDS = {
-      'quit'          => :cleanup,
-      'enter_command' => :get_user_command,
-      'change_view'   => :change_view,
-      'map_key'       => :map_key
-    }.freeze
+    COMMANDS = Zashoku::CConf[:core][:commands].merge(Zashoku::CConf[:app][:commands])
 
     def initialize
       @semaphore = Mutex.new
 
       Zashoku.logger = Logger.new(
-        File.join(Zashoku::AppRoot, "#{Zashoku::AppName}.log")
+        File.join(Zashoku::CConf[:app][:root], "#{Zashoku::CConf[:app][:name]}.log")
       )
 
       Zashoku.conf = ViewConfig.new
 
-      Zashoku.modules = Zashoku::Module.load(Zashoku::ViewerModules)
+      Zashoku.modules = Zashoku::Module.load(Zashoku::CConf[:app][:modules][:viewer])
       Zashoku.modules.merge!('conf' => Conf)
       Zashoku.conf.reload
 
       # note: start daemon if not running
-      Zashoku.client = Net::Client.new(Zashoku::Port)
+      Zashoku.client = Net::Client.new(Zashoku::CConf[:app][:net][:port])
       Zashoku.client.callbacks << method(:handle_event)
 
       @server_modules = Zashoku.client.command('modules')
@@ -89,8 +87,9 @@ module Zashoku
             .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, [])
+        history: Util.get_yaml(CMD_HISTORY, [])
       )
+      @searchline = Util::Readline.new('/', history: Util.get_yaml(SRCH_HISTORY, []))
 
       init_screen
       lay_traps!
@@ -102,6 +101,18 @@ module Zashoku
       sleep
     end
 
+    def reconnect_client
+        loop do
+          @socket = connect(@host, @port, loud_fail: false)
+          break if @socket
+          sleep 1
+        end
+
+        @alive = true
+        start_threads
+        Util.alert('regained connection!')
+    end
+
     def change_view(new_view)
       Zashoku.logger.debug("Changing view to #{new_view}")
       @views[@view].delete_observers
@@ -121,12 +132,15 @@ module Zashoku
     def lay_traps!
       Signal.trap('WINCH') do
         Thread.new do
-          @semaphore.synchronize { @views[@view].change_screen_size }
+          @semaphore.synchronize do
+            @views[@view].change_screen_size
+            @statusline.change_screen_size
+          end
         end
       end
       Signal.trap('INT') do
-          Thread.new do
-            @semaphore.synchronize { cleanup }
+        Thread.new do
+          @semaphore.synchronize { Util.alert('Type :quit<enter> to exit.') }
         end
       end
     end
@@ -134,10 +148,15 @@ module Zashoku
     def cleanup
       Zashoku.client.disconnect
       @key_thread&.exit
+      Zashoku.command_server('stop') if Zashoku::CConf[:app][:persistent_daemon]
       Curses.close_screen
-      Util.put_yaml(HISTORY, @cmdline.history)
+      if Zashoku::Conf.save?
+        Util.put_yaml(CMD_HISTORY, @cmdline.history)
+        Util.put_yaml(SRCH_HISTORY, @searchline.history)
+      end
+    ensure
       Term.show_cursor
-      exit
+      exit!
     end
 
     def init_screen
@@ -152,6 +171,10 @@ module Zashoku
         Zashoku.command(mod: mod, meth: meth, args: args)
       elsif @views.key?(mod) && @views[mod].respond_to?(meth)
         @views[mod].send(meth, *args)
+      elsif @views.key?(mod)
+        raise "#{mod} has no method '#{meth}'"
+      else
+        raise "module '#{mod}' not loaded"
       end
     end
 
@@ -159,10 +182,16 @@ module Zashoku
       cmd = @cmdline.read
       return unless cmd
       return builtin_command(*cmd.split) if COMMANDS.key?(cmd.split.first)
-
+      raise "no such command" if cmd.split.length == 1
       command(*cmd.split) unless cmd.empty?
-    rescue
-      Util.alert('Error')
+    rescue StandardError => e
+      Zashoku.logger.debug("#{cmd.split} raised an error '#{e}'")
+      Util.alert("Error: #{e}")
+    end
+
+    def search(*)
+      srchterm = @searchline.read
+      command(@view, :search, srchterm)
     end
 
     def handle_event(event)
@@ -179,8 +208,12 @@ module Zashoku
       send(COMMANDS[cmd], *args)
     end
 
-    def map_key(key, mod, command, *args)
-      Zashoku.conf.set(['keymaps', mod, key], "#{command} #{args.join(' ')}")
+    def map_key(key, mod, *command)
+      Zashoku.conf.set(['keymaps', mod, key], command.join(' '))
+    end
+
+    def print_version
+      Util.alert("zashoku v#{Zashoku::Version.join('.')}")
     end
 
     def scan_keyboard!
@@ -202,7 +235,7 @@ module Zashoku
         end
 
         mod, meth, *args = cmd.split
-        mod = mod == 'current_view' ? @view : mod
+        mod = mod == '$current_view' ? @view : mod
         args.map! do |arg|
           if arg.chr == '$'
             arg = arg[1..-1]
@@ -214,7 +247,11 @@ module Zashoku
             arg
           end
         end
-        command(mod, meth, *args)
+        begin
+          command(mod, meth, *args)
+        rescue Exception => e
+          Zashoku.logger.debug("#{[mod, meth, args].join(', ')} raised #{e}")
+        end
       end
     end
 

data/lib/zashoku.rb

@@ -1,22 +1,9 @@
 # frozen_string_literal: true
 
 require_relative 'core/options'
+require_relative 'constants'
 
 module Zashoku
-  Version = [1, 3, 2].freeze
-  Root    = File.expand_path('../', __dir__)
-
-  AppRoot = Root      unless const_defined?(:AppRoot)
-  AppName = 'zashoku' unless const_defined?(:AppName)
-  ViewerModules = []  unless const_defined?(:ViewerModules)
-  DaemonModules = []  unless const_defined?(:DaemonModules)
-  Host = 'localhost'  unless const_defined?(:Host)
-  Port = 26_119 unless const_defined?(:Port)
-
-  LoadPaths = [
-    File.join(Zashoku::AppRoot, 'modules')
-  ].freeze
-
   autoload :Generator, File.join(Root, 'lib/generator')
   autoload :Viewer,    File.join(Root, 'lib/viewer')
   autoload :Daemon,    File.join(Root, 'lib/daemon')
@@ -32,25 +19,48 @@ module Zashoku
   end
 
   def self.main(args)
-    options = Options.parse(args)
+    @options = Options.parse(args)
     Zashoku.modules = []
 
-    if options[:generate]
-      Generator.generate(options[:template], options[:generate_name])
-    elsif options[:server_command]
-      command_server(options[:server_command])
+    if @options[:generate]
+      Generator.generate(@options[:template], @options[:generate_name])
+    elsif @options[:server_command]
+      print command_server(@options[:server_command])[:payload]
     else
+      unless command_server('up?')[:status]
+        @options[:daemon] = true
+        command_server('start')
+        sleep(0.2) until command_server('up?')[:status]
+      end
       Viewer.new.run
     end
   end
 
+  def self.start_daemon
+    if @options[:daemon]
+      fork {
+        Process.daemon()
+        Daemon.new.listen
+      }
+    else
+      Daemon.new.listen
+    end
+  end
+
   def self.command_server(command)
     case command
     when 'start'
-      Daemon.new.listen
+      start_daemon
+    when 'restart'
+      command_server('stop')
+      start_daemon
     else
       require_relative 'core/net/client'
-      print Net::Client.command(Zashoku::Host, Zashoku::Port, command)
+      Net::Client.command(
+        Zashoku::CConf[:app][:net][:host],
+        Zashoku::CConf[:app][:net][:port],
+        command
+      )
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zashoku
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.5.0
 platform: ruby
 authors:
 - annacrombie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -120,6 +120,7 @@ files:
 - "./README.md"
 - "./config/daemon.yml"
 - "./config/view.yml"
+- "./lib/constants.rb"
 - "./lib/core/config/config.rb"
 - "./lib/core/config/daemon_config.rb"
 - "./lib/core/config/view_config.rb"
@@ -135,6 +136,7 @@ files:
 - "./lib/core/statusline/statusline.rb"
 - "./lib/core/statusline/widget.rb"
 - "./lib/core/util/folder_listen.rb"
+- "./lib/core/util/matcher.rb"
 - "./lib/core/util/readline.rb"
 - "./lib/core/util/term.rb"
 - "./lib/core/util/util.rb"