sgslib 0.2.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c7ee0414fad3641eb50bf386b9e05b2b4290ac3d
-  data.tar.gz: aec3efc5d970a7705bc44b90f26e060dd286650a
+SHA256:
+  metadata.gz: aaae860efa0ec12d6920ac0c2e7498e52b4c858ebe689f8591416187077c0381
+  data.tar.gz: ef31a4d32a397c6c557c389ccf78a2206050a62bd69f10885fd9ff36f9de5014
 SHA512:
-  metadata.gz: cf487f698bae00c8c37a2dfd588ab7388bc122afcb312d2a441ba8fc7887cb80a1da80d7d3e2977ed31964fe37c1a6943e40de5931553a62c942b0cbaabc130c
-  data.tar.gz: db0e9bbfc4fdcd778885dbb30fc2a7f98a8594b5933fcd9e8c681f6853df2f28a0bc99097d41e4b675776d3aff1c04a8f506cc0592bea97e83a28c0cf14fafb6
+  metadata.gz: 29df64a13c4e2526137fd7c4c049932f629c5a302285c4d866ee66b239fa7ddd79b816a1e1bb7c120388e71f5d9198c3ebc6bf54f688ef2d48403258f73d5ea2
+  data.tar.gz: 90f580001c3cd7377acec7abfd0dcbf66e56601187e42bf10339faa6868bec8ee23e241363828cfe0fb5efa99bfcaebf7bb4d8354269707f0503e89014ac2a15

data/lib/sgs/alarm.rb

@@ -97,7 +97,7 @@ module SGS
     #
     # Convert an alarm number into a string.
     def name(alarmno)
-      MESSAGES[alarmno]
+      ALARM_NAMES[alarmno]
     end
   end
 end

data/lib/sgs/config.rb

@@ -46,7 +46,6 @@ module SGS
       Otto.setup
       Timing.setup
       Waypoint.setup
-      Mission.setup
     end
   end
 end

data/lib/sgs/redis_base.rb

@@ -34,7 +34,6 @@ module SGS
   class RedisBase
     class << self
       def redis
-        puts "Class init"
         @@redis ||= Redis.new
       end
     end

data/lib/sgs/rpc.rb

@@ -0,0 +1,84 @@
+#
+# Copyright (c) 2018, Kalopa Research.  All rights reserved.  This is free
+# software; you can redistribute it and/or modify it under the terms of the
+# GNU General Public License as published by the Free Software Foundation;
+# either version 2, or (at your option) any later version.
+#
+# It is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this product; see the file COPYING.  If not, write to the Free
+# Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# THIS SOFTWARE IS PROVIDED BY KALOPA RESEARCH "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL KALOPA RESEARCH BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+##
+# Routines for sending and receiving messages using Redis.  Sourced from
+# Anthoni Scotti, https://128bit.io/2014/08/31/rpc-using-redis/
+#
+require 'redis'
+require 'securerandom'
+require 'msgpack'
+
+module SGS
+  class RPCClient
+    def initialize(channel)
+      @channel = channel.to_s
+    end
+
+    def method_missing(name, *args)
+      uuid = SecureRandom.uuid
+      request = {
+        'id' => uuid,
+        'jsonrpc' => '2.0',
+        'method' => name,
+        'params' => args
+      }
+      SGS::RedisBase.redis.lpush(@channel, request.to_msgpack)
+      channel, response = SGS::RedisBase.redis.brpop(uuid, timeout=60)
+      MessagePack.unpack(response)['result']
+    end
+  end
+
+  class RPCServer
+    def initialize(channel, klass)
+      @channel = channel.to_s
+      @klass = klass
+    end
+
+    def start
+      puts "Starting RPC server for #{@channel}"
+      loop do
+        channel, request = SGS::RedisBase.redis.brpop(@channel)
+        request = MessagePack.unpack(request)
+
+        puts "Working on request: #{request['id']}"
+
+        args = request['params'].unshift(request['method'])
+        result = @klass.send *args
+
+        reply = {
+          'jsonrpc' => '2.0',
+          'result' => result,
+          'id' => request['id']
+        }
+
+        SGS::RedisBase.redis.rpush(request['id'], MessagePack.pack(reply))
+        SGS::RedisBase.redis.expire(request['id'], 30)
+      end
+    end
+  end
+end

data/lib/sgs/version.rb

@@ -1,3 +1,3 @@
 module SGS
-  VERSION = "0.2.6"
+  VERSION = "0.4.0"
 end

data/lib/sgslib.rb

@@ -30,6 +30,7 @@
 require "sgs/version"
 require 'sgs/redis_base'
 require 'sgs/config'
+require 'sgs/rpc'
 require 'sgs/location'
 require 'sgs/nmea'
 require 'sgs/gps'

data/sgslib.gemspec

@@ -33,5 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
+  spec.add_runtime_dependency "msgpack", "~> 1.3"
+
   spec.add_dependency "redis", "~> 3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sgslib
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Dermot Tynan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +109,7 @@ files:
 - lib/sgs/nmea.rb
 - lib/sgs/otto.rb
 - lib/sgs/redis_base.rb
+- lib/sgs/rpc.rb
 - lib/sgs/timing.rb
 - lib/sgs/version.rb
 - lib/sgs/waypoint.rb
@@ -121,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sailboat Guidance System