asciidoctor-diagram 1.3.0.preview.2 → 1.3.0.preview.3

data/CHANGELOG.adoc

@@ -11,6 +11,11 @@ Enhancements::
   * Updated PlantUML to revision 8004 (23/08/2014)
   * Remove dependency on RJB to simplify installation
 
+Bug Fixes::
+
+  * Issue #49: Resolve issue that made Java 6 installation prompt appear on Mac OS X
+  * Issue #51: Resolved issue where PNG files generated by Graphviz were not processed correctly on Windows
+
 == 1.2.0
 
 Enhancements::

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

@@ -18,7 +18,9 @@ module Asciidoctor
             :body => code
         )
 
-        raise "Ditaa image generation failed: #{response[:reason]}" unless response[:code] == 200
+        unless response[:code] == 200
+          raise "Ditaa image generation failed: #{response[:reason]} #{response[:body]}"
+        end
 
         response[:body]
       end

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

@@ -31,7 +31,9 @@ module Asciidoctor
             :headers => headers
         )
 
-        raise "PlantUML image generation failed: #{response[:reason]}" unless response[:code] == 200
+        unless response[:code] == 200
+          raise "PlantUML image generation failed: #{response[:reason]} #{response[:body]}"
+        end
 
         response[:body]
       end

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

@@ -31,7 +31,7 @@ module Asciidoctor
 
           raise "#{tool} image generation failed" unless result_code == 0
 
-          File.read(target_file.path)
+          File.read(target_file.path, :mode => 'rb')
         ensure
           target_file.unlink
         end

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

@@ -24,6 +24,11 @@ module Asciidoctor
         def io
           @client
         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)
+        end
       end
 
       def self.load
@@ -31,18 +36,27 @@ module Asciidoctor
           return
         end
 
-        command_server
+        instance
         @loaded = true
       end
 
-      def self.command_server
+      def self.instance
         @java_exe ||= find_java
         raise "Could not find Java executable" unless @java_exe
-        @command_server ||= CommandServer.new(@java_exe, classpath)
+
+        unless @command_server
+          server = CommandServer.new(@java_exe, classpath)
+          @command_server = server
+          at_exit do
+            server.shutdown
+          end
+        end
+
+        @command_server
       end
 
       def self.send_request(req)
-        svr = command_server
+        svr = instance
         headers = req[:headers] ||= {}
         headers['Host'] = "localhost:#{svr.port}"
         format_request(req, svr.io)

data/lib/asciidoctor-diagram/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Diagram
-    VERSION = "1.3.0.preview.2"
+    VERSION = "1.3.0.preview.3"
   end
 end

data/spec/test_helper.rb

@@ -30,7 +30,7 @@ module Asciidoctor
 end
 
 RSpec.configure do |c|
-  TEST_DIR = 'testing'
+  TEST_DIR = File.expand_path('testing')
 
   c.before(:suite) do
     FileUtils.rm_r TEST_DIR if Dir.exists? TEST_DIR
@@ -45,12 +45,8 @@ RSpec.configure do |c|
     test_dir = File.expand_path(metadata[:description].gsub(/[^\w]+/, '_'), group_dir)
     Dir.mkdir(test_dir)
 
-    old_wd = Dir.pwd
-    Dir.chdir test_dir
-    begin
+    Dir.chdir(test_dir) do
       example.run
-    ensure
-      Dir.chdir old_wd
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-diagram
 version: !ruby/object:Gem::Version
-  version: 1.3.0.preview.2
+  version: 1.3.0.preview.3
   prerelease: 6
 platform: ruby
 authors: