meshchat 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f2e0fe21e401d973ec504f6fe5c2eeb5d4acff0
-  data.tar.gz: ca8adc64e30b1b166b1a55844b7bd8c9bdcd164e
+  metadata.gz: 1b522eab95998e41879706751143d6be2547f56f
+  data.tar.gz: a522f7911c68596e205f700a077b49ab68e6effb
 SHA512:
-  metadata.gz: f2cbab8677c041a77df0628a5337e2aa9b7d7344ce711dbfde64ef38a546ab0707e91e4ba323bd20a81050ea2dc4be008bf23ab612a871739bb886b408795fc9
-  data.tar.gz: 6d7b7dbbffd5836b1b92ea245a8256197d18eb3bd1c09a94d057e82c0ec641a0a3c1b4c2af301789cf6840d1c88a824e8314b095b44fc4ba14cdc7e393b75f90
+  metadata.gz: 56c862960a4e1985fd7d6e55ebc5757d2c3eb58c51be40ab2d8762ec0ceb080697e216f5280b0b72a9cbfa737d0caf624f3fc314f65d243723e8bce67461816f
+  data.tar.gz: 232bb3f936d3bbbbe49bfeebdb5985baaa05b535f2025d6e1759786f1aed5a89a5c3f77701bbb055cc3f2d41dc906bcbd1f0b28173b659b7233613ca0d30a1ef

data/lib/meshchat/cli.rb

@@ -40,8 +40,8 @@ module MeshChat
       MeshChat::Command::Base::SHARE => MeshChat::Command::Share,
       MeshChat::Command::Base::IMPORT => MeshChat::Command::Import,
       MeshChat::Command::Base::EXPORT => MeshChat::Command::Share,
-      MeshChat::Command::Base::ONLINE => MeshChat::Command::Offline,
-      MeshChat::Command::Base::OFFLINE => MeshChat::Command::Online,
+      MeshChat::Command::Base::ONLINE => MeshChat::Command::Online,
+      MeshChat::Command::Base::OFFLINE => MeshChat::Command::Offline,
       MeshChat::Command::Base::HELP => MeshChat::Command::Help,
       MeshChat::Command::Base::BIND => MeshChat::Command::Bind
     }
@@ -130,6 +130,7 @@ module MeshChat
       Thin::Logging.silent = true
 
       Thread.new do
+        # boot sinatra
         MeshChat::Net::Listener::Server.run!(
           port: MeshChat::Settings['port'],
           # logger: MeshChat::Display,

data/lib/meshchat/command/online.rb

@@ -6,12 +6,7 @@ module MeshChat
       end
 
       def handle
-        list = Node.online.map(&:as_info)
-        msg = if list.present?
-          list.join(", ")
-        else
-          'no one is online'
-        end
+        msg = Node.online.map(&:as_info).join(", ").presence || 'no one is online'
 
         Display.info msg
       end

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

@@ -22,11 +22,12 @@ module MeshChat
         # we can't decrypt?
 
         def self.run!(*)
+          # any code that should be ran
+          # before sintra starts should go here
+
           # start the server
           super
-
-          # send a pingall to see who's online
-          MeshChat::Command::PingAll.new.handle
+          # code after here will not run
         end
 
         get '/' do
@@ -78,6 +79,34 @@ module MeshChat
           status s
           body ''
         end
+
+        # Hack away our problems
+        # don't show the Sinatra has taken the stage message
+        #
+        # https://github.com/sinatra/sinatra/blob/master/lib/sinatra/base.rb#L1504
+        def self.start_server(handler, server_settings, handler_name)
+          handler.run(self, server_settings) do |server|
+
+            setup_traps
+            set :running_server, server
+            set :handler_name,   handler_name
+            server.threaded = settings.threaded if server.respond_to? :threaded=
+
+            yield server if block_given?
+          end
+        end
+
+        # Hack away our problems
+        # Don't show the Sinatra quit message
+        #
+        # https://github.com/sinatra/sinatra/blob/master/lib/sinatra/base.rb#L1420
+        def self.quit!
+          return unless running?
+          # Use Thin's hard #stop! if available, otherwise just #stop.
+          running_server.respond_to?(:stop!) ? running_server.stop! : running_server.stop
+          set :running_server, nil
+          set :handler_name, nil
+        end
       end
     end
   end

data/lib/meshchat/version.rb

@@ -1,3 +1,3 @@
 module MeshChat
-  VERSION = '0.6.9'
+  VERSION = '0.6.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meshchat
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - L. Preston Sego III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -261,5 +261,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: MeshChat-0.6.9
+summary: MeshChat-0.6.10
 test_files: []