meshchat 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b78573438d48db0c4e67092319332d045ca76b2
-  data.tar.gz: 07de08af6980a361b232fc659b38863b32c49608
+  metadata.gz: d0990d41d8c16d59332c7220b14e4f3e95fb6bfc
+  data.tar.gz: 793bb0946bd2b1944fdbdcb31469682b848b4f12
 SHA512:
-  metadata.gz: 2273a362c088cc1eb3898f97d7c8c175d2ab62892093d0030f53fe0ec91f5927e51acf018396344ece8caa05c0c0d49143a5fa95cbf74e28dae65fad11d92c9c
-  data.tar.gz: 3336359fe0a01a70974f0d17b4ffc444303ec88f6d71a3ccd5b1b2f09420805ba16bd8c00244b67f5fde7f647797f521a9a471d29b5cc99b3d1f9f6cb6817bdb
+  metadata.gz: d7fdaf5a47e96cc1047604d51c115a118f22cf574ccd74fbf0ea5c15ef1546fc03f0cfdea555d8ee8e2a4384e5cfe4d2f6d160c5b67d31a79d9f56698a7d9b3c
+  data.tar.gz: b75182aa773d64a418fe23c69bbe0f154bad70b048b929ce0b8a97d48ca822a49a3e16fdf1c850e98cf12d90a9bae08aac6deb7ef50c3599a9f0cb793a35fe77

data/lib/meshchat.rb

@@ -8,6 +8,7 @@ require 'colorize'
 require 'io/console'
 require 'readline'
 require 'logger'
+require 'libnotify'
 
 # required gems
 require 'awesome_print'
@@ -76,6 +77,8 @@ module Meshchat
 
     # by default the app_config[:input] is
     # Meshchat::Cli::KeyboardLineInput
-    EM.open_keyboard(app_config[:input], input_receiver)
+    # EM.open_keyboard(app_config[:input], input_receiver)
+    input = app_config[:input].new(input_receiver)
+    input.try(:start)
   end
 end

data/lib/meshchat/configuration/app_config.rb

@@ -16,12 +16,18 @@ module Meshchat
         @_options = DEFAULTS.merge(options)
         @_options[:user] = Configuration::Settings.new
 
-        locale_path = 'lib/meshchat/locale/'
+        locale_path = 'locale/'
         # I18n.load_path = Dir[locale_path + '*.yml']
+        # puts File.read(locale_path)
+        root_path = File.dirname(__FILE__)
+        full_path = "#{root_path}/../#{locale_path}"
         I18n.backend.store_translations(:en,
-          YAML.load(File.read(locale_path + 'en.yml')))
+          YAML.load(File.read(full_path + 'en.yml')))
 
-        Meshchat.const_set(:Notify, options[:notifier])
+        if notifier = options[:notifier]
+          notifier_instance = notifier.new
+          Meshchat.const_set(:Notify, notifier_instance)
+        end
 
         # The display has to be created right away so that
         # we can start outputting to it

data/lib/meshchat/debug.rb

@@ -27,17 +27,21 @@ module Meshchat
       Display.debug('SENDING: ' + node.alias_name + ' is not on the local network')
     end
 
+    def subscribed_to_relay
+      Display.debug('Subscribed to relay...')
+    end
+
     def received_message_from_relay(message, relay_url)
       Display.debug('RECEIVING on RELAY: ' + relay_url)
       Display.debug('RECEIVING on RELAY: ')
       Display.debug(message)
     end
 
-    def sending_message_over_relay(node, message, relay_url)
-      Display.debug('SENDING on RELAY: ' + relay_url)
-      Display.debug('SENDING on RELAY: ' + node.as_json.to_json)
-      Display.debug('SENDING on RELAY: ' + message.class.name)
-      Display.debug('SENDING on RELAY: ' + message.inspect)
+    def sending_message_over_relay(node, relay_pool)
+      Display.debug('SENDING on RELAY ---------------------- ')
+      Display.debug('SENDING on RELAY: ' + node.alias_name)
+      Display.debug('SENDING on RELAY: ' + node.uid)
+      Display.debug('SENDING on RELAY: ' + relay_pool._active_relay._url)
     end
 
     def receiving_message(message)
