TokiCLI 0.2.1 → 0.3.0

data/spec/spec_helper.rb

@@ -0,0 +1,26 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'coveralls'
+Coveralls.wear!
+
+# require 'TokiCLI'
+require_relative '../lib/TokiCLI'
+require_relative '../lib/API/toki_api'
+
+require 'stringio'
+def capture_stdout(&blk)
+  old = $stdout
+  $stdout = fake = StringIO.new
+  blk.call
+  fake.string
+ensure
+  $stdout = old
+end
+def capture_stderr(&blk)
+  old = $stderr
+  $stderr = fake = StringIO.new
+  blk.call
+  fake.string
+ensure
+  $stderr = old
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: TokiCLI
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -134,22 +134,70 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -173,7 +221,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -181,22 +232,18 @@ files:
 - Rakefile
 - TokiCLI.gemspec
 - bin/toki
-- lib/API/dbapi.rb
 - lib/API/helpers.rb
+- lib/API/toki_api.rb
+- lib/API/toki_db.rb
 - lib/TokiCLI.rb
-- lib/TokiCLI/app.rb
-- lib/TokiCLI/authorize.rb
-- lib/TokiCLI/export.rb
-- lib/TokiCLI/get_channels.rb
-- lib/TokiCLI/get_messages.rb
-- lib/TokiCLI/import.rb
-- lib/TokiCLI/scan.rb
-- lib/TokiCLI/search_messages.rb
+- lib/TokiCLI/adnimport.rb
+- lib/TokiCLI/fileops.rb
 - lib/TokiCLI/status.rb
 - lib/TokiCLI/version.rb
 - lib/TokiCLI/view.rb
+- lib/TokiServer/.bowerrc
+- lib/TokiServer/.gitignore
 - lib/TokiServer/Gemfile
-- lib/TokiServer/README.md
 - lib/TokiServer/bower.json
 - lib/TokiServer/bower_components/fastclick/.bower.json
 - lib/TokiServer/bower_components/fastclick/LICENSE
@@ -206,7 +253,9 @@ files:
 - lib/TokiServer/bower_components/foundation/.bower.json
 - lib/TokiServer/bower_components/foundation/bower.json
 - lib/TokiServer/bower_components/foundation/css/foundation.css
+- lib/TokiServer/bower_components/foundation/css/foundation.css.map
 - lib/TokiServer/bower_components/foundation/css/normalize.css
+- lib/TokiServer/bower_components/foundation/css/normalize.css.map
 - lib/TokiServer/bower_components/foundation/js/foundation.js
 - lib/TokiServer/bower_components/foundation/js/foundation.min.js
 - lib/TokiServer/bower_components/foundation/js/foundation/foundation.abide.js
@@ -247,6 +296,7 @@ files:
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_forms.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_global.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_grid.scss
+- lib/TokiServer/bower_components/foundation/scss/foundation/components/_icon-bar.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_inline-lists.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_joyride.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_keystrokes.scss
@@ -259,15 +309,15 @@ files:
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_pricing-tables.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_progress-bars.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_range-slider.scss
-- lib/TokiServer/bower_components/foundation/scss/foundation/components/_reveal-new.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_reveal.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_side-nav.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_split-buttons.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_sub-nav.scss
-- lib/TokiServer/bower_components/foundation/scss/foundation/components/_switch.scss
+- lib/TokiServer/bower_components/foundation/scss/foundation/components/_switches.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_tables.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_tabs.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_thumbs.scss
+- lib/TokiServer/bower_components/foundation/scss/foundation/components/_toolbar.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_tooltips.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_top-bar.scss
 - lib/TokiServer/bower_components/foundation/scss/foundation/components/_type.scss
@@ -538,20 +588,22 @@ files:
 - lib/TokiServer/bower_components/modernizr/test/qunit/run-qunit.js
 - lib/TokiServer/config.rb
 - lib/TokiServer/humans.txt
-- lib/TokiServer/itunesicon.rb
+- lib/TokiServer/itunesicons.rb
 - lib/TokiServer/js/app.js
 - lib/TokiServer/public/stylesheets/app.css
 - lib/TokiServer/robots.txt
 - lib/TokiServer/scss/_settings.scss
 - lib/TokiServer/scss/app.scss
 - lib/TokiServer/tokiserver.rb
+- lib/TokiServer/views/activity.erb
 - lib/TokiServer/views/apps_total.erb
 - lib/TokiServer/views/error.erb
 - lib/TokiServer/views/index.erb
 - lib/TokiServer/views/layout.erb
-- lib/TokiServer/views/name_log.erb
-- lib/TokiServer/views/name_split.erb
-- lib/TokiServer/views/name_total.erb
+- lib/TokiServer/views/logs_total.erb
+- spec/TokiCLI_spec.rb
+- spec/mock/mock.sqlite3
+- spec/spec_helper.rb
 homepage: https://github.com/ericdke/TokiCLI
 licenses:
 - MIT
@@ -564,7 +616,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -572,8 +624,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Toki.app command-line client and API server
-test_files: []
+test_files:
+- spec/TokiCLI_spec.rb
+- spec/mock/mock.sqlite3
+- spec/spec_helper.rb

data/lib/API/dbapi.rb

@@ -1,488 +0,0 @@
-# encoding: utf-8
-module TokiCLI
-  class DBAPI
-
-    require 'ostruct'
-    require 'amalgalite'
-    require 'CFPropertyList'
-    require 'terminal-table/import'
-    require 'json'
-    require 'fileutils'
-    require_relative "../TokiCLI/version"
-    require_relative "helpers"
-
-    attr_accessor :helpers, :db, :table
-
-    def initialize
-      @helpers = Helpers.new
-      @db = @helpers.db
-      @table = @helpers.table
-    end
-
-    ## ENDPOINTS
-
-    # Get the total time for an app given its exact bundle identifier
-    def bundle_total bundle_id, orig = nil
-      sec = (@db.execute("SELECT sum(totalSeconds) FROM #{@table} WHERE bundleIdentifier IS '#{bundle_id}'").flatten)[0]
-      sec = 0 if sec.nil?
-      args = if orig.nil?
-        [bundle_id]
-      else
-        [bundle_id, orig]
-      end
-      { meta: {
-          code: 200,
-          request: {command: 'bundle_total', args: args, processed_at: Time.now}
-        },
-        data: {
-          bundle: bundle_id,
-          name: @helpers.find_app_name(bundle_id),
-          total: {
-            seconds: sec,
-            time: @helpers.sec_to_time(sec)
-          }
-        }
-      }.to_json
-    end
-
-    # Get the total time for an app given a (partial) name
-    def name_total name
-      bun = JSON.parse(get_bundle_from_name(name))
-      if bun['meta']['code'] == 200
-        bundle_total bun['data']['bundle'], name
-      else
-        @helpers.json_nodata
-      end
-    end
-
-    # Get the total time for an app given its exact bundle identifier, since a specific day
-    def bundle_total_since bundle_id, day, orig = nil
-      since = (@db.execute("SELECT sum(totalSeconds) FROM #{@table} WHERE bundleIdentifier IS '#{bundle_id}' AND activeFrom >= #{Time.parse(day).to_i}").flatten)[0]
-      since = 0 if since.nil?
-      args = if orig.nil?
-        [bundle_id, day]
-      else
-        [bundle_id, day, orig]
-      end
-      { meta: {
-          code: 200,
-          request: {command: 'bundle_total_since', args: args, processed_at: Time.now}
-        },
-        data: {
-          bundle: bundle_id,
-          name: @helpers.find_app_name(bundle_id),
-          since: day,
-          total: {
-            seconds: since,
-            time: @helpers.sec_to_time(since)
-          }
-        }
-      }.to_json
-    end
-
-    # Get the total time for an app given a (partial) name, since a specific day
-    def name_total_since name, day
-      bun = JSON.parse(get_bundle_from_name(name))
-      if bun['meta']['code'] == 200
-        bundle_total_since bun['data']['bundle'], day, name
-      else
-        return_422 'name_total_since', [name, day]
-      end
-    end
-
-    # Get the total time for an app given its exact bundle identifier, before a specific day
-    def bundle_total_before bundle_id, day, orig = nil
-      before = (@db.execute("SELECT sum(totalSeconds) FROM #{@table} WHERE bundleIdentifier IS '#{bundle_id}' AND activeFrom < #{Time.parse(day).to_i}").flatten)[0]
-      before = 0 if before.nil?
-      args = if orig.nil?
-        [bundle_id, day]
-      else
-        [bundle_id, day, orig]
-      end
-      { meta: {
-          code: 200,
-          request: {command: 'bundle_total_before', args: args, processed_at: Time.now}
-        },
-        data: {
-          bundle: bundle_id,
-          name: @helpers.find_app_name(bundle_id),
-          before: day,
-          total: {
-            seconds: before,
-            time: @helpers.sec_to_time(before)
-          }
-        }
-      }.to_json
-    end
-
-    # Get the total time for an app given a (partial) name, before a specific day
-    def name_total_before name, day
-      bun = JSON.parse(get_bundle_from_name(name))
-      if bun['meta']['code'] == 200
-        bundle_total_before bun['data']['bundle'], day, name
-      else
-        return_422 'name_total_before', [name, day]
-      end
-    end
-
-    # Get the total time for an app given its exact bundle identifier, before and since a specific day
-    def bundle_total_split bundle_id, day, orig = nil
-      before = (@db.execute("SELECT sum(totalSeconds) FROM #{@table} WHERE bundleIdentifier IS '#{bundle_id}' AND activeFrom < #{Time.parse(day).to_i}").flatten)[0]
-      since = (@db.execute("SELECT sum(totalSeconds) FROM #{@table} WHERE bundleIdentifier IS '#{bundle_id}' AND activeFrom >= #{Time.parse(day).to_i}").flatten)[0]
-      before = 0 if before.nil?
-      since = 0 if since.nil?
-      args = if orig.nil?
-        [bundle_id, day]
-      else
-        [bundle_id, day, orig]
-      end
-      { meta: {
-          code: 200,
-          request: {command: 'bundle_total_split', args: args, processed_at: Time.now}
-        },
-        data: {
-          bundle: bundle_id,
-          name: @helpers.find_app_name(bundle_id),
-          split: day,
-          total: {
-            seconds: {
-              before: before,
-              since: since
-            },
-            time: {
-              before: @helpers.sec_to_time(before),
-              since: @helpers.sec_to_time(since)
-            }
-          }
-        }
-      }.to_json
-    end
-
-    # Get the total time for an app given a (partial) name, before and since a specific day
-    def name_total_split name, day
-      bun = JSON.parse(get_bundle_from_name(name))
-      if bun['meta']['code'] == 200
-        bundle_total_split bun['data']['bundle'], day, name
-      else
-        return_422 'name_total_split', [name, day]
-      end
-    end
-
-    # Get the total time for an app given its exact bundle identifier, between two specific days
-    def bundle_total_range bundle_id, day1, day2, orig = nil
-      total = (@db.execute("SELECT sum(totalSeconds) FROM #{@table} WHERE bundleIdentifier IS '#{bundle_id}' AND activeFrom >= #{Time.parse(day1).to_i} AND activeFrom < #{Time.parse(day2).to_i}").flatten)[0]
-      args = if orig.nil?
-        [bundle_id, day1, day2]
-      else
-        [bundle_id, day1, day2, orig]
-      end
-      total = 0 if total.nil?
-      { meta: {
-          code: 200,
-          request: {command: 'bundle_total_range', args: args, processed_at: Time.now}
-        },
-        data: {
-          bundle: bundle_id,
-          name: @helpers.find_app_name(bundle_id),
-          from: day1,
-          to: day2,
-          total: {
-            seconds: total,
-            time: @helpers.sec_to_time(total)
-          }
-        }
-      }.to_json
-    end
-
-    # Get the total time for an app given a (partial) name, between two specific days
-    def name_total_range name, day1, day2
-      bun = JSON.parse(get_bundle_from_name(name))
-      if bun['meta']['code'] == 200
-        bundle_total_range bun['data']['bundle'], day1, day2, name
-      else
-        return_422 'name_total_range', [name, day1, day2]
-      end
-    end
-
-    # Get all apps used between day 1 and day 2
-    def apps_range day1, day2
-      result = []
-      range = @db.execute("SELECT bundleIdentifier,sum(totalSeconds) FROM #{@table} WHERE activeFrom >= #{Time.parse(day1).to_i} AND activeFrom < #{Time.parse(day2).to_i} GROUP BY bundleIdentifier")
-      range.each {|id,sec| result << {
-        bundle: id,
-        name: @helpers.find_app_name(id),
-        total: {
-          seconds: sec,
-          time: @helpers.sec_to_time(sec)
-        }}
-      }
-      if result.empty?
-        return_422('apps_range', [day1, day2])
-      else
-        result.sort_by! {|obj| obj[:total][:seconds]}
-        {
-          meta: {
-            code: 200,
-            request: {command: 'apps_range', args: [day1, day2], processed_at: Time.now}
-          },
-          data: {
-            from: day1,
-            to: day2,
-            apps: result
-          }
-        }.to_json
-      end
-    end
-
-    # Get all apps used on a specific day
-    def apps_day day
-      date = DateTime.strptime(day, '%Y-%m-%d')
-      response = @db.execute("SELECT bundleIdentifier,sum(totalSeconds) FROM #{@table} WHERE activeFrom >= #{date.to_time.to_i} AND activeFrom < #{date.next_day.to_time.to_i} GROUP BY bundleIdentifier")
-      result = make_apps response
-      if result.empty?
-        return_422 'apps_day', [day]
-      else
-        {
-          meta: {
-            code: 200,
-            request: {command: 'apps_day', args: [day], processed_at: Time.now}
-          },
-          data: {
-            date: day,
-            apps: result
-          }
-        }.to_json
-      end
-    end
-
-    def apps_since day
-      date = DateTime.strptime(day, '%Y-%m-%d')
-      response = @db.execute("SELECT bundleIdentifier,sum(totalSeconds) FROM #{@table} WHERE activeFrom >= #{date.to_time.to_i} GROUP BY bundleIdentifier")
-      result = make_apps response
-      if result.empty?
-        return_422 'apps_since', [day]
-      else
-        {
-          meta: {
-            code: 200,
-            request: {command: 'apps_since', args: [day], processed_at: Time.now}
-          },
-          data: {
-            since: day,
-            apps: result
-          }
-        }.to_json
-      end
-    end
-
-    def apps_before day
-      date = DateTime.strptime(day, '%Y-%m-%d')
-      response = @db.execute("SELECT bundleIdentifier,sum(totalSeconds) FROM #{@table} WHERE activeFrom < #{date.to_time.to_i} GROUP BY bundleIdentifier")
-      result = make_apps response
-      if result.empty?
-        return_422 'apps_before', [day]
-      else
-        {
-          meta: {
-            code: 200,
-            request: {command: 'apps_before', args: [day], processed_at: Time.now}
-          },
-          data: {
-            before: day,
-            apps: result
-          }
-        }.to_json
-      end
-    end
-
-    # Get totals of all tracked apps
-    def apps_total
-      result = make_total
-      {
-        meta: {
-          code: 200,
-          request: {command: 'apps_total', args: [], processed_at: Time.now}
-        },
-        data: {
-          apps: result
-        }
-      }.to_json
-    end
-
-    # Get totals of top tracked apps
-    def apps_top number = 5
-      result = make_total
-      args = [number]
-      index = -number
-      apps = result[index..-1]
-      if apps.nil?
-        return_422 'apps_top', args
-      else
-        {
-          meta: {
-            code: 200,
-            request: {command: 'apps_top', args: args, processed_at: Time.now}
-          },
-          data: {
-            apps: apps
-          }
-        }.to_json
-      end
-    end
-
-    def return_422 command_name, args
-      {
-        meta: {
-          code: 422,
-          request: {command: command_name, args: args, processed_at: Time.now},
-          message: 'No data returned by this request'
-        },
-        data: {
-          apps: []
-        }
-      }.to_json
-    end
-
-    # Get the complete log for an app
-    def bundle_log bundle_id, orig = nil
-      log = @db.execute("SELECT * FROM #{@table} WHERE bundleIdentifier IS '#{bundle_id}'")
-      # id (INTEGER) 0, bundleIdentifier (VARCHAR) 1, activeFrom (INTEGER) 2, activeTo (INTEGER) 3, totalSeconds (INTEGER) 4, UUID (VARCHAR) 5, synced (INTEGER) 6, availableToSync (INTEGER) 7
-      result = {}
-      log.each do |arr|
-        result[arr[0]] = {
-          start: @helpers.epoch_to_date(arr[2]),
-          duration: {
-            seconds: arr[4],
-            time: @helpers.seconds_to_time(arr[4])
-          }
-        }
-      end
-      args = if orig.nil?
-        [bundle_id]
-      else
-        [bundle_id, orig]
-      end
-      { meta: {
-          code: 200,
-          request: {command: 'bundle_total', args: args, processed_at: Time.now}
-        },
-        data: {
-          bundle: bundle_id,
-          name: @helpers.find_app_name(bundle_id),
-          log: result
-        }
-      }.to_json
-    end
-
-    # Get the complete log for an app, given a (partial) name
-    def name_log name
-      bun = JSON.parse(get_bundle_from_name(name))
-      if bun['meta']['code'] == 200
-        bundle_log bun['data']['bundle'], name
-      else
-        @helpers.json_nodata
-      end
-    end
-
-
-    ## TOOLS
-
-    # Get all data from database
-    def get_all_data
-      (@helpers.get_all_data).to_json
-    end
-
-    # Scan disk for installed apps
-    def scan_apps
-      apps = []
-      (@helpers.scan).each do |id,name|
-        apps << {bundle: id, name: name}
-      end
-      {
-        meta: {
-          code: 200,
-          request: {
-            command: 'scan_apps',
-            processed_at: Time.now
-          }
-        },
-        data: {
-          apps: apps
-        }
-      }.to_json
-    end
-
-    # List of tracked apps
-    # (Run scan_apps before if necessary)
-    def tracked_apps
-      apps, ids = [], (@db.execute("SELECT bundleIdentifier FROM #{@table}")).flatten.uniq!
-      ids.each do |id|
-        @helpers.bundles.has_key?(id) ? apps << {bundle: id, name: @helpers.bundles[id]} : apps << {bundle: id, name: id}
-      end
-      {
-        meta: {
-          code: 200,
-          request: {
-            command: 'tracked_apps',
-            processed_at: Time.now
-          }
-        },
-        data: {
-          apps: apps
-        }
-      }.to_json
-    end
-
-    # Get bundle_id from app name or partial app name
-    # (Run scan_apps before if necessary)
-    def get_bundle_from_name name
-      resp = @helpers.get_bundle_from_name name
-      meta = {
-        request: {
-          command: 'get_bundle_from_name',
-          args: [name],
-          processed_at: Time.now
-          }
-      }
-      resp.empty? ?
-        {
-          meta: meta.merge!({
-            code: 404,
-            error: { message: "Unable to find an app containing '#{name}'" }
-          }),
-          data: {}
-        }.to_json :
-        {
-        meta: meta.merge!({code: 200}),
-        data: {
-          request: name,
-          bundle: resp[1],
-          name: resp[0]
-        }
-      }.to_json
-    end
-
-    private
-
-    def make_total
-      response = @db.execute("SELECT bundleIdentifier,sum(totalSeconds) FROM #{@table} GROUP BY bundleIdentifier")
-      make_apps response
-    end
-
-    def make_apps response
-      result = []
-      response.each {|id,sec| result << {
-        bundle: id,
-        name: @helpers.find_app_name(id),
-        total: {
-          seconds: sec,
-          time: @helpers.sec_to_time(sec)
-          }
-        }
-      }
-      result.sort_by! {|obj| obj[:total][:seconds]}
-      result
-    end
-
-  end
-end