strava-cli 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d67a17b36b8e60f1eee986199ffcef7ba88a594
-  data.tar.gz: 1ec92cd83e31bc523228b928683cf4ad61ff69bb
+  metadata.gz: 0d795febc4b2b8ba8c192ffd1011d7c3d10090ae
+  data.tar.gz: e62ff619b626dd2de5275ae79ad0a2060e86b1ed
 SHA512:
-  metadata.gz: d0b487877ce01851eba6538016198b70a1b528fbcb2493f44ae11f119b13ea74289e220e6d3c8060bfa9322f2b3a4e121468c088633d4db27c0763eea5acf899
-  data.tar.gz: 212c72c7bad5fc737e0acc7ef69624fe9e4bb02714b96e67d81382b6ec1ffbe29b60903d8b543bb083b5e905fb0336f60ac5f290c694015276aa681ecb3531db
+  metadata.gz: 5b10992a18ffdcfa8deda09e5e38b5b4628073f8193504fdc7dd13227667d3d1bc79d4468fbc462c2d59b0f2d47ae28a62b0b13c6f18915d26f82a010893c3df
+  data.tar.gz: 9f84c2b6147871938fa2ae154a2788f262b8c56a95ea30ee47ce0d0e163b57a4ff00c75a1007fe6a05e9af929886f02aad640b27410043b36fcb26a1c138b1cf

data/lib/strava/activity.rb

@@ -0,0 +1,33 @@
+require 'time'
+
+# Strava activity model
+class Activity
+  attr_accessor :date, :distance_km, :elapsed_time_min, :avg_speed
+
+  # Initialize an activity from the raw API json from Strava
+  #
+  # +raw_activity+ [Hash]
+  def initialize(raw_activity)
+    @date = Time.parse(raw_activity.start_date_local)
+    @distance_km = (raw_activity.distance / 1000.0).round(3)
+    @elapsed_time_min = (raw_activity.elapsed_time / 60.0).round(2)
+    elapsed_time_hour = (raw_activity.elapsed_time / 3600.0)
+    @avg_speed = (distance_km / elapsed_time_hour).round(2)
+  end
+
+  def human_date
+    date.strftime("%d %h %Y")
+  end
+
+  def human_distance_km
+    "#{distance_km} km"
+  end
+
+  def human_elapsed_time
+    "#{elapsed_time_min} min"
+  end
+
+  def human_avg_speed
+    "#{avg_speed} km/h"
+  end
+end

data/lib/strava/app.rb

@@ -1,12 +1,8 @@
 require 'easy_app_helper'
 require 'terminal-table'
+require 'ascii_charts'
 require 'strava/api/v3'
 require 'vcr'
-require 'time'
-
-# Method access to Hash content
-require 'hashie'
-class Hash; include Hashie::Extensions::MethodAccess; end
 
 # Configure HTTP records
 VCR.configure do |config|
@@ -21,7 +17,8 @@ module Strava
     NAME = 'Strava Dashboard'
     DESCRIPTION = 'Fetchs data from strava to report what you have done'
 
-    attr_accessor :client, :types, :fields
+    attr_accessor :client, :types, :graph, :activities
+
     def initialize
       config.config_file_base_name = 'strava'
       config.describes_application app_name: NAME,
@@ -31,6 +28,7 @@ module Strava
       config.add_command_line_section('Strava options') do |slop|
         slop.on :strava_access_token, 'Strava access token', argument: true, as: String
         slop.on :activity, 'Display this activity type only (Run, Ride, Swim)', argument: true
+        slop.on :graph, 'Display a graph instead of a table', argument: false
       end
 
       if config[:help]
@@ -43,7 +41,8 @@ module Strava
       else
         @types = %w(Run Ride Swim)
       end
-      @fields = ["Start date", "Distance", "Elapsed time", "Avg speed"]
+      @graph = config[:graph]
+      @activities = []
     end
 
     def configure_api_client
@@ -53,44 +52,107 @@ module Strava
     def run
       configure_api_client
 
-      activities = []
-
-      VCR.use_cassette("activities", record: :new_episodes) do
-        page = 0
-        per_page = 100
-        while activities.count == page*per_page
-          page +=1
-          activities += client.list_athlete_activities(per_page: per_page,page: page)
-        end
-      end
+      fetch_activities_data
 
       for type in types
-        rows = []
-        month = -1
-        activities.select { |activity| activity.type == type }.each do |activity|
-          date = Time.parse(activity.start_date_local)
-          current_month = date.month
-          distance_km = (activity.distance/1000.0).round(3)
-          elapsed_time_min = (activity.elapsed_time/60.0).round(2)
-          elapsed_time_hour = (activity.elapsed_time/3600.0)
-          avg_speed = (distance_km/elapsed_time_hour).round(2)
-          if current_month != month && month != -1
-            rows << :separator
-          end
-          month = current_month
-          rows << [date , "#{distance_km} km", "#{elapsed_time_min} min", "#{avg_speed} km/h"]
-        end
 
-        table = Terminal::Table.new :title => type, :headings => fields, :rows => rows
+        if graph
+          output_screen = build_graph_speed(type)
+        else
+          output_screen = build_table(type)
+        end
 
-        if rows.empty?
+        if output_screen.nil?
           puts "No activity found. Go out and start #{type}ing!"
         else
-          puts table
+          puts output_screen
         end
         puts "\n"
       end
     end
+
+    private
+
+    def build_table(activity_type)
+      fields = ["Date", "Distance", "Elapsed time", "Avg speed"]
+      rows = []
+      date = -1
+
+      select_activities(activity_type).each do |raw_activity|
+        activity = Activity.new(raw_activity)
+        current_date = activity.date
+
+        rows << :separator if date != -1 && current_date.month != date.month
+
+        date = current_date
+        rows << [
+          activity.human_date,
+          activity.human_distance_km,
+          activity.human_elapsed_time,
+          activity.human_avg_speed
+        ]
+      end
+
+      Terminal::Table.new(
+        title: activity_type,
+        headings: fields,
+        rows: rows
+      ) unless rows.empty?
+    end
+
+    def build_graph_speed(activity_type)
+      graph = ''
+
+      all = select_activities(activity_type).map do |raw_activity|
+        Activity.new(raw_activity)
+      end
+
+      activities_by_year = all.group_by do |activity|
+        activity.date.year
+      end
+
+      activities_by_year.each do |year, a|
+        data = []
+
+        activities_by_month = a.group_by do |activity|
+          activity.date.month
+        end
+
+        activities_by_month.each do |month, activities|
+          avg_speed = activities.sum(&:avg_speed) / activities.size
+
+          data << [
+            "#{month}/#{year}",
+            avg_speed
+          ]
+        end
+
+        if data.size > 1
+          graph += AsciiCharts::Cartesian.new(
+            data.reverse,
+            title: "#{year} - #{activity_type} avg speed",
+            step_size: 0.3
+          ).draw + "\n"
+        end
+      end
+
+      graph unless graph.empty?
+    end
+
+    def fetch_activities_data
+      VCR.use_cassette("activities", record: :new_episodes) do
+        page = 0
+        per_page = 100
+        while activities.count == page*per_page
+          page +=1
+          @activities += client.list_athlete_activities(per_page: per_page,page: page)
+        end
+      end
+    end
+
+    def select_activities(type)
+      activities.select { |activity| activity.type == type }
+    end
   end
 end
 

data/lib/strava/version.rb

@@ -1,3 +1,3 @@
 module Strava
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'.freeze
 end

data/lib/strava.rb

@@ -1,4 +1,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
+# Method access to Hash content
+require 'hashie'
+class Hash; include Hashie::Extensions::MethodAccess; end
+
 require 'strava/version'
+require 'strava/activity'
 require 'strava/app'

data/strava.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'hashie'
   s.add_dependency 'strava-api-v3'
   s.add_dependency 'terminal-table'
+  s.add_dependency 'ascii-charts'
 
   s.add_development_dependency 'pry'
   s.add_development_dependency 'guard'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strava-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Paul Bonaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-26 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_app_helper
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ascii-charts
+  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'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -302,6 +316,7 @@ files:
 - Gemfile
 - bin/strava
 - lib/strava.rb
+- lib/strava/activity.rb
 - lib/strava/app.rb
 - lib/strava/version.rb
 - strava.gemspec