@@ -46,10 +50,14 @@ module Meshchat
       Display.debug('RECEIVING: ' + message.message.to_s)
     end
 
-    def sending_message(message)
-      Display.debug('SENDING: ' + message.type)
-      Display.debug('SENDING: ' + message.sender.to_s)
-      Display.debug('SENDING: ' + message.message.to_s)
+    def message_being_dispatched(node, message)
+      Display.debug('DISPATCHING: ---------------------')
+      Display.debug('DISPATCHING: u - ' + node.uid)
+      Display.debug('DISPATCHING: a - ' + node.alias_name)
+      Display.debug('DISPATCHING: r - ' + node.on_relay.to_s)
+      Display.debug('DISPATCHING: l - ' + node.on_local_network.to_s)
+      Display.debug('DISPATCHING: ' + message.type)
+      Display.debug('DISPATCHING: ' + message.message.to_s)
     end
 
     def person_not_online(node, message, e)

data/lib/meshchat/network/dispatcher.rb

@@ -36,10 +36,15 @@ module Meshchat
         dispatch!(node, message)
       end
 
+      def send_to_all(message, ignore_offline_status: false)
+        nodes = ignore_offline_status ? Node.all : Node.online
+        nodes.each { |node| send_message(node: node, message: message) }
+      end
+
       private
 
       def dispatch!(node, message)
-        Debug.sending_message(message)
+        Debug.message_being_dispatched(node, message)
 
         message = encrypted_message(node, message)
 

data/lib/meshchat/network/local/connection.rb

@@ -46,7 +46,7 @@ module Meshchat
           # p http.response_header.status
           # p http.response_header
           # p http.response
-          http.callback {}
+          http.callback { Display.debug http.response_header.status }
         end
 
         def payload_for(encrypted_message)

data/lib/meshchat/network/message/node_list_hash.rb

@@ -18,9 +18,13 @@ module Meshchat
           if message != Node.as_sha512
             Display.debug 'node list hashes do not match'
 
+            node_list = _message_factory.create(
+              NODE_LIST,
+              data: { message: Node.as_json })
+
             _message_dispatcher.send_message(
               uid: payload['sender']['uid'],
-              message: NodeList.new(message: Node.as_json)
+              message: node_list
             )
           else
             Display.debug 'node list hash matches'

data/lib/meshchat/network/message/ping_reply.rb

@@ -4,7 +4,7 @@ module Meshchat
     module Message
       class PingReply < Base
         def display
-          'ping successful' if APP_CONFIG.user.debug?
+          super.merge(message: 'successfully responded to your ping')
         end
       end
     end

data/lib/meshchat/network/remote/connection.rb

@@ -13,6 +13,7 @@ module Meshchat
         end
 
         def send_message(node, encrypted_message)
+          Debug.sending_message_over_relay(node, _relay_pool)
           payload = payload_for(node.uid, encrypted_message)
           _relay_pool.send_payload(payload)
         end

data/lib/meshchat/network/remote/relay.rb

@@ -28,9 +28,7 @@ module Meshchat
           @_client = ActionCableClient.new(path, CHANNEL)
 
           # don't output anything upon connecting
-          _client.connected {
-            self._connected = true
-          }
+          _client.connected { self._connected = true }
 
           # If there are errors, report them!
           _client.errored do |message|
@@ -38,6 +36,7 @@ module Meshchat
           end
 
           _client.subscribed do
+            Debug.subscribed_to_relay
             connected.call if connected
           end
 
@@ -96,11 +95,18 @@ module Meshchat
         def error_message_received(message)
           Display.info message['error']
           if message['status'] == 404
