gaptool-client 0.3.4 → 0.3.6

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.6

data/gaptool-client.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gaptool-client"
-  s.version = "0.3.4"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Bailey"]

data/lib/gaptool-client.rb

@@ -75,27 +75,45 @@ module Gaptool
     option ["-e", "--environment"], "ENVIRONMENT", "Which environment, e.g. production", :required => true
     option ["-i", "--instance"], "INSTANCE", "Node instance, leave blank to query avilable nodes", :require => false
     option ["-f", "--first"], :flag, "Just connect to first available instance"
+    option ["-t", "--tmux"], :flag, "Open cluster in windows in a tmux session"
 
     def execute
-      if instance
-        @ssh = $api.ssh(role, environment, instance)
-      else
+      if tmux?
         nodes = $api.getenvroles(role, environment)
-        if first? || nodes.size == 1
-          puts "No instnace specified, but only one instance in cluster or first forced"
-          @ssh = $api.ssh(role, environment, nodes.first['instance'])
+        system "tmux start-server"
+        nodes.each_index do |i|
+          @ssh = $api.ssh(role, environment, nodes[i]['instance'])
+          if i == 0
+            system "tmux new-session -d -s #{role}-#{environment} -n #{nodes[i]['instance']}"
+          else
+            system "tmux new-window -t #{role}-#{environment}:#{i} -n #{nodes[i]['instance']}"
+          end
+          File.open("/tmp/gtkey-#{nodes[i]['instance']}", 'w') {|f| f.write(@ssh['key'])}
+          File.chmod(0600, "/tmp/gtkey-#{nodes[i]['instance']}")
+          system "tmux send-keys -t #{role}-#{environment}:#{i} 'SSH_AUTH_SOCK=\"\" ssh -i /tmp/gtkey-#{nodes[i]['instance']} admin@#{@ssh['hostname']}' C-m"
+        end
+        system "tmux attach -t #{role}-#{environment}"
+      else
+        if instance
+          @ssh = $api.ssh(role, environment, instance)
         else
-          puts "No instance specified, querying list."
-          nodes.each_index do |i|
-            puts "#{i}: #{nodes[i]['instance']}"
+          nodes = $api.getenvroles(role, environment)
+          if first? || nodes.size == 1
+            puts "No instnace specified, but only one instance in cluster or first forced"
+            @ssh = $api.ssh(role, environment, nodes.first['instance'])
+          else
+            puts "No instance specified, querying list."
+            nodes.each_index do |i|
+              puts "#{i}: #{nodes[i]['instance']}"
+            end
+            print "Select a node: ".color(:cyan)
+            @ssh = $api.ssh(role, environment, nodes[$stdin.gets.chomp.to_i]['instance'])
           end
-          print "Select a node: ".color(:cyan)
-          @ssh = $api.ssh(role, environment, nodes[$stdin.gets.chomp.to_i]['instance'])
         end
+        File.open('/tmp/gtkey', 'w') {|f| f.write(@ssh['key'])}
+        File.chmod(0600, '/tmp/gtkey')
+        system "SSH_AUTH_SOCK='' ssh -i /tmp/gtkey admin@#{@ssh['hostname']}"
       end
-      File.open('/tmp/gtkey', 'w') {|f| f.write(@ssh['key'])}
-      File.chmod(0600, '/tmp/gtkey')
-      system "SSH_AUTH_SOCK='' ssh -i /tmp/gtkey admin@#{@ssh['hostname']}"
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-client
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3790817521907323443
+      hash: -1782639922451775426
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: