rmate 1.5.2 → 1.5.3

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in rmate.gemspec
+gemspec

data/README.mdown

@@ -2,13 +2,15 @@
 
 If you wish to activate TextMate from an ssh session you can do so by copying the `rmate` (ruby) script to the server you are logged into. The script will connect back to TextMate running on your Mac so you should setup an ssh tunnel (as your Mac is likely behind NAT):
 
-	ssh -R 52698:127.0.0.1:52698 «server»
+	ssh -R 52698:127.0.0.1:52698 user@example.org
 
 # Usage
 
-Call `rmate --help` for options. Default options can be set in `/etc/rmate.rc` or `~/.rmate.rc`, e.g.:
+	rmate [options] file
 
-	host: auto
+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
 	port: 52698
 
 You can also set the `RMATE_HOST` and `RMATE_PORT` environment variables.

data/Rakefile

@@ -0,0 +1,2 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

data/bin/rmate

@@ -8,8 +8,10 @@ require 'optparse'
 require 'socket'
 require 'tempfile'
 require 'yaml'
+require 'fileutils'
+require 'rmate'
 
-VERSION_STRING = 'rmate version 1.5 (2012-09-19)'
+VERSION_STRING = 'rmate version %s (%s)' % Rmate::VERSION, Rmate::DATE
 
 class Settings
   attr_accessor :host, :port, :wait, :force, :verbose, :lines, :names, :types
@@ -99,26 +101,20 @@ end
 
 def handle_save(socket, variables, data)
   path = variables["token"]
-  $stderr.puts "Saving #{path}" if $settings.verbose
-  begin
-    backup_path = "#{path}~"
-    backup_path = "#{backup_path}~" while File.exists? backup_path
-    File.link(path, backup_path) if File.exist? path
-    Tempfile.open("rmate", File.dirname(path)) do |temp|
-      temp.close(false)
-      if File.exists?(path)
-        if stat = File.stat(path)
-          File.chown(stat.uid, stat.gid, temp.path)
-          File.chmod(stat.mode, temp.path)
-        end
-      end
-      open(temp.path, 'wb') {|file| file << data }
-      File.rename(temp.path, path)
+  if File.writable? path
+    $stderr.puts "Saving #{path}" if $settings.verbose
+    begin
+      backup_path = "#{path}~"
+      backup_path = "#{backup_path}~" while File.exists? backup_path
+      FileUtils.cp(path, backup_path, :preserve => true) if File.exists?(path)
+      open(path, 'wb') { |file| file << data }
+      File.unlink(backup_path) if File.exist? backup_path
+    rescue
+      # TODO We probably want some way to notify the server app that the save failed
+      $stderr.puts "Save failed! #{$!}" if $settings.verbose
     end
-    File.unlink(backup_path) if File.exist? backup_path
-  rescue
-    # TODO We probably want some way to notify the server app that the save failed
-    $stderr.puts "Save failed! #{$!}" if $settings.verbose
+  else
+    $stderr.puts "Skipping save, file not writable." if $settings.verbose
   end
 end
 

data/lib/rmate.rb

@@ -0,0 +1,5 @@
+require "rmate/version"
+
+module Rmate
+  # Your code goes here...
+end

data/lib/rmate/version.rb

@@ -0,0 +1,4 @@
+module Rmate
+  VERSION = "1.5.3"
+  DATE    = "2013-03-16"
+end

data/rmate.gemspec

@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/rmate/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.name          = 'rmate'
+  gem.version       = Rmate::VERSION
+  gem.date          = Rmate::DATE
+  gem.description   = %q{Remote TextMate}
+  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.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.require_paths = ['lib']
+end

metadata

@@ -5,15 +5,17 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 2
-  version: 1.5.2
+  - 3
+  version: 1.5.3
 platform: ruby
 authors: 
 - Alex Ross
 - Allan Odgaard
 - "Ciar\xC3\xA1n Walsh"
+- Curt Sellmer
 - James Edward Gray II
 - John St. John
+- Michael Sheets
 - Nicolas Ledez
 - OZAWA Sakuro
 - Timothy Andrew
@@ -26,8 +28,9 @@ date: 2013-03-16 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
-description: This program can be used to edit text files in TextMate 2 running on your local Mac.
-email: rmate@textmate.org
+description: Remote TextMate
+email: 
+- rmate@textmate.org
 executables: 
 - rmate
 extensions: []
@@ -35,10 +38,15 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin/rmate
+- Gemfile
 - README.mdown
+- Rakefile
+- bin/rmate
+- lib/rmate.rb
+- lib/rmate/version.rb
+- rmate.gemspec
 has_rdoc: true
-homepage: https://github.com/textmate/rmate
+homepage: https://github.com/textmate/rmate/
 licenses: []
 
 post_install_message: 
@@ -66,6 +74,6 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Proxy edits to a Mac running TextMate 2
+summary: Edit files from anywhere in TextMate 2 on your local Mac.
 test_files: []