slurpy 0.0.1 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84eed2ae7245d70deeb2ad3a5234e745cf5270ac
-  data.tar.gz: 3daf5b8c89349632146e7e690abd15ae18b98e3a
+  metadata.gz: 246cc873f48ba260818b7c06b8b11aa479e97f43
+  data.tar.gz: f8f2707a84de288e90e87f9796fc151baf2a0c12
 SHA512:
-  metadata.gz: 9f5f42c2aca8285ac086f3ef4884932b3262830c5aa30181517e2213a8ab228076d1bb80f6f7b5d8ae9a628d8136471e8c204fa0a459d42dfeb1593fc6101920
-  data.tar.gz: 94970fa6b47cff5180f9fb486525088908533a5afb3f42d0162921c248ea7a3bed2fe32e0115ca1d3e11bc4d9e15cd4b64f90885315b180fc58ffce4a094422a
+  metadata.gz: 0c09b450c8f1aa1aa7101e5529bd70c2090fa50008a8611ec20062187f7ee3d0306af16dbc5b5a624eb36110469dc3040fc2cd7394ed6e4df1df3034ee2b7224
+  data.tar.gz: 404f94d25caa42ac760af83f85bd59c929a8ca085c051c79fdae67099ca0f8dc0565fa1f108d6283c4e46b4dfaa07a45800ccd999c83503ec056fb7d32de9e8f

data/README.md

@@ -16,11 +16,11 @@ Use by doing the following:
 
     $ slurpy next "Day 1" "Convention"
 
-to get the next stop time for any SLU shuttle going from "Day 1 North" to "Convention Seattle".
+to get the next stop time for any SLU shuttle going from "Day 1 North" to "Convention Place".
 
 You can also set your defaults in ~/.slurpy like so
 
-    $ slurpy config {origin=> "Day 1 North", destination => "Convention Center"}
+    $ slurpy config --origin 'Day 1 North' --destination 'Convention Place'
 
 and then do
 
@@ -28,8 +28,8 @@ and then do
     $ slurpy next --return
     $ slurpy next "Blackfoot"
 
-* The first will search the times for the default route (Day 1 North -> Convention Center).
-* The second will search the times for the default route, inverted (Day 1 North -> Convention Center)
+* The first will search the times for the default route (Day 1 North -> Convention Place).
+* The second will search the times for the default route, inverted (Day 1 North -> Convention Place)
 * The third will search the times for the default origin (Prime) to Blackfoot
 
 ## Contributing

data/lib/slurpy.rb

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
-require 'slurpy/version'
-require 'slurpy/slurpy'
+require_relative 'slurpy/version'
+require_relative 'slurpy/slurpy'

data/lib/slurpy/slurpy.rb

@@ -9,10 +9,12 @@ require 'typhoeus'
 require 'thor'
 require 'api_cache'
 require 'moneta'
+require 'timezone'
 
 class Slurpy <  Thor
   DEFAULTS_FILE = "#{Dir.home}/.slurpy"
   CACHE_FOLDER = '/tmp/slurpy/cache'
+  TIMEZONE = 'America/Los_Angeles'
 
   BASE_URL = 'http://www.slushuttle.com/Services/JSONPRelay.svc/'
 
@@ -29,7 +31,7 @@ class Slurpy <  Thor
 
   option :return, :type => :boolean
 
-  desc 'next origin, destination', 'Returns the next routes from A to B'
+  desc 'next origin destination', 'Returns the next routes from origin to destination'
   def next(origin = defaults['origin'], destination = defaults['destination'])
 
     origin, destination = destination, origin if options[:return]
@@ -48,7 +50,7 @@ class Slurpy <  Thor
             to_origin_shuttles[route_id] < to_destination_shuttles[route_id]
         end
 
-    Slurpy.error "No shuttles from '#{origin_name}' to '#{destination_name}', sorry. " \
+    Slurpy.error "No shuttles from '#{origin_name}' to '#{destination_name}' right now, sorry. " \
                  "See http://www.slushuttle.com/ for more details." \
                    if origin_to_destination_shuttles.empty?
 
@@ -59,13 +61,34 @@ class Slurpy <  Thor
     end
   end
 
+  method_option :origin, :type => :string, :required => true
+  method_option :destination, :type => :string, :required => true
+
+  desc 'config', 'Sets the defaults origin and destination'
+  def config
+
+    settings = {
+      'origin' => options[:origin],
+      'destination' => options[:destination]
+    }
+
+    File.open(DEFAULTS_FILE, "w") do |file|
+      file.write settings.to_yaml
+    end
+  end
+
   private #####################################################################
 
   def defaults
-    Slurpy.error 'Slurpy needs params unless .slurpy exists' unless 
+    Slurpy.error 'Slurpy needs params unless .slurpy exists' unless
       File.exists?(DEFAULTS_FILE)
 
     @defaults ||= ::YAML::load_file(DEFAULTS_FILE)
+
+    Slurpy.error 'Invalid default origin' unless @defaults['origin']
+    Slurpy.error 'Invalid default destination' unless @defaults['destination']
+
+    @defaults
   end
 
   def self.error(message)
@@ -128,18 +151,18 @@ class Slurpy <  Thor
   def self.get_stop(query)
     Slurpy.from_cache "stop::#{query}", lambda {
       infos = request(:stops)
-        .select { |stop| stop['Description'].include? query }
+        .select { |stop| stop['Description'].downcase.include? query.downcase }
 
       stops = infos.map{ |stop| stop['Description']}.to_set.to_a
 
       error = "No stop matches '#{query}', sorry." if stops.empty?
 
-      error = "Your request for stop '#{query}' is not specific enough. " \
-              "Pick one: #{stops.inspect}" if stops.size > 1
+      #error = "Your request for stop '#{query}' is not specific enough. " \
+      #        "Pick one: #{stops.inspect}" if stops.size > 1
 
       Slurpy.error error if error
 
-      return infos, stops.first
+      return infos, stops
     }
   end
 
@@ -150,14 +173,16 @@ class Slurpy <  Thor
 
   def self.extract_date(date)
     epoch_time_in_seconds = date
-        .to_s 
+        .to_s
         .scan(%r(/Date\((\d+)\)/))
-        .flatten.first
+        .flatten.first.to_i / 1000
 
     Slurpy.error 'Failed to retrieve date from #{date}' unless epoch_time_in_seconds
-        
-    Time.at(epoch_time_in_seconds.to_i).strftime('%R')
+
+    timezone = Timezone::Zone.new :zone => TIMEZONE
+
+    timezone.time(Time.at(epoch_time_in_seconds)).strftime('%R')
   end
 end
 
-Slurpy.start(ARGV)
+Slurpy.start(ARGV)

data/lib/slurpy/version.rb

@@ -1,3 +1,3 @@
 module SlurpyMetadata
-  VERSION = '0.0.1'
+  VERSION = '0.1'
 end

data/slurpy.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "api_cache"
   spec.add_runtime_dependency "moneta"
+  spec.add_runtime_dependency "timezone"
 end

data/spec/slurpy_spec.rb

@@ -83,36 +83,37 @@ describe "slurpy" do
 
       Slurpy.should_receive(:get_times).at_least(:once).times.and_return([
         {"RouteID" => "1", "RouteStopID" => "1", "StopTimes" =>
-          [{"DepartureTime" => "\/Date\(0\)/"}, {"DepartureTime" => "\/Date\(10000\)/"}]},
+          [{"DepartureTime" => "\/Date\(0\)/"}, {"DepartureTime" => "\/Date\(10000000\)/"}]},
         {"RouteID" => "1", "RouteStopID" => "2", "StopTimes" =>
-          [{"DepartureTime" => "\/Date\(10000\)/"}, {"DepartureTime" => "\/Date\(30000\)/"}]},
+          [{"DepartureTime" => "\/Date\(10000000\)/"}, {"DepartureTime" => "\/Date\(30000000\)/"}]},
         {"RouteID" => "2", "RouteStopID" => "1", "StopTimes" =>
-          [{"DepartureTime" => "\/Date\(1000\)/"}, {"DepartureTime" => "\/Date\(11000\)/"}]},
+          [{"DepartureTime" => "\/Date\(1000000\)/"}, {"DepartureTime" => "\/Date\(11000000\)/"}]},
         {"RouteID" => "2", "RouteStopID" => "2", "StopTimes" =>
-          [{"DepartureTime" => "\/Date\(11000\)/"}, {"DepartureTime" => "\/Date\(30000\)/"}]}
+          [{"DepartureTime" => "\/Date\(11000000\)/"}, {"DepartureTime" => "\/Date\(30000000\)/"}]}
       ])
 
       Slurpy.start(["next", "Day 1", "Convention"])
 
       expect(capture(:stdout) { Slurpy.start(["next", "Day 1", "Convention"]) })
         .to eq("Searching routes from 'Day 1 North' to 'Convention Center'...\n" \
-               "Route R10 - Departure: 19:00 Arrival: 21:46\n" \
-               "Route R11 - Departure: 19:16 Arrival: 22:03\n")
+               "Route R10 - Departure: 16:00 Arrival: 18:46\n" \
+               "Route R11 - Departure: 16:16 Arrival: 19:03\n")
     end
 
     it "errors if no route between a and b exists" do
-      Slurpy.should_receive(:error).once.with("No shuttles from 'Day 1 North' to 'Convention Center', sorry. " \
+      Slurpy.should_receive(:error).once.with("No shuttles from 'Day 1 North' to 'Convention Center' " \
+        "right now, sorry. " \
         "See http://www.slushuttle.com/ for more details.")
 
       Slurpy.should_receive(:get_times).at_least(:once).times.and_return([
         {"RouteID" => "1", "RouteStopID" => "1", "StopTimes" =>
-          [{"DepartureTime" => "\/Date\(0\)/"}, {"DepartureTime" => "\/Date\(10000\)/"}]},
+          [{"DepartureTime" => "\/Date\(0\)/"}, {"DepartureTime" => "\/Date\(10000000\)/"}]},
         {"RouteID" => "1", "RouteStopID" => "3", "StopTimes" =>
-          [{"DepartureTime" => "\/Date\(10000\)/"}, {"DepartureTime" => "\/Date\(30000\)/"}]},
+          [{"DepartureTime" => "\/Date\(10000000\)/"}, {"DepartureTime" => "\/Date\(30000000\)/"}]},
         {"RouteID" => "2", "RouteStopID" => "1", "StopTimes" =>
-          [{"DepartureTime" => "\/Date\(1000\)/"}, {"DepartureTime" => "\/Date\(11000\)/"}]},
+          [{"DepartureTime" => "\/Date\(1000000\)/"}, {"DepartureTime" => "\/Date\(11000000\)/"}]},
         {"RouteID" => "2", "RouteStopID" => "4", "StopTimes" =>
-          [{"DepartureTime" => "\/Date\(11000\)/"}, {"DepartureTime" => "\/Date\(30000\)/"}]}
+          [{"DepartureTime" => "\/Date\(11000000\)/"}, {"DepartureTime" => "\/Date\(30000000\)/"}]}
       ])
 
       Slurpy.start(["next", "Day 1", "Convention"])
@@ -121,7 +122,7 @@ describe "slurpy" do
 
   describe "extract_date" do
     it "converts an epoch date to time" do
-      Slurpy.extract_date("\/Date\(10000\)/").should eql "21:46"
+      Slurpy.extract_date("\/Date\(1388318968000\)/").should eql "04:09"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slurpy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: '0.1'
 platform: ruby
 authors:
 - Andrea Della Corte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timezone
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Retrieves the SLUShuttle times from the command line.
 email:
 - andreadellacorte85@gmail.com
@@ -124,7 +138,6 @@ files:
 - README.md
 - Rakefile
 - bin/slurpy
-- lib/rubocop_report
 - lib/slurpy.rb
 - lib/slurpy/slurpy.rb
 - lib/slurpy/version.rb
@@ -159,4 +172,3 @@ summary: Command line interface for SLUShuttle.
 test_files:
 - spec/slurpy_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/rubocop_report

@@ -1,19 +0,0 @@
-Inspecting 3 files
-.EC
-
-Offences:
-
-slurpy/slurpy.rb:29:11: E: unexpected token tAMPER
-          && to_origin_shuttles[route_id] < to_destination_shuttles[route_id]
-          ^
-slurpy/slurpy.rb:49:11: E: unexpected token tAMPER
-          && time['RouteStopID'] == stop_id
-          ^
-slurpy/slurpy.rb:128:5: E: unexpected token tCONSTANT
-    Time.at(epoch_time_in_seconds).strftime("%R")
-    ^^^^
-slurpy/version.rb:1:1: C: Missing top-level module documentation comment.
-module SlurpyMetadata
-^^^^^^
-
-3 files inspected, 4 offences detected