caltrain 0.0.7 → 0.0.7.1

data/lib/caltrain.rb

@@ -31,6 +31,7 @@ module Caltrain
 
     def run!(args)
       loc, dir, act = *args
+      usage unless loc && dir
       loc = loc.to_sym
       act = :next unless act
 
@@ -41,10 +42,10 @@ module Caltrain
       elsif dir =~ /^s/i
         Schedule.method(act).call(loc, :south)
       else
-        raise
+        raise("#{dir} is not a recognized direction")
       end
-    rescue
-      usage
+    rescue => e
+      puts "Error: #{e}"
     end
 
     private

data/lib/caltrain/schedule.rb

@@ -19,6 +19,7 @@ module Schedule
 
     def next(loc, dir, output=$stdout)
       trip = trips_with_times(loc, dir).find { |_, time| time > now }
+      raise("No trips found!") unless trip
       options = {:output => output, :starting_at => loc}
 
       print_trip(trip.first, trip.last, options)
@@ -47,11 +48,15 @@ module Schedule
     end
 
     def weekend?
-      saturday? || Time.now.sunday?
+      saturday? || sunday?
+    end
+
+    def sunday?
+      Time.now.strftime("%A") == "Sunday"
     end
 
     def saturday?
-      Time.now.saturday?
+      Time.now.strftime("%A") == "Saturday"
     end
 
     def abbrevs
@@ -89,5 +94,14 @@ module Schedule
         :sf  => "San Francisco"
       }.freeze
     end
+
+    # for 1.8 support :/
+    def stop_order
+      @stop_order ||= [
+        :gil, :smt, :mrg, :bhl, :cap, :tam, :sj, :clp, :sc, :law, :sv,
+        :mv, :sa, :cal, :pa, :men, :ath, :rc, :scl, :bel, :hil, :hay, :sm,
+        :brl, :bdw, :mil, :sb, :ssf, :bsh, :tt, :sf
+      ].freeze
+    end
   end
 end

data/lib/caltrain/trip.rb

@@ -80,7 +80,7 @@ class Trip
   end
 
   def stops(dir=@direction)
-    @stops ||= Schedule.abbrevs.select { |_, v| time_data.map_nth(3).any? { |d| d =~ /^#{v}/ }  }.keys
+    @stops ||= Schedule.stop_order.select { |stop| time_data.map_nth(3).any? { |d| d =~ /^#{Schedule.abbrevs[stop]}/ }  }
     dir == :north ? @stops : @stops.reverse
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caltrain
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.7.1
   prerelease: 
 platform: ruby
 authors: