meshchat 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c964bd41eba72bdb632f46e5ea1a0f6d84b22984
-  data.tar.gz: 3e904fa0c4f90708457a176658c473dd0f398509
+  metadata.gz: fca3ee7e9b96b4f3c908452a8431b30439f677af
+  data.tar.gz: c83a3c29a2e306b82ac9eeec85a92012001cf010
 SHA512:
-  metadata.gz: 4929079025f53a876db2978628bccf9af4cfac2a7429e6ce365264369fc8bfea6636fcf334e987401ff38d11b9abe427de2784cded6831d43fa984107cb5231a
-  data.tar.gz: db5b1424bfa7c9fbecaf1cdae7cbe93d63f394826a41113908f484a94c86c9c9a02fbe11f9aae30ce16610ab77159fe45c603082b5908715157f5f67c4d7bb03
+  metadata.gz: 18c8c043f8ac60af265de57719d76ff2bf6aea30d6474f9d9a6d6621f6a49768a646b5b2d97c4342b09203e56e98e2bd1129492c86f7bbec39c6da6cb19b3243
+  data.tar.gz: 1213ce77facbfb2263afd1a5b89a3288a2ded7074c05fdb3996e0631d25eaac79fe3b5435ff7d7f4c10d267aab3eec1e2b83364f9fa4985f23fa59013f74dfd7

data/lib/meshchat/cli.rb

@@ -1,6 +1,7 @@
 require 'meshchat/cli/input'
 require 'meshchat/cli/base'
 require 'meshchat/command/base'
+require 'meshchat/command/chat'
 require 'meshchat/command/identity'
 require 'meshchat/command/irb'
 require 'meshchat/command/config'
@@ -19,6 +20,7 @@ require 'meshchat/command/offline'
 require 'meshchat/command/init'
 require 'meshchat/command/share'
 require 'meshchat/command/import'
+require 'meshchat/command/emote'
 
 
 module MeshChat
@@ -45,7 +47,10 @@ module MeshChat
       MeshChat::Command::Base::OFFLINE => MeshChat::Command::Offline,
       MeshChat::Command::Base::HELP => MeshChat::Command::Help,
       MeshChat::Command::Base::BIND => MeshChat::Command::Bind,
-      MeshChat::Command::Base::SEND_DISCONNECT => MeshChat::Command::SendDisconnect
+      MeshChat::Command::Base::SEND_DISCONNECT => MeshChat::Command::SendDisconnect,
+      MeshChat::Command::Base::EMOTE => MeshChat::Command::Emote,
+      MeshChat::Command::Base::CHAT => MeshChat::Command::Chat
+
     }
 
 

data/lib/meshchat/cli/input.rb

@@ -21,41 +21,17 @@ module MeshChat
             elsif is_whisper?(input)
               Command::Whisper
             else
-              # TODO: maybe change this to a chat command?
-              CLI::Input
+              Command::Chat
             end
 
+          Display.debug("INPUT: Detected '#{klass.name}' from '#{input}'")
           klass.new(input)
         end
-
       end
 
       def initialize(input)
         self._input = input.chomp
       end
-
-      def handle
-        return if _input.empty?
-
-        servers = Node.online
-        if !servers.empty?
-          m = Message::Chat.new(
-            message: _input
-          )
-
-          Display.chat m.display
-
-          # 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|
-            Net::Client.send(node: entry, message: m)
-          end
-        else
-          Display.warning 'you have no servers'
-        end
-      end
     end
   end
 end

data/lib/meshchat/command/base.rb

@@ -32,9 +32,11 @@ module MeshChat
       HELP = 'help'
       BIND = 'bind'
       SEND_DISCONNECT = 'senddisconnect'
+      EMOTE = 'me'
 
       def handle
         klass = CLI::COMMAND_MAP[command]
+        Display.debug("INPUT: #{klass.name} from #{command} derived from #{_input}")
         if klass
           klass.new(_input).handle
         else
@@ -44,6 +46,16 @@ module MeshChat
 
       protected
 
+      def corresponding_message_class
+        my_kind = self.class.name.demodulize
+        message_root_name = MeshChat::Message.name
+        message_class_name = "#{message_root_name}::#{my_kind}"
+
+        Display.debug("Corresponding: #{message_class_name}")
+
+        message_class_name.constantize
+      end
+
       def command_string
         @command_string ||= _input[1, _input.length]
       end

data/lib/meshchat/command/chat.rb

@@ -0,0 +1,30 @@
+module MeshChat
+  class Command
+    class Chat < Command::Base
+      def handle
+        servers = Node.online
+        if !servers.empty?
+          m = corresponding_message_class.new(
+            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|
+            Net::Client.send(node: entry, message: m)
+          end
+        else
+          Display.warning 'you have no servers'
+        end
+      end
+
+      def show_myself(message)
+        Display.chat message.display
+      end
+    end
+  end
+end

data/lib/meshchat/command/emote.rb

@@ -0,0 +1,20 @@
+module MeshChat
+  class Command
+    class Emote < Command::Chat
+      def self.description
+        'send an emote to the current chat'
+      end
+
+      def initialize(input)
+        input = input.chomp
+        emote_message = input.gsub(/\A\/me /, '').chomp
+        self._input = emote_message
+      end
+
+      def show_myself(message)
+        Display.info message.display
+      end
+
+    end
+  end
+end

data/lib/meshchat/command/help.rb

@@ -7,7 +7,9 @@ module MeshChat
 
       def handle
         MeshChat::CLI::COMMAND_MAP.each do |key, klass|
-          Display.info "/#{key}\t\t" + klass.description
+          if klass.respond_to?(:description)
+            Display.info "/#{key}\t\t" + klass.description
+          end
         end
       end
     end

data/lib/meshchat/command/irb.rb

@@ -1,12 +1,13 @@
 module MeshChat
   class Command
-    def self.description
-      'runs ruby commands (useful for debugging)'
-    end
 
     # TODO: only include this and awesome_print when booted with
     # debug=true in the config
     class IRB < Command::Base
+      def self.description
+        'runs ruby commands (useful for debugging)'
+      end
+
       def handle
         begin
           code = command_args[1..command_args.length].join(' ')

data/lib/meshchat/display.rb

@@ -11,6 +11,7 @@ module MeshChat
     def start(*args); current.start(*args); end
     def add_line(*args); current.add_line(*args); end
     def info(*args); current.info(*args); end
+    def emote(*args); current.emote(*args); end
     def warning(*args); current.warning(*args); end
     def alert(*args); current.alert(*args); end
     def success(*args); current.success(*args); end

data/lib/meshchat/display/base.rb

@@ -17,6 +17,13 @@ module MeshChat
         fail 'overload this method'
       end
 
+
+      # an emote
+      def emote(_line)
+        fail 'overload this method'
+      end
+
+
       # server info or other ignorable information
       def info(_line)
         fail 'overload this method'

data/lib/meshchat/display/manager.rb

@@ -9,6 +9,7 @@ module MeshChat
       delegate :start, to: :_ui
       delegate :add_line, to: :_ui
       delegate :info, to: :_ui
+      delegate :emote, to: :_ui
       delegate :warning, to: :_ui
       delegate :alert, to: :_ui
       delegate :success, to: :_ui
@@ -36,6 +37,9 @@ module MeshChat
         when Message::Whisper.name
           whisper result
           Notify.show(summary: message.sender_name, body: message.message)
+        when Message::Emote.name
+          emote result
+          Notify.show(summary: message.sender_name, body: message.message)
         when Message::PingReply.name, Message::Ping.name
           info result
         when Message::NodeList.name,

data/lib/meshchat/message.rb

@@ -1,5 +1,6 @@
 require 'meshchat/message/base'
 require 'meshchat/message/chat'
+require 'meshchat/message/emote'
 require 'meshchat/message/ping'
 require 'meshchat/message/ping_reply'
 require 'meshchat/message/disconnect'
@@ -12,6 +13,7 @@ require 'meshchat/message/node_list_hash'
 module MeshChat
   module Message
     CHAT = 'chat'
+    EMOTE = 'emote'
     PING = 'ping'
     PING_REPLY = 'pingreply'
     WHISPER = 'whisper'
@@ -24,6 +26,7 @@ module MeshChat
 
     TYPES = {
       CHAT => Chat,
+      EMOTE => Emote,
       WHISPER => Whisper,
       DISCONNECT => Disconnect,
       PING => Ping,

data/lib/meshchat/message/chat.rb

@@ -7,7 +7,12 @@ module MeshChat
         name = payload['sender']['alias']
         message = payload['message']
 
-        "#{time_recieved} #{name} > #{message}"
+        format_display(time_recieved, name, message)
+      end
+
+
+      def format_display(time, name, message)
+        "#{time} #{name} > #{message}"
       end
     end
   end

data/lib/meshchat/message/emote.rb

@@ -0,0 +1,9 @@
+module MeshChat
+  module Message
+    class Emote < Chat
+      def format_display(time, name, message)
+        "#{time} #{name} #{message}"
+      end
+    end
+  end
+end

data/lib/meshchat/net/listener/server.rb

@@ -77,7 +77,7 @@ module MeshChat
 
         def status_of(s)
           status s
-          Display.debug('SERVER: ' + s)
+          Display.debug('SERVER: ' + s.inspect)
           body ''
         end
 

data/lib/meshchat/version.rb

@@ -1,3 +1,3 @@
 module MeshChat
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meshchat
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - L. Preston Sego III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -192,7 +192,9 @@ files:
 - lib/meshchat/cli/input.rb
 - lib/meshchat/command/base.rb
 - lib/meshchat/command/bind.rb
+- lib/meshchat/command/chat.rb
 - lib/meshchat/command/config.rb
+- lib/meshchat/command/emote.rb
 - lib/meshchat/command/exit.rb
 - lib/meshchat/command/help.rb
 - lib/meshchat/command/identity.rb
@@ -223,6 +225,7 @@ files:
 - lib/meshchat/message/base.rb
 - lib/meshchat/message/chat.rb
 - lib/meshchat/message/disconnect.rb
+- lib/meshchat/message/emote.rb
 - lib/meshchat/message/node_list.rb
 - lib/meshchat/message/node_list_diff.rb
 - lib/meshchat/message/node_list_hash.rb
@@ -262,5 +265,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: MeshChat-0.7.1
+summary: MeshChat-0.8.0
 test_files: []