r2pipe 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5815400a10873eee220bb59709c3b33c0b507bc3
-  data.tar.gz: a3d828c7554e137e3091f923b1e348c0b9d8ae3b
+  metadata.gz: e1e048fe24dc8e38356d453a75803a4906b2dffc
+  data.tar.gz: 283e2241a8fb7267b63e1ab956818221fceb9758
 SHA512:
-  metadata.gz: 6cc2d21f5ad3b466fd382b3da39f8b2599ae9544c661a9e92b4dce62e830a173db6ef263bc9bd3d27d243f0ed91ca6c3c94f62904127bdf55a07bed2c535ccad
-  data.tar.gz: 36fd14b1bea6bd8e46de3cd26e640a896f3e9f4c7be4e111bd7fff5713c9c1c511d5fbdf3196db9d96fda31f7721fd1db532df15bb6f3cd7a839082fd7991720
+  metadata.gz: a8e12867c675f1c80c7b69f18a8b3eb72265620a665f8b08326ed82c4d475818e98c99deb7056ddce4f8e89d415be863b25206e856e81a9c778fc3096a4b001c
+  data.tar.gz: dcf8a38e152ac7c71310e3a97b64226010c66936fbe5fcfc107e2db0ae9e9b1c90d3c9837bb57e88dcfa5334e401915502e428c8cccb9d169759b5d4f5ac8caa

data/lib/r2pipe.rb

@@ -10,22 +10,13 @@ require 'shellwords'
 class R2Pipe
   def initialize(file = nil)
     @file = file
-    if file == nil
-      fdIn = ENV['R2PIPE_IN'].to_i
-      fdOut = ENV['R2PIPE_OUT'].to_i
-      if fdIn < 1 or fdOut < 1
-        raise 'Cannot find R2PIPE_IN and R2PIPE_OUT environment variables'
-      end
-      @read = IO.new(fdIn, 'r')
-      @write = IO.new(fdOut, 'w')
+    if file.nil?
+      fd_in, fd_out = getfds
+      @read = IO.new(fd_in, 'r')
+      @write = IO.new(fd_out, 'w')
       @pid = -1
     else
-      exec = "radare2 -q0 #{Shellwords.shellescape file} 2>/dev/null"
-      write, read, wait_thr = Open3.popen2(exec)
-      @read = read
-      @write = write
-      @pid = wait_thr.pid
-      @read.gets("\0")
+      execute file
     end
   end
 
@@ -43,14 +34,35 @@ class R2Pipe
     cmd('q!')
     @read.close
     @write.close
-    if @pid != -1
-      ::Process.wait @pid
-    end
+    return if @pid == -1
+
+    ::Process.wait @pid
   end
 
   def json(str)
-    if str != nil
-      JSON.parse str.sub("\n", '').sub("\r", '')
+    return if str.nil?
+
+    JSON.parse str.sub("\n", '').sub("\r", '')
+  end
+
+  private
+
+  def getfds
+    fd_in = ENV['R2PIPE_IN'].to_i
+    fd_out = ENV['R2PIPE_OUT'].to_i
+    if fd_in < 1 || fd_out < 1
+      raise 'Cannot find R2PIPE_IN and R2PIPE_OUT environment variables'
     end
+
+    [fd_in, fd_out]
+  end
+
+  def execute(file)
+    exec = "radare2 -q0 #{Shellwords.shellescape file} 2>/dev/null"
+    write, read, wait_thr = Open3.popen2(exec)
+    @read = read
+    @write = write
+    @pid = wait_thr.pid
+    @read.gets("\0")
   end
 end

data/lib/r2pipe/version.rb

@@ -1,3 +1,3 @@
 module R2pipe
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r2pipe
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jeffrey Crowell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler