tmux-connector 0.0.2 → 0.0.3

data/README.md

@@ -28,9 +28,16 @@ Manage multiple servers using SSH and [tmux].
 
 - send `top` command to all loadbalancing nodes in 'staging' session
 
-`tcon send production 'tail -f' -f 'rdb'`
+`tcon send production 'tail -f /var/log/syslog' -f 'rdb'`
 
-- send `tail -f` command to all database nodes in 'production' session
+- send `tail -f /var/log/syslog` command to all database nodes in 'production'
+    session
+
+`tcon send production -f 'rdb' 'C-c'`
+
+- send `Ctrl-C` to all database nodes in 'production' session (if executed
+    after the `tail -f /var/log/syslog` command, it will exit the `tail -f`
+    command
 
 `tcon resume s#3`
 
@@ -54,7 +61,8 @@ Usage:
   tcon delete (<session-name> | --all)
   tcon list
   tcon send <session-name> (<command> | --command-file=<file>)
-            [--server-filter=<regex>] [--group-filter=<regex>] [--verbose]
+            [--server-filter=<regex>] [--group-filter=<regex>]
+            [--filter=<regex>] [--verbose]
   tcon --help
   tcon --version
 
@@ -63,14 +71,18 @@ Options:
                              describes how new session is started. YAML format.
   <session-name>             Name that identifies the session. Must be unique.
   <command>                  Command to be executed on remote server[s].
+  <regex>                    String that represents valid Ruby regex.
   -s --ssh-config=file       Path to ssh config file [default: ~/.ssh/config].
   -n --session-name=name     Name of the session to be used in the tcon command.
   -p --purpose=description   Description of session's purpose.
   --all                      Delete all existing sessions.
-  -f --server-filter=regex   Filter to select a subset of the servers.
-                             Should be valid ruby regex.
+  -f --server-filter=regex   Filter to select a subset of the servers via
+                             host names.
   -g --group-filter=regex    Filter to select a subset of the servers via
-                             group membership.  Should be valid ruby regex.
+                             group membership.
+  -r --filter=regex          Filter to select a subset of the servers via
+                             host names or group membership.
+                             Combines --server-filter and --group-filter.
   -c --command-file=file     File containing the list of commands to be
                              executed on remote server[s].
   -v --verbose               Report how many servers were affected by the send

data/lib/tmux-connector.rb

@@ -18,7 +18,8 @@ Usage:
   tcon delete (<session-name> | --all)
   tcon list
   tcon send <session-name> (<command> | --command-file=<file>)
-            [--server-filter=<regex>] [--group-filter=<regex>] [--verbose]
+            [--server-filter=<regex>] [--group-filter=<regex>]
+            [--filter=<regex>] [--verbose]
   tcon --help
   tcon --version
 
@@ -27,14 +28,18 @@ Options:
                              describes how new session is started. YAML format.
   <session-name>             Name that identifies the session. Must be unique.
   <command>                  Command to be executed on remote server[s].
+  <regex>                    String that represents valid Ruby regex.
   -s --ssh-config=file       Path to ssh config file [default: ~/.ssh/config].
   -n --session-name=name     Name of the session to be used in the tcon command.
   -p --purpose=description   Description of session's purpose.
   --all                      Delete all existing sessions.
-  -f --server-filter=regex   Filter to select a subset of the servers.
-                             Should be valid ruby regex.
+  -f --server-filter=regex   Filter to select a subset of the servers via
+                             host names.
   -g --group-filter=regex    Filter to select a subset of the servers via
-                             group membership.  Should be valid ruby regex.
+                             group membership.
+  -r --filter=regex          Filter to select a subset of the servers via
+                             host names or group membership.
+                             Combines --server-filter and --group-filter.
   -c --command-file=file     File containing the list of commands to be
                              executed on remote server[s].
   -v --verbose               Report how many servers were affected by the send

data/lib/tmux-connector/commands/list.rb

@@ -7,10 +7,14 @@ module TmuxConnector
     end
 
     def run()
-      sessions_data = TmuxConnector.list_sessions
-      puts "sessions:"
-      puts sessions_data.to_yaml
-      puts "-" * 20
+      sessions_data = TmuxConnector.list_sessions suppress_error: true
+      if sessions_data.empty?
+        puts "No sessions found."
+      else
+        puts "sessions:"
+        puts sessions_data.to_yaml
+        puts "-" * 20
+      end
     end
   end
 end

data/lib/tmux-connector/commands/send.rb

@@ -20,6 +20,9 @@ module TmuxConnector
       @server_filter = Regexp.new(args['--server-filter']) rescue nil
       @group_filter = Regexp.new(args['--group-filter']) rescue nil
 
+      @server_filter ||= Regexp.new(args['--filter']) rescue nil
+      @group_filter ||= Regexp.new(args['--filter']) rescue nil
+
       @session = Session.load_by_name args['<session-name>']
     end
 

data/lib/tmux-connector/persistence_handler.rb

@@ -65,11 +65,12 @@ module TmuxConnector
     data.delete session_name
     open(MAIN_FILE, 'w') { |f| f.write data.to_yaml }
     File.delete(file) rescue nil
-
   end
 
-  def self.list_sessions()
-    raise "session file (#{ MAIN_FILE }) not found" unless File.exist? MAIN_FILE
+  def self.list_sessions(options={})
+    unless options[:suppress_error]
+      raise "session file (#{ MAIN_FILE }) not found" unless File.exist? MAIN_FILE
+    end
     return ( YAML.load_file(MAIN_FILE) rescue {} ) || {}
   end
 

data/lib/tmux-connector/tmux_handler.rb

@@ -1,10 +1,11 @@
 module TmuxConnector
   def self.delete_tmux_session(name)
+    system "tmux detach -s #{ name } &> /dev/null"
     system "tmux kill-session -t #{ name } &> /dev/null"
   end
 
   def self.delete_all_tmux_sessions()
-    sessions_list = %x( tmux list-sessions &> /dev/null )
+    sessions_list = %x( tmux list-sessions 2> /dev/null)
     sessions = sessions_list.scan(/^([^:]+): /).map(&:first)
     sessions.each { |e| delete_tmux_session e }
   end
@@ -38,9 +39,11 @@ module TmuxConnector
     def send_commands(send_commands, server_regex, group_regex, verbose)
       count = 0
       each_pane do |window_index, pane_index, host|
-        if( (server_regex.nil? || host.ssh_name.match(server_regex)) &&
-            (group_regex.nil? || host.group_id.match(group_regex) ||
-              session.merge_rules[host.group_id].match(group_regex)) )
+        matches = server_regex.nil? && group_regex.nil?
+        matches ||= !server_regex.nil? && host.ssh_name.match(server_regex)
+        matches ||= !group_regex.nil? && session.merge_rules[host.group_id].match(group_regex)
+
+        if matches
           system("tmux send-keys -t #{ name }:#{ window_index }.#{ pane_index } '#{ send_commands }' C-m")
           count += 1
         end

data/lib/tmux-connector/version.rb

@@ -1,3 +1,3 @@
 module TmuxConnector
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/tmux-connector.gemspec

@@ -7,10 +7,10 @@ Gem::Specification.new do |gem|
   gem.name          = "tmux-connector"
   gem.version       = TmuxConnector::VERSION
   gem.authors       = ["Ivan Kusalic"]
-  gem.email         = ["ikusalic@gmail.com"]  # TODO
+  gem.email         = ["ivan@ikusalic.com"]
   gem.summary       = %q{Manage multiple servers using SSH and tmux.}
   gem.description   = %q{tcon enables establishing connections (ssh) to multiple servers and executing commands on those servers. The sessions can be persisted (actually recreated) even after computer restarts. Complex sessions with different layouts for different kinds of servers can be easily created.} 
-  gem.homepage      = "http://github.com/ikusalic"  # TODO
+  gem.homepage      = "http://www.ikusalic.com"
 
   gem.add_dependency('docopt')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tmux-connector
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -32,7 +32,7 @@ description: tcon enables establishing connections (ssh) to multiple servers and
   after computer restarts. Complex sessions with different layouts for different kinds
   of servers can be easily created.
 email:
-- ikusalic@gmail.com
+- ivan@ikusalic.com
 executables:
 - tcon
 extensions: []
@@ -61,7 +61,7 @@ files:
 - lib/tmux-connector/tmux_handler.rb
 - lib/tmux-connector/version.rb
 - tmux-connector.gemspec
-homepage: http://github.com/ikusalic
+homepage: http://www.ikusalic.com
 licenses: []
 post_install_message: 
 rdoc_options: []