zzamboni-things2thl 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/bin/things2thl

@@ -14,6 +14,7 @@ options.areas = true
 options.quiet = false
 options.archivecompleted = true
 options.projectsfolder = nil
+options.contexttagsregex = '^@'
 opts = OptionParser.new do |opts|
   opts.separator ''
   opts.separator 'Options:'
@@ -28,6 +29,10 @@ opts = OptionParser.new do |opts|
   opts.on("--projects-as-lists", "Convert projects in Things to lists in THL (default)") { options.structure = :projects_as_lists }
   opts.on("--projects-as-tasks", "Convert projects in Things to tasks in THL") { options.structure = :projects_as_tasks }
   opts.on("--no-areas", "Ignore areas in Things") { options.areas = false }
+  opts.on('-C REGEX', '--context-tags-regex REGEX', 'Regular expression to identify tags that should be interpreted as contexts.',
+          "  (default: #{options.contexttagsregex})") do |regex|
+    options.contexttagsregex = regex
+  end
 
   opts.on("--top-level-folder FOLDER", "If specified, do the import inside the named folders, instead of the top level",
           " (Inbox, etc. will also be created there instead of their corresponding places)") do |toplevel|
@@ -78,15 +83,21 @@ thl = converter.thl
 # Create top-level containers if needed
 
 # First, traverse all areas
-things.areas.get.each { |area| converter.process(Things2THL::ThingsNode.new(area)) } if options.areas
+if options.areas
+  things.areas.get.each do |area|
+    converter.process(Things2THL::ThingsNode.new(area))
+  end
+end
 
 # Next, traverse all projects, putting each one inside its corresponding area
-things.projects.get.each { |project| converter.process(Things2THL::ThingsNode.new(project)) }
+things.projects.get.each do |project|
+  converter.process(Things2THL::ThingsNode.new(project))
+end
 
 # Now do the tasks
 # This is more complicated because:
 # - to_dos returns not only tasks, also projects (not areas)
-# - to-dos returns tasks from all the views: Inbox, Scheduled, Someday, and Next, so we have
+# - to-dos returns tasks from all the views: Inbox, Today, Scheduled, Someday, and Next, so we have
 #   to separate them and create the appropriate containers as needed
 things.to_dos.get.each do |t|
   task=Things2THL::ThingsNode.new(t)
@@ -94,30 +105,3 @@ things.to_dos.get.each do |t|
   converter.process(task)
 end
 
-# # First traverse areas
-# puts "Areas:"
-# things.areas.each { |n| converter.traverse(n, 0, thl.folders_group.get) }
-# # Then traverse area-less projects
-# puts "\nProjects without an area:"
-# parent = thl.folders_group.get
-# if (options.structure == :projects_as_tasks)
-#   parent = converter.find_or_create_list(parent, "Projects")
-# end
-# things.projects.each { |n| converter.traverse(n, 0, parent) unless n.parent_area? }
-# Then tasks without a project
-#puts "\nTasks without a project:"
-#things.focus(:next).children.each { |n| traverse(n, 0, options) unless n.parent? }
-
-#############
-
-# thl.folders_group.end.make(:new => :folder, :with_properties => {:name => 'test folder'})
-# app("/Applications/The Hit List.app").folders_group.folders.ID("1B98A3855A3C79DE").end.make(:new => :list, :with_properties => {:name => 'test list'})
-# task=app("/Applications/The Hit List.app").folders_group.folders.ID("1B98A3855A3C79DE").lists.ID("43B3187E6D90AB8D").end.make(:new => :task, :with_properties => {:title => 'test
-#  task', :notes => 'test notes' })
-# task.end.make(:new => :task, :with_properties => {:title => 'test subtask'})
-# task.set(:title => 'new title')
-# task.set(title => 'new title')
-# task.title = 'new title'
-# thl.set(task.title, :to => 'new title')
-# task.title.set('another title')
-# task.title.get

data/lib/Things2THL.rb

@@ -11,8 +11,8 @@ require 'appscript'; include Appscript
 module Things2THL
   module Version
     MAJOR  = 0
-    MINOR  = 2
-    PATCH  = 2
+    MINOR  = 3
+    PATCH  = 0
 
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end
@@ -228,6 +228,9 @@ module Things2THL
         exit(1)
       end
 
+      # Regular expression to match context tags. Compile it here to avoid
+      # repetition later on.
+      options.contexttagsregex_compiled = Regexp.compile(options.contexttagsregex)
       # Structure to keep track of already create items
       # These hashes are indexed by Things node ID (node.id_). Each element
       # contains a hash with two elements:
@@ -634,7 +637,15 @@ module Things2THL
         tasktags |= node.area.tags.map {|t| t.name }
       end
       unless tasktags.empty?
-        prop[:title] = [prop[:title], tasktags.map {|t| "/" + t + (t.index(" ")?"/":"") }].join(' ')
+        prop[:title] = [prop[:title], tasktags.map do |t|
+                          if options.contexttagsregex_compiled &&
+                              options.contexttagsregex_compiled.match(t)
+                            # Contexts cannot have spaces, we also remove any initial @'s before adding our own.
+                            "@" + t.gsub(/^@+/, "").gsub(/ /, '_')
+                          else
+                            "/" + t + (t.index(" ")?"/":"")
+                          end
+                        end].join(' ')
       end
     end
 

data/things2thl.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{things2thl}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Diego Zamboni"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zzamboni-things2thl
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Diego Zamboni