TokiCLI 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d881a874cdf17efa2db5ad24c0ab808d5a89fc7
-  data.tar.gz: 118745d1d2ee3ab2e4108115303f99fc507ed1c1
+  metadata.gz: 1db92272981801ffe206b7deb7b686bd194ceded
+  data.tar.gz: 0b556e5a4319091462a8eda7b8602e4a9d2779ae
 SHA512:
-  metadata.gz: 6ea00b551307a61234ffed4f78fcbbd8bb355e5831a88903107eadcf7e3ead7281b2f225dc5e173d2a60c243ac2a392c72776803e0d800bc382c60687d129ff1
-  data.tar.gz: d9d1c10fa33308227dbcb96e5ebbb497dc50f2d88a1338765d6c8ccd6bda7ece83b872b3631555e2597e00fb02bc3662c725ccc616abcc28358dd07127895207
+  metadata.gz: 3ca756456fc395d8e76fab04291802be0665183b50c2fb7e752690cff6c2f0f6268fd3e28e7eeb59f9933d39a5fa12ba93b2f4e68186a330c773ac4f0186c277
+  data.tar.gz: ebf7afa8a4f1fd14e66015050095c58854a8ff3c8e7f7c2dc96b73aaa888559de042f746c8f16590adaee68b7a868570b334ae7bcfcd9518b2612e87f6598d96

data/.ruby-version

@@ -0,0 +1 @@
+2.2.0

data/.travis.yml

@@ -1,3 +1,19 @@
 language: ruby
+cache: bundler
+
 rvm:
-  - 2.1.2
+  - "2.1.0"
+  - "2.0.0"
+
+script: 'bundle exec rake spec'
+
+branches:
+  only:
+    - master
+
+notifications:
+  email:
+    - ericdejonckheere@gmail.com
+
+before_install:
+  - gem install CFPropertyList -v '2.2.8'

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.1
+
+- Column width
+
 # 0.3.0
 
 - Complete refactoring

data/README.md

@@ -1,3 +1,8 @@
+[![Gem Version](https://badge.fury.io/rb/TokiCLI.svg)](http://badge.fury.io/rb/TokiCLI)
+
+[![Build Status](https://travis-ci.org/ericdke/TokiCLI.svg?branch=master)](https://github.com/ericdke/TokiCLI)
+
+
 # TokiCLI
 
 Toki.app command-line client and API server. 
@@ -6,6 +11,17 @@ Access your Toki data from the local database or from the App.net backup channel
 
 ![TokiServer example](https://www.evernote.com/shard/s89/sh/dd392b00-82b6-4f13-b573-c925a99ae5a0/02aa5ea4266e8bc7e28d7c91ba8b922c/deep/0/toki-server.png)  
 
+---
+
+**UPDATE**
+
+Toki.app will cease to function when App.net will shut down their servers on 2017/03/14.
+
+TokiCLI will continue to function but will then be irrelevant as there will not be anything to track anymore via Toki.app (and TokiCLI's App.net-related will also cease to function, of course).
+
+You will still be able to read and analyse your existing data with TokiCLI.
+
+---
 
 ## Installation
 
@@ -222,11 +238,9 @@ You can also use the TokiCLI API in another app:
 
 ### Basic
 
-Create a basic TokiCLI API instance:
-
-`toki = TokiCLI::TokiAPI.new("#{~/Library/path/to/tokiapp/db}")`
+Create a basic TokiCLI API instance without referencing bundles:
 
-*That's the format used by the test suite.*
+`toki = TokiCLI::TokiAPI.new("#{~/Library/path/to/tokiapp/db}", {})`  
 
 ### With apps names
 

data/TokiCLI.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '< 2.2.0'
 
   spec.add_dependency "thor", "~> 0.18"
   spec.add_dependency "rest-client", "~> 1.6"
@@ -28,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sinatra-assetpack', "~> 0.3", '>= 0.3.2'
   spec.add_dependency "sinatra-contrib", '~> 1.4', '>= 1.4.2'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "coveralls"

data/lib/TokiCLI/fileops.rb

@@ -3,7 +3,7 @@ module TokiCLI
   class FileOps
 
     require 'fileutils'
-    require 'CFPropertyList'
+    require 'cfpropertylist'
     require 'yaml'
 
     attr_accessor :home_path, :toki_path, :db_path, :db_file, :bundles_file, :bundles, :config_file, :config_path, :config, :data_path, :files_path, :user_file, :log_path

data/lib/TokiCLI/version.rb

@@ -1,3 +1,3 @@
 module TokiCLI
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/TokiCLI/view.rb

@@ -8,7 +8,7 @@ module TokiCLI
 
     def initialize settings = {}
       @settings = if settings.empty?
-        {"table"=>{"width"=>90}} # force default if no initialization
+        {"table"=>{"width"=>120}} # force default if no initialization
       else
         settings
       end
@@ -146,7 +146,7 @@ module TokiCLI
 
     def app_row_with_name(obj)
       max = @settings['table']['width'] / 3
-      [width(max + 5, obj['bundle']), width(max - 5, obj['name']), readable_time(obj['total']['time'])]
+      [width(max + 5, obj['bundle']), width(max - 10, obj['name']), readable_time(obj['total']['time'])]
     end
 
     def app_row(obj)

data/spec/TokiCLI_spec.rb

@@ -2,9 +2,18 @@ require 'spec_helper'
 
 describe TokiCLI do
 
+  class Fake
+    attr_accessor :home_path, :toki_path, :db_path, :db_file, :bundles_file, :bundles, :config_file, :config_path, :config, :data_path, :files_path, :user_file, :log_path
+    def db_file
+      'spec/mock/mock.sqlite3'
+    end
+    def config
+      {}
+    end
+  end
+
   before do
-    TokiCLI::FileOps.any_instance.stub(:db_file).and_return('spec/mock/mock.sqlite3')
-    TokiCLI::FileOps.any_instance.stub(:bundles).and_return(nil)
+    TokiCLI::FileOps.stub(:new).and_return(Fake.new)
   end
 
   describe "#version" do
@@ -92,7 +101,7 @@ describe TokiCLI do
       printed = capture_stdout do
         TokiCLI::App.start(['activity', '--day', '2014-09-14'])
       end
-      expect(printed).to include *['com.apple.finder              |  02:00:00     | 00m 04s      | 3009986780794979448', 'com.apple.Safari              |  17:00:00     | 02m 02s      | 279578532860092796', 'com.apple.finder              |  23:30:00     | 01m 37s      | 5321635596015812810']
+      expect(printed).to include *['3009986780794979448', '279578532860092796', '5321635596015812810']
     end
   end
 
@@ -101,7 +110,7 @@ describe TokiCLI do
       printed = capture_stdout do
         TokiCLI::App.start(['activity', '--since', '2014-09-14'])
       end
-      expect(printed).to include *['com.apple.finder              |  02:00:00     | 00m 04s      | 3009986780794979448', 'com.apple.Safari              |  17:00:00     | 02m 02s      | 279578532860092796', 'com.apple.finder              |  23:30:00     | 01m 37s      | 5321635596015812810', 'com.apple.finder              |  08:15:00     | 00m 29s      | 2450616761580369798', 'com.apple.Safari              |  15:00:00     | 00m 06s      | 7557789946794681026']
+      expect(printed).to include *['3009986780794979448', '279578532860092796', '5321635596015812810', '2450616761580369798', '7557789946794681026']
     end
   end
 
@@ -110,7 +119,7 @@ describe TokiCLI do
       printed = capture_stdout do
         TokiCLI::App.start(['bundle', 'com.apple.iTunes'])
       end
-      expect(printed).to include *['2014-04-13', '16:45:00               | 01m 02s                | 93837223385103975', '2014-04-14', '09:15:00               | 00m 18s                | 9048025340952260608', '12:30:00               | 00m 27s                | 8045504996000693405', 'Total: 3h 52m 32s']
+      expect(printed).to include *['93837223385103975', '9048025340952260608', '8045504996000693405']
     end
   end
 
@@ -265,8 +274,8 @@ describe TokiCLI::TokiAPI do
       expect(resp['meta']['code']).to eq 200
       expect(resp['meta']['request']['command']).to eq 'bundle_log'
       expect(resp['data'].size).to eq 1397
-      expect(resp['data']['6853206097451538432'].to_a).to eq [["bundle", "com.apple.finder"], ["name", nil], ["start", "2014-04-12 15:15:00 +0200"], ["duration", {"seconds"=>10, "time"=>{"hours"=>0, "minutes"=>0, "seconds"=>10}}]]
-      expect(resp['data']['8223841650221385607'].to_a).to eq [["bundle", "com.apple.finder"], ["name", nil], ["start", "2014-09-15 10:45:00 +0200"], ["duration", {"seconds"=>70, "time"=>{"hours"=>0, "minutes"=>1, "seconds"=>10}}]]
+      expect(resp['data']['6853206097451538432'].to_a).to include *[["bundle", "com.apple.finder"], ["name", nil], ["duration", {"seconds"=>10, "time"=>{"hours"=>0, "minutes"=>0, "seconds"=>10}}]]
+      expect(resp['data']['8223841650221385607'].to_a).to include *[["bundle", "com.apple.finder"], ["name", nil], ["duration", {"seconds"=>70, "time"=>{"hours"=>0, "minutes"=>1, "seconds"=>10}}]]
     end
   end
 
@@ -277,8 +286,8 @@ describe TokiCLI::TokiAPI do
       expect(resp['meta']['code']).to eq 200
       expect(resp['meta']['request']['command']).to eq 'bundle_log_since'
       expect(resp['data'].size).to eq 131
-      expect(resp['data']['3343489613556420396'].to_a).to eq [["bundle", "com.apple.finder"], ["name", nil], ["start", "2014-09-01 08:45:00 +0200"], ["duration", {"seconds"=>15, "time"=>{"hours"=>0, "minutes"=>0, "seconds"=>15}}]]
-      expect(resp['data']['8223841650221385607'].to_a).to eq [["bundle", "com.apple.finder"], ["name", nil], ["start", "2014-09-15 10:45:00 +0200"], ["duration", {"seconds"=>70, "time"=>{"hours"=>0, "minutes"=>1, "seconds"=>10}}]]
+      expect(resp['data']['3343489613556420396'].to_a).to include *[["bundle", "com.apple.finder"], ["name", nil], ["duration", {"seconds"=>15, "time"=>{"hours"=>0, "minutes"=>0, "seconds"=>15}}]]
+      expect(resp['data']['8223841650221385607'].to_a).to include *[["bundle", "com.apple.finder"], ["name", nil], ["duration", {"seconds"=>70, "time"=>{"hours"=>0, "minutes"=>1, "seconds"=>10}}]]
     end
   end
 
@@ -290,8 +299,8 @@ describe TokiCLI::TokiAPI do
       expect(resp['meta']['request']['command']).to eq 'bundle_log_before'
       expect(resp['data'].size).to eq 1266
       arr = resp['data'].to_a
-      expect(arr.first).to eq ["6853206097451538432", {"bundle"=>"com.apple.finder", "name"=>nil, "start"=>"2014-04-12 15:15:00 +0200", "duration"=>{"seconds"=>10, "time"=>{"hours"=>0, "minutes"=>0, "seconds"=>10}}}]
-      expect(arr.last).to eq ["3110227595022506229", {"bundle"=>"com.apple.finder", "name"=>nil, "start"=>"2014-08-31 23:00:00 +0200", "duration"=>{"seconds"=>30, "time"=>{"hours"=>0, "minutes"=>0, "seconds"=>30}}}]
+      expect(arr.first).to include "6853206097451538432"
+      expect(arr.last).to include "3110227595022506229"
     end
   end
 
@@ -303,8 +312,8 @@ describe TokiCLI::TokiAPI do
       expect(resp['meta']['request']['command']).to eq 'bundle_log_range'
       expect(resp['data'].size).to eq 26
       arr = resp['data'].to_a
-      expect(arr.first).to eq ["3343489613556420396", {"bundle"=>"com.apple.finder", "name"=>nil, "start"=>"2014-09-01 08:45:00 +0200", "duration"=>{"seconds"=>15, "time"=>{"hours"=>0, "minutes"=>0, "seconds"=>15}}}]
-      expect(arr.last).to eq ["249678006045203865", {"bundle"=>"com.apple.finder", "name"=>nil, "start"=>"2014-09-03 21:30:00 +0200", "duration"=>{"seconds"=>16, "time"=>{"hours"=>0, "minutes"=>0, "seconds"=>16}}}]
+      expect(arr.first).to include "3343489613556420396"
+      expect(arr.last).to include "249678006045203865"
     end
   end
 
@@ -317,8 +326,8 @@ describe TokiCLI::TokiAPI do
       expect(resp['meta']['request']['args']).to eq ["com.apple.finder", "2014-09-01", "2014-09-02"]
       expect(resp['data'].size).to eq 13
       arr = resp['data'].to_a
-      expect(arr.first).to eq ["3343489613556420396", {"bundle"=>"com.apple.finder", "name"=>nil, "start"=>"2014-09-01 08:45:00 +0200", "duration"=>{"seconds"=>15, "time"=>{"hours"=>0, "minutes"=>0, "seconds"=>15}}}]
-      expect(arr.last).to eq ["8777542996540152763", {"bundle"=>"com.apple.finder", "name"=>nil, "start"=>"2014-09-01 21:45:00 +0200", "duration"=>{"seconds"=>61, "time"=>{"hours"=>0, "minutes"=>1, "seconds"=>1}}}]
+      expect(arr.first).to include "3343489613556420396"
+      expect(arr.last).to include "8777542996540152763"
     end
   end
 
@@ -331,8 +340,8 @@ describe TokiCLI::TokiAPI do
       expect(resp['meta']['request']['args']).to eq ["2014-09-13"]
       expect(resp['data'].size).to eq 87
       arr = resp['data'].to_a
-      expect(arr.first).to eq ["1226267152535471391", {"bundle"=>"com.apple.appstore", "name"=>nil, "start"=>"2014-09-13 10:15:00 +0200", "duration"=>{"seconds"=>3, "time"=>{"hours"=>0, "minutes"=>0, "seconds"=>3}}}]
-      expect(arr.last).to eq ["7557789946794681026", {"bundle"=>"com.apple.Safari", "name"=>nil, "start"=>"2014-09-15 15:00:00 +0200", "duration"=>{"seconds"=>6, "time"=>{"hours"=>0, "minutes"=>0, "seconds"=>6}}}]
+      expect(arr.first).to include "1226267152535471391"
+      expect(arr.last).to include "7557789946794681026"
     end
   end
 
@@ -345,10 +354,83 @@ describe TokiCLI::TokiAPI do
       expect(resp['meta']['request']['args']).to eq ["2014-09-13"]
       expect(resp['data'].size).to eq 17
       arr = resp['data'].to_a
-      expect(arr.first).to eq ["6362298701774470696", {"bundle"=>"com.apple.Safari", "name"=>nil, "start"=>"2014-09-13 10:15:00 +0200", "duration"=>{"seconds"=>54, "time"=>{"hours"=>0, "minutes"=>0, "seconds"=>54}}}]
-      expect(arr.last).to eq ["2496889557830869773", {"bundle"=>"com.apple.finder", "name"=>nil, "start"=>"2014-09-13 19:00:00 +0200", "duration"=>{"seconds"=>297, "time"=>{"hours"=>0, "minutes"=>4, "seconds"=>57}}}]
+      expect(arr.first).to include "6362298701774470696"
+      expect(arr.last).to include "2496889557830869773"
     end
   end
 
+end
+
+describe TokiCLI::Helpers do
+
+  let(:helpers) { TokiCLI::Helpers.new }
+
+  describe "#sec_to_time" do
+    it "converts unix time in a hash of hours/minutes/seconds" do
+      result = helpers.sec_to_time(12345)
+      expect(result['hours']).to eq 3
+      expect(result['minutes']).to eq 25
+      expect(result['seconds']).to eq 45
+    end
+  end
+
+  describe "#epoch_to_date" do
+    it "converts unix date to iso time" do
+      result = helpers.epoch_to_date(1411075048)
+      expect(result.to_s).to include '2014-09-18'
+    end
+  end
+
+  describe "#check_date_validity" do
+    it "converts a string to a date object" do
+      result = helpers.check_date_validity('2014-09-18')
+      expect(result.iso8601[0..9]).to eq '2014-09-18'
+    end
+    it "returns false if string is incorrect" do
+      result = helpers.check_date_validity('yolo')
+      expect(result).to be false
+    end
+  end
+
+  describe "#readable_time" do
+    it "converts a hash of hours/minutes/seconds to a string" do
+      result = helpers.readable_time({'hours' => 12, 'minutes' => 33, 'seconds' => 7})
+      expect(result).to eq '12h 33m 07s'
+    end
+  end
+
+  describe "#readable_time_log" do
+    it "converts a hash of hours/minutes/seconds to a string" do
+      result = helpers.readable_time_log({'hours' => 12, 'minutes' => 33, 'seconds' => 7})
+      expect(result).to eq '33m 07s'
+    end
+  end
+
+  describe "#calc_apps_total" do
+    it "sums the number of seconds in each object" do
+      result = helpers.calc_apps_total([{'total' => {'seconds' => 7}}, {'total' => {'seconds' => 10}}])
+      expect(result).to eq 17
+    end
+  end
+
+  describe "#calc_logs_total" do
+    it "sums the number of seconds in each object" do
+      result = helpers.calc_logs_total(
+        {
+          1 => {
+            'duration' => {
+              'seconds' => 7
+            }
+          },
+          2 => {
+            'duration' => {
+              'seconds' => 10
+            }
+          }
+        }
+      )
+      expect(result).to eq 17
+    end
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: TokiCLI
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -160,14 +160,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +224,7 @@ files:
 - ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -614,9 +615,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "<"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -624,7 +625,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Toki.app command-line client and API server