gpsd_client 0.0.2 → 0.0.3

data/gpsd_client.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  #spec.files         = `git ls-files`.split("\n").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

data/lib/gpsd_client/version.rb

@@ -1,3 +1,3 @@
 module GpsdClient
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/gpsd_client.rb

@@ -11,7 +11,7 @@ module GpsdClient
     @started = false
 
     def initialize(options = {})
-        @host ||= options[:host] ||= "localhost"
+        @host = options[:host] ||= 'localhost'
         @port = options[:port] ||= 2947
     end
 
@@ -19,12 +19,18 @@ module GpsdClient
         if not @started
             begin
                 @socket = TCPSocket.new(@host, @port)
-                @socket.puts("w+")
-                line = @socket.gets
-                # puts "debug >> #{line[0...20]}"
-                @started = true if line.start_with? '{"class":"VERSION"'
-            rescue
-                @started = false
+                @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
+                end
+
+            rescue Exception => ex
+                puts 'Some error happen starting socket connection:'
+                puts ex.message
+                self.stop
             end
         end
         return @started
@@ -36,27 +42,37 @@ module GpsdClient
     
     def stop
         return not_started_msg("Gpsd.stop") if not self.started?
-        @socket.puts('?WATCH={"enable":false}')
+        @socket.puts '?WATCH={"enable":false};'
+        @socket.close unless @socket.closed?
+        @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?
         
-        return not_started_msg("Gpsd.get_position") if not self.started?
-        
-        while reads < 7 do # Skip VERSION SKY WATCH or DEVICES response
+        while reads < 10 do # Skip VERSION SKY WATCH or DEVICES response
             line = ""
             begin
-                @socket.puts('?WATCH={"enable":true,"json":true}')
+                @socket.puts '?WATCH={"enable":true};'
+                @socket.puts "?POLL;"
+                sleep 1
                 line = @socket.gets
-                #puts "debug >> #{line[0...20]}"
-            rescue
-                puts "Error writing Socket"
+            rescue Exception => ex
+                puts "Error while reading Socket: #{ex.message}"
             end
         
-            #puts line
-            if line.start_with? '{"class":"TPV"'
-                line = JSON.parse(line)
+            # Parse line, return empty string on fail
+            # if parsed, extract ptv Hash from the JSON report polled
+            line = JSON.parse(line) rescue ''
+            if line.is_a? Hash and line['tpv'].is_a? Array
+              #puts "debug >> #{line.to_json.to_s}"
+              line = line['tpv'][0]
+            end
+
+            if line.is_a? Hash and line['class'] == 'TPV'
                 # 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
@@ -66,13 +82,14 @@ module GpsdClient
             reads = reads + 1
         
         end
-        return {lat: nil, lon: nil, time: nil, speed: nil, altitude: nil } unless line['mode'] == 1
+        puts "TPV not found polling on GPSd"
+        return empty_hash
     end
     
     private
     
-    def not_started_msg( method = "Gpsd" )
-        puts "#{method}: Socket connection wasn't started"
+    def not_started_msg( method = 'Gpsd' )
+        puts "#{method}: No socket connection started"
         return nil
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpsd_client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,7 +74,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gpsd_client-0.0.2.gem
 - gpsd_client.gemspec
 - lib/.gitignore
 - lib/gpsd_client.rb
@@ -92,12 +91,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 223085853
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 223085853
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23