remote_sh 0.1.4 → 0.1.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1c7102862c0e9113c5e3e7472f7ef63d17ca9839a8fe11910c59550c1aa137b9
4
- data.tar.gz: c2c93b7fb6a6d33cf8323d732101e1f1739eba24d97d1471b2f3ef19e2fe28a2
3
+ metadata.gz: ff97c5e7c0039e57b5adffb905147772ea1ea8f7beed0418be9f5bbb27cc4785
4
+ data.tar.gz: 29b21e99ef6e41926af435997376561cf79fb15d5d8b125e2555c3582fc79eee
5
5
  SHA512:
6
- metadata.gz: 76a21a121e6a31dd08f06d0b179c45dfd3051ea5fd965aa810f1ffc2259de3076152d8414fc107dae9d7c608d2f06486d776b97e7eb2e8d07ca93f54b0c73417
7
- data.tar.gz: 6f152b0ab7aa5032e18eb3df14835861339dff9155ed862b6c6cf9252bee53f183497275ad28c393adb277e67db7461ab1307491117ae1d750ff56ea44a18f01
6
+ metadata.gz: 043a910e5ba94ca1551f253710a08a11f938aedea2ba9b5dd731a9990b6796c581710155093cb6f3c6503781404e6f1488ac1f8b1db1daf8008ad7481a7d855a
7
+ data.tar.gz: d941a9d149a65bdeb3a92ce05915e62de14d41be45b7ee427cd61ed1360801664a261e278fa231260c77e0a95ed936d33548643d8b7efc8dd83decb2b7eff1fa
@@ -39,6 +39,19 @@ module RemoteSh
39
39
  SshHelper.current_ports(host_host, remote_blacklist_ports + local_opened_ports).each { |port| SshHelper.close_port(host_host, port) }
40
40
  current_ports(local_blacklisted_ports + remote_opened_ports).each { |port| SshHelper.close_local_port(host_host, port) }
41
41
  ensure
42
+ SshHelper
43
+ .current_ports(host_host, remote_blacklist_ports)
44
+ .each do |port|
45
+ SshHelper.close_port(host_host, port)
46
+ rescue
47
+ end
48
+
49
+ current_ports(local_blacklisted_ports)
50
+ .each do |port|
51
+ SshHelper.close_local_port(host_host, port)
52
+ rescue
53
+ end
54
+
42
55
  File.delete(pid_filename)
43
56
  end
44
57
  end
@@ -59,39 +72,32 @@ module RemoteSh
59
72
  local_blacklisted_ports,
60
73
  local_opened_ports
61
74
  )
62
- # remote ports
63
- remote_opened_ports_was = remote_opened_ports
64
- remote_opened_ports = SshHelper.current_ports(host, remote_blacklisted_ports + local_opened_ports)
65
-
66
- remote_ports_to_close = remote_opened_ports_was - remote_opened_ports
67
- remote_ports_to_open = remote_opened_ports - remote_opened_ports_was
75
+ until Dir["#{pid_folder}/*"].empty?
76
+ # remote ports
77
+ remote_opened_ports_was = remote_opened_ports
78
+ remote_opened_ports = SshHelper.current_ports(host, remote_blacklisted_ports + local_opened_ports)
68
79
 
69
- remote_ports_to_open.each { |port| SshHelper.forward_port(host, port) }
70
- remote_ports_to_close.each { |port| SshHelper.close_port(host, port) }
80
+ remote_ports_to_close = remote_opened_ports_was - remote_opened_ports
81
+ remote_ports_to_open = remote_opened_ports - remote_opened_ports_was
71
82
 
72
- #local ports
83
+ remote_ports_to_open.each { |port| SshHelper.forward_port(host, port) }
84
+ remote_ports_to_close.each { |port| SshHelper.close_port(host, port) }
73
85
 
74
- local_opened_ports_was = local_opened_ports
75
- local_opened_ports = current_ports(local_blacklisted_ports + remote_opened_ports)
86
+ #local ports
76
87
 
77
- local_ports_to_close = local_opened_ports_was - local_opened_ports
78
- local_ports_to_open = local_opened_ports - local_opened_ports_was
88
+ local_opened_ports_was = local_opened_ports
89
+ local_opened_ports = current_ports(local_blacklisted_ports + remote_opened_ports)
79
90
 
80
- # puts 'local_ports_to_open' + local_ports_to_open.inspect
81
- local_ports_to_open.each { |port| SshHelper.forward_local_port(host, port) }
82
- # puts 'local_ports_to_close' + local_ports_to_close.inspect
83
- local_ports_to_close.each { |port| SshHelper.close_local_port(host, port) }
91
+ local_ports_to_close = local_opened_ports_was - local_opened_ports
92
+ local_ports_to_open = local_opened_ports - local_opened_ports_was
84
93
 
85
- sleep(1)
94
+ # puts 'local_ports_to_open' + local_ports_to_open.inspect
95
+ local_ports_to_open.each { |port| SshHelper.forward_local_port(host, port) }
96
+ # puts 'local_ports_to_close' + local_ports_to_close.inspect
97
+ local_ports_to_close.each { |port| SshHelper.close_local_port(host, port) }
86
98
 
87
- work_loop(
88
- host,
89
- pid_folder,
90
- remote_blacklisted_ports,
91
- remote_opened_ports,
92
- local_blacklisted_ports,
93
- local_opened_ports
94
- ) unless Dir["#{pid_folder}/*"].empty?
99
+ sleep(1)
100
+ end
95
101
  end
96
102
  end
97
103
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module RemoteSh
4
- VERSION = "0.1.4"
4
+ VERSION = "0.1.6"
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: remote_sh
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4
4
+ version: 0.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Egorov
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-12-29 00:00:00.000000000 Z
11
+ date: 2025-01-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: filewatcher