meshchat 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 769222556d02960c10f6e09f5216979a9d3b99b0
-  data.tar.gz: d2fb3690c939227b155933e7f404cea22b4a8ab4
+  metadata.gz: 677204be2321055039fb7d40db56bf98240b65c5
+  data.tar.gz: 7183a0315be9faa2f4730c3a6f3c5d718ae184b6
 SHA512:
-  metadata.gz: 5cf9b9d8a513a1a1e92e8e8b7afb1ada009dad234a3a935cc846b7bab8f34ced4539dbf643444b3c393ac6e9d5ee4309ea81b90b3da58956037dde9d355e6d2f
-  data.tar.gz: 273717543e8ec2081d2d2e7545da2fcea27eb398e7297eceb3f8a4a8976a86ce7f9f8c82d59772af1b4a42ff802de2af4caa476e90c0af0d2d7cb7122ea3d819
+  metadata.gz: cdf0dfc6e780ce78e04f0986ea82c895e3ced5a76ef0e69184e655aa5d2e3d411a5a53505fdc5f127d3e1820c75f053f15c72fd928eb8f6c23badc5fb1da3853
+  data.tar.gz: 78e642349854b82423d953819e49f326046b5096f3c876611acdc12e1e5584cd98ae1c62d886f044867bf8176f4d247d88621dc009ed2467a54683ad9cdcdd1a

data/lib/meshchat/configuration/database.rb

@@ -31,6 +31,8 @@ module Meshchat
 
                 table.column :on_local_network, :boolean, default: true, null: false
                 table.column :on_relay, :boolean, default: false, null: false
+
+                table.timestamps
               end
             end
           end

data/lib/meshchat/locale/en.yml

@@ -12,3 +12,4 @@ identity:
   current_alias: 'Your current name/alias is: %{name}'
 node:
   not_found: "Node not found, or does not have a location. Have you imported %{name}?"
+  multiple_with_alias: "!! You know multiple people named '%{name}', which would you like to send to?"

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

@@ -22,6 +22,10 @@ module Meshchat
 
           @_to = to
         end
+
+        def display
+          super.merge(to: _to)
+        end
       end
     end
   end

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

@@ -7,6 +7,7 @@ module Meshchat
         COMMAND = '/'
 
         attr_accessor :_message_dispatcher, :_message_factory, :_cli
+        attr_accessor :_whisper_lock_target
 
         def initialize(message_dispatcher, message_factory, cli)
           self._message_dispatcher = message_dispatcher
@@ -32,6 +33,14 @@ module Meshchat
           klass.new(input, _message_dispatcher, _message_factory, self)
         end
 
+        def clear_whisper_lock
+          self._whisper_lock_target = nil
+        end
+
+        def whisper_lock_to(node)
+          self._whisper_lock_target = node
+        end
+
         def create_for_input(input)
           klass =
             if is_command?(input)
@@ -39,11 +48,20 @@ module Meshchat
             elsif is_whisper?(input)
               Command::Whisper
             else
+              return whisper_for_locked_target(input) if _whisper_lock_target
               Command::Chat
             end
 
           create_with_class(input, klass)
         end
+
+        def whisper_for_locked_target(input)
+          command = Command::Whisper.new(
+            input, _message_dispatcher, _message_factory, self)
+
+          command._target_node = _whisper_lock_target
+          command
+        end
       end
     end
   end

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

@@ -16,7 +16,18 @@ module Meshchat
 
           def initialize
             Readline.callback_handler_install('> ') do |line|
-              EventMachine.next_tick { @input_receiver.create_input(line) }
+              EventMachine.next_tick { handle_input(line) }
+            end
+          end
+
+          def handle_input(line)
+            if @callback
+              # call and clear, so we can resume normal
+              # input handling
+              @callback.call(line)
+              @callback = nil
+            else
+              @input_receiver.create_input(line)
             end
           end
 
@@ -32,6 +43,10 @@ module Meshchat
             @input_receiver = receiver
           end
 
+          def callback_on_next_tick=(callback)
+            @callback = callback
+          end
+
         end
 
         class << self
@@ -40,6 +55,14 @@ module Meshchat
             aliases = Meshchat::Node.all.map { |n| "#{n.alias_name}" }
             commands + aliases
           end
+
+          def input_handler
+            @input_handler
+          end
+
+          def input_handler=(handler)
+            @input_handler = handler
+          end
         end
 
         def start
@@ -48,12 +71,13 @@ module Meshchat
           conn = EventMachine.watch $stdin, Handler
           conn.notify_readable = true
           conn.input_receiver = _input_receiver
-
+          self.class.input_handler = conn
           # update auto completion
           completion = proc { |s| self.class.autocompletes.grep(/^#{Regexp.escape(s)}/) }
           Readline.completion_proc = completion
         end
 
+
         # def initialize(*args)
         #   super(args)
         #

data/lib/meshchat/ui/command.rb

@@ -7,13 +7,17 @@ module Meshchat
       eager_autoload do
         autoload :Base
         autoload :Chat
+        autoload :Emote
+        autoload :Whisper
+        autoload :WhisperLock
+        autoload :AllChatLock
+
         autoload :Identity
         autoload :Irb
         autoload :Config
         autoload :Ping
         autoload :PingAll
         autoload :Server
-        autoload :Whisper
         autoload :Exit
         autoload :SendDisconnect
         autoload :Help
@@ -22,8 +26,10 @@ module Meshchat
         autoload :Offline
         autoload :Share
         autoload :Import
-        autoload :Emote
         autoload :Roll
+
+        # Utility
+        autoload :NodeFinder
       end
 
       COMMAND_MAP = {
@@ -46,7 +52,9 @@ module Meshchat
         Base::SEND_DISCONNECT => SendDisconnect,
         Base::EMOTE           => Emote,
         Base::ROLL            => Roll,
-        Base::CHAT            => Chat
+        Base::CHAT            => Chat,
+        Base::WHISPER_LOCK    => WhisperLock,
+        Base::ALL_CHAT_LOCK   => AllChatLock
       }.freeze
     end
   end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+module Meshchat
+  module Ui
+    module Command
+      class AllChatLock < Command::Base
+        def self.description
+          'sets the current chat to the "All Chat"'
+        end
+
+        def handle
+          return unless _input_factory._whisper_lock_target
+          Display.info 'whisper lock disabled'
+          _input_factory.clear_whisper_lock
+        end
+      end
+    end
+  end
+end

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

@@ -30,6 +30,8 @@ module Meshchat
         SEND_DISCONNECT = 'senddisconnect'
         EMOTE = 'me'
         ROLL = 'roll'
+        WHISPER_LOCK = 'wl'
+        ALL_CHAT_LOCK = 'all'
 
         attr_reader :_input, :_message_dispatcher
         attr_reader :_message_factory, :_input_factory
@@ -47,7 +49,7 @@ module Meshchat
           if klass
             _input_factory.create(for_input: _input, with_class: klass).handle
           else
-            Display.alert 'not implemented...'
+            Display.alert "#{command} not implemented..."
           end
         end
 

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

@@ -0,0 +1,58 @@
+module Meshchat
+  module Ui
+    module Command
+      module NodeFinder
+        module_function
+
+        def find_by_target(string, &block)
+          search_key = string.start_with?('#') ? :uid : :alias_name
+          nodes = Node.where(search_key => string)
+          if nodes.length == 0
+            return Display.warning('No node by: ' + string)
+          end
+
+          return block.call(nodes.first) if nodes.length == 1
+
+          Display.warning I18n.t('node.multiple_with_alias', name: string)
+          ask_for_specification(nodes, block)
+        end
+
+        def ask_for_specification(nodes, block)
+          # there are now more than 1 nodes
+          display_nodes(nodes)
+
+
+          # insert a callback into the input handler to run the next
+          # time a line is received
+          #
+          # TODO: this feels gross, is there a better way?
+          # TODO: move this callback from ReadlineInput to the Input Base
+          CLI::ReadlineInput.input_handler.callback_on_next_tick = lambda do |line|
+            answer = line.to_i
+            node = nodes[answer]
+            # finally, send the mesasge
+            # (or do whatever this is)
+            # but usually, it sending the message
+            block.call(node)
+          end
+        end
+
+        def display_nodes(nodes)
+          # write header
+          Display.info "\t\t     UID      Last Seen"
+          Display.info '-' * 60
+
+          # write nodes
+          nodes.each_with_index do |node, index|
+            i = index.to_s
+            alias_name = node.alias_name
+            uid = node.uid[0..5]
+            last_seen = node.updated_at&.strftime('%B %e, %Y  %H:%M:%S') || 'never'
+            line = "%-2s | %-15s %-8s %s" % [i, alias_name, uid, last_seen]
+            Display.info line
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,35 +3,48 @@ module Meshchat
   module Ui
     module Command
       class Whisper < Command::Base
+        attr_accessor :_target_node
+
         def self.description
           'sends a private message to a spepcific person'
         end
 
         def target
           # get first arg
+          return _target_node.alias_name if _target_node
           command
         end
 
         def message
+          return _input if _target_node
           command_args[1..command_args.length].try(:join, ' ')
         end
 
         def handle
-          node = Node.find_by_alias_name(target)
+          return send_message_to_node(_target_node) if _target_node
+          find_node_and_whisper(target)
+        end
 
-          if node
-            m = _message_factory.create(
-              Network::Message::WHISPER,
-              data: {
-                message: message,
-                to: target
-              })
+        def send_message_to_node(node)
+          m = _message_factory.create(
+            Network::Message::WHISPER,
+            data: {
+              message: message,
+              to: target
+            })
 
-            Display.whisper m.display
+          Display.whisper m.display
+
+          _message_dispatcher.send_message(node: node, message: m)
+        end
 
-            _message_dispatcher.send_message(node: node, message: m)
-          else
-            Display.alert "node for #{target} not found or is not online"
+        def find_node_and_whisper(target)
+          NodeFinder.find_by_target(target) do |node|
+            if node
+              send_message_to_node(node)
+            else
+              Display.alert "node for #{target} not found or is not online"
+            end
           end
         end
       end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+module Meshchat
+  module Ui
+    module Command
+      class WhisperLock < Command::Base
+        def self.description
+          'sets the current chat to to a chosen person'
+        end
+
+        def target
+          # get first arg
+          command_args[1]
+        end
+
+        def handle
+          NodeFinder.find_by_target(target) do |node|
+            Display.info "whisper-locked to #{node.alias_name}##{node.uid}"
+            _input_factory.whisper_lock_to(node)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -35,7 +35,7 @@ module Meshchat
 
         def info(msg)
           if msg.is_a?(Hash)
-            message_parts_for(msg) do |time, name, message|
+            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)
@@ -60,7 +60,7 @@ module Meshchat
         end
 
         def emote(msg)
-          message_parts_for(msg) do |time, name, message|
+          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)
@@ -70,7 +70,7 @@ module Meshchat
         end
 
         def chat(msg)
-          message_parts_for(msg) do |time, name, message|
+          message_parts_for(msg) do |time, name, message, _|
             colored_time = (time.to_s + ' ').colorize(:light_magenta)
             colored_name = (name + ' ').colorize(:cyan)
 
@@ -79,12 +79,14 @@ module Meshchat
         end
 
         def whisper(msg)
-          message_parts_for(msg) do |time, name, message|
+          message_parts_for(msg) do |time, name, message, to|
             colored_time = (time.to_s + ' ').colorize(:magenta).bold
-            colored_name = (name + ' ').colorize(:light_black).bold
+            colored_name = name.colorize(:light_black).bold
             colored_message = message.colorize(:blue).bold
+            colored_to = to.colorize(:blue).bold
 
-            print_non_destructively(colored_time + colored_name + colored_message)
+            names = "#{colored_name}->#{to} "
+            print_non_destructively(colored_time + names + colored_message)
           end
         end
 
@@ -94,8 +96,9 @@ module Meshchat
           time = msg[:time].strftime('%H:%M:%S')
           name = msg[:from].to_s
           message = msg[:message]
+          to = msg[:to]
 
-          yield(time, name, message)
+          yield(time, name, message, to)
         end
       end
     end

data/lib/meshchat/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meshchat
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - L. Preston Sego III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -316,6 +316,7 @@ files:
 - lib/meshchat/ui/cli/keyboard_line_input.rb
 - lib/meshchat/ui/cli/readline_input.rb
 - lib/meshchat/ui/command.rb
+- lib/meshchat/ui/command/all_chat_lock.rb
 - lib/meshchat/ui/command/base.rb
 - lib/meshchat/ui/command/bind.rb
 - lib/meshchat/ui/command/chat.rb
@@ -326,6 +327,7 @@ files:
 - lib/meshchat/ui/command/identity.rb
 - lib/meshchat/ui/command/import.rb
 - lib/meshchat/ui/command/irb.rb
+- lib/meshchat/ui/command/node_finder.rb
 - lib/meshchat/ui/command/offline.rb
 - lib/meshchat/ui/command/online.rb
 - lib/meshchat/ui/command/ping.rb
@@ -335,6 +337,7 @@ files:
 - lib/meshchat/ui/command/server.rb
 - lib/meshchat/ui/command/share.rb
 - lib/meshchat/ui/command/whisper.rb
+- lib/meshchat/ui/command/whisper_lock.rb
 - lib/meshchat/ui/display.rb
 - lib/meshchat/ui/display/base.rb
 - lib/meshchat/ui/display/manager.rb
@@ -366,6 +369,6 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Meshchat-0.11.2
+summary: Meshchat-0.12.0
 test_files: []
 has_rdoc: