gpsd_client 0.0.4 → 0.0.5

data/README.md

@@ -42,7 +42,6 @@ end
 
 # To stop polling the daemon
 gpsd.stop()
-# Actually Gpsd.stop() doesn't close the connection socket (to be fixed)
 ```
 
 ## Development

data/gpsd_client.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec-core", "~> 3.2.1"
+  spec.add_development_dependency "rspec-expectations", "~> 3.2.1"
 end

data/lib/gpsd_client.rb

@@ -4,6 +4,10 @@ require "socket"
 require "json"
 
 module GpsdClient
+  
+  if ! ::IO.const_defined?(:EAGAINWaitReadable)
+    class ::IO::EAGAINWaitReadable; end
+  end
 
   class Gpsd
     attr_reader :host, :port
@@ -11,7 +15,7 @@ module GpsdClient
     @started = false
 
     def initialize(options = {})
-        @host = options[:host] ||= 'localhost'
+        @host = options[:host] ||= '127.0.0.1'
         @port = options[:port] ||= 2947
     end
 
@@ -22,12 +26,12 @@ module GpsdClient
                 @socket.puts 'w+'
                 line = JSON.parse @socket.gets rescue ''
                 if line.is_a? Hash and line['class'] == 'VERSION'
-                  #@socket.puts '?WATCH={"enable":true,"json":true}' # disabled reporting, instead we are polling
                   @socket.puts '?WATCH={"enable":true};'
                   @started = true
+                  flush_socket
                 end
 
-            rescue Exception => ex
+            rescue => ex
                 puts 'Some error happen starting socket connection:'
                 puts ex.message
                 self.stop
@@ -35,11 +39,11 @@ module GpsdClient
         end
         return @started
     end
-    
+
     def started?
         @started
     end
-    
+
     def stop
         return not_started_msg("Gpsd.stop") if not self.started?
         @socket.puts '?WATCH={"enable":false};'
@@ -47,25 +51,28 @@ module GpsdClient
         @started = false if @socket.closed?
         !self.started?
     end
-    
+
     def get_position
-        reads = 0
         empty_hash =  {lat: nil, lon: nil, time: nil, speed: nil, altitude: nil }
         return empty_hash if not self.started?
-        
-        while reads < 10 do # Skip VERSION SKY WATCH or DEVICES response
-            line = ""
-            begin
-                @socket.puts '?WATCH={"enable":true};'
-                sleep 0.1
-                @socket.puts "?POLL;"
-                line = @socket.gets
-            rescue Exception => ex
-                puts "Error while reading Socket: #{ex.message}"
+        begin
+            @socket.puts "?POLL;"
+            retries = 0
+            until retries == 10 do
+                begin
+                    lines = @socket.read_nonblock(4096).split("\r\n")
+                rescue IO::WaitReadable, IO::EAGAINWaitReadable
+                    retries += 1
+                    sleep 0.1*retries
+                end
             end
-        
-            # Parse line, return empty string on fail
-            # if parsed, extract ptv Hash from the JSON report polled
+        rescue => ex
+            puts "Error while reading Socket: #{ex.message}"
+        end
+
+        # Parse line, return empty string on fail
+        # if parsed, extract ptv Hash from the JSON report polled
+        lines.each do |line|
             line = JSON.parse(line) rescue ''
             if line.is_a? Hash and line['tpv'].is_a? Array
               #puts "debug >> #{line.to_json.to_s}"
@@ -76,22 +83,32 @@ module GpsdClient
                 # http://www.catb.org/gpsd/client-howto.html
                 # mode 1 means no valid data
                 # return "Lat: #{line['lat'].to_s}, Lon: #{line['lon'].to_s}" unless line['mode'] == 1
+                flush_socket
                 return {lat: line['lat'], lon: line['lon'], time: line['time'], speed: line['speed'], altitude: line['alt']} unless line['mode'] == 1
             end
-            
-            reads = reads + 1
-        
+            #puts "debug >> TPV not found polling on GPSd"
         end
-        #puts "debug >> TPV not found polling on GPSd"
         return empty_hash
     end
-    
+
     private
-    
+
     def not_started_msg( method = 'Gpsd' )
         puts "#{method}: No socket connection started"
         return nil
     end
-    
+
+    # Reads from socket until no more data is returned, the read data will be thrown away.
+    # Params:
+    # +socket+:: the socket to read from
+    def flush_socket
+        begin
+            loop do
+                @socket.read_nonblock(1024)
+            end
+        rescue IO::WaitReadable, IO::EAGAINWaitReadable
+            true
+        end
+    end
   end
 end

data/lib/gpsd_client/version.rb

@@ -1,3 +1,3 @@
 module GpsdClient
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpsd_client
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-11 00:00:00.000000000 Z
+date: 2016-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 description: A simple GPSd client intended for use on the Raspberry Pi.
 email:
 - rccursach@gmail.com
@@ -93,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -491074447
+      hash: -295433375
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -491074447
+      hash: -295433375
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23