teecket 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50df0ea7655efd26ed2cd62cf05baa414cd08808
-  data.tar.gz: f4bb77471eed59fce72a465e69ca5a71ab4f8c69
+  metadata.gz: 9ee540199c264f86ba6312ae82849a00defce72f
+  data.tar.gz: 3da57bfbdd0164679278815b5fc37f2b4c8e803a
 SHA512:
-  metadata.gz: 2f3dfd04a23f954cbbda673973a5648160247570b18198fd4e72a919a8b141e0bd4d60c3f8893e82dc1d0d6df2c5cc3a21ee04b005c4edf3deae591791e016ff
-  data.tar.gz: 597c9ab624cd3ce94fa3f848a70ea48f0e76f330c23258dca0babf1883eee7d9f6919a6d6c7d64a603231aa8f209e60d57f6ae37b922aefe2b911aa7662814b2
+  metadata.gz: c1aeccd697457d6ba343e113f03af7524efa6d5cb767b5393c1e7909ed5555f01383f6259acf6852d41d8f1999c70b06b557421b4179f9f1c400f63dde07f798
+  data.tar.gz: e442fe72a00deef871928fc56b48116c85b169373bf1aa42f0b9e7bf9ff64d6873a5920dc5703dec4e42112458a6711103f0981a197f002c0158deb3685f37f0

data/README.md

@@ -0,0 +1,50 @@
+## Welcome to Teecket
+
+Teecket is a gem that will search from AirAsia, Firefly, Malaysia Airlines and
+Malindo Air from the comfort of your command line.
+
+## Installation
+
+At the command prompt, install it using `gem`:
+
+    gem install teecket
+
+## Usage
+
+This is an example for a working command:
+
+    teecket KUL KBR 30-07-2015
+
+If you're unsure, typing just the `teecket` will yield:
+
+    teecket KBR KUL 30-07-2015
+
+This is an example of an output:
+
+    +-------------------+-----------------+---------+--------+-------------+----------+----------+-----------+
+    | Flight            | Flight #        | Transit | Origin | Destination | Depart   | Arrive   | Fare (RM) |
+    +-------------------+-----------------+---------+--------+-------------+----------+----------+-----------+
+    | Malaysia Airlines | FY5311 + FY5333 | YES     | KBR    | JHB         | 08:00 AM | 11:40 AM |    296.20 |
+    | Malaysia Airlines | MH5427          | NO      | KBR    | JHB         | 08:50 AM | 10:30 AM |    239.55 |
+    | Malaysia Airlines | FY5305 + FY5491 | YES     | KBR    | JHB         | 01:25 PM | 05:10 PM |    296.20 |
+    | Malaysia Airlines | FY5323 + FY5339 | YES     | KBR    | JHB         | 02:50 PM | 06:20 PM |    296.20 |
+    | Malaysia Airlines | FY5325 + FY5341 | YES     | KBR    | JHB         | 03:35 PM | 07:50 PM |    296.20 |
+    | Malaysia Airlines | FY5505 + FY5343 | YES     | KBR    | JHB         | 06:25 PM | 09:30 PM |    296.20 |
+    | Malaysia Airlines | FY5321 + FY5331 | YES     | KBR    | JHB         | 10:20 PM | 08:15 AM |    296.20 |
+    | Malindo Air       | OD1241 + OD1201 | YES     | KBR    | JHB         | 01:25 AM | 09:50 AM |    141.00 |
+    | Malindo Air       | OD1255 + OD1201 | YES     | KBR    | JHB         | 03:10 AM | 09:50 AM |    141.00 |
+    | Malindo Air       | OD1243 + OD1201 | YES     | KBR    | JHB         | 04:25 AM | 09:50 AM |    141.00 |
+    | Malindo Air       | OD1235 + OD1201 | YES     | KBR    | JHB         | 06:05 AM | 09:50 AM |    141.00 |
+    | Malindo Air       | OD1245 + OD1217 | YES     | KBR    | JHB         | 09:15 AM | 01:00 PM |    141.00 |
+    | Malindo Air       | OD1245 + OD1213 | YES     | KBR    | JHB         | 09:15 AM | 02:00 PM |    141.00 |
+    | Firefly           | FY2231          | NO      | KBR    | JHB         | 08:50 AM | 10:30 AM |    200.29 |
+    +-------------------+-----------------+---------+--------+-------------+----------+----------+-----------+
+
+## Contributing
+
+It'll help this gem stay alive, so, please do :)
+
+## License
+
+Teecket is released under the [MIT
+License](http://www.opensource.org/licenses/MIT).

data/bin/teecket

@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
 
 require 'teecket'
+require 'teecket/printer'
 
 if ARGV.count == 3
-  Teecket.search({ from: ARGV[0], to: ARGV[1], date: ARGV[2]})
+  output = Teecket.search({ from: ARGV[0], to: ARGV[1], date: ARGV[2]})
+  puts Printer.table(output)
 else
   puts 'Example: teecket KBR KUL 30-07-2015'
 end

data/lib/teecket/air_asia.rb

@@ -22,6 +22,7 @@ class AirAsia < Flight
           flight_number = rs['segments'][0]['flight-number']
           origin        = rs['segments'][0]['origincode']
           destination   = rs['segments'][0]['destinationcode']
+          transit       = 'NO'
 
           depart_at     = depart_at.strftime('%I:%M %p')
           arrive_at     = arrive_at.strftime('%I:%M %p')
@@ -30,6 +31,7 @@ class AirAsia < Flight
 
           fares << { flight_name: 'AirAsia',
                      flight_number: flight_number,
+                     transit: transit,
                      origin: origin,
                      destination: destination,
                      depart_at: depart_at,

data/lib/teecket/firefly.rb

@@ -56,6 +56,7 @@ class Firefly < Flight
         flight_number = doc.css('div.market1')[i].css('div.visible-xs').css('table')[0].text.strip
         origin        = doc.css('div.market1')[i]['onclick'].scan(/~[A-Z]{3}~/)[0].gsub('~', '')
         destination   = doc.css('div.market1')[i]['onclick'].scan(/~[A-Z]{3}~/)[1].gsub('~', '')
+        transit       = 'NO'
 
         depart_at     = DateTime.parse("#{date} #{depart_at.gsub(/\t/, '').match(/^(.*?)(AM|PM)/).to_s}").strftime('%I:%M %p')
         arrive_at     = DateTime.parse("#{date} #{arrive_at.gsub(/\t/, '').match(/^(.*?)(AM|PM)/).to_s}").strftime('%I:%M %p')
@@ -64,6 +65,7 @@ class Firefly < Flight
 
         fares << { flight_name: 'Firefly',
                    flight_number: flight_number,
+                   transit: transit,
                    origin: origin,
                    destination: destination,
                    depart_at: depart_at,

data/lib/teecket/malaysia_airlines.rb

@@ -19,24 +19,34 @@ class MalaysiaAirlines < Flight
 
     if result['success']
       result['outboundOptions'].each do |rs|
-        depart_at     = DateTime.parse(rs['flights'][0]['depScheduled'])
-        arrive_at     = DateTime.parse(rs['flights'][0]['arrScheduled'])
-        fare          = rs['fareDetails']['totalTripFare']
-        flight_number = rs['flights'][0]['marketingAirline'] + rs['flights'][0]['flightNumber']
-        origin        = rs['flights'][0]['departureAirport']['code']
-        destination   = rs['flights'][0]['arrivalAirport']['code']
-
-        depart_at = depart_at.strftime('%I:%M %p')
-        arrive_at = arrive_at.strftime('%I:%M %p')
+        fare      = rs['fareDetails']['totalTripFare']
+        origin    = rs['flights'][0]['departureAirport']['code']
+        depart_at = rs['flights'][0]['depScheduled']
+
+        if rs['flights'].count > 1
+          transit       = 'YES'
+          arrive_at     = rs['flights'][rs['flights'].count - 1]['arrScheduled']
+          flight_number = rs['flights'].map { |arr| arr['operatingAirline'] + arr['flightNumber'] }.join(' + ')
+          destination   = rs['flights'][rs['flights'].count - 1]['arrivalAirport']['code']
+        else
+          transit       = 'NO'
+          arrive_at     = rs['flights'][0]['arrScheduled']
+          flight_number = rs['flights'][0]['marketingAirline'] + rs['flights'][0]['flightNumber']
+          destination   = rs['flights'][0]['arrivalAirport']['code']
+        end
+
+        depart_at = DateTime.parse(depart_at).strftime('%I:%M %p')
+        arrive_at = DateTime.parse(arrive_at).strftime('%I:%M %p')
         fare      = sprintf("%.2f", fare)
 
-          fares << { flight_name: 'Malaysia Airlines',
-                     flight_number: flight_number,
-                     origin: origin,
-                     destination: destination,
-                     depart_at: depart_at,
-                     arrive_at: arrive_at,
-                     fare: fare }
+        fares << { flight_name: 'Malaysia Airlines',
+                   flight_number: flight_number,
+                   transit: transit,
+                   origin: origin,
+                   destination: destination,
+                   depart_at: depart_at,
+                   arrive_at: arrive_at,
+                   fare: fare }
       end
     end
   end

data/lib/teecket/malindo_air.rb

@@ -35,12 +35,20 @@ class MalindoAir < Flight
 
       if result['SearchAirlineFlightsResult']
         result['SearchAirlineFlightsResult'].each do |rs|
+
+          if rs['SegmentInformation'].count > 1
+            transit   = 'YES'
+            arrive_at = rs['SegmentInformation'][rs['SegmentInformation'].count - 1]['ArrivalDate']
+          else
+            transit   = 'NO'
+            arrive_at = rs['ArrivalDate']
+          end
+
           depart_at     = rs['DepartureDate']
-          arrive_at     = rs['ArrivalDate']
           fare          = rs['FlightAmount']
-          flight_number = rs['MACode'] + rs['FlightNo']
           origin        = rs['DepCity']
           destination   = rs['ArrCity']
+          flight_number = rs['SegmentInformation'].map { |arr| arr['MACode'] + arr['FlightNo'] }.join(' + ')
 
           depart_at     = DateTime.strptime(depart_at.gsub(/^\/Date\(|\)\//, ''), '%Q').strftime('%I:%M %p')
           arrive_at     = DateTime.strptime(arrive_at.gsub(/^\/Date\(|\)\//, ''), '%Q').strftime('%I:%M %p')
@@ -48,6 +56,7 @@ class MalindoAir < Flight
 
           fares << { flight_name: 'Malindo Air',
                      flight_number: flight_number,
+                     transit: transit,
                      origin: origin,
                      destination: destination,
                      depart_at: depart_at,

data/lib/teecket/printer.rb

@@ -1,11 +1,14 @@
 require 'terminal-table'
+require 'byebug'
 
 class Printer
   def self.table(rows = [])
-    headings = ['Flight', 'Flight #', 'Origin', 'Destination', 'Depart', 'Arrive', 'Fare (RM)']
+    headings = ['Flight', 'Flight #', 'Transit', 'Origin', 'Destination', 'Depart', 'Arrive', 'Fare (RM)']
 
-    new_rows = rows.map { |row| row.values }
+    rows.each { |row| row[:fare] = row[:fare].rjust(9, ' ') }
 
-    Terminal::Table.new(headings: headings, rows: new_rows)
+    rows.map! { |row| row.values }
+
+    Terminal::Table.new(headings: headings, rows: rows)
   end
 end

data/lib/teecket.rb

@@ -4,7 +4,6 @@ require 'teecket/flight'
 require 'teecket/air_asia'
 require 'teecket/malaysia_airlines'
 require 'teecket/malindo_air'
-require 'teecket/printer'
 require 'teecket/firefly'
 
 class Teecket
@@ -21,8 +20,6 @@ class Teecket
     malindo = MalindoAir.new({ from: params[:from], to: params[:to], date: params[:date] })
     malindo.get
 
-    output = airasia.fares + mas.fares + malindo.fares + firefly.fares
-
-    puts Printer.table(output)
+    airasia.fares + mas.fares + malindo.fares + firefly.fares
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teecket
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Amree Zaid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
@@ -77,6 +77,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - bin/teecket
 - lib/teecket.rb
 - lib/teecket/air_asia.rb