dply 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96fbfcce3c8a2e5404e890de41d56654318486f72f3e75ff66bf66e581ebaa12
-  data.tar.gz: 6d392dcfabfe8baa40b4dd70d0edfd54f12c907d3061a04b9c6f372dd8a64ce9
+  metadata.gz: 55d99894e3da7af050da5f7d13dedc375da33bdc8caac7b14f96b67f17d83c13
+  data.tar.gz: ecd98f89af7c815d424058ecd155af05b0f4b1a7595d00129b1dd011f503914d
 SHA512:
-  metadata.gz: 5fa9c1f8a344b3a76c4bde61b659c593be22c40cc3c4b4fdf7780efafe39602c64fe2b097e7500f39f0bf308df2f8790fdf6dcecd826681e2a5b81f8ccd18914
-  data.tar.gz: 182bd7d26be2e2ed0138f419e972480ddd1a556d763d96d297c54d8b6d90d8426606ae5164d54d62ab2fa8f51366a51e31c4b07a74d28ff4c48de0edae305741
+  metadata.gz: 3d90ae8db5c66c444a3094846da3697a79ab2a79be253973472af1cf8129e411bc0df0a60ad74d2469586fbe9b182617faefb5461a9c3e189755b38edeccf2be
+  data.tar.gz: 37d6c1efb5c13c311bbc081e22ee5c9aa923c431371e55a110f1fb8ab4361979d72611bc897a424df7f550201dca587437ccf02a373df96a3c7a0f49d5fcc25d

data/dev_exe/dplyr

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
-load __dir__ + '/../bin/dplyr'
+load __dir__ + '/../exe/dplyr'

data/lib/dply/version.rb

@@ -1,3 +1,3 @@
 module Dply
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end

data/lib/dplyr/remote_task.rb

@@ -1,5 +1,4 @@
 require 'pty'
-require 'dplyr/report'
 require 'dply/logger'
 
 module Dplyr
@@ -9,26 +8,43 @@ module Dplyr
 
     attr_reader :exit_status, :messages
 
-    def initialize(host, task, id_size: nil)
+    SSH_OPTS = %w(-oBatchMode=yes -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null)
+
+    def initialize(host, task, id_size:)
       @host = host
       @task = task
+      @id = host[:id]
       @messages = []
-      @id_size = id_size || @host_info[:id].size
+      @id_size = id_size
     end
 
     def run
       reset!
-      r, w, pid = PTY.spawn(remote_cmd)
-      pty_read(r, @host[:id])
+      copy_application_yml
+      r, w, pid = spawn_remote_cmd
+      pty_read r
       @exit_status = get_exit_status pid
     end
 
-    def remote_cmd
+    def copy_application_yml
+      src = "config/application.yml"
+      dest = "#{user}@#{addr}:#{dir}/config/application.yml"
+      return if not File.exist? src
+      hprint "copying application.yml\n"
+      command = ["scp", "-q", *SSH_OPTS, src, dest]
+      system *command, exception: true
+    end
+
+    def spawn_remote_cmd
       if logger.debug?
-        %(#{ssh} -l #{user} #{addr} '#{env} drake --remote --debug -d #{dir} #{@task} 2>&1')
+        script = %(#{env} drake --remote --debug -d #{dir} #{@task} 2>&1)
+        err = :out
       else
-        %(#{ssh} -l #{user} #{addr} '#{env} drake --remote -d #{dir} #{@task} 2>&1' 2>/dev/null)
+        script = %(#{env} drake --remote -d #{dir} #{@task} 2>&1)
+        err = "/dev/null"
       end
+      command = ["ssh", "-tt", *SSH_OPTS, "-l", user, addr, script]
+      PTY.spawn(*command, err: err)
     end
 
     def user
@@ -47,16 +63,12 @@ module Dplyr
       @host.fetch :roles
     end
     
-    def ssh
-      "ssh -tt -o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
-    end
-
-    def pty_read(file, id)
+    def pty_read(file)
       file.each do |line|
         if line =~ /\Adply_msg\|/
           receive_message line
         else
-          printf output_template, id, line
+          hprint line
         end
       end
     rescue EOFError,Errno::ECONNRESET, Errno::EPIPE, Errno::EIO => e
@@ -80,6 +92,10 @@ module Dplyr
       end
     end
 
+    def hprint(message)
+      printf output_template, @id, message
+    end
+
     def reset!
       @output_template = nil
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dply
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-elf