tweemux 1.3.0 → 1.4.0

data/lib/tweemux/action/at.rb

@@ -1,15 +1,2 @@
-class Tweemux::Action::At < Tweemux::Action
-  def run args
-    host, port = args
-    cmd = 'ssh', host
-    if port
-      cmd.push '-p'+port
-      port_parens = " (on port #{port})"
-    end
-    forced_path_for_osx_people = 'PATH=/usr/local/bin:/usr/bin'
-    explained_run cmd + [
-      '-t', forced_path_for_osx_people,
-      'tmux', '-2uS', Tweemux::SOCK, 'attach',
-    ], "Connect to #{host}#{port_parens}, demand a pty, then attach to session"
-  end
-end
+require 'tweemux/action/on'
+class Tweemux::Action::At < Tweemux::Action::On; end

data/lib/tweemux/action/on.rb

@@ -1 +1,25 @@
-class Tweemux::Action::On < Tweemux::Action::At; end
+class Tweemux::Action::On < Tweemux::Action
+  def run args
+    host, port, *rest = args
+    cmd = 'ssh', host
+    if port
+      cmd.push '-p'+port
+      port_parens = " (on port #{port})"
+    end
+    desc = ["Connect to #{host}#{port_parens}"]
+    forced_path_for_osx_people = 'PATH=/usr/local/bin:/usr/bin'
+    cmd.concat [ '-t', forced_path_for_osx_people ]
+    desc.push 'demand a pty'
+    cmd.concat [ 'tmux', '-2uS', Tweemux::SOCK ]
+    desc.push 'Run tmux (with 256 colors, UTF-8, on the shared socket'
+    if rest.empty?
+      cmd.push 'attach'
+      desc.push 'attach to existing session'
+    else
+      cmd.concat rest
+      desc.push rest.join ' '
+    end
+    description = desc.join ', '
+    explained_run cmd, description
+  end
+end

data/lib/tweemux/version.rb

@@ -1,3 +1,3 @@
 class Tweemux
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/test/tweemux/action/on_test.rb

@@ -14,3 +14,11 @@ class Tweemux::Action::OnImplicitPortTest  < MiniTest::Unit::TestCase
     [ %w(ssh sharpsaw.org -t PATH=/usr/local/bin:/usr/bin tmux -2uS /tmp/tweemux.sock attach) ]
   end
 end
+
+class Tweemux::Action::PassThruIsCoolForOnTest  < MiniTest::Unit::TestCase
+  include TweemuxActionHelper
+  def argv; %w'on sharpsaw.org 22 -CC a' end
+  def expected_commands
+    [ %w(ssh sharpsaw.org -p22 -t PATH=/usr/local/bin:/usr/bin tmux -2uS /tmp/tweemux.sock -CC a) ]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweemux
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies: []
 description: ! 'For Remote Pair Programming: A handy script to create-or-join a world-readable
   tmux session