basis-band 0.1.1 → 0.2.0

data/README.md

@@ -84,3 +84,16 @@ If you want the activity info for a given day pass in the access token using
                 },
 ...
 ```
+
+## Optional
+
+The command line tool parses the ~/.basis-band file as YAML to pick up
+persistent options. So if you want to avoid having to keep passing the userid
+on the command line you can just add it to the options file:
+
+```
+---
+:userid: '1234567890abcdef12345678'
+```
+
+And that value will be used as if you passed a -u to the command.

data/bin/basis-band

@@ -16,9 +16,11 @@ end
 
 options = {}
 options_file = File.expand_path('.basis-band', ENV['HOME'])
-puts "Looking for options #{options_file}"
 if File.exist?(options_file)
-  options = YAML::load_file options_file
+  o = YAML::load_file options_file
+  if not o.nil?
+    options = YAML::load_file options_file
+  end
 end
 
 OptionParser.new do |opts|
@@ -70,9 +72,9 @@ if options[:summary]
 end
 
 if options[:userid] and options[:date]
-  raw = b.data_for_day(options[:date])
+  raw = b.metrics_for_day(options[:date])
 elsif options[:token] and options[:date]
-  raw = b.fetch_activities_for_day(options[:date], options[:token])
+  raw = b.activities_for_day(options[:token], options[:date])
 else
   raw = $stdin.read
 end

data/lib/basis-band.rb

@@ -14,34 +14,58 @@ class BasisBand
     @cache_dir = dir
   end
 
-  def data_for_day(date)
-    r = cached_value_for_day(date)
-    if !r
-      r = fetch_value_for_day(date)
-    end
-    r
+  def metrics_for_day(date)
+    with_cache(metrics_cache_filename(date)) { |filename|
+      fetch_metrics_value(date, filename)
+    }
   end
 
-  def data_for_all
-    all = all_cache_files.collect do |f|
-      d = File.basename(f, ".json")
-      [d, cached_value_for_day(d)]
-    end
-    Hash[all]
+  def activities_for_day(token, date)
+    with_cache(activities_cache_filename(date)) { |filename|
+      fetch_activities_value(token, date, filename)
+    }
+  end
+
+  def metrics_cache_filename(date)
+    File.join(@cache_dir, date + "_metrics.json")
+  end
+
+  def activities_cache_filename(date)
+    File.join(@cache_dir, date + "_activities.json")
+  end
+
+  def metrics_cache_files()
+    Dir[File.join(@cache_dir, "*_metrics.json")]
+  end
+
+  def activities_cache_files()
+    Dir[File.join(@cache_dir, "*_activities.json")]
+  end
+
+  def metrics_for_all
+    metrics = metrics_cache_files.collect { |f|
+      date = File.basename(f, "_metrics.json")
+      [d, cached_value(f)]
+    }
+    Hash[metrics]
   end
 
-  def cache_filename(date)
-    File.join(@cache_dir, date + ".json")
+  def activities_for_all
+    activities = activities_cache_files.collect { |f|
+      date = File.basename(f, "_activities.json")
+      [d, cached_value(f)]
+    }
+    Hash[activities]
   end
 
-  def all_cache_files()
-    Dir[File.join(@cache_dir, "*.json")]
+  def with_cache(filename)
+    cached_value(filename) || yield(filename)
   end
 
-  def cached_value_for_day(date)
+  def cached_value(filename)
     raw = nil
     begin
-      File.open(cache_filename(date), "r") { |f|
+      File.open(filename, "r") { |f|
         raw = f.read
       }
     rescue
@@ -50,20 +74,27 @@ class BasisBand
     raw
   end
 
-  def fetch_value_for_day(date)
+  def fetch_result_w_cache(filename)
     f = ApiFetch.new()
-    raw = f.get_day(@userid, date)
-    if raw && @cache_dir
-      File.open(cache_filename(date), "w") { |f|
-        f.write(raw)
+    r = yield f
+    if r
+      File.open(filename, "w") { |f|
+        f.write(r)
       }
     end
-    raw
+    r
   end
 
-  def fetch_activities_for_day(date, token)
-    f = ApiFetch.new()
-    raw = f.get_activities(token, date)
-    raw
+  def fetch_metrics_value(date, filename)
+    fetch_result_w_cache(filename) { |fetch|
+      fetch.get_day_metrics(@userid, date)
+    }
   end
+
+  def fetch_activities_value(token, date, filename)
+    fetch_result_w_cache(filename) { |fetch|
+      fetch.get_day_activities(token, date)
+    }
+  end
+
 end

data/lib/basis-band/api-fetch.rb

@@ -54,12 +54,12 @@ class ApiFetch
     http.request(request).body
   end
 
-  def get_day(userid, date, summary = true, body_states = true, skip_metrics = [])
+  def get_day_metrics(userid, date, summary = true, body_states = true, skip_metrics = [])
     res = https_fetch(url(userid, date, summary, body_states, skip_metrics))
     res
   end
 
-  def get_activities(token, date)
+  def get_day_activities(token, date)
     res = https_fetch_v2(activities_url(date), token)
     res
   end

data/lib/basis-band/version.rb

@@ -1,3 +1,3 @@
 module BasisBandMeta
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basis-band
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json