remote_sh 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 704e7c8b84ebc598cc5e4d4859c401c88a4966ae5bebe4816169fd2cfc07d11e
-  data.tar.gz: 44a46d576571e529cec100b914c4c377ed0c7c39d289bef9d3e21577d91b1ac0
+  metadata.gz: 97bb90de5d65095a12854843df61d54b9e08e774c1b2cab1ddf19d289f76319f
+  data.tar.gz: ab9932f0a7c2817c9b55f193e97f22ef71600a23187d8b8929bbb3f00fa3b565
 SHA512:
-  metadata.gz: be962d6ac6e1e2ac3c3d270c0234177c5f547f6a0452564f3eedc8de34fbc5366d932f5bd9fdb871613f2a96de7ca1d2144622064ce5a0cd843fe967d6a7d69d
-  data.tar.gz: 785be7983d082f0481999c8e8c15e3096b34242cc18cef87d9c83f91cf446e0b5753d1145dafe10240e6eabcde02975d9bd92735982f51f002903e41e89e3b51
+  metadata.gz: ccfc0c0500546a57bed1183036c0953ecc7e0ef99c787b1c079bdfa4b862590c04e152b1b50b5190eafb476904db8a35ecaa639dcc8e7e07c6b16e22d222b014
+  data.tar.gz: b8dcd2b9ed962a7a09294f4bbb211d50b7382c53e67e3386b24c946ce2f2ba9e7d53d58b750eb46b2e0a591310e010db0b695ce882db14906d8d539e535244cd

data/lib/remote_sh/cli.rb

@@ -33,6 +33,7 @@ module RemoteSh
     ensure
       File.delete(pid_filename) if @owns_sync
     end
+    map 'a' => :attach
 
     desc "sync_down", "synces down remote changes"
     def sync_down
@@ -44,9 +45,38 @@ module RemoteSh
       )
     end
 
+    desc "sync_up", "synces up local changes"
+    def sync_up
+      RsyncHelper.up(
+        WorkspaceConfiguration::WOKRING_DIR,
+        WorkspaceConfiguration.config["host_path"],
+        WorkspaceConfiguration.host_config["host"],
+        WorkspaceConfiguration.config["ignore"] || []
+      )
+    end
+
+    desc "exec", "executes given command within remote context"
+    def exec(*argv)
+      sync_up
+      host = WorkspaceConfiguration.host_config["host"]
+      host_path = WorkspaceConfiguration.config["host_path"]
+      SshHelper.exec(host, host_path, argv)
+      sync_down
+    end
+    map 'e' => :exec
+
     desc "init", "inits"
     def init
       WorkspaceConfiguration.init!
     end
+
+    desc "port_forward", "ssh and port_forward"
+    def port_forward
+      host = WorkspaceConfiguration.host_config["host"]
+      host_path = WorkspaceConfiguration.config["host_path"]
+      PortForwarder.start_or_skip(WorkspaceConfiguration.host_config)
+      SshHelper.attach(host, host_path)
+    end
+    map 'pf' => :port_forward
   end
 end

data/lib/remote_sh/file_syncer.rb

@@ -20,10 +20,22 @@ module RemoteSh
         Filewatcher.new("#{local_path}/**/{.[^\.]*,*}", interval: 1).watch do |_changes|
           if @sync_side == :client || @sync_side.nil?
             mutex.synchronize do
-              @sync_side = :client
-              RsyncHelper.up(local_path, host_path, host, ignored_files)
+              @sync_side = :clientA
+              begin
+                RsyncHelper.up(local_path, host_path, host, ignored_files)
+                @up_requested = false
+              rescue
+                @up_requested = true
+              end
               do_after_timeout(1) do
-                mutex.synchronize { @sync_side = nil }
+                begin
+                  RsyncHelper.up(local_path, host_path, host, ignored_files) if @up_requested
+                rescue
+                end
+
+                mutex.synchronize do
+                  @sync_side = nil
+                end
               end
             end
           end
@@ -89,8 +101,17 @@ module RemoteSh
           if @sync_side == :server || @sync_side.nil?
             mutex.synchronize do
               @sync_side = :server
-              RsyncHelper.down(local_path, host_path, host, ignored_files)
+              begin
+                RsyncHelper.down(local_path, host_path, host, ignored_files)
+                @down_requested = false
+              rescue
+                @down_requested = true
+              end
               do_after_timeout(1) do
+                begin
+                  RsyncHelper.down(local_path, host_path, host, ignored_files) if @down_requested
+                rescue
+                end
                 mutex.synchronize { @sync_side = nil }
               end
             end

data/lib/remote_sh/port_forwarder.rb

@@ -38,6 +38,8 @@ module RemoteSh
         )
         SshHelper.current_ports(host_host, remote_blacklist_ports + local_opened_ports).each { |port| SshHelper.close_port(host_host, port) }
         current_ports(local_blacklisted_ports + remote_opened_ports).each { |port| SshHelper.close_local_port(host_host, port) }
+      rescue
+        start_or_skip(host_config)
       ensure
         SshHelper
           .current_ports(host_host, remote_blacklist_ports)

data/lib/remote_sh/ssh_helper.rb

@@ -9,6 +9,11 @@ module RemoteSh
       system("ssh -t #{host} \"cd #{dir}; exec \$SHELL -l\"")
     end
 
+    def exec(host, dir, args)
+      cmd = "cd #{dir}; #{args.join(' ')}"
+      system("ssh -t -q #{host} \"#{cmd}\"")
+    end
+
     def current_ports(host, blacklist_ports)
       `ssh #{host} "netstat -tuln | grep LISTEN"`
         .split("\n")

data/lib/remote_sh/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RemoteSh
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remote_sh
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Pavel Egorov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 2025-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filewatcher