inkmake 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca9c896579e7dd74d63c5f03efcebb6666e3049f6655004c7839be1d45925b6b
-  data.tar.gz: d96de1bafece36491faee72746f3b6769d054c9f5a43d1342150d473161ec343
+  metadata.gz: e8f974d5799a2dad944fc34bc8ff9ee6357493f19166ccdf8baa93db3e76dac3
+  data.tar.gz: 03777d34d7aa798e57cb6f7a3ea55300284157c424636aa551ee6502eb9f4ddd
 SHA512:
-  metadata.gz: 5557f546572722207bb1206cb57636bec0f77d86b8499bc5e42091c6e4409fe360fcfd8ebc7e622f92b156ccded91f971958f77333eebc695bfe1665e4f7b602
-  data.tar.gz: 86575e60b47f87296960c0724675a2a4e776cfd8f7e6b6f4b02580e248d4675b63faac8bb05e9fe41c145407aa3e9a6017f329bfaeed4da1ee1e89a69780c65a
+  metadata.gz: ddf8cdeefbfbf3b7f3aff2cfcebfb48cc8f6916d96f56794fabec3470e9e382fa12eeb65c14a016aeb0c12406542ba98255d62c8c677979166f531abcf1cd5c7
+  data.tar.gz: f68bb1b2b9229aee3d8f64038dfcccf5ea615b2770115419e049741c9ce31b77ceefca1801afef005feae83f3a683ee1ff4f73d5db67d48827ded5754289b0cf

data/lib/inkmake.rb

@@ -139,8 +139,26 @@ class Inkmake
       end
     end
 
-    def open_shell
-      @in, @out = open(["--shell"])
+    def response
+      if @inkscape_version == 0
+        o = @out.getc
+        if o == ">"
+          puts "1> #{o}" if Inkmake.verbose
+          return :prompt;
+        end
+      else
+        o = @out.getc + @out.getc
+        if o == "> "
+          puts "1> #{o}" if Inkmake.verbose
+          return :prompt;
+        end
+      end
+      o = o + @out.readline
+      puts "2> '#{o}'" if Inkmake.verbose
+      o
+    end
+
+    def wait_prompt
       loop do
         case response
         when :prompt then break
@@ -148,6 +166,11 @@ class Inkmake
       end
     end
 
+    def open_shell
+      @in, @out = open(["--shell"])
+      wait_prompt
+    end
+
     def command0(args)
       c = args.collect do |key, value|
         if value
@@ -174,25 +197,6 @@ class Inkmake
       @in.flush
     end
 
-    def response
-      if @inkscape_version == 0
-        o = @out.read(1)
-        if o == ">"
-          puts "1> #{o}" if Inkmake.verbose
-          return :prompt;
-        end
-      else
-        o = @out.read(2)
-        if o == "> "
-          puts "1> #{o}" if Inkmake.verbose
-          return :prompt;
-        end
-      end
-      o = o + @out.readline
-      puts "2> #{o}" if Inkmake.verbose
-      o
-    end
-
     def probe_inkscape_version
       _in, out = open(["--version"])
       version = 0
@@ -278,7 +282,7 @@ class Inkmake
       end
       c.each do |a|
         command1([a])
-        response
+        wait_prompt
       end
 
       command1([["export-do"]])
@@ -292,7 +296,7 @@ class Inkmake
         end
       end
       command1([["file-close"]])
-      response
+      wait_prompt
 
       [width, height]
     end
@@ -314,7 +318,7 @@ class Inkmake
         })
       else
         command1([["file-open", file]])
-        response
+        wait_prompt
         command1([["query-all", file]])
       end
       loop do
@@ -325,7 +329,7 @@ class Inkmake
       end
       if @inkscape_version == 1 then
         command1([["file-close", file]])
-        response
+        wait_prompt
       end
       ids
     end
@@ -360,7 +364,9 @@ class Inkmake
         (["/Applications/Inkscape.app/Contents/MacOS/inkscape",
           "/Applications/Inkscape.app/Contents/Resources/bin/inkscape",
           'c:\Program Files\Inkscape\inkscape.exe',
-          'c:\Program Files (x86)\Inkscape\inkscape.exe'] +
+          'c:\Program Files\Inkscape\bin\inkscape.exe',
+          'c:\Program Files (x86)\Inkscape\inkscape.exe',
+          'c:\Program Files (x86)\Inkscape\bin\inkscape.exe'] +
           (ENV['PATH'].split(':').map {|p| File.join(p, "inkscape")}))
         .select do |path|
           File.exists? path
@@ -453,10 +459,11 @@ class Inkmake
 
     def parse_split_line(line)
       # changed CSV API in ruby 1.9
+      # - [nil] to remove empty fields
       if RUBY_VERSION.start_with? "1.8"
-        CSV::parse_line(line, fs = " ")
+        CSV::parse_line(line, fs = " ") - [nil]
       else
-        CSV::parse_line(line, **{:col_sep => " "})
+        CSV::parse_line(line, **{:col_sep => " "}) - [nil]
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inkmake
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Mattias Wadman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: mattias.wadman@gmail.com