meshchat 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5671565391401b5aabfdbc5b5fbf4fd3fbb4f669
-  data.tar.gz: c8f10685c22c6ed97b17723d5dfacac3078b1607
+  metadata.gz: d92a2e7b4e026335fc14b3c574cd4252a5f0dbb7
+  data.tar.gz: 37348ba21effad3647ef2ccd154235b371243810
 SHA512:
-  metadata.gz: 35054ce9d7603e797f94da7f785f4e3c43d8a401e4523c915e1614d048bcdfbe671c3ac956da94daa70c630ddc7f702bd1f2232ac757355a2b3cc3989f8b4f59
-  data.tar.gz: 0dc75c02103b3fff808102fb4bb32e5f6e451f558d1479d0bf2b3d452c93a7d2a34f2b011697490397abcb231724998cfb8239b624a95f376088f86ce52a5c15
+  metadata.gz: 6477e3bff10e2bd795ad277a6376351c87fd520796a0bc717baf27776a0698caecfc6573190cb4074c9a3feea2f4fe1fd930d518ce18212978297e39af9a17fc
+  data.tar.gz: a3031e4f8b1a5196c3407798006c8ef750eabd83ae791973505480bae32399380d6f76d87c1ff1f400b010452b95f3854fb30520ced07f28e4a355818dcc333d

data/README.md

@@ -8,12 +8,15 @@ See [Spiced Gracken](https://github.com/NullVoxPopuli/spiced_gracken)
 
 In order to use meshchat with your own interface, you only need to pass in your own implementations of `Display::Base` and `CLI::Base`
 
+Optionally, you may pass in a notifier to have the mesh-chat trigger notifications for your system
+
 ```ruby
 MeshChat.start(
   client_name: NAME, # name of your client
   client_version: VERSION, # version of your client
-  display: ui, # your class of your implementation of `Display::Base`
-  input: input, # your class of your implementation of `CLI::Base`
+  display: ui, # your class implementing `Display::Base`
+  input: input, # your class implementing `CLI::Base`
+  notifier: notifier, # your class implementing `Notifier::Base`
   on_display_start: ->{ MeshChat::CLI.check_startup_settings } # optional
 )
 ```

data/lib/meshchat.rb

@@ -4,10 +4,8 @@ require 'socket'
 require 'json'
 require 'date'
 require 'colorize'
-require 'curses'
 require 'io/console'
 require "readline"
-
 require 'logger'
 
 # required gems
@@ -16,7 +14,6 @@ require 'sqlite3'
 require 'active_record'
 require 'curb'
 require 'thin'
-require 'libnotify'
 
 # active support extensions
 require 'active_support/core_ext/module/delegation'
@@ -47,7 +44,6 @@ module MeshChat
   Settings = Config::Settings
   Node = Models::Entry
   Cipher = Encryption
-  Notify = Notifier::Base
 
   module_function
 
@@ -59,12 +55,17 @@ module MeshChat
       display: Display::Base,
       client_name: NAME,
       client_version: VERSION,
-      input: CLI::Base
+      input: CLI::Base,
+      notifier: Notifier::Base
     }
     options = defaults.merge(overrides)
 
     # before doing anything, ensure we have a place to store data
     Database.setup_storage
+
+    # set up the notifier (if there is one)
+    const_set(:Notify, options[:notifier])
+
     # set the options / overrides!
     Instance.start(options)
   end

data/lib/meshchat/cli.rb

@@ -123,7 +123,6 @@ module MeshChat
           threaded: true
         )
       end
-
     end
 
     def close_server

data/lib/meshchat/message/node_list.rb

@@ -18,7 +18,10 @@ module MeshChat
 
         if they_only_have.present?
           they_only_have.each do |n|
-            Node.from_json(n).save!
+            # be sure that we don't add ourselves
+            unless n['uid'] == Settings['uid']
+              Node.from_json(n).save!
+            end
           end
         end
 

data/lib/meshchat/message/node_list_hash.rb

@@ -22,6 +22,8 @@ module MeshChat
             node: node,
             message: NodeList.new(message: Node.as_json)
           )
+        else
+          Display.debug 'node list hash matches'
         end
       end
     end

data/lib/meshchat/message/ping_reply.rb

@@ -2,7 +2,7 @@ module MeshChat
   module Message
     class PingReply < Base
       def display
-        'ping successful'.freeze
+        'ping successful'.freeze if Settings.debug?
       end
     end
   end

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

@@ -15,6 +15,14 @@ module MeshChat
         # TODO: do we want to return an error if
         # we can't decrypt?
 
+        def self.run!(*)
+          # start the server
+          super
+
+          # send a pingall to see who's online
+          MeshChat::Command::PingAll.new.handle
+        end
+
         get '/' do
           process_request
         end

data/lib/meshchat/notifier/base.rb

@@ -13,7 +13,8 @@ module MeshChat
 
       # Notifier::Base is a singleton
       # Not all Notifiers need to be singletons,
-      # but it doesn't really make sense to have more than one
+      # but it doesn't really make sense to have more than one.
+      # An OS generally only has one notification system
       class << self
         delegate :show, to: :instance
 
@@ -23,27 +24,7 @@ module MeshChat
       end
 
       def show(*args)
-        libnotify_message.update(*args) do |notify|
-          yield(notify) if block_given?
-        end
-      end
-
-      private
-
-      def libnotify_message()
-        @message ||= Libnotify.new do |notify|
-          notify.summary    = MeshChat::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  = "/usr/share/icons/gnome/scalable/emblems/emblem-default.svg"
-        end
-
-        @message
+        # by default don't notify
       end
     end
   end

data/lib/meshchat/version.rb

@@ -1,3 +1,3 @@
 module MeshChat
-  VERSION = '0.6.1'
+  VERSION = '0.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meshchat
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - L. Preston Sego III
@@ -108,34 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: curses
-  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: libnotify
-  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: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -285,6 +257,6 @@ rubyforge_project:
 rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
-summary: MeshChat-0.6.1
+summary: MeshChat-0.6.3
 test_files: []
 has_rdoc: