rmate 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb01149adffb982c59add526c2f37ff360eb6dfe
-  data.tar.gz: 00fecc43b47a622770630f875e507d80488bc762
+  metadata.gz: df13b1ad905e18aecc8727b1f12d7f3ad3efc0c8
+  data.tar.gz: 7011a8c285b498fb9caacd053b5641e203f8201d
 SHA512:
-  metadata.gz: 363c38d9acc3897608acead4e1178bb500a386bbac8ad54ae91b45941d9c8fb47c901d878a456cf64cabe9651d0a57a20dbd8a0b07530663ba89fc1171e9dad6
-  data.tar.gz: 3dce272d71ad359a6bc1afd29d6b4f5e23550f29a63a1d64a0d0246144d2301dfaa411664e2001ee547a518e2e250423dd3052b49149ed60a9d2c36db97bd2c7
+  metadata.gz: 74a1b17c25063cad0bda780f83954e9f8af439a29d110b00d68ff1335c63a40c8f90b8290eb2b3628800a8376d440edf20dc1f05aba368c84854f8c4b816b455
+  data.tar.gz: b5fa8782db9ed962040cf3f0512fe15f6ca3bde3c6b62e91cb5d8abf08c5d1fc0bbeddee0e6206514ee838a0784dbcf1a08bea799eb96f41db9ae60dd73026fa

data/README.mdown

@@ -4,6 +4,10 @@ If you wish to activate TextMate from an ssh session you can do so by copying th
 
 	ssh -R 52698:localhost:52698 user@example.org
 
+or, if using unix sockets (available with OpenSSH v6.7 and above):
+
+	ssh -R /home/user/.rmate.socket:localhost:52698 user@example.org
+
 # Install
 
 ## Rubygems
@@ -33,16 +37,15 @@ If `~/bin` is not already in your `PATH` then you may want to add something like
 
 Call `rmate --help` for a list of options. Default options can be set in `/etc/rmate.rc` or `~/.rmate.rc`, e.g.:
 
-	host: auto  # prefer host from SSH_CONNECTION over localhost
+	host: auto                   # Prefer host from SSH_CONNECTION over localhost
 	port: 52698
+	unixsocket: ~/.rmate.socket  # Use this socket file if it exists
 
-You can also set the `RMATE_HOST` and `RMATE_PORT` environment variables.
+You can also set the `RMATE_HOST`, `RMATE_PORT` and `RMATE_UNIXSOCKET` environment variables.
 
 For more info see this [blog post about rmate](http://blog.macromates.com/2011/mate-and-rmate/ "TextMate Blog » mate and rmate").
 
 # Ports
 
 - [Bash](https://github.com/aurora/rmate) by Harald Lapp
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/textmate/rmate/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+- [Python](https://github.com/sclukey/rmate-python) by Steven Clukey

data/bin/rmate

@@ -11,15 +11,15 @@ require 'yaml'
 require 'fileutils'
 
 module Rmate
-  DATE           = "2014-02-06"
-  VERSION        = "1.5.7"
+  DATE           = "2015-06-23"
+  VERSION        = "1.5.8"
   VERSION_STRING = "rmate version #{Rmate::VERSION} (#{Rmate::DATE})"
 
   class Settings
-    attr_accessor :host, :port, :wait, :force, :verbose, :lines, :names, :types
+    attr_accessor :host, :port, :unixsocket, :wait, :force, :verbose, :lines, :names, :types
 
     def initialize
-      @host, @port = 'localhost', 52698
+      @host, @port, @unixsocket = 'localhost', 52698, '~/.rmate.socket'
 
       @wait    = false
       @force   = false
@@ -30,8 +30,9 @@ module Rmate
 
       read_disk_settings
 
-      @host = ENV['RMATE_HOST'].to_s if ENV.has_key? 'RMATE_HOST'
-      @port = ENV['RMATE_PORT'].to_i if ENV.has_key? 'RMATE_PORT'
+      @host       = ENV['RMATE_HOST'].to_s       if ENV.has_key? 'RMATE_HOST'
+      @port       = ENV['RMATE_PORT'].to_i       if ENV.has_key? 'RMATE_PORT'
+      @unixsocket = ENV['RMATE_UNIXSOCKET'].to_s if ENV.has_key? 'RMATE_UNIXSOCKET'
 
       parse_cli_options
 
@@ -43,22 +44,25 @@ module Rmate
         file = File.expand_path current_file
         if File.exist? file
           params = YAML::load(File.open(file))
-          @host = params["host"] unless params["host"].nil?
-          @port = params["port"] unless params["port"].nil?
+          @host       = params["host"] unless params["host"].nil?
+          @port       = params["port"] unless params["port"].nil?
+          @unixsocket = params["unixsocket"] unless params["unixsocket"].nil?
         end
       end
     end
 
     def parse_cli_options
       OptionParser.new do |o|
-        o.on(           '--host=name',       "Connect to host.", "Use 'auto' to detect the host from SSH.", "Defaults to #{@host}.") { |v| @host    = v          }
-        o.on('-p',      '--port=#', Integer, "Port number to use for connection.", "Defaults to #{@port}.")                          { |v| @port    = v          }
-        o.on('-w',      '--[no-]wait',       'Wait for file to be closed by TextMate.')                                              { |v| @wait    = v          }
-        o.on('-l',      '--line [NUMBER]',   'Place caret on line [NUMBER] after loading file.')                                     { |v| @lines <<= v          }
-        o.on('-m',      '--name [NAME]',     'The display name shown in TextMate.')                                                  { |v| @names <<= v          }
-        o.on('-t',      '--type [TYPE]',     'Treat file as having [TYPE].')                                                         { |v| @types <<= v          }
-        o.on('-f',      '--force',           'Open even if the file is not writable.')                                               { |v| @force   = v          }
-        o.on('-v',      '--verbose',         'Verbose logging messages.')                                                            { |v| @verbose = v          }
+        o.on(           '--host=name',       "Connect to host.", "Use 'auto' to detect the host from SSH.", "Defaults to #{@host}.") { |v| @host       = v       }
+        o.on('-s',      '--unixsocket=name', "UNIX socket path.", "Takes precedence over host/port if the file exists", \
+                                                                  "Default #{@unixsocket}")                                          { |v| @unixsocket = v       }
+        o.on('-p',      '--port=#', Integer, "Port number to use for connection.", "Defaults to #{@port}.")                          { |v| @port       = v       }
+        o.on('-w',      '--[no-]wait',       'Wait for file to be closed by TextMate.')                                              { |v| @wait       = v       }
+        o.on('-l',      '--line [NUMBER]',   'Place caret on line [NUMBER] after loading file.')                                     { |v| @lines      <<= v     }
+        o.on('-m',      '--name [NAME]',     'The display name shown in TextMate.')                                                  { |v| @names      <<= v     }
+        o.on('-t',      '--type [TYPE]',     'Treat file as having [TYPE].')                                                         { |v| @types      <<= v     }
+        o.on('-f',      '--force',           'Open even if the file is not writable.')                                               { |v| @force      = v       }
+        o.on('-v',      '--verbose',         'Verbose logging messages.')                                                            { |v| @verbose    = v       }
         o.on_tail('-h', '--help',            'Show this message.')                                                                   { puts o; exit              }
         o.on_tail(      '--version',         'Show version.')                                                                        { puts VERSION_STRING; exit }
         o.parse!
@@ -153,8 +157,20 @@ module Rmate
     end
   end
 
-  def connect_and_handle_cmds(host, port, cmds)
-    socket = TCPSocket.new(host, port)
+  def connect_and_handle_cmds(host, port, unixsocketpath, cmds)
+    socket = nil
+    unixsocketpath = File.expand_path(unixsocketpath) unless unixsocketpath.nil?
+    if unixsocketpath.nil? || !File.exist?(unixsocketpath)
+      $stderr.puts "Using TCP socket to connect: ‘#{host}:#{port}’" if $settings.verbose
+      begin
+        socket = TCPSocket.new(host, port)
+      rescue Exception => e
+        abort "Error connecting to ‘#{host}:#{port}’: #{e.message}"
+      end
+    else
+      $stderr.puts "Using UNIX socket to connect: ‘#{unixsocketpath}’" if $settings.verbose
+      socket = UNIXSocket.new(unixsocketpath)
+    end
     server_info = socket.readline.chomp
     $stderr.puts "Connect: ‘#{server_info}’" if $settings.verbose
 
@@ -204,9 +220,9 @@ end
 
 unless $settings.wait
   pid = fork do
-    Rmate::connect_and_handle_cmds($settings.host, $settings.port, cmds)
+    Rmate::connect_and_handle_cmds($settings.host, $settings.port, $settings.unixsocket, cmds)
   end
   Process.detach(pid)
 else
-  Rmate::connect_and_handle_cmds($settings.host, $settings.port, cmds)
+  Rmate::connect_and_handle_cmds($settings.host, $settings.port, $settings.unixsocket, cmds)
 end

data/lib/rmate.rb

@@ -11,15 +11,15 @@ require 'yaml'
 require 'fileutils'
 
 module Rmate
-  DATE           = "2014-02-06"
-  VERSION        = "1.5.7"
+  DATE           = "2015-06-23"
+  VERSION        = "1.5.8"
   VERSION_STRING = "rmate version #{Rmate::VERSION} (#{Rmate::DATE})"
 
   class Settings
-    attr_accessor :host, :port, :wait, :force, :verbose, :lines, :names, :types
+    attr_accessor :host, :port, :unixsocket, :wait, :force, :verbose, :lines, :names, :types
 
     def initialize
-      @host, @port = 'localhost', 52698
+      @host, @port, @unixsocket = 'localhost', 52698, '~/.rmate.socket'
 
       @wait    = false
       @force   = false
@@ -30,8 +30,9 @@ module Rmate
 
       read_disk_settings
 
-      @host = ENV['RMATE_HOST'].to_s if ENV.has_key? 'RMATE_HOST'
-      @port = ENV['RMATE_PORT'].to_i if ENV.has_key? 'RMATE_PORT'
+      @host       = ENV['RMATE_HOST'].to_s       if ENV.has_key? 'RMATE_HOST'
+      @port       = ENV['RMATE_PORT'].to_i       if ENV.has_key? 'RMATE_PORT'
+      @unixsocket = ENV['RMATE_UNIXSOCKET'].to_s if ENV.has_key? 'RMATE_UNIXSOCKET'
 
       parse_cli_options
 
@@ -43,22 +44,25 @@ module Rmate
         file = File.expand_path current_file
         if File.exist? file
           params = YAML::load(File.open(file))
-          @host = params["host"] unless params["host"].nil?
-          @port = params["port"] unless params["port"].nil?
+          @host       = params["host"] unless params["host"].nil?
+          @port       = params["port"] unless params["port"].nil?
+          @unixsocket = params["unixsocket"] unless params["unixsocket"].nil?
         end
       end
     end
 
     def parse_cli_options
       OptionParser.new do |o|
-        o.on(           '--host=name',       "Connect to host.", "Use 'auto' to detect the host from SSH.", "Defaults to #{@host}.") { |v| @host    = v          }
-        o.on('-p',      '--port=#', Integer, "Port number to use for connection.", "Defaults to #{@port}.")                          { |v| @port    = v          }
-        o.on('-w',      '--[no-]wait',       'Wait for file to be closed by TextMate.')                                              { |v| @wait    = v          }
-        o.on('-l',      '--line [NUMBER]',   'Place caret on line [NUMBER] after loading file.')                                     { |v| @lines <<= v          }
-        o.on('-m',      '--name [NAME]',     'The display name shown in TextMate.')                                                  { |v| @names <<= v          }
-        o.on('-t',      '--type [TYPE]',     'Treat file as having [TYPE].')                                                         { |v| @types <<= v          }
-        o.on('-f',      '--force',           'Open even if the file is not writable.')                                               { |v| @force   = v          }
-        o.on('-v',      '--verbose',         'Verbose logging messages.')                                                            { |v| @verbose = v          }
+        o.on(           '--host=name',       "Connect to host.", "Use 'auto' to detect the host from SSH.", "Defaults to #{@host}.") { |v| @host       = v       }
+        o.on('-s',      '--unixsocket=name', "UNIX socket path.", "Takes precedence over host/port if the file exists", \
+                                                                  "Default #{@unixsocket}")                                          { |v| @unixsocket = v       }
+        o.on('-p',      '--port=#', Integer, "Port number to use for connection.", "Defaults to #{@port}.")                          { |v| @port       = v       }
+        o.on('-w',      '--[no-]wait',       'Wait for file to be closed by TextMate.')                                              { |v| @wait       = v       }
+        o.on('-l',      '--line [NUMBER]',   'Place caret on line [NUMBER] after loading file.')                                     { |v| @lines      <<= v     }
+        o.on('-m',      '--name [NAME]',     'The display name shown in TextMate.')                                                  { |v| @names      <<= v     }
+        o.on('-t',      '--type [TYPE]',     'Treat file as having [TYPE].')                                                         { |v| @types      <<= v     }
+        o.on('-f',      '--force',           'Open even if the file is not writable.')                                               { |v| @force      = v       }
+        o.on('-v',      '--verbose',         'Verbose logging messages.')                                                            { |v| @verbose    = v       }
         o.on_tail('-h', '--help',            'Show this message.')                                                                   { puts o; exit              }
         o.on_tail(      '--version',         'Show version.')                                                                        { puts VERSION_STRING; exit }
         o.parse!
@@ -153,8 +157,20 @@ module Rmate
     end
   end
 
-  def connect_and_handle_cmds(host, port, cmds)
-    socket = TCPSocket.new(host, port)
+  def connect_and_handle_cmds(host, port, unixsocketpath, cmds)
+    socket = nil
+    unixsocketpath = File.expand_path(unixsocketpath) unless unixsocketpath.nil?
+    if unixsocketpath.nil? || !File.exist?(unixsocketpath)
+      $stderr.puts "Using TCP socket to connect: ‘#{host}:#{port}’" if $settings.verbose
+      begin
+        socket = TCPSocket.new(host, port)
+      rescue Exception => e
+        abort "Error connecting to ‘#{host}:#{port}’: #{e.message}"
+      end
+    else
+      $stderr.puts "Using UNIX socket to connect: ‘#{unixsocketpath}’" if $settings.verbose
+      socket = UNIXSocket.new(unixsocketpath)
+    end
     server_info = socket.readline.chomp
     $stderr.puts "Connect: ‘#{server_info}’" if $settings.verbose
 
@@ -204,9 +220,9 @@ end
 
 unless $settings.wait
   pid = fork do
-    Rmate::connect_and_handle_cmds($settings.host, $settings.port, cmds)
+    Rmate::connect_and_handle_cmds($settings.host, $settings.port, $settings.unixsocket, cmds)
   end
   Process.detach(pid)
 else
-  Rmate::connect_and_handle_cmds($settings.host, $settings.port, cmds)
+  Rmate::connect_and_handle_cmds($settings.host, $settings.port, $settings.unixsocket, cmds)
 end

data/rmate.gemspec

@@ -9,8 +9,9 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Edit files from anywhere in TextMate 2 on your local Mac.}
   gem.email         = ['rmate@textmate.org']
   gem.homepage      = 'https://github.com/textmate/rmate/'
+  gem.license       = 'MIT'
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
-  gem.authors       = `git log --pretty="format:%an"|sort -u`.split("\n")
+  gem.authors       = `git log --pretty='format:%an' -- . ':!README*'|sort|uniq -c|sort -k2|sort -srnk1|sed -E 's/^ *[0-9]+ //'`.split("\n")
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rmate
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
-- Adam Strzelecki
-- Alex Ross
 - Allan Odgaard
+- Alex Ross
 - Ciarán Walsh
-- Curt Sellmer
 - James Edward Gray II
+- Curt Sellmer
+- OZAWA Sakuro
+- Adam Strzelecki
+- Benjamin Piwowarski
 - John St. John
-- Michael Sheets
 - Nicolas Ledez
-- OZAWA Sakuro
 - Richard Myers
 - Rogelio Gudino
 - Timothy Andrew
@@ -21,7 +21,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies: []
 description: Remote TextMate
 email:
@@ -38,7 +38,8 @@ files:
 - lib/rmate.rb
 - rmate.gemspec
 homepage: https://github.com/textmate/rmate/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -56,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Edit files from anywhere in TextMate 2 on your local Mac.