omnifocus-extrabrain 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9338e6fe76c74d2663d71b5086fe01eab256254a
-  data.tar.gz: 4d66acef1590db5a5606b9a9d34245c0a41ba6f2
+  metadata.gz: b755d9c4ca2482a56067d1676b8c90cd66e07758
+  data.tar.gz: de8a413cc21b9489b6efece86026f34a04d9e08c
 SHA512:
-  metadata.gz: 64d1870941a4d35c8bfbe75a38071e33013866d1f6b5f18bdb788fb12e4f98c2304720a3b3a9a8105c6ba5a86d03b6410154c9519228dda4686942038387e82d
-  data.tar.gz: 58d071e03f7b11a2c93566491111943af4ad2f94807a0e766eb3de88500cbcfa3e4d38edaa66eb63262b40eedf32bca83de8b1d35b824256f9883d7267abddda
+  metadata.gz: e78f75ec7e85cdc6acc1d890b7eb96787404584c24a91102862725b11adac9f75584061e404312a4a99f7cd60294aa9c55454caa334c334735b6da627c7ffe23
+  data.tar.gz: 393838f32fe188fbc9e2df999f15afca967d1160eeba1d85c1e0d4fea86778227572a1a8b9296510ec6b75dc331597f840ba17ba8e9583a7c24e57ac319e6ad9

data/lib/omnifocus/extrabrain.rb

@@ -1,11 +1,14 @@
 require 'rest-client'
 require 'keychain'
+require 'base64'
+require 'byebug'
 
 module OmniFocus::Extrabrain
   PREFIX = 'EB'
 
   class Task
-    attr_accessor :id, :title, :project_title
+    attr_accessor :id, :title, :project_id, :team
+    attr_writer :project_title
 
     def initialize(attrs = {})
       attrs.each do |attribute, value|
@@ -16,8 +19,12 @@ module OmniFocus::Extrabrain
       end
     end
 
+    def url
+      "https://#{team['subdomain']}.extrabrain.se/tasks/#{id}"
+    end
+
     def ticket_id
-      "#{PREFIX}-#{project_title}##{id}"
+      "#{PREFIX}##{id}"
     end
 
     def project_title
@@ -46,9 +53,8 @@ module OmniFocus::Extrabrain
   def populate_extrabrain_tasks
     teams.each do |team|
       page = 1
-
       while tasks = get_tasks(team, page) do
-        tasks.each { |t| process_extrabrain_task(t, team) }
+        tasks.each { |task| process_extrabrain_task(task, team) }
         page = page + 1
       end
     end
@@ -68,29 +74,29 @@ module OmniFocus::Extrabrain
 
   def user_id
     @user_id ||= begin
-                  current_user = JSON.parse resource['users/current.json'].get
-                  current_user['user']['id']
-                end
+      current_user = JSON.parse resource['users/current.json'].get
+      current_user['user']['id']
+    end
   end
 
   def resource
     @resource ||= client('https://extrabrain.se')
   end
 
-
   def get_tasks(team, page)
     team_resource = client("https://#{team['subdomain']}.extrabrain.se")
     json = JSON.parse team_resource["tasks.json?user_id=#{user_id}&page=#{page}"].get
     return nil if json.nil? || json.empty?
-    json.map { |task_attributes| Task.new(task_attributes) }
+    json.map { |task_attributes| Task.new(task_attributes.merge team: team) }
   end
 
   def process_extrabrain_task(task, team)
-    description = "https://#{team['subdomain']}.extrabrain.se/tasks/#{task.id}"
     if existing[task.ticket_id]
-      bug_db[task.project_title][task.ticket_id] = true
-      return
+      bug_db[existing[task.ticket_id]][task.ticket_id] = true
+    else
+      title = "#{task.ticket_id}: #{task.title}"
+      description = task.url
+      bug_db[task.project_title][task.ticket_id] = [title, description]
     end
-    bug_db[task.project_title][task.ticket_id] = [task.title, description]
   end
 end

data/lib/omnifocus/extrabrain/version.rb

@@ -1,5 +1,5 @@
 module OmniFocus
   module Extrabrain
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/omnifocus-extrabrain.gemspec

@@ -19,9 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency 'omnifocus'
   spec.add_dependency 'rest-client'
   spec.add_dependency 'ruby-keychain'
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'byebug'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnifocus-extrabrain
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Alexander Ross
@@ -10,6 +10,20 @@ bindir: exe
 cert_chain: []
 date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: omnifocus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Plugin for omnifocus gem to provide Extrabrain BTS synchronization.
 email:
 - alex@aross.se