remote_sh 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff97c5e7c0039e57b5adffb905147772ea1ea8f7beed0418be9f5bbb27cc4785
-  data.tar.gz: 29b21e99ef6e41926af435997376561cf79fb15d5d8b125e2555c3582fc79eee
+  metadata.gz: 67423d9a51157d17c0945130089f3a92504d3c3748fc9fcff1342fec5fe1c84e
+  data.tar.gz: 65e267157add7333bc4cbb95404f0e68c2b0a423252223b315a292de7b1ce3a8
 SHA512:
-  metadata.gz: 043a910e5ba94ca1551f253710a08a11f938aedea2ba9b5dd731a9990b6796c581710155093cb6f3c6503781404e6f1488ac1f8b1db1daf8008ad7481a7d855a
-  data.tar.gz: d941a9d149a65bdeb3a92ce05915e62de14d41be45b7ee427cd61ed1360801664a261e278fa231260c77e0a95ed936d33548643d8b7efc8dd83decb2b7eff1fa
+  metadata.gz: 4893611c20ccd6f49f65b97cdd6a68e02d20b2818df22e4b2204076d545061eb42feab92fb3536023adf5ef76576923cd3f0fec48a1e0772ae458e385f103523
+  data.tar.gz: 3145547a5e731b1dd2d03128be41eadf9123c24622e4ff4020c9b8ffc8ae6898917129652ef569252c733f806fed3b27e692dd52b98ecb87f7469df15fc740ae

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,6 +45,24 @@ 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)
+      host = WorkspaceConfiguration.host_config["host"]
+      host_path = WorkspaceConfiguration.config["host_path"]
+      SshHelper.exec(host, host_path, argv)
+    end
+    map 'e' => :exec
+
     desc "init", "inits"
     def init
       WorkspaceConfiguration.init!

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
@@ -50,7 +62,7 @@ module RemoteSh
 
       path = socket_file.split("/")[...-1].join("/")
 
-      `ssh #{host} "rm #{socket_file}"`
+      `ssh #{host} "rm -f #{socket_file}"`
       `ssh #{host} "mkdir -p #{path}"`
 
       Thread.new do
@@ -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.6"
+  VERSION = "0.1.8"
 end

metadata

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