asciidoctor-diagram 1.5.19 → 2.0.5

data/lib/asciidoctor-diagram/umlet/converter.rb

@@ -0,0 +1,33 @@
+require_relative '../diagram_converter'
+require_relative '../util/cli_generator'
+require_relative '../util/platform'
+require_relative '../util/java'
+
+module Asciidoctor
+  module Diagram
+    # @private
+    class UmletConverter
+      include DiagramConverter
+      include CliGenerator
+
+
+      def supported_formats
+        [:svg, :png, :pdf, :gif]
+      end
+
+      def convert(source, format, options)
+        java = ::Asciidoctor::Diagram::Java.java
+
+        umlet = source.find_command('umlet')
+        ext = File.extname(umlet)
+        if ext == '' || ext != '.jar'
+          umlet = File.expand_path(File.basename(umlet, '.*') + '.jar', File.dirname(umlet))
+        end
+
+        generate_file(java, 'uxf', format.to_s, source.to_s) do |tool_path, input_path, output_path|
+          [tool_path, '-jar', Platform.native_path(umlet), '-action=convert', "-format=#{format.to_s}", "-filename=#{Platform.native_path(input_path)}", "-output=#{Platform.native_path(output_path)}"]
+        end
+      end
+    end
+  end
+end

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

@@ -1,36 +1,14 @@
-require_relative '../extensions'
-require_relative '../util/cli_generator'
-require_relative '../util/platform'
-require_relative '../util/which'
+require_relative '../diagram_processor'
+require_relative 'converter'
 
 module Asciidoctor
   module Diagram
-    # @private
-    module Umlet
-      include CliGenerator
-      include Which
-
-      def self.included(mod)
-        [:svg, :png, :pdf, :gif].each do |f|
-          mod.register_format(f, :image) do |parent, source|
-            umlet(parent, source, f)
-          end
-        end
-      end
-
-      def umlet(parent, source, format)
-        generate_file(which(parent, 'umlet'), 'uxf', format.to_s, source.to_s) do |tool_path, input_path, output_path|
-          [tool_path, '-action=convert', "-format=#{format.to_s}", "-filename=#{Platform.native_path(input_path)}", "-output=#{Platform.native_path(output_path)}"]
-        end
-      end
-    end
-
-    class UmletBlockProcessor < Extensions::DiagramBlockProcessor
-      include Umlet
+    class UmletBlockProcessor < DiagramBlockProcessor
+      use_converter UmletConverter
     end
 
-    class UmletBlockMacroProcessor < Extensions::DiagramBlockMacroProcessor
-      include Umlet
+    class UmletBlockMacroProcessor < DiagramBlockMacroProcessor
+      use_converter UmletConverter
     end
   end
 end

data/lib/asciidoctor-diagram/util/cli.rb

@@ -9,7 +9,7 @@ module Asciidoctor
         require_relative 'java'
 
         def self.run(*args)
-          opts = args.pop if args.last.is_a? Hash
+          opts = args.pop.dup if args.last.is_a? Hash
           in_data = opts && opts[:stdin_data]
 
           pb = java.lang.ProcessBuilder.new(*args)
@@ -61,12 +61,23 @@ module Asciidoctor
         require 'open3'
 
         def self.run(*args)
-          stdout, stderr, status = Open3.capture3(*args)
+          if Hash === args.last
+            opts = args.pop.dup
+          else
+            opts = {}
+          end
+
+          # When the first argument is an array, we force capture3 (or better the underlying Kernel#spawn)
+          # to use a non-shell execution variant.
+          cmd = File.basename(args[0])
+          args[0] = [args[0], cmd]
+
+          stdout, stderr, status = Open3.capture3(*args, opts)
 
           exit = status.exitstatus
 
           if exit != 0
-            raise "#{File.basename(args[0])} failed: #{stdout.empty? ? stderr : stdout}"
+            raise "#{cmd} failed: #{stdout.empty? ? stderr : stdout}"
           end
 
           {

data/lib/asciidoctor-diagram/util/cli_generator.rb

@@ -1,3 +1,4 @@
+require 'asciidoctor/logging'
 require 'tempfile'
 require_relative 'cli'
 
@@ -5,6 +6,8 @@ module Asciidoctor
   module Diagram
     # @private
     module CliGenerator
+      include Asciidoctor::Logging
+
       def generate_stdin(tool, format, code)
         tool_name = File.basename(tool)
 
@@ -26,7 +29,7 @@ module Asciidoctor
         else
           opts = [tool]
         end
-        generate(opts, :stdout, :stdin_data => code)
+        generate(opts, :stdout, :stdin_data => code, :binmode => true)
       end
 
       def generate_file(tool, input_ext, output_ext, code)
@@ -51,6 +54,20 @@ module Asciidoctor
         end
       end
 
+      def generate_file_stdout(tool, input_ext, code)
+        tool_name = File.basename(tool)
+
+        source_file = Tempfile.new([tool_name, ".#{input_ext}"])
+        begin
+          File.write(source_file.path, code)
+
+          opts = yield tool, source_file.path
+          generate(opts, :stdout)
+        ensure
+          source_file.unlink
+        end
+      end
+
       private
       def generate(opts, target_file, open3_opts = {})
         case opts
@@ -64,6 +81,7 @@ module Asciidoctor
             raise "Block passed to generate_file should return an Array or a Hash"
         end
 
+        logger.debug "Executing #{args} with options #{open3_opts}"
         result = ::Asciidoctor::Diagram::Cli.run(*args, open3_opts)
 
         data = target_file == :stdout ? result[:out] : read_result(target_file, out_file)

data/lib/asciidoctor-diagram/util/gif.rb

@@ -7,14 +7,14 @@ module Asciidoctor
       GIF87A_SIGNATURE = 'GIF87a'.force_encoding(Encoding::ASCII_8BIT)
       GIF89A_SIGNATURE = 'GIF89a'.force_encoding(Encoding::ASCII_8BIT)
 
-      def self.get_image_size(data)
+      def self.post_process_image(data)
         bio = BinaryIO.new(data)
         gif_signature = bio.read_string(6)
         raise "Invalid GIF signature" unless gif_signature == GIF87A_SIGNATURE || gif_signature == GIF89A_SIGNATURE
 
         width = bio.read_uint16_le
         height = bio.read_uint16_le
-        [width, height]
+        [data, width, height]
       end
     end
   end

data/lib/asciidoctor-diagram/util/java.rb

@@ -6,7 +6,7 @@ module Asciidoctor
     module Java
       def self.classpath
         @classpath ||= [
-            File.expand_path(File.join('../..', 'server-1.3.13.jar'), File.dirname(__FILE__))
+            File.expand_path(File.join('../..', 'server-1.3.15.jar'), File.dirname(__FILE__))
         ]
       end
 
@@ -88,6 +88,119 @@ module Asciidoctor
           raise "#{prefix_msg}: #{response[:reason]}"
         end
       end
+
+      def self.java
+        @java_exe ||= find_java
+        raise "Could not find Java executable" unless @java_exe
+        @java_exe
+      end
+
+      private
+      def self.find_java
+        case ::Asciidoctor::Diagram::Platform.os
+          when :windows
+            path_to(ENV['JAVA_HOME'], 'bin/java.exe') || registry_lookup || ::Asciidoctor::Diagram::Which.which('java')
+          when :macosx
+            path_to(ENV['JAVA_HOME'], 'bin/java') || path_to(::Asciidoctor::Diagram::Cli.run('/usr/libexec/java_home')[:out].strip, 'bin/java') || ::Asciidoctor::Diagram::Which.which('java')
+          else
+            path_to(ENV['JAVA_HOME'], 'bin/java') || ::Asciidoctor::Diagram::Which.which('java')
+        end
+      end
+
+      def self.path_to(java_home, java_binary)
+        exe_path = File.expand_path(java_binary, java_home)
+        if File.executable?(exe_path)
+          exe_path
+        else
+          nil
+        end
+      end
+
+      JDK_KEY = 'HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit'
+      JRE_KEY = 'HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment'
+
+      def self.registry_lookup
+        registry_current(JRE_KEY) || registry_current(JDK_KEY) || registry_any()
+      end
+
+      def self.registry_current(key)
+        current_version = registry_query(key, 'CurrentVersion')
+        if current_version
+          java_home = registry_query("#{key}\\#{current_version}", 'JavaHome')
+          java_exe(java_home)
+        else
+          nil
+        end
+      end
+
+      def self.registry_any()
+        java_homes = registry_query('HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft', 'JavaHome', :recursive => true).values
+        java_homes.map { |path| java_exe(path) }.find { |exe| !exe.nil? }
+      end
+
+      def self.java_exe(java_home)
+        java = File.expand_path('bin/java.exe', java_home)
+
+        if File.executable?(java)
+          java
+        else
+          nil
+        end
+      end
+
+      def self.registry_query(key, value = nil, opts = {})
+        args = ['reg', 'query']
+        args << key
+        args << '/v' << value unless value.nil?
+        args << '/s' if opts[:recursive]
+
+        begin
+          lines = ::Asciidoctor::Diagram::Cli.run(*args)[:out].lines.reject { |l| l.strip.empty? }.each
+        rescue
+          lines = [].each
+        end
+
+        result = {}
+
+        while true
+          begin
+            begin
+              k = lines.next
+            rescue StopIteration
+              break
+            end
+
+            unless k.start_with? key
+              next
+            end
+
+            v = nil
+            begin
+              v = lines.next.strip if lines.peek.start_with?(' ')
+            rescue StopIteration
+              break
+            end
+
+            if !k.valid_encoding? || (v && !v.valid_encoding?)
+              next
+            end
+
+            if v && (md = /([^\s]+)\s+(REG_[^\s]+)\s+(.+)/.match(v))
+              v_name = md[1]
+              v_value = md[3]
+              result["#{k}\\#{v_name}"] = v_value
+            else
+              result[k] = v
+            end
+          end
+        end
+
+        if value && !opts[:recursive]
+          result.values[0]
+        else
+          result
+        end
+      end
     end
   end
 end

data/lib/asciidoctor-diagram/util/java_socket.rb

@@ -9,28 +9,25 @@ module Asciidoctor
     # @private
     module Java
       class CommandServer
-        attr_reader :port
-
         def initialize(java, classpath)
           args = []
           args << '-Djava.awt.headless=true'
           args << '-Djava.net.useSystemProxies=true'
           args << '-cp'
           args << classpath.flatten.map { |jar| ::Asciidoctor::Diagram::Platform.host_os_path(jar).strip }.join(::Asciidoctor::Diagram::Platform.host_os_path_separator)
-          args << 'org.asciidoctor.diagram.CommandServer'
+          args << 'org.asciidoctor.diagram.StdInOutCommandServer'
 
-          @server = IO.popen([java, *args])
-          @port = @server.readline.strip.to_i
-          @client = TCPSocket.new 'localhost', port
+          @server = IO.popen([java, *args], 'r+b')
         end
 
         def io
-          @client
+          @server
         end
 
         def shutdown
           # KILL is a bit heavy handed, but TERM does not seem to shut down the JVM on Windows.
           Process.kill('KILL', @server.pid)
+          @server.close
         end
       end
 
@@ -44,11 +41,8 @@ module Asciidoctor
       end
 
       def self.instance
-        @java_exe ||= find_java
-        raise "Could not find Java executable" unless @java_exe
-
         unless defined?(@command_server) && @command_server
-          server = CommandServer.new(@java_exe, classpath)
+          server = CommandServer.new(java, classpath)
           @command_server = server
           at_exit do
             server.shutdown
@@ -60,118 +54,12 @@ module Asciidoctor
 
       def self.send_request(req)
         svr = instance
-        headers = req[:headers] ||= {}
-        headers['Host'] = "localhost:#{svr.port}"
+        req[:headers] ||= {}
+        # headers = req[:headers] ||= {}
+        # headers['Host'] = "localhost:#{svr.port}"
         format_request(req, svr.io)
         parse_response(svr.io)
       end
-
-      private
-      def self.find_java
-        case ::Asciidoctor::Diagram::Platform.os
-          when :windows
-            path_to(ENV['JAVA_HOME'], 'bin/java.exe') || registry_lookup || ::Asciidoctor::Diagram::Which.which('java')
-          when :macosx
-            path_to(ENV['JAVA_HOME'], 'bin/java') || path_to(::Asciidoctor::Diagram::Cli.run('/usr/libexec/java_home')[:out].strip, 'bin/java') || ::Asciidoctor::Diagram::Which.which('java')
-          else
-            path_to(ENV['JAVA_HOME'], 'bin/java') || ::Asciidoctor::Diagram::Which.which('java')
-        end
-      end
-
-      def self.path_to(java_home, java_binary)
-        exe_path = File.expand_path(java_binary, java_home)
-        if File.executable?(exe_path)
-          exe_path
-        else
-          nil
-        end
-      end
-
-      JDK_KEY = 'HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit'
-      JRE_KEY = 'HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment'
-
-      def self.registry_lookup
-        registry_current(JRE_KEY) || registry_current(JDK_KEY) || registry_any()
-      end
-
-      def self.registry_current(key)
-        current_version = registry_query(key, 'CurrentVersion')
-        if current_version
-          java_home = registry_query("#{key}\\#{current_version}", 'JavaHome')
-          java_exe(java_home)
-        else
-          nil
-        end
-      end
-
-      def self.registry_any()
-        java_homes = registry_query('HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft', 'JavaHome', :recursive => true).values
-        java_homes.map { |path| java_exe(path) }.find { |exe| !exe.nil? }
-      end
-
-      def self.java_exe(java_home)
-        java = File.expand_path('bin/java.exe', java_home)
-
-        if File.executable?(java)
-          java
-        else
-          nil
-        end
-      end
-
-      def self.registry_query(key, value = nil, opts = {})
-        args = ['reg', 'query']
-        args << key
-        args << '/v' << value unless value.nil?
-        args << '/s' if opts[:recursive]
-
-        begin
-          lines = ::Asciidoctor::Diagram::Cli.run(*args)[:out].lines.reject { |l| l.strip.empty? }.each
-        rescue
-          lines = [].each
-        end
-
-        result = {}
-
-        while true
-          begin
-            begin
-              k = lines.next
-            rescue StopIteration
-              break
-            end
-
-            unless k.start_with? key
-              next
-            end
-
-            v = nil
-            begin
-              v = lines.next.strip if lines.peek.start_with?(' ')
-            rescue StopIteration
-              break
-            end
-
-            if !k.valid_encoding? || (v && !v.valid_encoding?)
-              next
-            end
-
-            if v && (md = /([^\s]+)\s+(REG_[^\s]+)\s+(.+)/.match(v))
-              v_name = md[1]
-              v_value = md[3]
-              result["#{k}\\#{v_name}"] = v_value
-            else
-              result[k] = v
-            end
-          end
-        end
-
-        if value && !opts[:recursive]
-          result.values[0]
-        else
-          result
-        end
-      end
     end
   end
 end