rosh 0.7.0 → 0.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +5 -5
  2. data/lib/rosh/version.rb +1 -1
  3. data/lib/rosh.rb +23 -2
  4. data/rosh.gemspec +1 -2
  5. metadata +10 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: a4b0821ffe5555bfc94c655ce5fb65df8cad010f
4
- data.tar.gz: 9194acb2ffd94f23204a0bbb047d15e7720bdeea
2
+ SHA256:
3
+ metadata.gz: 8b2fab6f41d5905467f31451ef95acb39c7eb8fe20c7f73d7a1738db8a8a7e87
4
+ data.tar.gz: cc245fe892759cf80f32f3c3350ce20311e1323f77f69bcf8bb9ccc900246602
5
5
  SHA512:
6
- metadata.gz: da22e8d575e6eac82951990f4ac59a260327bd15576b1dc386ff8d7d0fdc46b5fd5d1cf01e7cbe59b3420a400642d8b9032a064c27fd77d20ca791808ff5813b
7
- data.tar.gz: ccb2656b299e71747e42c3e16f7decca02597254f705edb7a86d321f56108a22f548438e35d0afbbac0f7f3b356c5f766b80741e722c78dd8c5a88f30a19f8aa
6
+ metadata.gz: e6b64bd51c565a4656c6d4592fb5ba77ef873e3046baf01927836cc5077695b81ba0f5823d3a8c32d3ef7814eefba44f37baafbc7ad7bb9cbfe40f7f37cda6ce
7
+ data.tar.gz: 44a80483ac889fce806662c003797b5ca785b84ea28fda96d0a00994a43d81f453f05426a70a718bdfdfce28a809bec8e8e7bcb90c928fb36eee29276a0d6161
data/lib/rosh/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class Rosh
2
- VERSION = '0.7.0'
2
+ VERSION = '0.8.0'
3
3
  end
data/lib/rosh.rb CHANGED
@@ -15,6 +15,7 @@ class Rosh
15
15
  opt.on('-a alive-interval'){|v| alive_interval = v.to_i}
16
16
  opt.on('-e escape'){|v| @escape = v}
17
17
  opt.on('-I interval'){|v| @interval = v.to_f}
18
+ opt.on('-V'){|v| @verbose = true}
18
19
  end.parse! args
19
20
  @host, @name = *args, :default
20
21
  abort 'hostname is required' if @host == :default
@@ -23,18 +24,34 @@ class Rosh
23
24
 
24
25
  # check ~/.ssh/config to resolve alias name
25
26
  config = Net::SSH::Config.for(@host)
27
+ if @verbose
28
+ puts "ssh-config: #{config}"
29
+ end
26
30
  @host = config[:host_name] if config[:host_name]
27
31
  @ssh_opts << "-l #{config[:user]}" if config[:user]
28
32
  @ssh_opts << "-p #{config[:port]}" if config[:port]
33
+ @ssh_opts << "-J #{config[:proxy].jump_proxies}" if config[:proxy]
29
34
  if keys = config[:keys]
30
35
  keys.each{|k| @ssh_opts << "-i #{k}"}
31
36
  end
37
+ if @verbose
38
+ puts "host: #{@host}"
39
+ puts "name: #{@name}"
40
+ puts "interval: #{@interval}"
41
+ puts "alive_interval: #{alive_interval}"
42
+ puts "options: #{@ssh_opts*' '}"
43
+ end
32
44
  @first_try = true
33
45
  end
34
46
 
35
47
  def connect
36
- reconnect until system ["ssh", *@ssh_opts, resolv,
48
+ cmd = ["ssh", *@ssh_opts, resolv,
37
49
  '-t', "'screen -rx #{@name}'", '2>/dev/null']*' '
50
+ if @verbose
51
+ puts "connecting to #{@host}..."
52
+ puts cmd
53
+ end
54
+ reconnect until system cmd
38
55
  end
39
56
 
40
57
  def reconnect
@@ -58,7 +75,11 @@ class Rosh
58
75
 
59
76
  private
60
77
  def sh(a, r=nil)
61
- system "ssh #{resolv} #{@ssh_opts*' '} 'screen -S #{@name} #{a}' #{r}"
78
+ cmd = "ssh #{resolv} #{@ssh_opts*' '} 'screen -S #{@name} #{a}' #{r}"
79
+ if @verbose
80
+ puts cmd
81
+ end
82
+ system cmd
62
83
  end
63
84
 
64
85
  def resolv
data/rosh.gemspec CHANGED
@@ -1,4 +1,3 @@
1
- # coding: utf-8
2
1
  lib = File.expand_path('../lib', __FILE__)
3
2
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
3
  require File.join(lib, %w[rosh version])
@@ -21,6 +20,6 @@ Gem::Specification.new do |spec|
21
20
  spec.require_paths = ["lib"]
22
21
 
23
22
  spec.add_dependency "net-ssh"
24
- spec.add_development_dependency "bundler", "~> 1.3"
23
+ spec.add_development_dependency "bundler"
25
24
  spec.add_development_dependency "rake"
26
25
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rosh
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.8.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Genki Takiuchi
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-10-27 00:00:00.000000000 Z
11
+ date: 2025-03-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: net-ssh
@@ -28,16 +28,16 @@ dependencies:
28
28
  name: bundler
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '1.3'
33
+ version: '0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '1.3'
40
+ version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rake
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ homepage: https://github.com/genki/rosh
75
75
  licenses:
76
76
  - MIT
77
77
  metadata: {}
78
- post_install_message:
78
+ post_install_message:
79
79
  rdoc_options: []
80
80
  require_paths:
81
81
  - lib
@@ -90,9 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
90
90
  - !ruby/object:Gem::Version
91
91
  version: '0'
92
92
  requirements: []
93
- rubyforge_project:
94
- rubygems_version: 2.4.8
95
- signing_key:
93
+ rubygems_version: 3.4.15
94
+ signing_key:
96
95
  specification_version: 4
97
96
  summary: Rosh is roaming shell
98
97
  test_files: []