TokiCLI 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24126edaca561eab0623a449445132dddf6697a0
-  data.tar.gz: bec8ef8903fd53c79b8ef96696dc04fde69e9e7b
+  metadata.gz: 2b09a54e6095cd0db8771b463d7b0b42abcce848
+  data.tar.gz: a38757d420d82bba26f791d5db014034ddd0ca69
 SHA512:
-  metadata.gz: 985a22eda651b23467d18db8e7198edd24c5454275a09958e31b4d38a74f9a4d44031e30033302dd7cba00a3485b0b7301470464f605ce94170d2e1f7a8ab2f3
-  data.tar.gz: 8168f8fa325678e6e4d332476ee0d889a9819bbcf9a917e0cf89d7442b29c5295350f049a0f1ad5f19168f69193fb723df3ff0354767d00dab3247970d71dbac
+  metadata.gz: c038040cc9efe49a44e23b70e9c3341ccfbba70619248ebd1a198997f1f8ad1436f9ceae4f7e6e1a7256b605938f4cfa4f8e879cd93c48d8c620c88e79659097
+  data.tar.gz: b2301f6b6608aea4cbc75f616893c18f8e484223fece39d13cb7e4dc05a1e5ab42d229e1a1bde9c0833407cd65f18a81ecf446660ecbf06ff6ed8e88fc4b76b1

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# 0.0.2
+
+- Repo URL
+- Better description
+- Readme
+- New command: top
+- Results are sorted
+
+# 0.0.1
+
+- DB: total + log
+- ADN: total + log

data/README.md

@@ -1,13 +1,84 @@
 # TokiCLI
 
-TODO: Write a gem description
+Toki.app command-line client. 
+
+Access your Toki data from the local database or from the App.net backup channel.
 
 ## Installation
 
-    $ gem install TokiCLI
+    gem install TokiCLI
 
 ## Usage
 
-TODO: Write usage instructions here
+### Log
+
+The **log** command shows the entire log (history) for one app.
+
+You don't have to specify the exact name of the identifier: for example, typing 'iterm' will find 'com.googlecod.iterm2'.
+
+`toki log iterm`
+
+The results are sorted by ascending date and time.
+
+When pulling the data from ADN instead of the local database, the results are sorted by ascending synced message.
+
+### Total
+
+The **total** command shows the total usage time for all apps.
+
+`toki total`
+
+The results are sorted by ascending usage time.
+
+### Top
+
+The **top** command shows your top used apps.
+
+`toki top`
+
+TokiCLI shows the top 5 by default, but you can specify a number with the `-n` option:
+
+`toki top -n 10`
+
+### Auth
+
+In order to be able to access your ADN channel (optional), you have to obtain a "token" (secret code) from App.net: go to your App.net account page, click "Your apps" then find "Create a token for yourself."
+
+The last step is simply to do `toki auth` and paste the token.
+
+### Global option
+
+TokiCLI accesses the local Toki database by default.
+
+If you want to access the App.net backup channel instead, you have to specify the `-a` option:
+
+`toki total -a`
+
+`toki log vlc -a`
+
+`toki top -n 10 -a`  
+
+
+## Toki
+
+[Toki](https://itunes.apple.com/fr/app/toki/id861749202?mt=12) is a Mac OS X app written by [Keitaroh Kobayashi](http://app.net/keita).
+
+It's a time tracker for your apps that sits in the menu bar.
+
+## Important
+
+**TokiCLI does _not_ track your apps.**
+
+**Tracking is the job of Toki.app by @keita.**
+
+TokiCLI interacts only with the Toki.app database or the App.net backup channel.
+
+## Next
+
+Teasing: TokiCLI has only read-only commands... for now. ;)
+
+## Thanks
 
+Keita was super nice and said "Awesome!" instead of just "Yes" or "GTFO" when I asked him if I could use the 'Toki' name for this companion Gem.
 
+Many thanks and congrats to Keita! :)

data/TokiCLI.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = TokiCLI::VERSION
   spec.authors       = ["Eric Dejonckheere"]
   spec.email         = ["eric@aya.io"]
-  spec.summary       = %q{Toki command-line client}
-  spec.description   = %q{Toki command-line client: read your Toki data from the local database or from the App.net backup channel}
-  spec.homepage      = ""
+  spec.summary       = %q{Toki.app command-line client}
+  spec.description   = %q{Toki.app command-line client: read your Toki data from the local database or from the App.net backup channel, delete data from both...}
+  spec.homepage      = "https://github.com/ericdke/TokiCLI"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/bin/toki

@@ -2,7 +2,7 @@
 # encoding: utf-8
 # Toki command-line client
 # Author: Eric Dejonckheere (http://app.net/ericd)
-# Toki by: Keita Kobayashi (http://app.net/keita)
+# Toki by: Keitaroh Kobayashi (http://app.net/keita)
 
 $PROGRAM_NAME = 'toki'
 require_relative '../lib/TokiCLI'

data/lib/TokiCLI/app.rb

@@ -7,38 +7,39 @@ module TokiCLI
     desc "total", "Shows the total usage of all apps"
     option :adn, aliases: '-a', type: :boolean, desc: 'Select ADN channel as source (toki total -a)'
     def total
-      if options[:adn]
-        toki = total_adn
-      else
-        toki = total_db
-      end
+      toki = create_toki(options)
       get_total(toki, options)
     end
 
+    desc "top", "Shows your most used apps"
+    option :adn, aliases: '-a', type: :boolean, desc: 'Select ADN channel as source (toki top -a)'
+    option :number, aliases: '-n', type: :numeric, desc: 'Specifi the number of apps (toki top -n 10)'
+    def top
+      toki = create_toki(options)
+      entries = toki.get_content(options)
+      clear
+      hits = toki.top(entries, options[:number] || 5)
+      puts TokiCLI::View.new.hits_table(hits.reverse)
+      puts "\n"
+    end
+
     desc "auth", "Input your App.net token for authorization"
     def auth
       puts Status.paste_token
       token = STDIN.gets.chomp!
-      unless token.nil?
-        save_token(token)
-      else
-        abort(Status.no_token)
-      end
+      abort(Status.no_token) if token == ''
+      save_token(token)
       puts Status.done
     end
 
     desc "log APP", "Shows the complete log for an app"
-    option :adn, aliases: '-a', type: :boolean, desc: 'Select ADN channel as source (toki total -a)'
+    option :adn, aliases: '-a', type: :boolean, desc: 'Select ADN channel as source (toki log -a)'
     def log(*args)
       abort(Status.specify_name) if args.empty?
-      if options[:adn]
-        toki = total_adn
-      else
-        toki = total_db
-      end
       asked = args[0]
-      synced = toki.get_content(options)
-      app_data = toki.get_app(asked, synced)
+      toki = create_toki(options)
+      entries = toki.get_content(options)
+      app_data = toki.get_app(asked, entries)
       v = TokiCLI::View.new
       puts v.app_table(asked, app_data)
       puts "\n"
@@ -46,6 +47,14 @@ module TokiCLI
 
     private
 
+    def create_toki(options)
+      if options[:adn]
+        total_adn
+      else
+        total_db
+      end
+    end
+
     def total_adn
       clear
       puts Status.get_all
@@ -54,7 +63,7 @@ module TokiCLI
 
     def total_db
       clear
-      puts "getting data from db\n"
+      #puts "getting data from db\n"
       init_toki_db
     end
 

data/lib/TokiCLI/module.rb

@@ -35,7 +35,9 @@ module TokiCLI
         app_data[obj.msg[:id]] = {
           from: Time.at(obj.app[:active_from]).strftime("%Y/%m/%d %Hh:%Mm:%Ss"),
           to: Time.at(obj.app[:active_to]).strftime("%Y/%m/%d %Hh:%Mm:%Ss"),
-          duration: "#{human[:hours]}h #{human[:minutes]}m #{human[:seconds]}s"
+          duration: "#{human[:hours]}h #{human[:minutes]}m #{human[:seconds]}s",
+          name: obj.app[:name],
+          raw_from: obj.app[:active_from]
         }
       end
       human = epoch_to_human(totals[:app])
@@ -43,16 +45,9 @@ module TokiCLI
       app_data
     end
     def all_data(synced)
-      totals = {}
-      synced.each do |obj|
-        unless totals[obj.app[:name]].nil?
-          totals[obj.app[:name]] = totals[obj.app[:name]] + obj.app[:total]
-        else
-          totals[obj.app[:name]] = obj.app[:total]
-        end
-      end
+      totals = get_totals(synced)
       bundles = {}
-      sorted = totals.sort_by{ |k,v| v }
+      sorted = sort_totals(totals)
       sorted.each do |name, total|
         human = epoch_to_human(total)
         if human[:hours] < 1
@@ -63,9 +58,44 @@ module TokiCLI
       end
       bundles
     end
+    def top(synced, number = 5)
+      number = -number
+      totals = get_totals(synced)
+      sorted = sort_totals(totals)
+      humanized = []
+      sorted.each do |n,t|
+        humanized << [n, humanized_date(t)]
+      end
+      humanized[number..-1]
+    end
 
     private
 
+    def humanized_date(epoch)
+      human = epoch_to_human(epoch)
+      "#{human[:hours]}h #{human[:minutes]}m #{human[:seconds]}s"
+    end
+
+    def sort_totals(totals)
+      totals.sort_by { |k,v| v }
+    end
+
+    def get_totals(synced)
+      totals = {}
+      synced.each do |obj|
+        totals[obj.app[:name]] = app_total(obj, totals)
+      end
+      totals
+    end
+
+    def app_total(obj, totals)
+      unless totals[obj.app[:name]].nil?
+        totals[obj.app[:name]] + obj.app[:total]
+      else
+        obj.app[:total]
+      end
+    end
+
     def epoch_to_human(epoch)
       hours = epoch / 3600
       minutes = (epoch / 60 - hours * 60)
@@ -81,11 +111,10 @@ module TokiCLI
     def get_db_data
       db = open_db
       data = db.execute("SELECT * FROM KKAppActivity")
+      db.close
       data
     end
 
-
-
     def open_db
       tmp_path = "#{Dir.home}/temp/toki/"
       db_path = "#{Dir.home}/Library/Containers/us.kkob.Toki/Data/Documents/toki_data.sqlite3"
@@ -120,13 +149,13 @@ module TokiCLI
       msg = {}
       usr = {}
       app = {}
-      msg[:id] = rand(100000000)
+      msg[:id] = obj[0]
       msg[:thread] = msg[:id]
       msg[:date] = Time.now
       usr[:username] = ENV['USERNAME']
       usr[:name] = usr[:username]
       usr[:id] = obj[5]
-      app[:id] = obj[0]
+      app[:id] = msg[:id]
       app[:uuid] = obj[5]
       app[:name] = obj[1]
       app[:active_to] = obj[3]

data/lib/TokiCLI/version.rb

@@ -1,3 +1,3 @@
 module TokiCLI
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/TokiCLI/view.rb

@@ -9,23 +9,32 @@ module TokiCLI
       end
       table
     end
+    def hits_table(list)
+      table = init_table
+      table.title = "Your top apps monitored by Toki"
+      list.each.with_index(1) do |obj,index|
+        table << ["#{index}", "#{obj[0]}", "#{obj[1]}"]
+      end
+      table
+    end
     def app_table(asked, app_data)
       table = init_table
-      table.title = "Toki time tracking for '#{asked}'"
-      table.headings = ['From', 'To', 'Duration']
+      table.style = { :width => 100 }
+      table.title = "Toki time tracking for '#{asked}' => #{app_data.first[1][:name]}"
+      table.headings = ['From', 'To', 'Duration', 'Sync id']
       @index = 0
       @length = app_data.length - 1
-      app_data.each do |id, log|
-        if id == 'total'
-          @total = log
-          next
-        end
+      @total = app_data.select {|k,v| k == 'total'}
+      app_data.delete('total')
+      data = app_data.to_a
+      data.sort_by! {|k,v| v[:raw_from] }
+      data.each do |id, log|
         @index += 1
-        table << ["#{log[:from]}", "#{log[:to]}", "#{log[:duration]}"]
+        table << ["#{log[:from]}", "#{log[:to]}", "#{log[:duration]}", "#{id}"]
         table << :separator unless @index == @length
       end
       table << :separator
-      table << [{ :value => "Total: #{@total}", :colspan => 3, :alignment => :center }]
+      table << [{ :value => "Total: #{@total['total']}", :colspan => 4, :alignment => :center }]
       table
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: TokiCLI
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -94,8 +94,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 'Toki command-line client: read your Toki data from the local database
-  or from the App.net backup channel'
+description: 'Toki.app command-line client: read your Toki data from the local database
+  or from the App.net backup channel, delete data from both...'
 email:
 - eric@aya.io
 executables:
@@ -104,6 +104,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -119,7 +120,7 @@ files:
 - lib/TokiCLI/status.rb
 - lib/TokiCLI/version.rb
 - lib/TokiCLI/view.rb
-homepage: ''
+homepage: https://github.com/ericdke/TokiCLI
 licenses:
 - MIT
 metadata: {}
@@ -142,6 +143,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Toki command-line client
+summary: Toki.app command-line client
 test_files: []
 has_rdoc: