vatsim 0.0.2 → 0.0.3

data/README.md

@@ -0,0 +1,12 @@
+# vatsim.rb
+vatsim.rb is a Ruby library for retrieving online status for Pilots and ATC connections on the [VATSIM] network.
+
+[VATSIM]: http://www.vatsim.net
+
+## Installation
+    gem install vatsim 
+
+## Documentation
+[http://rdoc.info/gems/vatsim][documentation]
+
+[documentation]: http://rdoc.info/gems/vatsim

data/lib/vatsim.rb

@@ -1,6 +1,5 @@
 require 'vatsim/data'
 require 'vatsim/client'
 require 'vatsim/prefile'
-require 'vatsim/general'
 require 'vatsim/version'
 

data/lib/vatsim/client.rb

@@ -5,7 +5,6 @@ module Vatsim
 
     # Initialize Client with colon delimited line from vatsim-data.txt format
     def initialize line
-
       attributes = [:callsign, :cid, :realname, :clienttype, :frequency, :latitude, :longitude, :altitude, :groundspeed, :planned_aircraft, :planned_tascruise, :planned_depairport, :planned_altitude, :planned_destairport, :server, :protrevision, :rating, :transponder, :facilitytype, :visualrange, :planned_revision, :planned_flighttype, :planned_deptime, :planned_actdeptime, :planned_hrsenroute, :planned_minenroute, :planned_hrsfuel, :planned_minfuel, :planned_altairport, :planned_remarks, :planned_route, :planned_depairport_lat, :planned_depairport_lon, :planned_destairport_lat, :planned_destairport_lon, :atis_message, :time_last_atis_received, :time_logon, :heading, :QNH_iHg, :QNH_Mb]
 
       line_split = line.split(":")
@@ -13,7 +12,6 @@ module Vatsim
       attributes.each_with_index.map { |attribute, index|
         instance_variable_set("@#{attribute}", line_split[index]) if self.respond_to?(attribute)
       }
-
     end
   end
 end

data/lib/vatsim/data.rb

@@ -28,7 +28,6 @@ module Vatsim
       end
 
       parse
-
     end
 
     # Returns all connected Pilots
@@ -53,40 +52,35 @@ module Vatsim
 
     # Parse the vatsim data file and store output as necessary
     def parse
+      download_files if @refresh_files
 
-      if @clients.length == 0
-
-	      download_files if @refresh_files
-
-        parsing_clients = false
-        parsing_prefile = false
-        parsing_general = false
+      parsing_clients = false
+      parsing_prefile = false
+      parsing_general = false
 
-	      File.open(@data_file_path, 'r:ascii-8bit').each { |line|
+      File.open(@data_file_path, 'r:ascii-8bit').each { |line|
 
-          parsing_clients = false if line.start_with? ";"
-          parsing_prefile = false if line.start_with? ";"
-          parsing_general = false if line.start_with? ";"
+        parsing_clients = false if line.start_with? ";"
+        parsing_prefile = false if line.start_with? ";"
+        parsing_general = false if line.start_with? ";"
 
-          if parsing_clients
-            @clients << Client.new(line)
-          elsif parsing_prefile
-            @prefiles << Prefile.new(line)
-          elsif parsing_general
-            line_split = line.split("=")
-            @general[line_split[0].strip.downcase.gsub(" ", "_")] = line_split[1].strip
-          end
+        if parsing_clients
+          @clients << Client.new(line)
+        elsif parsing_prefile
+          @prefiles << Prefile.new(line)
+        elsif parsing_general
+          line_split = line.split("=")
+          @general[line_split[0].strip.downcase.gsub(" ", "_")] = line_split[1].strip
+        end
 
-          parsing_clients = true if line.start_with? "!CLIENTS:"
-          parsing_prefile = true if line.start_with? "!PREFILE:"
-          parsing_general = true if line.start_with? "!GENERAL:"
-        }
-      end
+        parsing_clients = true if line.start_with? "!CLIENTS:"
+        parsing_prefile = true if line.start_with? "!PREFILE:"
+        parsing_general = true if line.start_with? "!GENERAL:"
+      }
     end
 
     # Initialize the system by downloading status and vatsim data files
     def download_files
-
       if !File.exists?(@status_file_path) or File.mtime(@status_file_path) < Time.now - STATUS_DOWNLOAD_INTERVAL
        download_to_file STATUS_URL, @status_file_path
       end
@@ -94,7 +88,6 @@ module Vatsim
       if !File.exists?(@data_file_path ) or File.mtime(@data_file_path ) < Time.now - DATA_DOWNLOAD_INTERVAL
         download_to_file random_data_url, @data_file_path
       end
-
     end
 
     # Download a url to a file path
@@ -103,18 +96,16 @@ module Vatsim
 
       File.new(file, File::CREAT)
 
-	    Net::HTTP.start(url.host) { |http|
+      Net::HTTP.start(url.host) { |http|
         resp = http.get(url.path)
         open(file, "wb") { |file|
           file.write(resp.body)
         }
       }
-
     end
 
     # Return random vatsim data url from status file
     def random_data_url
-
       url0s = Array.new
       file = File.open(@status_file_path)
       file.each {|line|
@@ -123,7 +114,6 @@ module Vatsim
         end
       }
       return url0s[rand(url0s.length)]
-
      end
   end
 end

data/lib/vatsim/prefile.rb

@@ -4,7 +4,6 @@ module Vatsim
     attr_reader :callsign, :cid, :realname, :clienttype, :frequency, :latitude, :longitude, :altitude, :groundspeed, :planned_aircraft, :planned_tascruise, :planned_depairport, :planned_altitude, :planned_destairport, :server, :protrevision, :rating, :transponder, :facilitytype, :visualrange, :planned_revision, :planned_flighttype, :planned_deptime, :planned_actdeptime, :planned_hrsenroute, :planned_minenroute, :planned_hrsfuel, :planned_minfuel, :planned_altairport, :planned_remarks, :planned_route, :planned_depairport_lat, :planned_depairport_lon, :planned_destairport_lat, :planned_destairport_lon, :atis_message, :time_last_atis_received, :time_logon, :heading, :QNH_iHg, :QNH_Mb
 
     def initialize line
-
       attributes = [:callsign, :cid, :realname, :clienttype, :frequency, :latitude, :longitude, :altitude, :groundspeed, :planned_aircraft, :planned_tascruise, :planned_depairport, :planned_altitude, :planned_destairport, :server, :protrevision, :rating, :transponder, :facilitytype, :visualrange, :planned_revision, :planned_flighttype, :planned_deptime, :planned_actdeptime, :planned_hrsenroute, :planned_minenroute, :planned_hrsfuel, :planned_minfuel, :planned_altairport, :planned_remarks, :planned_route, :planned_depairport_lat, :planned_depairport_lon, :planned_destairport_lat, :planned_destairport_lon, :atis_message, :time_last_atis_received, :time_logon, :heading, :QNH_iHg, :QNH_Mb]
 
       line_split = line.split(":")
@@ -12,7 +11,6 @@ module Vatsim
       attributes.each_with_index.map { |attribute, index|
         instance_variable_set("@#{attribute}", line_split[index]) if self.respond_to?(attribute)
       }
-
     end
   end
 end

data/lib/vatsim/version.rb

@@ -1,4 +1,4 @@
 module Vatsim
-  VERSION = "0.0.2" # Current gem version
+  VERSION = "0.0.3" # Current gem version
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vatsim
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-05-19 00:00:00.000000000 Z
 dependencies: []
 description: Ruby gem to retrieve Pilot/ATC online status
 email: trevor.dawe@gmail.com
@@ -19,11 +19,11 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- README.md
 - Rakefile
 - lib/vatsim.rb
 - lib/vatsim/client.rb
 - lib/vatsim/data.rb
-- lib/vatsim/general.rb
 - lib/vatsim/prefile.rb
 - lib/vatsim/version.rb
 - spec/spec_helper.rb

data/lib/vatsim/general.rb

@@ -1,6 +0,0 @@
-module Vatsim
-  # General properties from vatsim data file
-  class General
-  end
-end
-