TokiCLI 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f75f8a7b54a3176511c5589d7cfd13fb3de6afa7
-  data.tar.gz: 9edcdb6869e30b35f59b6406a1e71644b20da9dc
+  metadata.gz: 540ff62bc17ff6dba3312cf62395d76ba46ac522
+  data.tar.gz: a5281bcc5f82f6ba5ba7300b34a4eb5e9922fda1
 SHA512:
-  metadata.gz: 938f6f3406004255d4bc7ba5ad5671585dff565b47a6c607e67989a6a39cac1e6a1393408befff8f7f1ea63f5b952e475c8f40f7adbf8f581700b20c5970f2ee
-  data.tar.gz: fde21a595247b54df7a72ab5edc2358a4cddb6ef4562e80f0051fdad1e9e11a81400f5c53bba3bb24971e8c57154072d03406ba4ba99a0b68eb67e9087b45c95
+  metadata.gz: b934a2c4969dfefbf0128a7b19c84f4b279c1fef7aa0249e3b45f3cc620b740f8e3820df360c40caa2a76faa3e906d6e1bffaf6470837ec02f783ef1c7be11c8
+  data.tar.gz: 99ae0bf882c9b2c98cb1264a031542ee99a16949fd657f39b9373c548f5278c9e53eec59e0fe3ace15f0f05e80f76211c511937e7ad7ad06f1c80af04d890b33

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.0.7
+
+- Scan for apps name
+- Display apps name in results if apps have been scanned
+
 # 0.0.6
 
 - Fix paths

data/README.md

@@ -4,7 +4,7 @@ Toki.app command-line client.
 
 Access your Toki data from the local database or from the App.net backup channel.
 
-![TokiCLI](https://files.app.net/21krs3SJm.png)  
+![TokiCLI](https://files.app.net/2dxzh_bHz.png)  
 
 
 ## Installation
@@ -59,6 +59,14 @@ The dates you type have to be formatted like this: year-month-day and separated
 
 `toki range 2014-04-17 2014-04-19`
 
+### Scan
+
+Scan for apps name.
+
+Will crawl the Applications folder and try to resolve app names from bundle identifiers.
+
+Toki will display apps names in results if apps have been scanned.  
+
 ### Auth
 
 In order to be able to access your ADN channel (optional), TokiCLI has to obtain a "token" (secret code) from App.net.

data/TokiCLI.gemspec

@@ -20,10 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_dependency "thor", ">= 0.18"
-  spec.add_dependency "rest-client", ">= 1.6"
-  spec.add_dependency "amalgalite", ">= 1.3"
-  spec.add_dependency "terminal-table", ">= 1.4"
+  spec.add_dependency "thor", "~> 0.18"
+  spec.add_dependency "rest-client", "~> 1.6"
+  spec.add_dependency "amalgalite", "~> 1.3"
+  spec.add_dependency "terminal-table", "~> 1.4"
+  spec.add_dependency "CFPropertyList", "~> 2.2.8"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/TokiCLI/app.rb

@@ -4,6 +4,18 @@ module TokiCLI
     package_name "TokiCLI"
     %w{get_messages search_messages get_channels module status view authorize}.each {|r| require_relative "#{r}"}
 
+    desc "scan", "Scan /Applications to resolve app names"
+    def scan
+      toki = create_toki(options)
+      bundle_ids = toki.get_bundle_ids
+      path = "#{Dir.home}/.toki_cli"
+      Dir.mkdir path unless Dir.exist? path
+      f = File.new "#{path}/apps.json", "w"
+      f.write bundle_ids.to_json
+      f.close
+      puts "\nDone.\n\n"
+    end
+
     desc "total", "Shows the total usage of all apps"
     option :adn, aliases: '-a', type: :boolean, desc: 'Select ADN channel as source (toki total -a)'
     option :json, aliases: '-j', type: :boolean, desc: 'Export the results as a JSON file'
@@ -175,7 +187,8 @@ module TokiCLI
     end
 
     def get_all(t, options)
-      t.all_data(t.get_content(options))
+      content = t.get_content(options)
+      t.all_data(content)
     end
   end
 end

data/lib/TokiCLI/get_messages.rb

@@ -10,7 +10,7 @@ module ADNChannels
       args = {:count => 200, :before_id => nil}
       messages = []
       @index = 1
-      puts "Downloading synced objects (~1MB/page):\n\n"
+      puts "Downloading synced objects (200/page):\n\n"
       loop do
         puts "--Downloading from page #{@index}...\n"
         @url = "#{@base_url}/channels/#{channel_id}/messages?access_token=#{@token}&include_machine=1&include_message_annotations=1&include_deleted=0&include_html=0&count=#{args[:count]}&before_id=#{args[:before_id]}"

data/lib/TokiCLI/module.rb

@@ -5,11 +5,31 @@ module TokiCLI
     CLIENT_ID = 'm6AccJFM56ENCn58Vde9cSg3uSpbvAAs'
     CALLBACK_URL = 'http://aya.io/toki_cli/auth.html'
 
+    attr_reader :bundles
+
     def initialize(token, channel_id)
       @token = token
       @channel_id = channel_id
+      if File.exist? "#{Dir.home}/.toki_cli/apps.json"
+        @bundles = JSON.parse(File.read("#{Dir.home}/.toki_cli/apps.json"))
+      end
+    end
+
+    def get_bundle_ids
+      puts "Analyzing apps in /Applications\n\n"
+      require 'CFPropertyList'
+      files = get_plists "/Applications/*/Contents/*"
+      utils = get_plists "/Applications/Utilities/*/Contents/*"
+      home = get_plists "#{Dir.home}/Applications/*/Contents/*"
+      @infos = {}
+      get_bundles files
+      get_bundles utils
+      get_bundles home
+      @infos
     end
 
+
+
     def get_content(options)
       if options[:adn]
         get_adn_data.reverse.map {|obj| make_obj_from_adn(obj)}
@@ -136,7 +156,7 @@ module TokiCLI
       usr[:id] = obj['user']['id']
       app[:id] = d['id']
       app[:uuid] = d['UUID']
-      app[:name] = d['bundleIdentifier']
+      app[:name] = make_app_name [nil, d['bundleIdentifier']]
       app[:active_to] = d['activeTo']
       app[:active_from] = d['activeFrom']
       app[:total] = d['totalSeconds']
@@ -157,15 +177,48 @@ module TokiCLI
       usr[:id] = obj[5]
       app[:id] = msg[:id]
       app[:uuid] = obj[5]
-      app[:name] = obj[1]
+      app[:name] = make_app_name obj
       app[:active_to] = obj[3]
       app[:active_from] = obj[2]
       app[:total] = obj[4]
       OpenStruct.new(app: app, msg: msg, usr: usr)
     end
 
+    def make_app_name obj
+      if @bundles[obj[1]]
+        @bundles[obj[1]]
+      else
+        obj[1]
+      end
+    end
+
     def parsed_date(string)
       "#{string[0...10]} #{string[11...19]}"
     end
+
+    def get_plists path
+      Dir.glob(path).select {|f| (File.split f).last == 'Info.plist'}
+    end
+
+    def get_bundles plists
+      plists.each do |obj|
+        puts "Analyzing #{obj} ...\n"
+        begin
+          pl = CFPropertyList::List.new(:file => obj)
+        rescue CFFormatError
+          puts "Unable to read the file, skipping...\n"
+          next
+        end
+        data = CFPropertyList.native_types(pl.value)
+        name = data['CFBundleName']
+        bundle_id = data['CFBundleIdentifier']
+        if name.nil?
+          name = data['CFBundleExecutable']
+        end
+        next if name.nil?
+        next if bundle_id.nil? || bundle_id.empty?
+        @infos[bundle_id] = name
+      end
+    end
   end
 end

data/lib/TokiCLI/version.rb

@@ -1,3 +1,3 @@
 module TokiCLI
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: TokiCLI
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: amalgalite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: CFPropertyList
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement