caltrain 0.0.6 → 0.0.7

data/lib/caltrain/data_parser.rb

@@ -0,0 +1,15 @@
+module DataParser
+  class << self
+    def data
+      @data ||= {}
+    end
+
+    def parse(file_path)
+      data[file_path] ||= File.read(file_path).
+      split(/[\n\r]+/)[1..-1].
+      map { |line| line.gsub('"', '').
+             gsub(/\s+/, ' ').
+             split(/,+/) }
+    end
+  end
+end

data/lib/caltrain/printing.rb

@@ -0,0 +1,26 @@
+module Printing
+  def print_trip(trip, time, options={})
+    start = options[:starting_at]
+    output = options[:output] || $stdout
+
+    output << train_info(trip, time) << "\n"
+    output << "  " << stop_info(trip, start) << "\n"
+  end
+
+  def train_info(trip, time)
+    "#{time} - Train #{trip.train_no} (#{trip.type})"
+  end
+
+  def stop_info(trip, start=trip.stops.first)
+    string = trip.stops.join(' -> ')
+    "*#{string[(string =~ /\b#{start}\b/ || 0)..-1]}"
+  end
+
+  def pretty_hash(hash)
+    max_field_width = hash.values.map(&:size).max
+
+    hash.each do |key, value|
+      puts "%#{max_field_width}s #{key}" % value
+    end
+  end
+end

data/lib/caltrain/schedule.rb

@@ -0,0 +1,93 @@
+module Schedule
+  class << self
+    include Printing
+
+    def times_path
+      "#{Caltrain.base_dir}/data/google_transit/stop_times.txt"
+    end
+
+    def data
+      @data ||= DataParser.parse(times_path)
+    end
+
+    def list(loc, dir, output=$stdout)
+      trips = trips_with_times(loc, dir).select { |_, time| time > now }
+      options = {:output => output, :starting_at => loc}
+
+      trips.each { |trip, time| print_trip(trip, time, options) }
+    end
+
+    def next(loc, dir, output=$stdout)
+      trip = trips_with_times(loc, dir).find { |_, time| time > now }
+      options = {:output => output, :starting_at => loc}
+
+      print_trip(trip.first, trip.last, options)
+    end
+
+    def trips_with_times(loc, dir)
+      @trips_with_times ||= trips_for_today(dir).map do |trip|
+        if time = trip.time_at_location(loc)
+          [trip, time]
+        end
+      end.compact.sort_by_nth(1)
+    end
+
+    def trips_for_today(dir)
+      if weekend?
+        Trip.weekend(dir)
+      elsif saturday?
+        Trip.saturday_only(dir)
+      else
+        Trip.weekday(dir)
+      end
+    end
+
+    def now
+      Time.now.strftime('%H:%M:%S')
+    end
+
+    def weekend?
+      saturday? || Time.now.sunday?
+    end
+
+    def saturday?
+      Time.now.saturday?
+    end
+
+    def abbrevs
+      @abbrevs ||= {
+        :gil => "Gilroy",
+        :smt => "San Martin",
+        :mrg => "Morgan Hill",
+        :bhl => "Blossom Hill",
+        :cap => "Capitol",
+        :tam => "Tamien",
+        :sj  => "San Jose",
+        :clp => "College Park",
+        :sc  => "Santa Clara",
+        :law => "Lawrence",
+        :sv  => "Sunnyvale",
+        :mv  => "Mountain View",
+        :sa  => "San Antonio",
+        :cal => "California Ave",
+        :pa  => "Palo Alto",
+        :men => "Menlo Park",
+        :ath => "Atherton",
+        :rc  => "Redwood City",
+        :scl => "San Carlos",
+        :bel => "Belmont",
+        :hil => "Hillsdale",
+        :hay => "Hayward Park",
+        :sm  => "San Mateo",
+        :brl => "Burlingame",
+        :bdw => "Broadway",
+        :mil => "Millbrae",
+        :sb  => "San Bruno",
+        :ssf => "So. San Francisco",
+        :bsh => "Bayshore",
+        :tt  => "22nd Street",
+        :sf  => "San Francisco"
+      }.freeze
+    end
+  end
+end

data/lib/caltrain/trip.rb

@@ -0,0 +1,86 @@
+class Trip
+  attr_reader :trip_id, :route_id, :service_id, :headsign, :direction, :shape_id
+
+  class << self
+    def trips_path
+      "#{Caltrain.base_dir}/data/google_transit/trips.txt"
+    end
+
+    def data
+      DataParser.parse(trips_path)
+    end
+
+    def new_from_data(data)
+      new(*data)
+    end
+
+    def trips(dir=nil)
+      @trips ||= []
+      [:north, :south].include?(dir) ? @trips.select { |trip| trip.direction == dir } : @trips
+    end
+
+    def weekend(dir=nil)
+      trips(dir).select { |trip| trip.service_id =~ /^WE/ }
+    end
+
+    def weekday(dir=nil)
+      trips(dir).select { |trip| trip.service_id =~ /^WD/ }
+    end
+
+    def saturday_only(dir=nil)
+      trips(dir).select { |trip| trip.service_id =~ /^ST/ }
+    end
+
+    def today(dir=nil)
+      if Schedule.saturday?
+        weekend(dir) + saturday_only(dir)
+      elsif Schedule.weekend?
+        weekend(dir)
+      else
+        weekday(dir)
+      end
+    end
+
+    def <<(trip)
+      @trips << trip unless trips.map(&:trip_id).include?(trip.trip_id)
+    end
+  end
+
+  def initialize(*data)
+    @trip_id = data[0]
+    @route_id = data[1]
+    @service_id = data[2]
+    @headsign = data[3]
+    @direction = data[4] == '0' ? :north : :south
+    @shape_id = data[5]
+
+    Trip << self
+  end
+
+  def train_no
+    @trip_id =~ /^(\d+)_.+$/; $1.to_i
+  end
+
+  def type
+    @route_id =~ /^ct_(\w+)_\d+/; $1
+  end
+
+  def time_data
+    @time_data ||= Schedule.data.select { |row| row[0] == @trip_id }
+  end
+
+  def times
+    @times ||= time_data.map_nth(1)
+  end
+
+  def time_at_location(loc)
+    return nil if loc == stops.last
+    loc_str = Schedule.abbrevs[loc]
+    time_data.find { |row| row[3] =~ /^#{loc_str}/ }[1] rescue nil
+  end
+
+  def stops(dir=@direction)
+    @stops ||= Schedule.abbrevs.select { |_, v| time_data.map_nth(3).any? { |d| d =~ /^#{v}/ }  }.keys
+    dir == :north ? @stops : @stops.reverse
+  end
+end

data/lib/caltrain.rb

@@ -1,134 +1,56 @@
-class Caltrain
-  class << self
-    def base_dir
-      File.expand_path('..', File.dirname(__FILE__))
-    end
-
-    def times_path
-      "#{base_dir}/data/google_transit/stop_times.txt"
-    end
-
-    def trips_path
-      "#{base_dir}/data/google_transit/trips.txt"
-    end
-
-    def upcoming_departures(loc, dir)
-      times(loc, dir).select { |time| time > now }.sort
-    end
-
-    def next_departure(loc, dir)
-      times(loc, dir).find { |time| time > now }
-    end
-
-    def times(loc, dir)
-      @times ||= times_for_location(loc).select { |line| trip_ids_for_direction(dir).include?(line[0]) }.map {|i| i[1]}.sort
-    end
-
-    def trip_ids_for_direction(dir)
-      @trip_ids_for_direction ||= trips_for_time_of_week.select {|trip| trip[4] == (dir == :north ? '0' : '1') }.map(&:first)
-    end
-
-    def trips_for_time_of_week
-      @trips_for_time_of_week ||= all_trips.select { |trip| trip[2] =~ (weekend? ? /^WE/ : /^WD/) }
-    end
-
-    def times_for_location(loc)
-      @times_for_location ||= all_times.select { |arr| arr[3] =~ /^#{abbrevs[loc]}/ }
-    end
+require 'core_ext'
 
-    def all_times
-      @all_times ||= File.read(times_path).split(/[\n\r]+/)[1..-1].map { |line| line.gsub('"', '').split(/,+/) }
-    end
-
-    def all_trips
-      @all_trips ||= File.read(trips_path).split(/[\n\r]+/)[1..-1].map { |line| line.gsub('"', '').split(/,+/) }.sort
-    end
-
-    def weekend?
-      @weekend ||= (Time.now.saturday? || Time.now.sunday?)
-    end
+module Caltrain
+  require 'caltrain/data_parser'
+  require 'caltrain/trip'
+  require 'caltrain/printing'
+  require 'caltrain/schedule'
 
-    def now
-      @now ||= Time.now.strftime('%H:%M:%S')
-    end
-
-    def abbrevs
-      {
-        :tt  => "22nd Street",
-        :ath => "Atherton",
-        :bsh => "Bayshore",
-        :bel => "Belmont",
-        :bhl => "Blossom Hill",
-        :bdw => "Broadway",
-        :brl => "Burlingame",
-        :cal => "California Ave",
-        :cap => "Capitol",
-        :clp => "College Park",
-        :gil => "Gilroy",
-        :hay => "Hayward Park",
-        :hil => "Hillsdale",
-        :law => "Lawrence",
-        :men => "Menlo Park",
-        :mil => "Millbrae",
-        :mrg => "Morgan Hill",
-        :mv  => "Mountain View",
-        :pa  => "Palo Alto",
-        :rc  => "Redwood City",
-        :sa  => "San Antonio",
-        :sb  => "San Bruno",
-        :scl => "San Carlos",
-        :sf  => "San Francisco",
-        :sj  => "San Jose",
-        :smt => "San Martin",
-        :sm  => "San Mateo",
-        :sc  => "Santa Clara",
-        :ssf => "So. San Francisco",
-        :sv  => "Sunnyvale",
-        :tam => "Tamien"
-      }
-    end
-
-    def pretty_abbrevs
-      max_field_width = abbrevs.values.map(&:size).max
+  class << self
+    include Printing
 
-      abbrevs.values.zip(abbrevs.keys).each do |name, abr|
-        puts "%#{max_field_width}s #{abr}" % name
-      end
+    def base_dir
+      File.expand_path('..', File.dirname(__FILE__))
     end
 
     def usage
       puts "Usage:"
-      puts "  caltrain <action> <location> <direction>"
-      puts "  action => [ next | list ]"
+      puts "  caltrain <location> <direction> [ list | next ]"
       puts ""
       puts "Abbreviations:"
-      pretty_abbrevs
+      pretty_hash(Schedule.abbrevs)
       exit(1)
     end
 
-    def actions
-      { :list => :upcoming_departures, :next => :next_departure }
-    end
-
     def clean!
-      instance_variables.each { |i| instance_variable_set(i, nil) }
+      [self, Trip].each do |klass|
+        klass.instance_variables.each { |i| klass.instance_variable_set(i, nil) }
+      end
       true
     end
 
     def run!(args)
-      begin
-        act, loc, dir = *args
-
-        if dir =~ /^n/
-          puts method(actions[act.to_sym]).call(loc.to_sym, :north)
-        elsif dir =~ /^s/
-          puts method(actions[act.to_sym]).call(loc.to_sym, :south)
-        else
-          raise
-        end
-      rescue
-        usage
+      loc, dir, act = *args
+      loc = loc.to_sym
+      act = :next unless act
+
+      populate_trips!
+
+      if dir =~ /^n/i
+        Schedule.method(act).call(loc, :north)
+      elsif dir =~ /^s/i
+        Schedule.method(act).call(loc, :south)
+      else
+        raise
       end
+    rescue
+      usage
+    end
+
+    private
+
+    def populate_trips!
+      DataParser.parse(Trip.trips_path).each { |args| Trip.new_from_data(args) }
     end
   end
 end

data/lib/core_ext.rb

@@ -0,0 +1,9 @@
+class Array
+  def map_nth(n)
+    map { |elem| elem[n] } rescue self
+  end
+
+  def sort_by_nth(n)
+    sort_by { |elem| elem[n] } rescue self
+  end
+end

data/spec/caltrain_spec.rb

@@ -1,99 +1,5 @@
-require 'minitest/autorun'
-require 'minitest/pride'
-require 'mocha'
-
-require File.expand_path('../lib/caltrain', File.dirname(__FILE__))
-
 describe Caltrain do
-  before { Caltrain.stubs(:weekend?).returns(false) }
-
-  after { Caltrain.clean! }
-
   it 'has a base directory' do
     Caltrain.base_dir.must_equal(File.expand_path('..', File.dirname(__FILE__)))
   end
-
-  describe 'trips' do
-    it 'should parse trips.txt depending on the day of the week' do
-      Caltrain.all_trips.first.must_equal(['101_20110701','ct_local_20110701','WD_20110701','San Francisco (Train 101)','0','cal_sj_sf'])
-    end
-  end
-
-  describe 'times' do
-    it 'should parse stop_times.txt correctly' do
-      line = ['280_20110701','18:50:00','18:50:00','Mountain View Caltrain','10']
-      Caltrain.all_times.must_include(line)
-    end
-
-    it 'should return times for a location' do
-      ['16:58:00', '08:13:00', '19:44:00'].each do |time|
-        Caltrain.times_for_location(:sv).map {|i| i[1]}.must_include(time)
-      end
-    end
-  end
-
-  describe '#next_departure' do
-    it 'should return the next departure for north' do
-      Caltrain.stubs(:now).returns('08:05:12')
-      Caltrain.next_departure(:sv, :north).must_equal('08:13:00')
-    end
-
-    it 'should return the next departure for south' do
-      Caltrain.stubs(:now).returns('18:50:00')
-      Caltrain.next_departure(:sf, :south).must_equal('18:56:00')
-    end
-  end
-
-  describe '#upcoming_departures' do
-    it 'should return the upcoming trips for north' do
-      Caltrain.stubs(:now).returns('08:05:12')
-      upcoming1 = Caltrain.upcoming_departures(:sv, :north)
-      upcoming1.must_include('08:18:00')
-      upcoming1.wont_include('09:55:00')
-      upcoming1.wont_include('09:14:00')
-    end
-
-    it 'should return upcoming trips for south' do
-      Caltrain.stubs(:now).returns('18:30:10')
-      upcoming2 = Caltrain.upcoming_departures(:sf, :south)
-      upcoming2.must_include('18:33:00')
-      upcoming2.wont_include('18:44:00')
-      upcoming2.wont_include('18:59:00')
-    end
-  end
-
-  describe 'weekend versus weekday' do
-    it 'should pick weekday times' do
-      Caltrain.stubs(:now).returns('09:10:10')
-
-      Caltrain.next_departure(:mv, :north).must_equal('09:29:00')
-
-      upcoming = Caltrain.upcoming_departures(:mv, :north)
-      upcoming.must_include('16:37:00')
-      upcoming.wont_include('09:19:00')
-    end
-
-    it 'should pick weekend times' do
-      Caltrain.stubs(:weekend?).returns(true)
-      Caltrain.stubs(:now).returns('07:46:15')
-
-      Caltrain.next_departure(:sj, :north).must_equal('08:00:00')
-
-      upcoming = Caltrain.upcoming_departures(:sj, :south)
-      upcoming.must_include('12:00:00')
-      upcoming.wont_include('07:50:00')
-    end
-  end
-
-  describe 'excluding last stops' do
-    it 'should not include times for last sf stop' do
-      Caltrain.stubs(:now).returns('18:58:30')
-      Caltrain.next_departure(:sf, :south).must_equal('19:30:00')
-    end
-
-    it 'should not include times for last sj stop' do
-      Caltrain.stubs(:now).returns('08:12:10')
-      Caltrain.next_departure(:sj, :north).must_equal('08:22:00')
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caltrain
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2151812960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151812960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A command line tool to easily figure out when the next caltrain leaves.
 email: alexgenco@gmail.com
 executables:
@@ -29,17 +34,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/caltrain/data_parser.rb
+- lib/caltrain/printing.rb
+- lib/caltrain/schedule.rb
+- lib/caltrain/trip.rb
 - lib/caltrain.rb
+- lib/core_ext.rb
 - bin/caltrain
-- data/google_transit/agency.txt
-- data/google_transit/calendar.txt
-- data/google_transit/calendar_dates.txt
-- data/google_transit/fare_attributes.txt
-- data/google_transit/fare_rules.txt
-- data/google_transit/routes.txt
-- data/google_transit/shapes.txt
 - data/google_transit/stop_times.txt
-- data/google_transit/stops.txt
 - data/google_transit/trips.txt
 - spec/caltrain_spec.rb
 homepage: http://github.com/alexgenco/caltrain
@@ -62,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Get the next caltrain

data/data/google_transit/agency.txt

@@ -1,2 +0,0 @@
-agency_id,agency_name,agency_url,agency_timezone,agency_phone,agency_lang
-"caltrain-ca-us","Caltrain","http://www.caltrain.com","America/Los_Angeles","800-660-4287","en"

data/data/google_transit/calendar.txt

@@ -1,5 +0,0 @@
-service_id,monday,tuesday,wednesday,thursday,friday,saturday,sunday,start_date,end_date
-"ST_20110701","0","0","0","0","0","1","0","20110701","20120219"
-"WD_20110701","1","1","1","1","1","0","0","20110701","20160701"
-"WE_20110701","0","0","0","0","0","1","1","20110701","20160701"
-"ST_20120220","0","0","0","0","0","1","0","20120220","20120220"

data/data/google_transit/calendar_dates.txt

@@ -1,6 +0,0 @@
-service_id,date,exception_type
-"SN_20110701","20111226","1"
-"WD_20110701","20111226","2"
-"WD_20110701","20120102","2"
-"SN_20110701","20120102","1"
-

data/data/google_transit/fare_attributes.txt

@@ -1,13 +0,0 @@
-fare_id,price,currency_type,payment_method,transfers,transfer_duration
-"OW_1_20110701",2.7500,"USD","1",,
-"OW_2_20110701",4.7500,"USD","1",,
-"OW_3_20110701",6.7500,"USD","1",,
-"OW_4_20110701",8.7500,"USD","1",,
-"OW_5_20110701",10.7500,"USD","1",,
-"OW_6_20110701",12.7500,"USD","1",,
-"OW_1_20120220",2.7500,"USD","1",,
-"OW_2_20120220",4.7500,"USD","1",,
-"OW_3_20120220",6.7500,"USD","1",,
-"OW_4_20120220",8.7500,"USD","1",,
-"OW_5_20120220",10.7500,"USD","1",,
-"OW_6_20120220",12.7500,"USD","1",,