fitgem-app 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 599642621d3c3e531fc7d34e39c83fe6dafbc25d
-  data.tar.gz: b1b8399be2ba955ae87304bff59518474f710c8a
+  metadata.gz: 97d44a1d25f258f2211c4296ab1d54b32c11ced4
+  data.tar.gz: 1481da14324a20f5ea0eec3bd289c39bf4448de4
 SHA512:
-  metadata.gz: af5ca38a5e4431524e13e5bd09d781f1ccd1a468ef8d812aa5032a92d797ea69cba680eab6595805085bfe7fc25f40f25506ffe11efb39069f91fea6e6cfd093
-  data.tar.gz: bff15f4e640f56cafd99316a2f6ba14b2968c8e26bb3856b05101f4ffb2341b01a1850cbf0b52864ae902c9f6787d8579339c2f9e8e7ce5ef4f53bd082e57aa5
+  metadata.gz: 2ae5df19fcf24d0cdf84a567f3c532c01737a0e9a29363dc2674a88c66a30ac6e993da1fac31055709cbcd51eb2c1410215002a0cd7501d8f77fff00ae5a6892
+  data.tar.gz: a769a150e741a19f2db9c211c682346efbb788368ae08524f5e08c0a436ac327ad13ca5f5071ac08926ab90d4c87168bfa4c0c6ef91b7e0b02ad66bb7f1a5978

data/bin/fitgem

@@ -2,6 +2,9 @@
 require 'httparty'
 require 'multi_json'
 
+class APIError < RuntimeError
+end
+
 class FitbitAccount
   include HTTParty
   @@base_uri = 'api.fitbit.com/1/user'
@@ -9,24 +12,33 @@ class FitbitAccount
   def initialize()
     @access_token = `echo -n $FB_ACCESS_TOKEN`
     @user_id = `echo -n $FB_USER_ID`
+  end
 
-    if @access_token == "" && @user_id == ""
-      puts "We need some information. Please navigate to http://juniorrubyist.github.io/fitgem/authorize.html in a browser. Then, authorize and copy/paste the information."
-      print "Where is your shell configuration/variables file in your home directory?\n(e.g. .bashrc, .zshenv, etc.; usually .bashrc) "
-      @default_shell = File.open(ENV['HOME']+"/#{gets.chomp}", "a+")
-      @default_shell.puts("\n### Added by Fitgem")
-
-      print "Copy your Access Token: "
-      @access_token = gets.chomp
-      @default_shell.puts("export FB_ACCESS_TOKEN=\"#{@access_token}\"")
-
-      print "Copy your User ID: "
-      @user_id = gets.chomp
-      @default_shell.puts("export FB_USER_ID=\"#{@user_id}\"")
-
-      puts "OK, your terminal will close in 30 seconds for changes to take effect, please re-open and run fitgem to open help."
-      `sleep 30s`
-      `exit`
+  def error_check
+    if @parsed_response["success"] == false
+      case @parsed_response.code
+      when 401
+        if @parsed_response["errors"][0]["errorType"] == "invalid_client"
+          puts "Please report this issue on the FitGem (juniorRubyist/fitgem) issue tracker on Github."
+        end
+      when 403
+        if @parsed_response["errors"][0]["errorType"] == "insufficient_scope"
+          puts "Please report this issue on the FitGem (juniorRubyist/fitgem) issue tracker on Github."
+        else
+          puts "You may need to modify your privacy settings. Then, try again."
+        end
+      when 404
+        puts "Please report this issue on the FitGem (juniorRubyist/fitgem) issue tracker on Github."
+      when 429
+        puts "Oops, you've exceeded your limit of 150 requests per hour. Try again on the :00."
+        exit
+      when 500...600
+        puts "Oh no, there might be a Fitbit service outage! Try again soon."
+        exit
+      else
+        puts "Please report this issue on the FitGem (juniorRubyist/fitgem) issue tracker on Github."
+      end
+      raise APIError, @parsed_response
     end
   end
 
@@ -34,6 +46,7 @@ class FitbitAccount
     @response = self.class.get("https://#{@@base_uri}/#{@user_id}/activities/steps/date/today/1d/1min.json",
       :headers => {"Authorization" => "Bearer #{@access_token}"})
     @parsed_response = MultiJson.load(@response.body)
+    self.error_check
     @parsed_response = @parsed_response["activities-steps"][0]["value"].to_i
   end
 
@@ -41,6 +54,7 @@ class FitbitAccount
     @response = self.class.get("https://#{@@base_uri}/#{@user_id}/activities/floors/date/today/1d/1min.json",
       :headers => {"Authorization" => "Bearer #{@access_token}"})
     @parsed_response = MultiJson.load(@response.body)
+    self.error_check
     @parsed_response = @parsed_response["activities-floors"][0]["value"].to_i
   end
 
@@ -48,6 +62,7 @@ class FitbitAccount
     @response = self.class.get("https://#{@@base_uri}/#{@user_id}/activities/calories/date/today/1d/1min.json",
       :headers => {"Authorization" => "Bearer #{@access_token}"})
     @parsed_response = MultiJson.load(@response.body)
+    self.error_check
     @parsed_response = @parsed_response["activities-calories"][0]["value"].to_i
   end
 
@@ -55,6 +70,7 @@ class FitbitAccount
     @response = self.class.get("https://#{@@base_uri}/#{@user_id}/activities/distance/date/today/1d/1min.json",
       :headers => {"Authorization" => "Bearer #{@access_token}"})
     @parsed_response = MultiJson.load(@response.body)
+    self.error_check
     @parsed_response = @parsed_response["activities-distance"][0]["value"]
   end
 
@@ -92,23 +108,44 @@ class FitbitAccount
     puts "AUTHOR"
     puts "    Joseph Geis <geis28@gmail.com> (see files AUTHORS for details)."
   end
+
+  def setup
+    if @access_token == "" && @user_id == ""
+      @configuration = File.new(ENV['HOME']+"/.fitgem", "a+")
+      @configuration.puts("")
+
+      print "Copy your Access Token: "
+      @access_token = gets.chomp
+      @default_shell.puts("export FB_ACCESS_TOKEN=\"#{@access_token}\"")
+
+      print "Copy your User ID: "
+      @user_id = gets.chomp
+      @default_shell.puts("export FB_USER_ID=\"#{@user_id}\"")
+
+      puts "Alright sparky! Close your terminal or logout and login to get started."
+    else
+      puts "Hey, you've already finished setup!"
+    end
+  end
 end
 
 fitgem = FitbitAccount.new()
 choice = ARGV[0]
-case choice
-when 'steps', 's'
-  puts "#{fitgem.steps} steps taken"
-when 'distance', 'd'
-  puts "#{fitgem.distance} miles walked"
-when 'floors', 'f'
-  puts "#{fitgem.floors} floors climbed"
-when 'calories', 'c'
-  puts "#{fitgem.calories} calories burned"
-when 'full', 'all', 'a'
-  fitgem.full_report
-when 'help', 'h', '?'
-  fitgem.help
-else
-  puts "Are you lost?, run Fitgem help"
+unless `echo -n $TRAVIS_CI` == "true"
+  case choice
+  when 'steps', 's'
+    puts "#{fitgem.steps} steps taken"
+  when 'distance', 'd'
+    puts "#{fitgem.distance} miles walked"
+  when 'floors', 'f'
+    puts "#{fitgem.floors} floors climbed"
+  when 'calories', 'c'
+    puts "#{fitgem.calories} calories burned"
+  when 'full', 'all', 'a'
+    fitgem.full_report
+  when 'help', 'h', '?'
+    fitgem.help
+  else
+    puts "Are you lost?, run fitgem help"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitgem-app
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Joseph Geis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json