-            # mark the node as offline via relay
-            # TODO: find the intended node.
-            #       if on_local_network is true, send to http_client
-            # Display.info "#{node.alias_name} has ventured offline"
-            # Debug.person_not_online(node, message, e)
+            uid = message['uid']
+            mark_as_offline(uid)
+          end
+        end
+
+        def mark_as_offline(uid)
+          node = Node.find_by_uid(uid)
+          if node
+            Display.info "#{node.alias_name} has ventured offline"
+            node.update(on_relay: false)
+          else
+            Display.info 'someone directly sent you a fake offline message'
           end
         end
       end

data/lib/meshchat/ui/cli.rb

@@ -6,21 +6,55 @@ module Meshchat
     class CLI
       extend ActiveSupport::Autoload
 
+      # 60 seconds times 5 minutes
+      AWAY_TIMEOUT = 60 * 5
+
       eager_autoload do
         autoload :InputFactory
         autoload :Base
         autoload :KeyboardLineInput
+        autoload :ReadlineInput
       end
 
       attr_reader :_message_dispatcher, :_message_factory, :_command_factory
+      attr_accessor :_last_input_received_at
+      attr_accessor :_sent_idle_message
 
       def initialize(dispatcher, message_factory, _display)
         @_message_dispatcher = dispatcher
         @_message_factory = message_factory
         @_command_factory = InputFactory.new(dispatcher, message_factory, self)
+        self._sent_idle_message = false
+        self._last_input_received_at = Time.now
+
+        # only check for timeout once a minute
+        EM.add_periodic_timer(60) { away_timeout }
+      end
+
+      def away_timeout
+        return unless activity_timeout_triggred?
+        message = _message_factory.create(Network::Message::EMOTE,
+          data: {
+            message: 'has become idle'
+          })
+
+        _message_dispatcher.send_to_all(message)
+        self._sent_idle_message = true
+      end
+
+      def activity_timeout_triggred?
+        return false if _sent_idle_message
+        seconds_passed = Time.now - _last_input_received_at
+        seconds_passed > AWAY_TIMEOUT
+      end
+
+      def reset_timeout_timer
+        self._last_input_received_at = Time.now
+        self._sent_idle_message = false
       end
 
       def create_input(msg)
+        reset_timeout_timer
         handler = _command_factory.create(for_input: msg)
         handler.handle
       rescue => e

data/lib/meshchat/ui/cli/readline_input.rb

