text_tunnel 0.1.1 → 0.2.0

data/bin/text_tunnel

@@ -14,11 +14,23 @@ where [options] are:
   EOS
 
   opt :port, "Port", :type => :int, :default => 1777
+  opt :fallback_editor, "Fallback editor if error connecting to text_tunneld web server", :default => "vi"
 end
 
 Trollop.die "text_tunnel requires exactly one filename argument" unless ARGV.size == 1
 file_path = ARGV[0]
 
+# Ensure that we will receive the interrupt (crtl+c) signal. When text_tunnel
+# is launched by crontab -e it blocks or ignores the INT signal. This restores
+# default functionality.
+Signal.trap "INT", "DEFAULT"
+
+def try_fallback_editor(fallback_editor, file_path)
+  puts "Attempting fallback editor: #{fallback_editor} #{file_path}"
+  success = system fallback_editor, file_path
+  puts "ERROR: Fallback editor failed." unless success
+end
+
 require "text_tunnel/client"
 begin
   client = Client.new(config[:port], file_path)
@@ -33,6 +45,7 @@ begin
   end
 rescue Errno::ECONNREFUSED => e
   puts "ERROR: Unable to connect to text_tunneld web server."
+  try_fallback_editor config[:fallback_editor], file_path
 rescue Errno::EISDIR
   puts "ERROR: #{file_path} is a directory."
 rescue Errno::EACCES
@@ -42,6 +55,7 @@ rescue RestClient::Exception, UnexpectedResponseError => e
   puts "HTTP Status Code: #{e.http_code}"
   puts "HTTP Body:"
   puts e.http_body
+  try_fallback_editor config[:fallback_editor], file_path
 rescue Interrupt
   puts "Exiting..."
 ensure

data/lib/text_tunnel/version.rb

@@ -1,3 +1,3 @@
 module TextTunnel
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/readme.md

@@ -28,11 +28,11 @@ variable set you will need to include an --editor option.
 Connect to the remote host with SSH and specify a reverse port forward (the
 default port for Text Tunnel is 1777).
 
-	ssh -R 1777:localhost:1777 remote-host
+    ssh -R 1777:localhost:1777 remote-host
 
 On the remote machine use text_tunnel as your editor.
 
-	text_tunnel /path/to/file
+    text_tunnel /path/to/file
 
 The file should open on your local machine. Do your edits and save your file.
 It will automatically be transferred to the remote host. When you are done hit
@@ -43,14 +43,32 @@ Crtl+C on the remote host to terminate Text Tunnel.
 The reverse port forward can be configured in ~/.ssh/config to avoid having to
 retype the reverse port forward on the command line every time.
 
+    RemoteForward 127.0.0.1:1777 127.0.0.1:1777
+
 Consider setting text_tunnel as your EDITOR environment variable on your
 remote hosts. This will let you use a local text editor for git commit
-messages, crontabs, etc.
+messages, crontabs, etc. If the text_tunneld server is unavailable it will
+seamlessly fall back to vi. You can use the --fallback-editor option to
+configure the fallback console editor.
+
+    export EDITOR='/usr/local/bin/text_tunnel --fallback-editor=nano'
+
+text_tunneld supports a background daemon mode. Run text_tunneld -h for full
+options. You may want to configure it to run automatically when you log in to
+your desktop environment. Sadly, the exact means of doing this vary across
+platforms. On Ubuntu 12.04 with the Gnome Classic desktop environment you can
+configure a program to autostart in Applications -> System Tools ->
+Preferences -> Startup Applications. The following command would start
+text_tunneld in background mode with the "subl" editor.
 
-text_tunneld supports a background daemon mode. Run text_tunneld -h for full options.
+    text_tunneld --editor subl --daemon
 
 ## Version History
 
+* **0.2.0**
+  * Unblock INT signal for bin/text_tunnel. This allows usage with crontab -e.
+  * Fall back to local editor if text_tunneld server is unreachable.
+  * Added information to readme about autostarting on desktop login.
 * **0.1.1**
   * Add compatibility with older patch versions of Ruby 1.9.2.
 * **0.1.0**

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: text_tunnel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client