zashoku 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35663a0571ac59386c29a85223b2b3f75690dd70
-  data.tar.gz: 26a5bba70e214f1f059a58014b418c5dbd9a2d84
+  metadata.gz: 770d3ee1cf2f87e16048ee6b4e85c5386396ac57
+  data.tar.gz: 4eba5da2106507d67008149dd0ed87538dd3e8e0
 SHA512:
-  metadata.gz: 509a76eccd21d5f1d46c02f24dc35e99e4bd5aa93fa17694d058bea5316ff59a945ca738ff261ca77a570a0a7f372e384f4579b0d355192b6fc61cc3035710b5
-  data.tar.gz: 5b20daf5028f0983ddc42de1ce01c99bed88e7408cc763bfbe75b8ee09bd6e7f4fd6bc7e083936080cd372386abadafaad62f3f2456b506c8a99604b31e72a0a
+  metadata.gz: 8be103708b5a862b9c26200c18c3eff09eab154efe10f7fd88b9bc7a704ee4997b148cd624aee1105cb6fdb2562b0d3841c1a3e4b76e2f4cb8ebcf02adf91698
+  data.tar.gz: 1aeec1a3e41021aa32d36d0e88536680df6ca666e343d1c0f8551961049d1740e147b0fb6d2d37eb7e1ec57316a1f72e6f7a5026b25e2144978a7318d58e43ad

data/lib/constants.rb

@@ -3,7 +3,7 @@
 require_relative 'core/util/util'
 
 module Zashoku
-  Version = [1, 5, 4].freeze
+  Version = [1, 5, 5].freeze
 
   Root    = File.expand_path('../', __dir__)
 

data/lib/core/net/client.rb

@@ -9,7 +9,7 @@ module Zashoku
     class Client
       attr_accessor :callbacks
 
-      def initialize(port, host = Zashoku::CConf[:app][:net][:host])
+      def initialize(host, port)
         @host, @port = host, port
         @socket = connect(@host, @port)
         @alive = true

data/lib/core/options.rb

@@ -11,7 +11,8 @@ module Zashoku
         server_command: nil,
         generate: false,
         template: nil,
-        generate_name: nil
+        generate_name: nil,
+        host: {}
       }
 
       parser = OptionParser.new do |opts|
@@ -33,6 +34,11 @@ module Zashoku
           end
         end
 
+        opts.on('-H HOST', '--host HOST', 'specify host') do |host|
+          options[:host][:host] = host.split(':').first
+          options[:host][:port] = host.split(':').last
+        end
+
         opts.on_tail('-h', '--help', 'Show this message') do
           puts opts
           exit

data/lib/daemon.rb

@@ -32,7 +32,8 @@ module Zashoku
   end
 
   class Daemon
-    def initialize
+    def initialize(port:)
+      @port = port
       @semaphore = Mutex.new
 
       Zashoku.logger = Logger.new(STDOUT)
@@ -52,7 +53,7 @@ module Zashoku
 
     def listen
       lay_traps!
-      @server = Net::Server.new(Zashoku::CConf[:app][:net][:port])
+      @server = Net::Server.new(@port)
       @server.handler = method(:respond)
       Zashoku.logger.info('server listening')
       sleep

data/lib/viewer.rb

@@ -51,7 +51,8 @@ module Zashoku
 
     COMMANDS = Zashoku::CConf[:core][:commands].merge(Zashoku::CConf[:app][:commands])
 
-    def initialize
+    def initialize(host:, port:)
+      @host, @port = host, port
       @semaphore = Mutex.new
 
       Zashoku.logger = Logger.new(
@@ -66,7 +67,7 @@ module Zashoku
       Zashoku.conf.reload
 
       # note: start daemon if not running
-      Zashoku.client = Net::Client.new(Zashoku::CConf[:app][:net][:port])
+      Zashoku.client = Net::Client.new(host, port)
       Zashoku.client.callbacks << method(:handle_event)
 
       @server_modules = Zashoku.client.command('modules')

data/lib/zashoku.rb

@@ -18,49 +18,51 @@ module Zashoku
     modules[message[:mod]].send(message[:meth], *message[:args])
   end
 
+
   def self.main(args)
     @options = Options.parse(args)
+    host = @options[:host].key?(:host) ? @options[:host][:host] : Zashoku::CConf[:app][:net][:host]
+    port = @options[:host].key?(:port) ? @options[:host][:port] : Zashoku::CConf[:app][:net][:port]
+
     Zashoku.modules = []
 
     if @options[:generate]
       Generator.generate(@options[:template], @options[:generate_name])
     elsif @options[:server_command]
-      print command_server(@options[:server_command])[:payload]
+      print command_server(@options[:server_command], host, port)[:payload]
     else
-      unless command_server('up?')[:status]
+      unless command_server('up?', host, port)[:status]
         @options[:daemon] = true
-        command_server('start')
-        sleep(0.2) until command_server('up?')[:status]
+        command_server('start', host, port)
+        sleep(0.2) until command_server('up?', host, port)[:status]
       end
-      Viewer.new.run
+      Viewer.new(host: host, port: port)
     end
   end
 
-  def self.start_daemon
+  def self.start_daemon(port)
     if @options[:daemon]
       fork {
         Process.daemon()
-        Daemon.new.listen
+        d = Daemon.new(port: port)
+        d.listen
       }
     else
-      Daemon.new.listen
+      d = Daemon.new(port: port)
+      d.listen
     end
   end
 
-  def self.command_server(command)
+  def self.command_server(command, host, port)
     case command
     when 'start'
-      start_daemon
+      start_daemon(port)
     when 'restart'
       command_server('stop')
       start_daemon
     else
       require_relative 'core/net/client'
-      Net::Client.command(
-        Zashoku::CConf[:app][:net][:host],
-        Zashoku::CConf[:app][:net][:port],
-        command
-      )
+      Net::Client.command(host, port, command)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zashoku
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - annacrombie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses