basis-band 0.2.0 → 0.3.0

data/bin/basis-band

@@ -14,12 +14,12 @@ def samples_to_csv(samples)
   lines
 end
 
-options = {}
+options = {:type => 'metrics'}
 options_file = File.expand_path('.basis-band', ENV['HOME'])
 if File.exist?(options_file)
   o = YAML::load_file options_file
   if not o.nil?
-    options = YAML::load_file options_file
+    options.merge!(o)
   end
 end
 
@@ -37,29 +37,18 @@ OptionParser.new do |opts|
   opts.on("-C", "--cachedir DIR", "Directory to use to cache results") do |c|
     options[:cachedir] = c
   end
-  opts.on("-l", "--login username:password", "Login and print user id") do |l|
-    options[:login] = l
-  end
   opts.on("-s", "--summary", "Summarize all the data from the cache") do |s|
     options[:summary] = s
   end
   opts.on("-t", "--token TOKEN", "Token for v2 API access") do |t|
     options[:token] = t
   end
+  opts.on("-T", "--type TYPE", "'metrics' or 'activities' (default 'metrics')") do |t|
+    options[:type] = t
+  end
 end.parse!
 
-if options[:login]
-  (u,p) = options[:login].split(":", 2)
-  token, id = ApiAuth.new.login(u, p)
-  puts "ID for V1 api: #{id}"
-  puts "token for V2 api: #{token}"
-  exit
-end
-
-b = BasisBand.new(options[:userid])
-if options[:cachedir]
-  b.set_cache_dir(options[:cachedir])
-end
+b = BasisBand.new(options[:cachedir])
 
 if options[:summary]
   all = b.data_for_all
@@ -71,9 +60,9 @@ if options[:summary]
   exit
 end
 
-if options[:userid] and options[:date]
-  raw = b.metrics_for_day(options[:date])
-elsif options[:token] and options[:date]
+if options[:type] == 'metrics'
+  raw = b.metrics_for_day(options[:userid], options[:date])
+elsif options[:type] == 'activities'
   raw = b.activities_for_day(options[:token], options[:date])
 else
   raw = $stdin.read

data/bin/basis-band-login

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+require 'basis-band'
+require 'optparse'
+
+options = {}
+
+OptionParser.new do |opts|
+  opts.banner = "basis-band gem v#{BasisBandMeta::VERSION}\nUsage: basis-band-login [options]"
+  opts.on("-e", "--email EMAIL", "Mandatory login for mybasis.com") do |e|
+    options[:email] = e
+  end
+  opts.on("-p", "--password PASS", "Mandatory password for mybasis.com") do |p|
+    options[:password] = p
+  end
+end.parse!
+
+token, id = ApiAuth.new.login(options[:email], options[:password])
+puts "ID for V1 api: #{id}"
+puts "token for V2 api: #{token}"
+

data/lib/basis-band.rb

@@ -6,17 +6,16 @@ require 'basis-band/api-response-model'
 class BasisBand
   @cache_dir = nil
 
-  def initialize(userid)
-    @userid = userid
-  end
+  attr_accessor :api
 
-  def set_cache_dir(dir)
-    @cache_dir = dir
+  def initialize(cache_dir)
+    @cache_dir = cache_dir
+    @api = ApiFetch.new()
   end
 
-  def metrics_for_day(date)
+  def metrics_for_day(userid, date)
     with_cache(metrics_cache_filename(date)) { |filename|
-      fetch_metrics_value(date, filename)
+      fetch_metrics_value(userid, date, filename)
     }
   end
 
@@ -75,8 +74,7 @@ class BasisBand
   end
 
   def fetch_result_w_cache(filename)
-    f = ApiFetch.new()
-    r = yield f
+    r = yield
     if r
       File.open(filename, "w") { |f|
         f.write(r)
@@ -85,15 +83,15 @@ class BasisBand
     r
   end
 
-  def fetch_metrics_value(date, filename)
-    fetch_result_w_cache(filename) { |fetch|
-      fetch.get_day_metrics(@userid, date)
+  def fetch_metrics_value(userid, date, filename)
+    fetch_result_w_cache(filename) {
+      @api.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)
+    fetch_result_w_cache(filename) {
+      @api.get_day_activities(token, date)
     }
   end
 

data/lib/basis-band/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basis-band
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -32,6 +32,7 @@ description: A library and collection of tools for exporting monitoring data fro
 email: mikerowehl@gmail.com
 executables:
 - basis-band
+- basis-band-login
 extensions: []
 extra_rdoc_files: []
 files:
@@ -41,6 +42,7 @@ files:
 - lib/basis-band/version.rb
 - lib/basis-band.rb
 - bin/basis-band
+- bin/basis-band-login
 - README.md
 - test/test_api-fetch.rb
 - test/test_api-response-model.rb