zashoku 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4fa01a68fedb50955e21f463118c0b40b7a3ea3
-  data.tar.gz: f6c95b13d29fbde419815753ed527fef44a6de14
+  metadata.gz: 3e99bb8738a8d367c416d66c40130b91e07e9a76
+  data.tar.gz: f45b7cef607b9e640d89dec4999976c178918cd8
 SHA512:
-  metadata.gz: b4f12efc2dc904b9ffe2d5d1204be2b083e77318d6673398bbc805d3677a1503e8cb1e19cfe72d9e52b8cdeea9392d53263360c3b64846802a82659df534bca2
-  data.tar.gz: 62b9a8b0d03efba68fd7523fe5a093de69789423d2a59ff1ffa6600903aace9d3db2720227fdad9a8c130b59166043d0f371d24d1bbfc42fc32c94c3bba269eb
+  metadata.gz: ab0df30b379d34a69274ca6ba17f63a1dd42ada0d52f1a1413fb7039d40d900bc9bf888b0faa4b1e41b5fbd419c6a9168b809e13032b9dff45032877e7252ed0
+  data.tar.gz: a40c62b9937bd0a060285324667d88b9498e7d8992cb3e849543cb5e98a98bdc31312285eace7c57ee09896324d48e8993f8d58ec221c2a17559c8605cb3ac08

data/README.md

@@ -1,16 +1,25 @@
-# zashoku
+# zashoku座食
 command line application framework
 
 ## features
-+ for lazy people
++ good for lazy people
 + generators
 + optimized view
 + mvc
 + client / server model
++ rendering support for asian characters
+
+## examples
+#### create new app
+`zashoku -g app <name>`
+
+#### create new module
+`zashoku -g module <name>`
+
 
 ## installation
 `gem install zashoku`
 
-## documentation
-+ [rubydoc.info](http://www.rubydoc.info/gems/zashoku/)
-+ [wiki](https://github.com/annacrombie/zashoku/wiki/)
+## resources
++ [rubydoc.info/gems/zashoku](http://www.rubydoc.info/gems/zashoku/)
++ [rubygems.org/gems/zashoku](https://www.rubygems.org/gems/zashoku)

data/bin/zashoku

@@ -1,17 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-begin
-  if File.exist?(File.join(File.dirname(__FILE__), '../lib/zashoku.rb'))
-    require_relative '../lib/zashoku'
-  end
-  # rescue LoadError
-  #  require 'zashoku'
-end
-
-unless defined? Zashoku
-  puts 'cant find zashoku library'
-  exit
-end
+require_relative '../lib/zashoku'
 
 Zashoku.main(ARGV)

data/config/daemon.yml

@@ -1,8 +1 @@
 ---
-log_file: '$conf_dir/aw.log'
-conf_dir: '~/.config/zashoku'
-
-modules:
-  disabled: []
-  enabled:
-    - Bandcamp

data/config/view.yml

@@ -4,10 +4,6 @@ color:
   primary: "\e[0m\e[32m"
   secondary: "\e[0m\e[33m"
   main: "\e[0m\e[34m"
-modules:
-  disabled: []
-  enabled:
-  - Bandcamp
 keymaps:
   global:
     259: current_view move_cursor up

data/lib/core/config/config.rb

@@ -5,7 +5,7 @@ require 'fileutils'
 
 module Zashoku
   class Config < Controller
-    CONF_DIR  = File.join(Dir.home, '.config/zashoku')
+    CONF_DIR  = File.join(Dir.home, '.config/', Zashoku::AppName)
     CONF_FILE = File.join(CONF_DIR, '/conf.yml')
 
     def initialize
@@ -39,7 +39,7 @@ module Zashoku
     end
 
     def user_conf
-      read(self.class::CONF_FILE)
+      Util.get_yaml(self.class::CONF_FILE)
     end
 
     def pref_model(title, value, trail)
@@ -86,11 +86,5 @@ module Zashoku
     def save
       File.open(self.class::CONF_FILE, 'w') { |f| f.write(YAML.dump(@conf)) }
     end
-
-    def read(file)
-      YAML.safe_load(File.open(file, 'r', &:read))
-    rescue
-      {}
-    end
   end
 end

data/lib/core/config/daemon_config.rb

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

data/lib/core/config/view_config.rb

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

data/lib/core/formatter.rb

@@ -96,7 +96,6 @@ module Zashoku
     def self.format_line(string, obj)
       pfs = pre_format(string, obj)
       len = pfs.reduce(0) { |l, s| l + Unicode::DisplayWidth.of(s[0]) } + 1
-      Zashoku.logger.debug("formatting #{pfs}, len: #{len}\n--->#{Util::Term.cols} - #{len} / #{pfs.length - 1}")
       buffer = pfs.length > 1 ? (Util::Term.cols - len) / (pfs.length - 1) : 0
 
       buffer -= (Util::Term.cols - len - buffer)

data/lib/core/module.rb

@@ -4,15 +4,9 @@ require 'yaml'
 
 module Zashoku
   module Module
-    LoadPaths = [
-      File.join(Zashoku::Root, 'lib/core/modules/'),
-      File.join(Zashoku::Root, 'modules/'),
-      File.join(Dir.home, '.config/zashoku/modules/')
-    ].freeze
-
     def self.require_module(mod)
       mod = mod.downcase
-      LoadPaths.map do |path|
+      Zashoku::LoadPaths.map do |path|
         mod_path = File.join(path, "#{mod}/lib/#{mod}.rb")
         next unless File.exist?(mod_path)
         begin
@@ -31,7 +25,13 @@ module Zashoku
 
     def self.require_all(modules)
       modules.map do |mod|
-        Zashoku.const_get(mod) if require_module(mod)
+        if require_module(mod)
+          Zashoku.logger.debug("loaded module #{mod}")
+          Zashoku.const_get(mod)
+        else
+          Zashoku.logger.debug("failed to load module #{mod}")
+          nil
+        end
       end.compact
     end
 

data/lib/core/net/client.rb

@@ -9,7 +9,7 @@ module Zashoku
     class Client
       attr_accessor :callbacks
 
-      def initialize(port, host = 'localhost')
+      def initialize(port, host = Zashoku::Host)
         @socket = connect(host, port)
         @alive = true
 
@@ -26,6 +26,18 @@ module Zashoku
         @semaphore = Mutex.new
       end
 
+      def self.command(host, port, msg, args = {})
+        sock = TCPSocket.new(host, port)
+        sock.puts(JSON.generate({'msg' => msg}.merge(args)))
+        result = sock.readline
+        sock.close
+        JSON.parse(result).map { |k, v| "#{k}: #{v}\n" }.join
+      rescue Errno::ECONNREFUSED
+        "error: could not connect connect to server\n"
+      rescue EOFError
+        nil
+      end
+
       def connect(host, port)
         TCPSocket.new(host, port)
       rescue Errno::ECONNREFUSED
@@ -55,10 +67,8 @@ module Zashoku
       def command(msg, args = {})
         return unless alive?
         @semaphore.synchronize {
-        id = Random.rand
 
         payload = { 'msg' => msg }.merge(args)
-        Zashoku.logger.debug("client.command #{id} #{payload}")
         @command_queue << JSON.generate(payload)
 
         result = @result_queue.pop
@@ -84,7 +94,6 @@ module Zashoku
 
       def distribute_results!
         response = JSON.parse(@socket.readline)
-        Zashoku.logger.debug("distributing #{response.class} #{response.length}")
         if response['event']
           @event_queue << response
         else

data/lib/core/net/server.rb

@@ -59,6 +59,7 @@ module Zashoku
         Thread.abort_on_exception = true
         loop do
           Thread.start(@server.accept) do |client|
+            Zashoku.logger.debug("got client (hash: #{client.hash})")
             @clients << client
             @client_queue[client] = Queue.new
             handle(client)

data/lib/core/options.rb

@@ -6,6 +6,8 @@ class Options
   def self.parse(args)
     options = {
       daemon: false,
+      server: true,
+      server_command: nil,
       generate: false,
       template: nil,
       generate_name: nil
@@ -14,8 +16,13 @@ class Options
     parser = OptionParser.new do |opts|
       opts.banner = 'Usage: zashoku [options]'
 
-      opts.on('-d', '--daemon', 'pass commands to the daemon') do |d|
-        options[:daemon] = d
+      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|

data/lib/core/view.rb

@@ -24,11 +24,8 @@ module Zashoku
       @old_rows = Term.rows
 
       # @win = Curses::Window.new(0,0,0,0)
-      Zashoku.logger.debug('refreshing')
-      refresh
-
-      dirty_all_lines
       @view = [0, Term.rows - 3]
+      refresh
     end
 
     def dirty_all_lines
@@ -96,7 +93,6 @@ module Zashoku
         @selected = i
         @expanded = i
       end
-      #adjust_view
 
       arr = [@expanded, oexpanded] - [-1]
       @dirty_lines = arr.min.step(@view[1]).to_a
@@ -144,9 +140,7 @@ module Zashoku
       @dirty_lines += [os, @selected]
 
       adjust_view
-      fix_cursor
-      changed
-      notify_observers
+      changed!
     end
 
     def fix_cursor
@@ -210,8 +204,6 @@ module Zashoku
       )
 
       @items_formatted = Zashoku::Formatter.items(get_format, @items)
-      changed
-      notify_observers
     end
 
     def draw_line(line_on)
@@ -247,9 +239,7 @@ module Zashoku
       line_on = @view[0]
       lines_to_draw = @view[1]
 
-      # print the menu title
-      lo = "\e[1;1H"
-      print lo + @cl['m'] + @title_formatted + "\e[K"
+      print "\e[1;1H#{@cl['m']}#{@title_formatted}\e[K"
 
       while line_on < lines_to_draw
         draw_line(line_on) if @dirty_lines.include?(line_on)

data/lib/daemon.rb

@@ -4,7 +4,6 @@ require 'json'
 require 'logger'
 require 'socket'
 require 'thread'
-require 'warning'
 
 require_relative 'core/controller'
 require_relative 'core/config/daemon_config'
@@ -29,28 +28,32 @@ module Zashoku
 
   class Daemon
     def initialize
+      @semaphore = Mutex.new
+
+      Zashoku.logger = Logger.new(STDOUT)
       # Load conf
       Zashoku.conf = DaemonConfig.new
       # Load modules
-      Zashoku.modules = Zashoku::Module.load(Zashoku.conf.get(%w[modules enabled]))
+      Zashoku.modules = Zashoku::Module.load(Zashoku::DaemonModules)
       # Update conf with module defaults
       Zashoku.conf.reload
 
-      #initialize logger
-      Zashoku.logger = Logger.new(STDOUT)
-
       Zashoku.controllers =
         Zashoku.modules.keys.zip(Zashoku.modules.values.map(&:controller)).to_h
 
-      @server = Net::Server.new(12_345)
-      @server.handler = method(:respond)
-
       Zashoku.controllers.each_value { |c| c.add_observer(self) }
 
-      # $stdout.reopen(@pref.parseDir(@pref.get('daemon_log_file')), 'w')
-      # $stderr.reopen(@pref.parseDir(@pref.get('daemon_log_file')), 'w')
+      # $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.handler = method(:respond)
+      Zashoku.logger.debug('server listening')
       sleep
     end
 
@@ -70,11 +73,21 @@ module Zashoku
         Zashoku.command(message)
       when 'disconnect'
         nil
+      when 'stop'
+        cleanup
       else
         'what?'
       end
     end
 
+    def lay_traps!
+      Signal.trap('INT') do
+        Thread.new do
+          @semaphore.synchronize { cleanup }
+        end
+      end
+    end
+
     def cleanup
       @server.exit
       exit

data/lib/generator/app_generator.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Zashoku
+  module Generator
+    class AppGenerator < Generator
+      def generate!
+        generated << transfer('app', @name_path)
+        generated << transfer('module', Pathname.new(File.join(@name_path, 'modules', @name)))
+      end
+    end
+  end
+end

data/lib/generator/module_generator.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Zashoku
+  module Generator
+    class ModuleGenerator < Generator
+      def generate!
+        generated << transfer('module', @name_path)
+      end
+    end
+  end
+end

data/lib/generator.rb

@@ -4,41 +4,74 @@ require 'fileutils'
 require 'pathname'
 
 module Zashoku
-  class Generator
+  module Generator
     TemplateDir = File.join(Zashoku::Root, 'templates')
-    LowerCaseIdentifier = '<module_name>'
-    UpperCaseIdentifier = '<Module_name>'
     Extensions = 'rb,yml,md,gemspec'
 
-    def initialize(template, name)
-      @template = template
-      @name = name
-      @input_dir = Pathname.new(File.join(TemplateDir, template))
-      @output_dir = Pathname.new(File.join(Zashoku::Root, 'modules', @name))
-      raise 'Module already exists' if Dir.exist?(@output_dir)
-    end
+    def self.generate(template, name)
+      raise 'error, no name given' unless name
+      generator =
+        case template
+        when 'module'
+          require_relative 'generator/module_generator'
+          ModuleGenerator.new(name)
+        when 'app'
+          require_relative 'generator/app_generator'
+          AppGenerator.new(name)
+        else
+          raise "Template #{template} not found"
+        end
 
-    def refactor(thing)
-      thing
-        .to_s
-        .gsub(/#{LowerCaseIdentifier}/, @name)
-        .gsub(/#{UpperCaseIdentifier}/, @name.capitalize)
+      generator.generate!
+      puts "generated #{generator.generated.join(', ')}"
     end
 
-    def generate
-      Dir.glob("#{@input_dir}/**/*.#{Extensions}").each do |file|
-        new_file =
-          File.join(
-            @output_dir,
-            refactor(Pathname.new(file).relative_path_from(@input_dir))
-          )
+    class Generator
+      attr_accessor :generated
+
+      def initialize(name)
+        @generated = []
+        @name = name
+        @name_path = Pathname.new(File.absolute_path(@name))
+      end
 
-        FileUtils.mkdir_p(File.dirname(new_file))
+      def pairs
+        @pairs || @pairs = {
+          /<name>/ => @name,
+          /<Name>/ => @name.capitalize
+        }
+      end
+
+      def refactor(thing)
+        pairs.reduce(thing.to_s) { |f, t| f = f.gsub(t[0], t[1]) }
+      end
 
-        File.open(new_file, 'w') do |f|
-          f.print refactor(File.open(file, 'r', &:read))
+      def transfer(template, output)
+        input_dir  = Pathname.new(File.join(TemplateDir, template))
+        output_dir = Pathname.new(output)
+        raise "path #{output_dir} already exists" if Dir.exist?(output_dir)
+        Dir.glob("#{input_dir}/**/*").each do |file|
+          next if Dir.exist?(file)
+
+          new_file =
+            File.join(
+              output_dir,
+              refactor(Pathname.new(file).relative_path_from(input_dir))
+            )
+
+          FileUtils.mkdir_p(File.dirname(new_file))
+
+          File.open(new_file, 'w') do |f|
+            f.print refactor(File.open(file, 'r', &:read))
+          end
+
+          FileUtils.chmod(File.stat(file).mode, new_file)
         end
+
+        output
       end
+
+      def generate!; end
     end
   end
 end

data/lib/viewer.rb

@@ -52,33 +52,37 @@ module Zashoku
     def initialize
       @semaphore = Mutex.new
 
+      Zashoku.logger = Logger.new(
+        File.join(Zashoku::AppRoot, "#{Zashoku::AppName}.log")
+      )
+
       Zashoku.conf = ViewConfig.new
 
-      Zashoku.modules = Zashoku::Module.load(
-        Zashoku.conf.get(%w[modules enabled])
-      )
+      Zashoku.modules = Zashoku::Module.load(Zashoku::ViewerModules)
       Zashoku.conf.reload
 
-      Zashoku.logger = Logger.new('zashoku_log.log')
-
       # note: start daemon if not running
-      Zashoku.client = Net::Client.new(12_345)
+      Zashoku.client = Net::Client.new(Zashoku::Port)
       Zashoku.client.callbacks << method(:handle_event)
 
       @views = Zashoku.modules.keys.zip(Zashoku.modules.map do |_k, m|
         m.view
       end).to_h
-
       @view = @views.keys.first
+
       init_screen
       lay_traps!
       Thread.abort_on_exception = true
       Thread.new { scan_keyboard! }
+
+      init_view(@view) if @view
+      sleep
+    end
+
+    def init_view(view)
       @views[@view].add_observer(self, :draw_view)
       @views[@view].refresh
       draw_view
-
-      sleep
     end
 
     def lay_traps!

data/lib/zashoku.rb

@@ -3,9 +3,20 @@
 require_relative 'core/options'
 
 module Zashoku
-  Version = [1, 0, 0].freeze
+  Version = [1, 1, 0].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 = 12_345       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')
@@ -25,11 +36,21 @@ module Zashoku
     Zashoku.modules = []
 
     if options[:generate]
-      Generator.new(options[:template], options[:generate_name]).generate
-    elsif options[:daemon]
-      Daemon.new
+      Generator.generate(options[:template], options[:generate_name])
+    elsif options[:server_command]
+      command_server(options[:server_command])
     else
       Viewer.new.run
     end
   end
+
+  def self.command_server(command)
+    case command
+    when 'start'
+      Daemon.new.listen
+    else
+      require_relative 'core/net/client'
+      print Net::Client.command(Zashoku::Host, Zashoku::Port, command)
+    end
+  end
 end

metadata

@@ -1,15 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: zashoku
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - annacrombie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
-dependencies: []
+date: 2017-10-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: curses
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.8
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: unicode-display_width
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: inspired by cmus, vim, and rails
 email: meotleft@gmail.com
 executables:
@@ -36,6 +116,8 @@ files:
 - "./lib/core/view.rb"
 - "./lib/daemon.rb"
 - "./lib/generator.rb"
+- "./lib/generator/app_generator.rb"
+- "./lib/generator/module_generator.rb"
 - "./lib/viewer.rb"
 - "./lib/zashoku.rb"
 - bin/zashoku
@@ -51,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="