@@ -0,0 +1,75 @@
+require 'readline/callback'
+
+# frozen_string_literal: true
+module Meshchat
+  module Ui
+    class CLI
+      class ReadlineInput
+        # The class used for interpeting the line input
+        attr_reader :_input_receiver
+
+        def initialize(input_receiver)
+          @_input_receiver = input_receiver
+        end
+
+        module Handler
+
+          def initialize
+            Readline.callback_handler_install('> ') do |line|
+              EventMachine.next_tick { @input_receiver.create_input(line) }
+            end
+          end
+
+          def notify_readable
+            Readline.callback_read_char
+          end
+
+          def unbind
+            Readline.callback_handler_remove
+          end
+
+          def input_receiver=(receiver)
+            @input_receiver = receiver
+          end
+
+        end
+
+        class << self
+          def autocompletes
+            commands = Meshchat::Ui::Command::COMMAND_MAP.map { |k, _v| "/#{k}" }
+            aliases = Meshchat::Node.all.map { |n| "#{n.alias_name}" }
+            commands + aliases
+          end
+        end
+
+        def start
+          # Ripl.start
+
+          conn = EventMachine.watch $stdin, Handler
+          conn.notify_readable = true
+          conn.input_receiver = _input_receiver
+
+          # update auto completion
+          completion = proc { |s| self.class.autocompletes.grep(/^#{Regexp.escape(s)}/) }
+          Readline.completion_proc = completion
+        end
+
+        # def initialize(*args)
+        #   super(args)
+        #
+        #
+        # end
+
+        # called every time meshchat wants a line of text from the user
+        # def get_input
+        #   # update auto completion
+        #   completion = proc { |s| self.class.autocompletes.grep(/^#{Regexp.escape(s)}/) }
+        #   Readline.completion_proc = completion
+        #
+        #   Readline.readline('> ', true)
+        # end
+
+      end
+    end
+  end
+end

data/lib/meshchat/ui/command/chat.rb

@@ -10,10 +10,6 @@ module Meshchat
             m = _message_factory.create(type, data: { message: _input })
             show_myself(m)
 
-            # if sending to all, iterate thorugh list of
-            # servers, and send to each one
-            # TODO: do this async so that one server doesn't block
-            # the rest of the servers from receiving the messages
             servers.each do |entry|
               _message_dispatcher.send_message(node: entry, message: m)
             end

data/lib/meshchat/ui/command/emote.rb

@@ -15,7 +15,7 @@ module Meshchat
         end
 
         def show_myself(message)
-          Display.info message.display
+          Display.emote message.display
         end
       end
     end

data/lib/meshchat/ui/command/help.rb

@@ -8,9 +8,10 @@ module Meshchat
         end
 
         def handle
-          Meshchat::CLI::COMMAND_MAP.each do |key, klass|
+          Meshchat::Ui::Command::COMMAND_MAP.each do |key, klass|
             if klass.respond_to?(:description)
-              Display.info "/#{key}\t\t" + klass.description
+              line = "/%-18s %s" % [key, klass.description ]
+              Display.info line
             end
           end
         end

data/lib/meshchat/ui/command/ping_all.rb

@@ -9,9 +9,7 @@ module Meshchat
 
         def handle
           ping = _message_factory.create(Network::Message::PING)
-          Node.all.each do |n|
-            _message_dispatcher.send_message(node: n, message: ping)
-          end
+          _message_dispatcher.send_to_all(ping, ignore_offline_status: true)
         end
       end
     end

data/lib/meshchat/ui/display.rb

@@ -7,6 +7,7 @@ module Meshchat
       eager_autoload do
         autoload :Base
         autoload :Manager
+        autoload :ReadlineDisplay
       end
 
       module_function

data/lib/meshchat/ui/display/readline_display.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+module Meshchat
+  module Ui
+    module Display
+      class ReadlineDisplay < Meshchat::Ui::Display::Base
+        def start
+          puts "\n"
+          alert 'Welcome to Spiced Rumby!'
+          puts "\n"
+          puts "\n"
+          # Start up Ripl, but it will not receive any user input
+          # Ripl.start
+        end
+
+        def print_non_destructively(text)
+          # Example of writing output while line is being edited.
+          #
+          # See also http://stackoverflow.com/questions/1512028/gnu-readline-how-do-clear-the-input-line
+          if buffer = Readline.line_buffer
+            print "\b \b" * buffer.size
+            print "\r"
+          end
+
+          begin
+            puts text + "\n"
+          ensure
+            Readline.forced_update_display
+          end
+        end
+
+        # TODO: find a more elegant way to handle color
+        def add_line(line)
+          print_non_destructively(line)
+        end
+
+        def info(msg)
+          if msg.is_a?(Hash)
+            message_parts_for(msg) do |time, name, message|
+              colored_time = (time.to_s + ' ').colorize(:magenta)
+              colored_name = (name + ' ').colorize(:light_black)
+              colored_message = message.colorize(:light_black)
+
+              print_non_destructively(colored_time + colored_name + colored_message)
+            end
+          else
+            print_non_destructively(msg.colorize(:light_black))
+          end
+        end
+
+        def warning(msg)
+          print_non_destructively(msg.colorize(:yellow))
+        end
+
+        def alert(msg)
+          print_non_destructively(msg.colorize(:red))
+        end
+
+        def success(msg)
+          print_non_destructively(msg.colorize(:green))
+        end
+
+        def emote(msg)
+          message_parts_for(msg) do |time, name, message|
+            colored_time = (time.to_s + ' ').colorize(:magenta)
+            colored_name = (name + ' ').colorize(:light_black)
+            colored_message = message.colorize(:light_black)
+
+            print_non_destructively(colored_time + colored_name + colored_message)
+          end
+        end
+
+        def chat(msg)
+          message_parts_for(msg) do |time, name, message|
+            colored_time = (time.to_s + ' ').colorize(:light_magenta)
+            colored_name = (name + ' ').colorize(:cyan)
+
+            print_non_destructively(colored_time + colored_name + message)
+          end
+        end
+
+        def whisper(msg)
+          message_parts_for(msg) do |time, name, message|
+            colored_time = (time.to_s + ' ').colorize(:magenta).bold
+            colored_name = (name + ' ').colorize(:light_black).bold
+            colored_message = message.colorize(:blue).bold
+
+            print_non_destructively(colored_time + colored_name + colored_message)
+          end
+        end
+
+        def message_parts_for(msg)
+          return yield(nil, nil, msg) if msg.is_a?(String)
+
+          time = msg[:time].strftime('%H:%M:%S')
+          name = msg[:from].to_s
+          message = msg[:message]
+
+          yield(time, name, message)
+        end
+      end
+    end
+  end
+end

data/lib/meshchat/ui/notifier.rb

@@ -4,6 +4,7 @@ module Meshchat
     module Notifier
       extend ActiveSupport::Autoload
       autoload :Base
+      autoload :LibNotify
     end
   end
 end

data/lib/meshchat/ui/notifier/lib_notify.rb

@@ -0,0 +1,46 @@
+module Meshchat
+  module Ui
+    module Notifier
+      # Inherit from base to obtain singletonness
+      #
+      # Meshchat uses singletons for notifications, because an OS
+      # generally only has one notification system
+      class LibNotify < Base
+        # this is the only method that needs to be overwritten
+        def show(*args)
+          libnotify_message.update(*args) do |notify|
+            yield(notify) if block_given?
+          end
+        end
+
+        private
+
+        def icon_path
+          unless @icon_path
+            relative_path = 'vendor/icons/ic_chat_bubble_black_24dp.png'
+            current_directory = Dir.pwd # should be the gem root
+            @icon_path = current_directory + '/' + relative_path
+          end
+
+          @icon_path
+        end
+
+        def libnotify_message
+          @message ||= Libnotify.new do |notify|
+            notify.summary    = APP_CONFIG[:client_name]
+            notify.body       = ''
+            notify.timeout    = 1.5 # 1.5 (s), 1000 (ms), "2", nil, false
+            notify.urgency    = :normal # :low, :normal, :critical
+            notify.append     = false # default true - append onto existing notification
+            notify.transient  = false # default false - keep the notifications around after display
+            # TODO: this will vary on each system - maybe package icons
+            # with the gem
+            notify.icon_path  = icon_path
+          end
+
+          @message
+        end
+      end
+    end
+  end
+end

data/lib/meshchat/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Meshchat
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meshchat
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - L. Preston Sego III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.3
+- !ruby/object:Gem::Dependency
+  name: ripl-readline-em
+  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'
 - !ruby/object:Gem::Dependency
   name: action_cable_client
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: libnotify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -286,6 +314,7 @@ files:
 - lib/meshchat/ui/cli/base.rb
 - lib/meshchat/ui/cli/input_factory.rb
 - lib/meshchat/ui/cli/keyboard_line_input.rb
+- lib/meshchat/ui/cli/readline_input.rb
 - lib/meshchat/ui/command.rb
 - lib/meshchat/ui/command/base.rb
 - lib/meshchat/ui/command/bind.rb
@@ -308,8 +337,10 @@ files:
 - lib/meshchat/ui/display.rb
 - lib/meshchat/ui/display/base.rb
 - lib/meshchat/ui/display/manager.rb
+- lib/meshchat/ui/display/readline_display.rb
 - lib/meshchat/ui/notifier.rb
 - lib/meshchat/ui/notifier/base.rb
+- lib/meshchat/ui/notifier/lib_notify.rb
 - lib/meshchat/version.rb
 homepage: https://github.com/NullVoxPopuli/meshchat
 licenses:
@@ -334,6 +365,6 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Meshchat-0.10.0
+summary: Meshchat-0.11.0
 test_files: []
 has_rdoc: