word-to-markdown 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9de91d876eb8b4dd4b895c3a36240cb270891592
-  data.tar.gz: 7a671dd33ed9faa1cab5e14cef87da8be3a34f61
+  metadata.gz: 938db70eb63b1d41df9281525cfb0334b6c1ecec
+  data.tar.gz: 5408876edb42f47971a4344035a66e3bb855ccd0
 SHA512:
-  metadata.gz: 220ba6079d8383d369601a84ab32f278deb63ec498317b1b77c60208e8fa16ae9317ed57ce6bb9db9164ecc85ac759eeabe0dc95239e4b993dd777ba32c79c12
-  data.tar.gz: 34a838bfb0f659c3cc6a70b3488d01fba8f4b5f69097ba760c06ead8df31e50c05095f0d2e1a178ea9b5eedcff8551a32a1ff8ccb6e421016db21367df5b690a
+  metadata.gz: c653fc5026f8fc2a0df92c1d4e6ca8d8c84f7bc70ea03ddfc0e9aca8e27b1d9a2b37e8d2f3b9ba50c775821551af654ee91e371000adef5ba64ab8df562c63d2
+  data.tar.gz: 60310ffd328fa13ef5187e46950c36906e11fcf3ba5190c469d10840829efe084cbd8b1513c1e1c8ea212d251ae6aed235bda224cc81e3e8d4ba734dfc462037

data/bin/w2m

@@ -9,7 +9,7 @@ end
 
 if ARGV[0] == "--version"
   puts "WordToMarkdown v#{WordToMarkdown::VERSION}"
-  puts "LibreOffice v#{WordToMarkdown.soffice.version}"
+  puts "LibreOffice v#{WordToMarkdown.soffice.version}" unless Gem.win_platform?
 else
   doc = WordToMarkdown.new ARGV[0]
   puts doc.to_s

data/lib/cliver/dependency_ext.rb

@@ -20,12 +20,13 @@ module Cliver
     # Returns the version of the resolved dependency
     def version
       return @detected_version if defined? @detected_version
+      return if Gem.win_platform?
       version = installed_versions.find { |p, v| p == path }
       @detected_version = version.nil? ? nil : version[1]
     end
 
     def major_version
-      version.split(".").first
+      version.split(".").first if version
     end
   end
 end

data/lib/word-to-markdown.rb

@@ -27,10 +27,11 @@ class WordToMarkdown
   SOFFICE_VERSION_REQUIREMENT = '> 4.0'
 
   PATHS = [
+    "*", # Sub'd for ENV["PATH"]
     "~/Applications/LibreOffice.app/Contents/MacOS",
     "/Applications/LibreOffice.app/Contents/MacOS",
-    "/C/Program Files (x86)/LibreOffice 5/program",
-    "/C/Program Files (x86)/LibreOffice 4/program"
+    "/Program Files/LibreOffice 5/program",
+    "/Program Files (x86)/LibreOffice 4/program"
   ]
 
   # Create a new WordToMarkdown object
@@ -49,7 +50,7 @@ class WordToMarkdown
 
     output, status = Open3.capture2e(soffice.path, *args)
     logger.debug output
-    raise "Command `#{soffice_path} #{args.join(" ")}` failed: #{output}" if status.exitstatus != 0
+    raise "Command `#{soffice.path} #{args.join(" ")}` failed: #{output}" if status.exitstatus != 0
     output
   end
 
@@ -62,10 +63,7 @@ class WordToMarkdown
   #   version - returns the resolved version
   #   open    - is the dependency currently open/running?
   def self.soffice
-    @@soffice_dependency ||= Cliver::Dependency.new(
-      "soffice", SOFFICE_VERSION_REQUIREMENT,
-      :path => "*:" + PATHS.join(":")
-    )
+    @@soffice_dependency ||= Cliver::Dependency.new("soffice", *soffice_dependency_args)
   end
 
   def self.logger
@@ -84,4 +82,20 @@ class WordToMarkdown
   def to_s
     document.to_s
   end
+
+  private
+
+  # Workaround for two upstream bugs:
+  # 1. `soffice.exe --version` on windows opens a popup and retuns a null string when manually closed
+  # 2. Even if the second argument to Cliver is nil, Cliver thinks there's a requirement
+  #    and will shell out to `soffice.exe --version`
+  # In order to support Windows, don't pass *any* version requirement to Cliver
+  def self.soffice_dependency_args
+    args = [:path => PATHS.join(File::PATH_SEPARATOR)]
+    if Gem.win_platform?
+      args
+    else
+      args.unshift SOFFICE_VERSION_REQUIREMENT
+    end
+  end
 end

data/lib/word-to-markdown/version.rb

@@ -1,3 +1,3 @@
 class WordToMarkdown
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: word-to-markdown
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-26 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reverse_markdown
@@ -217,3 +217,4 @@ signing_key:
 specification_version: 4
 summary: Ruby Gem to convert Word documents to markdown
 test_files: []
+has_rdoc: