dji 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e2a5d2d495eeeaadd66d708f483a1db82642463
-  data.tar.gz: 608dd161a829331acba3ac040471fd6a18ade786
+  metadata.gz: c817f271d8e53a310476c6c54055b322a7f589b3
+  data.tar.gz: dfafb133d12fd0de90eca90b77633201a42a2c14
 SHA512:
-  metadata.gz: 23c77b9dbcf7027cef897adeb4ae74764aaf1900f45d6c74465a2f13fcd27793a06cccc50167f39ee62dffab4c3990bc13e43028355746a24faedf02ca3b20fa
-  data.tar.gz: 482320f82bee5ac0a77e43716133e0b6a84a3ca754b224e3b3d84d56ee8d735de02edcde66ee5b94b82ca25a332a6bab5f4211a770dfc4fa3b6ebbc1d2d58e2a
+  metadata.gz: f0ef0f4ef7668a45e47489fc27d1b42539d72ad7f6778b2cbe07decc42f5d5142faf600cd5dba8a30c113583ea667c1ba5e621585b1437a20cac9110373057d6
+  data.tar.gz: 521bf639c382ea925f1affeedc84b7c281a9fc169e22a3ffb26d4cbdab3a04bd186e93d66808c9595669d09c359b8b0264258a59183eed719cc98de8d43c0072

data/README.md

@@ -25,9 +25,20 @@ If you are on Ubuntu Linux, you can do:
 
 ## Usage
 
-### Track an order
+### Order Tracking
 
-    $ dji track -o ORDER_NUMBER -p PHONE_TAIL
+```
+$ dji track [options]
+
+OPTIONS:
+
+  -o, --order ORDER_NUMBER  # Your order number
+  -p, --phone PHONE_TAIL    # Last 4 digits of your phone number
+  -r, --repeat INTERVAL     # Optional: Repat every INTERVAL seconds
+  --publish                 # Optional: Publish your order details to http://dji-track.herokuapp.com/orders
+```
+
+#### Example: Track an order
 
 Use your order number in place of ORDER_NUMBER and the last 4 digits of your phone number for PHONE_TAIL. A full example might look like this:
 
@@ -42,6 +53,8 @@ Use your order number in place of ORDER_NUMBER and the last 4 digits of your pho
     Shipping Company : Tba
     Tracking Number  : 
 
+#### Example: Track an order, every 60 seconds
+
 If you want this to repeat automatically at an interval, specify the option for repeat (either -r or --repeat) with the number of seconds. Do not use this nefariously, I suggest a reasonable interval such as 60 seconds, but more useful is probably around 300 seconds (5 minutes) to 600 seconds (10 minutes).
 
     $ dji track -o 123456789012 -p 1234 -r 60
@@ -67,6 +80,34 @@ If you want this to repeat automatically at an interval, specify the option for
     Shipping Company : Tba
     Tracking Number  : 
 
+#### Example: Track an order, every 5 minutes, and publish details for others to see
+
+    $ dji track -o 123456789012 -p 1234 -r 300 --publish
+
+    ORDER TRACKING AS OF 2016-10-27 01:12:27 -0700
+    ------------------------------------------------------
+    Order Number     : 123456789012
+    Total            : USD $1,398.00
+    Payment Status   : Pay Confirmed
+    Shipping Status  : Pending
+    Shipping Company : Tba
+    Tracking Number  : 
+
+    You have successfully published your latest order status.
+    See order statuses reported by others at http://dji-track.herokuapp.com/orders
+
+    ORDER TRACKING AS OF 2016-10-27 01:17:28 -0700
+    ------------------------------------------------------
+    Order Number     : 123456789012
+    Total            : USD $1,398.00
+    Payment Status   : Pay Confirmed
+    Shipping Status  : Pending
+    Shipping Company : Tba
+    Tracking Number  : 
+
+    You have successfully published your latest order status.
+    See order statuses reported by others at http://dji-track.herokuapp.com/orders
+
 ### Search FedEx and track by reference
 
 If you think your shipper is FedEx but you don't have a tracking code yet, you might be able to find your shipment by

data/lib/dji/commands/track/track_command.rb

@@ -6,6 +6,7 @@ module DJI
       option :phone_tail, required: true, aliases: :p
       option :repeat, aliases: :r
       option :publish, required: false, default: false
+      option :dji_username, required: false, aliases: [:username, :u]
 
       def track
         if options[:repeat].present?
@@ -14,12 +15,12 @@ module DJI
           puts "Requesting order tracking details every #{interval} seconds. Press CONTROL-C to stop..."
 
           while true
-            data = DJI::OrderTracking.tracking_details(options[:order_number], options[:phone_tail])
+            data = DJI::OrderTracking.tracking_details(order_number: options[:order_number], phone_tail: options[:phone_tail], dji_username: options[:dji_username])
             DJI::OrderTracking.publish(data) if data.present? && options[:publish].present?
             sleep(interval)
           end
         else
-          data = DJI::OrderTracking.tracking_details(options[:order_number], options[:phone_tail])
+          data = DJI::OrderTracking.tracking_details(order_number: options[:order_number], phone_tail: options[:phone_tail], dji_username: options[:dji_username])
           DJI::OrderTracking.publish(data) if data.present? && options[:publish].present?
         end
       end

data/lib/dji/order_tracking.rb

@@ -24,11 +24,11 @@ module DJI
       end
 
       # Get the tracking details for an order
-      def tracking_details(order_number, phone)
+      def tracking_details(options = {})
         auth_token = authenticity_token(tracking_url)
 
         url = URI.parse(tracking_url)
-        params = { 'number' => order_number, 'phone_tail' => phone, 'utf8' => '✓' }
+        params = { 'number' => options[:order_number], 'phone_tail' => options[:phone_tail], 'utf8' => '✓' }
         params[auth_token[:param]] = auth_token[:token]
 
         headers = {
@@ -56,6 +56,8 @@ module DJI
           data[:shipping_status] = content.at_xpath('div[4]').text.split(': ')[1]
           data[:shipping_company] = content.at_xpath('div[5]/span').text
           data[:tracking_number] = content.at_xpath('div[6]/a').text
+
+          data[:dji_username] = options[:dji_username] if options[:dji_username].present?
           
           print_tracking_details(data)
           data
@@ -78,12 +80,13 @@ module DJI
           puts
           puts "ORDER TRACKING AS OF #{now}"
           puts "------------------------------------------------------"
-          puts "Order Number     : #{data[:order_number]}"
-          puts "Total            : #{data[:total]}"
-          puts "Payment Status   : #{data[:payment_status]}"
-          puts "Shipping Status  : #{data[:shipping_status]}"
-          puts "Shipping Company : #{data[:shipping_company]}"
-          puts "Tracking Number  : #{data[:tracking_number]}"
+          puts "DJI Forum Username : #{data[:dji_username]}" if data[:dji_username]
+          puts "Order Number       : #{data[:order_number]}"
+          puts "Total              : #{data[:total]}"
+          puts "Payment Status     : #{data[:payment_status]}"
+          puts "Shipping Status    : #{data[:shipping_status]}"
+          puts "Shipping Company   : #{data[:shipping_company]}"
+          puts "Tracking Number    : #{data[:tracking_number]}"
           puts
       end
 
@@ -97,7 +100,8 @@ module DJI
             payment_total:    data[:total],
             shipping_status:  data[:shipping_status],
             shipping_company: data[:shipping_company],
-            tracking_number:  data[:tracking_number]
+            tracking_number:  data[:tracking_number],
+            dji_username:     data[:dji_username]
           }
         }
 
@@ -122,8 +126,8 @@ module DJI
       end
 
       def publish_url
-        #'http://localhost:3000/orders'
-        'http://dji-track.herokuapp.com/orders'
+        'http://localhost:3000/orders'
+        #'http://dji-track.herokuapp.com/orders'
       end
 
     end

data/lib/dji/version.rb

@@ -1,3 +1,3 @@
 module DJI
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dji
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Kevin Elliott