rubyfocus 0.5.15 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f5a4c91ed0928fd76122bd1a73aac09cd7865910
-  data.tar.gz: c0b84fe38a026dec491cacb779d1af6711c113e4
+SHA256:
+  metadata.gz: a5d202cfe72692a61bbc8a64095b20bff39a7bf9ce1925e8cfa9cb868c06c0ba
+  data.tar.gz: 4a476d1c8acbe3ea05435ec43151c063b4c3b3f7417464fb8f18deaf08b92adc
 SHA512:
-  metadata.gz: e310985eb7a3abb07c71659308b02e819db7ca8d833d543b3bf6c050ceda74ad009a22008c5d55b1bb9938db02def736ad749c94dfdc92cf3d45e6c7be47a469
-  data.tar.gz: ab34e7acef67d5c7a4892a71065ae98200398027d9698d2630bc502987c136bfba55db773e7c6b5ec73e235bfdfe4cff5a15614f8066d60e07aa2ff5227342fe
+  metadata.gz: 8a9e39b6683470c437d020f7f4cd054e4331f74408c097161ac6fa6ab7d536dfc6f0916362b8fca8d7a19f4fe39918da0b2196ec5fea4d80c3a47dd55a098a64
+  data.tar.gz: 44c688ddf537a88e6fec2bb5d0d40f9c13f113e830d7f8d69dd9e3edfc136ee1d8a6b70f082f5cf2bda743501ffb5692724dd37b0de0d8a49a04eac88cf3ab6d

data/CHANGELOG.md

@@ -2,9 +2,16 @@
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.5.16] - 2019-04-05
+
+### Changed
+
+* Updated OmniFocus locations code, to deal with current and future versions of OmniFocus
+* Updated gem dependencies, to address security issues.
+
 ## [0.5.15]
 
-## Changed
+### Changed
 
 * Fixed further bugs related to Rubyfocus' not being able to pick the base file from OmniFocus' local file store.
 

data/README.md

@@ -20,7 +20,7 @@ Now build and install it!
 
 ```
 gem build rubyfocus.gemspec
-gem install rubyfocus-0.5.15.gem
+gem install rubyfocus-0.5.16.gem
 ```
 
 # Usage

data/lib/rubyfocus/fetchers/local_fetcher.rb

@@ -65,18 +65,71 @@ class Rubyfocus::LocalFetcher < Rubyfocus::Fetcher
 	#---------------------------------------
 	# Location file setters and getters
 
-	# Default (non app-store) file location
+	# Where do we expect OS X to store containers?
+	def container_location
+		@container_location ||= File.join(ENV["HOME"], "Library/Containers/")
+	end
+
+	attr_writer :container_location
+
+	# Default (non app-store) file location. Will look for "com.omnigroup.Omnifocus###"
+	# (where ### is a number) and pick the most recent.
+	#
+	# If it cannot find any directories matching this pattern, will return ""
+	# (empty string). Note that File.exists?("") returns `false`.
 	def default_location
-		@default_location ||= File.join(ENV["HOME"],
-																		"/Library/Containers/com.omnigroup.OmniFocus2",
-																		"Data/Library/Application Support/OmniFocus/OmniFocus.ofocus")
+		if @default_location.nil?
+			omnifocus_directories = Dir[File.join(container_location, "com.omnigroup.OmniFocus*")]
+
+			default_omnifocus_directories = omnifocus_directories.select{ |path|
+				File.basename(path) =~ /com\.omnigroup\.OmniFocus\d+$/
+			}
+
+			if (default_omnifocus_directories.size == 0)
+				# If none match the regexp, we return ""
+				@default_location = ""
+			else
+				# Otherwise, match highest
+				last_omnifocus_directory = default_omnifocus_directories.sort().last()
+				
+				@default_location = File.join(
+					last_omnifocus_directory,
+					"Data/Library/Application Support/OmniFocus/OmniFocus.ofocus"
+				)
+			end
+		end
+
+		return @default_location
 	end
 
-	# Default app-store file location
+	# App store file location. Will look for "com.omnigroup.Omnifocus###.MacAppStore"
+	# (where ### is a number) and pick the most recent.
+	#
+	# If it cannot find any directories matching this pattern, will return ""
+	# (empty string). Note that File.exists?("") returns `false`.
 	def appstore_location
-		@appstore_location ||= File.join(ENV["HOME"],
-																			"/Library/Containers/com.omnigroup.OmniFocus2.MacAppStore",
-																			"Data/Library/Application Support/OmniFocus/OmniFocus.ofocus")
+		if @appstore_location.nil?
+			omnifocus_directories = Dir[File.join(container_location, "com.omnigroup.OmniFocus*")]
+
+			appstore_omnifocus_directories = omnifocus_directories.select{ |path|
+				File.basename(path) =~ /com\.omnigroup\.OmniFocus\d+\.MacAppStore$/
+			}
+
+			if (appstore_omnifocus_directories.size == 0)
+				# If none match the regexp, we return ""
+				@appstore_location = ""
+			else
+				# Otherwise, match highest
+				last_omnifocus_directory = appstore_omnifocus_directories.sort().last()
+				
+				@appstore_location = File.join(
+					last_omnifocus_directory,
+					"Data/Library/Application Support/OmniFocus/OmniFocus.ofocus"
+				)
+			end
+		end
+
+		return @appstore_location
 	end
 
 	# Determine location based on assigned and default values. Returns +nil+

data/rubyfocus.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README.md"]
 
   # Add runtime dependencies here
-  s.add_runtime_dependency "nokogiri", "~> 1.6", ">= 1.6.6"
-  s.add_runtime_dependency "rubyzip", "~> 1.2", ">= 1.2.1"
+  s.add_runtime_dependency "nokogiri", "~> 1.8", ">= 1.8.5"
+  s.add_runtime_dependency "rubyzip", "~> 1.2", ">= 1.2.2"
   s.add_runtime_dependency "httparty", "~> 0.13", ">= 0.13.7"
 end

data/version.txt

@@ -1 +1 @@
-0.5.15
+0.5.16

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyfocus
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.5.16
 platform: ruby
 authors:
 - Jan-Yves Ruzicka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-06 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: 1.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: 1.8.5
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Pure ruby bridge to OmniFocus.