omnifocus 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 736efe96b1222812da98464175ed830369fa7b935426516d2bc408f79a823fd5
-  data.tar.gz: 5c607620f41f6bab752ea0566bc1fbaec1ff624d0ceca6b6829acc3772795024
+  metadata.gz: ddf124365ed5a5b3b49db9297322210bcd365be07a958b8d04c095367082a26a
+  data.tar.gz: eaa5696f26809287c533b6dc4dffdcb19839128fafb07d9e1d40b5bc1543815e
 SHA512:
-  metadata.gz: 30021137f84365e0e9b18b36931c592473bc4c41acfab1d10ee4b7fb4dbd88c96541be49555bbe4887a8e97e3e3f850e22b3309eb9a8d1dcc7068a1b439967c8
-  data.tar.gz: 4b28845beb951219077f85ad0e2491739e0584125560f49a35105473f4c5c494f89603c38e3e41eedd04a5bdf5c34d8b5b9902c245a982cc0edad2344caa868b
+  metadata.gz: fd581b4f1df8028d72b52eb5aa98ccd0e596b1d54309da10dc692f7f6b78735af92121bfd935301d95d62e16faf80f35c49e88b36cdc556d54ced436a7f51991
+  data.tar.gz: 63199ee6de77af1b367959445c897ab11c5bbe08eb9ed47bb9ab5e1eb70a40d5c4a1db3c72669ae2461792e0a3265455658d3882efe3db5d24d42bd7ffce719d

data/History.rdoc

@@ -1,3 +1,20 @@
+=== 2.7.0 / 2022-04-09
+
+* 4 minor enhancements:
+
+  * Added #active qualifier
+  * Added all_active_tasks
+  * Added filtering to #all_subtasks.
+  * Added some cleanup to remove duplicate tasks (by ticket_id, first one wins).
+
+* 5 bug fixes:
+
+  * Fix for CJK name support. (inevity)
+  * Fixed #non_dropped_project for newer omnifocus applescript changes.
+  * Fixed creating release/triage tasks for an existing project.
+  * Fixed filtering existing tasks, was ignoring '_' in project names and duplicating tasks.
+  * Force load all plugins in bin/of on start
+
 === 2.6.0 / 2020-02-12
 
 * 4 minor enhancements:

data/Rakefile

@@ -20,7 +20,7 @@ Hoe.spec "omnifocus" do
 end
 
 def omnifocus cmd, options = nil
-  inc = "-Ilib:../../omnifocus-github/dev/lib:../../omnifocus-redmine/dev/lib"
+  inc = "-Ilib:../../omnifocus-github/dev/lib"
 
   ruby "#{inc} bin/of #{cmd} #{options}"
 end

data/bin/of

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'omnifocus'
 require 'abbrev'
 
+OmniFocus._load_plugins nil
 methods = OmniFocus.public_instance_methods(false).grep(/^cmd_/)
 methods.map! { |s| s[4..-1] }
 

data/lib/omnifocus.rb

@@ -1,6 +1,7 @@
 old_w, $-w = $-w, nil
 require 'rb-scpt'
 $-w = old_w
+require "yaml"
 
 NERD_FOLDER = ENV["OF_FOLDER"] || "nerd"
 
@@ -29,7 +30,7 @@ include Appscript
 # bts_id: a string uniquely identifying a task: SYSTEM(-projectname)?#id
 
 class OmniFocus
-  VERSION = "2.6.0"
+  VERSION = "2.7.0"
 
   class << self
     attr_accessor :description, :current_desc
@@ -73,10 +74,9 @@ class OmniFocus
   ##
   # Load any file matching "omnifocus/*.rb"
 
-  def self._load_plugins
+  def self._load_plugins filter = ARGV.shift
     @__loaded__ ||=
       begin
-        filter = ARGV.shift
         loaded = {}
         Gem.find_files("omnifocus/*.rb").each do |path|
           name = File.basename path
@@ -97,8 +97,6 @@ class OmniFocus
   end
 
   def load_or_create_config
-    require "yaml"
-
     path = File.expand_path "~/.omnifocus.yml"
 
     unless File.exist? path then
@@ -126,8 +124,12 @@ class OmniFocus
     @omnifocus ||= Appscript.app('OmniFocus').default_document
   end
 
-  def all_subtasks task
-    [task] + task.tasks.get.flatten.map{|t| all_subtasks(t) }
+  def all_subtasks task, filter = nil
+    if filter then
+      [task] + task.tasks[filter].get.flatten.map{ |t| all_subtasks t, filter }
+    else
+      [task] + task.tasks.get.flatten.map{ |t| all_subtasks t }
+    end
   end
 
   def all_tasks
@@ -136,6 +138,10 @@ class OmniFocus
     omnifocus.flattened_projects.tasks.get.flatten.map{|t| all_subtasks(t) }.flatten
   end
 
+  def all_active_tasks
+    omnifocus.flattened_projects.tasks[active].get.flatten.map{|t| all_subtasks(t, active) }.flatten
+  end
+
   ##
   # Utility shortcut to make a new thing with a name via appscript.
 
@@ -168,7 +174,7 @@ class OmniFocus
     prefixen = self.class._plugins.map { |klass| klass::PREFIX rescue nil }
     of_tasks = nil
 
-    prefix_re = /^(#{Regexp.union prefixen}(?:-[\w\s.-]+)?\#\d+)/
+    prefix_re = /^(#{Regexp.union prefixen}(?:-[\s\p{L}._-]+)?\#\d+)/
 
     if prefixen.all? then
       of_tasks = all_tasks.find_all { |task|
@@ -183,8 +189,15 @@ class OmniFocus
     end
 
     of_tasks.each do |of_task|
-      ticket_id = of_task.name.get[prefix_re, 1]
+      ticket_id                  = of_task.name.get[prefix_re, 1]
       project                    = of_task.containing_project.name.get
+
+      if existing.key? ticket_id
+        warn "Duplicate task! #{ticket_id}"
+        warn "  deleting: #{of_task.id_.get}"
+        omnifocus.flattened_projects.tasks.delete of_task
+      end
+
       existing[ticket_id]        = project
       bug_db[project][ticket_id] = false
     end
@@ -590,19 +603,20 @@ class OmniFocus
     unless proj then
       warn "creating #{name} project"
       proj = make nerd_projects, :project, name, :review_interval => rep
+    end
 
+    rel_task = proj.tasks[rel_q].first.get rescue nil
+    tri_task = proj.tasks[tri_q].first.get rescue nil
+
+    if rel_task || tri_task then # repair
+      new_task_from proj, tri_task, "Release #{name}", rel_tag, -min30 unless rel_task
+      new_task_from proj, rel_task, "Triage #{name}",  tri_tag, +min30 unless tri_task
+    else
       make proj, :task, "Release #{name}", props.merge(:due_date => rel_due_date,
                                                        :primary_tag => rel_tag)
       make proj, :task, "Triage #{name}",  props.merge(:due_date => tri_due_date,
                                                        :primary_tag => tri_tag)
-      return
     end
-
-    rel_task = proj.tasks[rel_q].first.get rescue nil
-    tri_task = proj.tasks[tri_q].first.get rescue nil
-
-    new_task_from proj, tri_task, "Release #{name}", rel_tag, -min30 unless rel_task
-    new_task_from proj, rel_task, "Triage #{name}",  tri_tag, +min30 unless tri_task
   end
 
   def new_task_from proj, task, name, tag, offset
@@ -964,8 +978,12 @@ class OmniFocus
     its.status.eq(:active)
   end
 
+  def active
+    its.completed.eq(false)
+  end
+
   def non_dropped_project
-    its.status.eq(:dropped).not
+    its.status.eq(:dropped_status).not
   end
 
   def all_projects

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: omnifocus
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Ryan Davis
 - aja
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE5MTIxMzAwMDIwNFoXDTIwMTIxMjAwMDIwNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -23,14 +23,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCkkcHqAa6IKLYGl93rn78J3L+LnqyxaA059n4IGMHWN5bv9KBQnIjOrpLadtYZ
-  vhWkunWDKdfVapBEq5+T4HzqnsEXC3aCv6JEKJY6Zw7iSzl0M8hozuzRr+w46wvT
-  fV2yTN6QTVxqbMsJJyjosks4ZdQYov2zdvQpt1HsLi+Qmckmg8SPZsd+T8uiiBCf
-  b+1ORSM5eEfBQenPXy83LZcoQz8i6zVB4aAfTGGdhxjoMGUEmSZ6xpkOzmnGa9QK
-  m5x9IDiApM+vCELNwDXXGNFEnQBBK+wAe4Pek8o1V1TTOxL1kGPewVOitX1p3xoN
-  h7iEjga8iM1LbZUfiISZ+WrB
+  AQCKB5jfsuSnKb+t/Wrh3UpdkmX7TrEsjVmERC0pPqzQ5GQJgmEXDD7oMgaKXaAq
+  x2m+KSZDrqk7c8uho5OX6YMqg4KdxehfSLqqTZGoeV78qwf/jpPQZKTf+W9gUSJh
+  zsWpo4K50MP+QtdSbKXZwjAafpQ8hK0MnnZ/aeCsW9ov5vdXpYbf3dpg6ADXRGE7
+  lQY2y1tJ5/chqu6h7dQmnm2ABUqx9O+JcN9hbCYoA5i/EeubUEtFIh2w3SpO6YfB
+  JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
+  YsuyUzsMz6GQA4khyaMgKNSD
   -----END CERTIFICATE-----
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2022-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-scpt
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '3.23'
 description: Synchronizes bug tracking systems to omnifocus.
 email:
 - ryand-ruby@zenspider.com
@@ -122,7 +122,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/seattlerb/omnifocus
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -139,8 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Synchronizes bug tracking systems to omnifocus.
 test_files: []