asciidoctor-diagram-office 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a2eec6d98bfb52e75ee34bf14e2ba4f95f5d2dc
-  data.tar.gz: 46519dbfa6d0e4d709cf4cc760fea1f97065e506
+  metadata.gz: d531bf68d4aa36d2e021a6432e1fb24bb483464a
+  data.tar.gz: 1a508ce86e68b630d914108bd15648950ac4bd0a
 SHA512:
-  metadata.gz: d4d9bb9cf57eb0d4cb926a6cbf8e87388b02df9cd356d336b97730fddf9bf45e7ffe05bc30993e74ebc4d719c1fb205f6f17ff05cc56a0c5b4b1fb507cd17fe0
-  data.tar.gz: 0f35a6099deca0f41a03ab736fde1a9f3ec0c3712ad9d48ae6043178eba9ee32e5344d65222e8df348d3f35282ebf1b64f5ff4bba2fe6e3719bf7bb3941ecbf5
+  metadata.gz: 06c18b6a3ee0a5cc6bea3dd89c8f36c806af6a73e0d1c7be12116e4f9025806636daf903d835e5bf120cb11aa8b3ed017802c7fcf02119bb18508693b7b62feb
+  data.tar.gz: 04acbaebdf8e6983df3e051a33ae2358df698a2fa445fe7ac66eceea355884b23d57019358d66f202187080c4494771340f3fccce8c919904c7125e2acdd3304

data/lib/asciidoctor-diagram-office/extension.rb

@@ -1,3 +1,4 @@
+require 'timeout'
 require 'asciidoctor-diagram/extensions'
 require 'asciidoctor-diagram/util/cli'
 require 'asciidoctor-diagram/util/cli_generator'
@@ -8,10 +9,12 @@ module Asciidoctor
   module Diagram
     # @private
     module OfficeServer
-        def self.listen
+      def self.listen
         unless defined?(@office_listener) && @office_listener
-          pid = spawn('unoconv --listener')
+          pid = spawn('unoconv --listener > /dev/null 2>&1')
           thr = Process.detach(pid)
+          is_port_open?
+
           at_exit do
             begin
               Process.kill(:TERM, pid)
@@ -21,6 +24,23 @@ module Asciidoctor
           @office_listener = true
         end
       end
+
+      def self.is_port_open?()
+        begin
+          Timeout::timeout(10) do
+            begin
+              s = TCPSocket.open('localhost', 2002)
+              s.close
+              return true
+            rescue
+              sleep(1)
+              retry
+            end
+          end
+        rescue Timeout::Error
+          raise 'Failed to start office listener'
+        end
+      end
     end
 
     # @private
@@ -99,7 +119,8 @@ module Asciidoctor
       include Office
 
       def create_source(parent, target, attributes)
-        Office::Source.new(parent, apply_target_subs(parent, target), attributes)
+        image_file = parent.normalize_system_path(target, parent.attr('imagesdir'))
+        Office::Source.new(parent, image_file, attributes)
       end
     end
 
@@ -107,7 +128,8 @@ module Asciidoctor
       include Office
 
       def create_source(parent, target, attributes)
-        Office::Source.new(parent, apply_target_subs(parent, target), attributes)
+        image_file = parent.normalize_system_path(target, parent.attr('imagesdir'))
+        Office::Source.new(parent, image_file, attributes)
       end
     end
   end

data/lib/asciidoctor-diagram-office/version.rb

@@ -1,7 +1,7 @@
 module Asciidoctor
   module Diagram
     module Office
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram-office
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Hiroyuki Wada