tramtracker 0.0.3 → 0.0.4

data/README.md

@@ -7,13 +7,28 @@ A commandline tool for Melbourne's TramTracker
 Installation
 ------------
 
-`gem install tramtracker`
+```
+gem install tramtracker
+```
 
 
 Basic usage
 -----------
 
-`tramtracker <stop-id>`
+To simply print the next trams for a given stop:
+```
+tramtracker <stop-id>
+```
+
+To poll at a regular interval, use the -p option:
+```
+tramtracker -p <stop-id>
+```
+
+To see the help information, use the -h options:
+```
+tramtracker -h
+```
 
 
 Configuration

data/bin/tramtracker

@@ -1,14 +1,21 @@
 #!/usr/bin/env ruby
-require 'tramtracker'
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
 require 'optparse'
+require 'tramtracker'
+require 'formatters'
+
+
+formatter_class = Formatters::PrintFormatter
+dotfile = "#{ENV['HOME']}/.tramtracker"
+
 
 optparse = OptionParser.new do |opts|
   opts.banner = "Usage: tramtracker [options] <stop-id>"
 
-  # opts.on('-p', '--poll', "Poll every 15 seconds") do
-  #   options[:interval] = 15
-  #   options[:max_iterations] = 60
-  # end
+  opts.on('-p', '--poll', "Poll every 15 seconds") do
+    formatter_class = Formatters::PollingFormatter
+  end
 
   opts.on('-h', '--help', 'Display this screen') do
     puts opts
@@ -17,17 +24,18 @@ optparse = OptionParser.new do |opts|
 end
 optparse.parse!
 
+
 id = ARGV[0]
-dotfile = "#{ENV['HOME']}/.tramtracker"
 id ||= File.read(dotfile) if File.exists?(dotfile)
-
 unless id
   puts optparse
   exit 1
 end
 
 
-puts Time.now
-Tramtracker.new(id).get.each do |tram|
-  printf "Route %3s arriving in %2s minutes\n", tram[:route], tram[:minutes]
+begin
+  formatter_class.new(Tramtracker.new(id)).report
+rescue Interrupt
+  # Prevent the Exception stack trace from being printed upon ctrl-c
+  puts  # This just puts the next prompt on its own line
 end

data/lib/formatters.rb

@@ -0,0 +1,2 @@
+require "formatters/print_formatter"
+require "formatters/polling_formatter"

data/lib/formatters/polling_formatter.rb

@@ -0,0 +1,46 @@
+module Formatters
+  class PollingFormatter
+
+    KILL_LINE_CHAR = "\x1B[K"
+    CURSOR_UP_CHAR = "\x1B[A"
+
+    def initialize(tramtracker)
+      @tramtracker = tramtracker
+      @delay_interval = 15
+      @max_iterations = 60
+    end
+
+    def report
+      puts Time.now.strftime "[%H:%M:%S] Stop #{@tramtracker.stop_id}"
+      puts "Retrieving tram information..."
+      last_results_count = 0
+      @max_iterations.times do |iteration|
+        results = @tramtracker.get
+        clear(last_results_count + 2)
+        last_results_count = results.count
+        puts Time.now.strftime "[%H:%M:%S] Stop #{@tramtracker.stop_id}"
+        results.each do |tram|
+          printf "Route %3s arriving in %2s minutes\n",
+            tram[:route],
+            tram[:minutes]
+        end
+        delay @delay_interval
+      end
+    end
+
+    private
+
+    def delay(seconds)
+      seconds.times do |i|
+        print "\rRetrieving again in #{seconds-i} seconds..."
+        sleep 1
+      end
+      print "\r#{KILL_LINE_CHAR}Retrieving again NOW...\n"
+    end
+
+    def clear(lines)
+      lines.times { print "#{CURSOR_UP_CHAR}#{KILL_LINE_CHAR}" }
+    end
+
+  end
+end

data/lib/formatters/print_formatter.rb

@@ -0,0 +1,17 @@
+module Formatters
+  class PrintFormatter
+    def initialize(tramtracker)
+      @tramtracker = tramtracker
+    end
+
+    def report
+      puts Time.now.strftime "[%H:%M:%S] Stop #{@tramtracker.stop_id}"
+      puts "Retrieving tram information..."
+      @tramtracker.get.each do |tram|
+        printf "Route %3s arriving in %2s minutes\n",
+          tram[:route],
+          tram[:minutes]
+      end
+    end
+  end
+end

data/lib/tramtracker.rb

@@ -1,17 +1,26 @@
 require 'open-uri'
 
 class Tramtracker
+  attr_accessor :stop_id
+
   def initialize(stop_id)
-    @url = "http://www.tramtracker.com.au/?id=#{stop_id}"
+    @stop_id = stop_id
   end
 
   def get
     regex = /\d*\) Rte (\d*)<br>\r\n(\d*)/
-    open(@url).read.scan(regex).collect do |route, minutes|
+    open(url).read.scan(regex).collect do |route, minutes|
       {
-        :route => route,
-        :minutes => minutes
+        route: route,
+        minutes: minutes
       }
     end
   end
+
+  private
+
+  def url
+    "http://www.tramtracker.com.au/?id=#{@stop_id}"
+  end
+
 end

data/tramtracker.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "tramtracker"
-  gem.version       =  "0.0.3"
+  gem.version       =  "0.0.4"
   gem.authors       = ["Steven Occhipinti"]
   gem.email         = ["dev@stevenocchipinti.com"]
   gem.description   = "A commandline tool for Melbourne's TramTracker"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramtracker
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies: []
 description: A commandline tool for Melbourne's TramTracker
 email:
@@ -25,6 +25,9 @@ files:
 - README.md
 - Rakefile
 - bin/tramtracker
+- lib/formatters.rb
+- lib/formatters/polling_formatter.rb
+- lib/formatters/print_formatter.rb
 - lib/tramtracker.rb
 - test/lib/tramtracker_test.rb
 - test/test_helper.rb
@@ -49,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: CLI TramTracker