pair 0.0.1 → 0.0.2

data/.gitignore

@@ -13,3 +13,4 @@ doc
 
 # jeweler generated
 pkg
+*.gem

data/lib/pair/session/authorized_keys_file.rb

@@ -1,21 +1,22 @@
 module Pair
   class Session
+    # TODO replace with authorized_keys gem
     class AuthorizedKeysFile
       ACCESS_TYPE = "type"
       KEYS        = "keys"
 
       attr_accessor :member_keys
-      attr_accessor :session
+      attr_accessor :attach_command
       attr_accessor :key_file_path
 
-      def initialize(member_keys = {}, session)
-        self.member_keys = member_keys
-        self.session = session
-        self.key_file_path = File.expand_path("~/.ssh/authorized_keys")
+      def initialize(member_keys = {}, attach_command)
+        self.member_keys    = member_keys
+        self.attach_command = attach_command
+        self.key_file_path  = File.expand_path("~/.ssh/authorized_keys")
       end
 
       def install
-        return nil if self.member_keys.values.empty? || self.member_keys.values.map { |k,v| v }.empty?
+        return if member_keys.empty?
 
         backup_authorized_keys if key_file_exists?
         create_authorized_keys
@@ -45,10 +46,6 @@ module Pair
         FileUtils.mv(backup_key_file_path, self.key_file_path)
       end
 
-      def line_numbers_of(key)
-        `grep -ns ".*#{key}.*" #{self.key_file_path} | sed 's/\:.*//'`.split('\n').map(&:strip)
-      end
-
       def key_file_exists?
         File.exists? self.key_file_path
       end
@@ -79,17 +76,18 @@ module Pair
       end
 
       def write_rows_for keys, of_type, in_file
+        read_only = of_type == 'viewer'
+
         keys.each do |key|
-          in_file.puts "command=\"#{command(session, of_type)}\",#{key_options.join(',')} #{key["content"]} #id:#{key["id"]}"
-        end
-        in_file.puts ""
-      end
+          command = attach_command[read_only].join(' ').inspect
 
-      def command(session, type)
-        options = ["-S /tmp/pairmill/tmux-#{session.name} attach"]
-        options << "-r" if type == 'viewer'
+          options = ["command=#{command}", *key_options].join(',')
+          content = key["content"]
+          comment = "# id: #{key["id"]}"
 
-        "/usr/local/bin/tmux #{options.join(' ')}"
+          in_file.puts [options, content, comment].join(' ')
+        end
+        in_file.puts ""
       end
 
       def key_options

data/lib/pair/session/hosted_session.rb

@@ -1,8 +1,16 @@
 module Pair
   class Session
+    def self.host(options)
+      session = HostedSession.new(options)
+      at_exit { session.stop! }
+
+      session.start!
+      session.stop!
+    end
+
     class HostedSession < self
-      attr_accessor :tunnel,  :authorized_keys_file,  :tmux,  :response
-      private       :tunnel=, :authorized_keys_file=, :tmux=, :response=
+      attr_accessor :tunnel,  :authorized_keys_file,  :response
+      private       :tunnel=, :authorized_keys_file=, :response=
 
       def initialize(options = {})
         puts "Hosting session #{"called #{options[:name].inspect} " if options[:name]}..."
@@ -10,7 +18,6 @@ module Pair
         self.name         = options.delete(:name)
         self.viewers      = options.delete(:viewers)      || []
         self.participants = options.delete(:participants) || []
-        self.tmux         = Tmux.new(self)
 
         super(options)
       end
@@ -24,25 +31,48 @@ module Pair
             tmux.attach
           end
         else
-          puts "There was a problem starting the host session %s" % (name && name.inspect)
-          puts "response: #{response.inspect}" if response && $-d
-          puts ""
+          connection_error!
         end
 
         exit
       end
 
+      def stop!
+        tmux.stop
+        tunnel.close
+        cleanup_authorized_keys
+      rescue
+        raise if $-d
+      end
+
+      def host_login
+        `whoami`.chomp
+      end
+
+      private
+
+      def tmux
+        @tmux ||= Tmux.new(name)
+      end
+
+      def tunnel
+        @tunnel ||= Tunnel.new(response["tunnel"])
+      end
+
+      def authorized_keys_file
+        @key_file ||= AuthorizedKeysFile.new(response["member_keys"], tmux.method(:attach_command))
+      end
+
       def display_startup_message
         puts "Your pairs can connect to this session using the following command:"
         puts ""
         puts "	#{connect_command}"
         puts ""
-        print "Press any key to continue..."
+        print "Press [Enter] to continue..."
 
         gets
       end
 
-      # TODO: this should get host/user from response
       def connect_command
         "ssh-add; ssh -tqA -l#{bastion["join_user"]} #{bastion["host"]} #{name}"
       end
@@ -51,40 +81,31 @@ module Pair
         response["tunnel"]["bastion"]
       end
 
-      def host_login
-        `whoami`.chomp
-      end
-
       def cleanup_authorized_keys
         authorized_keys_file.cleanup
       end
 
-      private
-
       def setup
         create_session_on_server && authorized_keys_file.install
       end
 
       def create_session_on_server
         self.response = Api.create_session(self)["session"]
-
-        if self.response
-          self.name                 = response["name"]
-          self.tunnel               = Tunnel.new(self.response["tunnel"].merge(:host => true))
-          self.authorized_keys_file = AuthorizedKeysFile.new(self.response["member_keys"], self)
+        if response
+          self.name = response['name']
+          true
+        else
+          false
         end
       end
 
-      def stop!
-        tunnel.close
-        tmux.stop
-        cleanup_authorized_keys
+      def connection_error!
+        puts "There was a problem starting the host session %s" % (name && name.inspect)
+        puts "response: #{response.inspect}" if response && $-d
+        puts ""
+        abort
       end
     end
-
-    def self.host(options)
-      HostedSession.new(options).start!
-    end
   end
 end
 

data/lib/pair/session/tmux.rb

@@ -1,73 +1,48 @@
 require 'fileutils'
+require 'tmpdir'
 
 module Pair
   class Session
     class Tmux
-      TMP_PATH = "/tmp"
+      attr_accessor :session_name
+      private       :session_name=
 
-      attr_accessor :session
-      private       :session=
-
-      def initialize(session)
-        self.session = session
-        create_socket_directory
-      end
-
-      def app_path
-        self.class.to_s.split('::').first.downcase
-      end
-
-      def unique
-        @unique ||= srand.to_s[0,5]
+      def initialize(session_name)
+        self.session_name = session_name
       end
 
       def start
         args = %W[-S #{socket_path} new-session -d]
-        system "tmux", *args
+        system tmux, *args
+      end
 
-        at_exit { stop }
+      def attach(read_only = false)
+        system(*attach_command(read_only))
       end
 
       def stop
-        `lsof -t #{socket_path}/ | xargs kill -9`
+        `lsof -t #{socket_path}/ 2>/dev/null | xargs kill -9`
         FileUtils.rm_f(socket_path)
-        self.session.cleanup_authorized_keys if self.session.respond_to?(:cleanup_authorized_keys)
       end
 
-      def window(command)
-        args = %W[
-          -S #{socket_path}
-          new-window
-          -t #{session.name}:0
-          -n 'Pairing'
-          'ssh pair@bastion.pairmill.com -A'
-        ]
-
-        system "tmux", *args
-      end
-
-      def attach(read_only = false)
-        args = %W[-S #{socket_path} attach]
-        args += " -r" if read_only
-
-        system "tmux", *args
+      def attach_command(read_only = false)
+        args = %W[#{tmux} -S #{socket_path} attach]
+        args << " -r" if read_only
+        args
       end
 
       private
-      def create_socket_directory
-        FileUtils.mkdir_p(socket_directory, :mode => 0700)
-      end
 
-      def socket_directory
-        File.join TMP_PATH, app_path
+      def tmux
+        @tmux ||= `which tmux`.chomp
       end
 
       def socket_path
-        File.join socket_directory, socket_name
+        File.join(Dir.tmpdir, socket_name)
       end
 
       def socket_name
-        "tmux-#{session.name}"
+        "pair-#{session_name.gsub(/[^\w_-]+/,'')}.tmux"
       end
     end
   end

data/lib/pair/session/tunnel.rb

@@ -24,8 +24,11 @@ module Pair
       def open
         self.tunnel = IO.popen(ssh_command)
         puts "SSH tunnel started (PID = #{tunnel.pid})" if $-d
-        at_exit { close }
-        yield if block_given?
+
+        if block_given?
+          yield
+          close
+        end
       end
 
       def close
@@ -41,15 +44,11 @@ module Pair
 
       def ssh_command
         options = []
-        if self.options[:host]
-          options << "-nq"
-          options << "-l #{bastion["host_user"]}"
-          options << "-p #{bastion["ssh_port"]}" unless bastion["ssh_port"] == 22
-          options << "-R #{port}:localhost:#{host_port}"
-        else
-          options << "-tAq"
-          options << "-l #{bastion["join_user"]}"
-        end
+
+        options << "-nqT" # Run no command, be quiet, don't allocate pseudo-terminal
+        options << "-l #{bastion["host_user"]}"
+        options << "-p #{bastion["ssh_port"]}" unless bastion["ssh_port"] == 22
+        options << "-R #{port}:localhost:#{host_port}"
 
         "ssh #{bastion["host"]} #{options.join(" ")}"
       end

data/lib/pair/version.rb

@@ -1,3 +1,3 @@
 module Pair
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/{pairmill → pair}/session/authorized_keys_file_spec.rb

@@ -2,10 +2,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 require 'fileutils'
 
-describe Pairmill::Session::AuthorizedKeysFile do
+describe Pair::Session::AuthorizedKeysFile do
   let(:member_keys) { FixtureHelper.user_keys }
   let(:session) { "testing-session" }
-  let(:subject) { Pairmill::Session::AuthorizedKeysFile.new(member_keys, session) }
+  let(:subject) { Pair::Session::AuthorizedKeysFile.new(member_keys, session) }
 
   before do
     subject.stub!(:backup_authorized_keys)

data/spec/spec_helper.rb

@@ -1,15 +1,15 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+
 require 'rspec'
 require 'json'
 require 'fixture_helper'
-require 'pairmill'
-require 'pairmill/session'
+require 'pair'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pair
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-26 00:00:00.000000000Z
+date: 2011-11-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70280668289560 !ruby/object:Gem::Requirement
+  requirement: &70298620262940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70280668289560
+  version_requirements: *70298620262940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70280668276060 !ruby/object:Gem::Requirement
+  requirement: &70298620258860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70280668276060
+  version_requirements: *70298620258860
 description: Effortless remote pairing
 email:
 - me@bjeanes.com
@@ -66,9 +66,7 @@ files:
 - spec/fixtures/api_hosted_session.yml
 - spec/fixtures/api_joined_session.yml
 - spec/fixtures/user_keys.yml
-- spec/pairmill/session/authorized_keys_file_spec.rb
-- spec/pairmill/session/joined_session_spec.rb
-- spec/pairmill/session/session_spec.rb
+- spec/pair/session/authorized_keys_file_spec.rb
 - spec/spec_helper.rb
 homepage: http://www.pairmill.com
 licenses: []
@@ -99,7 +97,5 @@ test_files:
 - spec/fixtures/api_hosted_session.yml
 - spec/fixtures/api_joined_session.yml
 - spec/fixtures/user_keys.yml
-- spec/pairmill/session/authorized_keys_file_spec.rb
-- spec/pairmill/session/joined_session_spec.rb
-- spec/pairmill/session/session_spec.rb
+- spec/pair/session/authorized_keys_file_spec.rb
 - spec/spec_helper.rb

data/spec/pairmill/session/joined_session_spec.rb

@@ -1,16 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
-describe Pairmill::Session::JoinedSession do
-  let(:host) { "chad.pry@gmail.com" }
-  let(:name) { "testing-conference" }
-
-  describe "when instantiating an object" do
-    it "sets the host" do
-      Pairmill::Session::JoinedSession.new(host, name).host.should == host
-    end
-
-    it "sets the name" do
-      Pairmill::Session::JoinedSession.new(host, name).name.should == name
-    end
-  end
-end

data/spec/pairmill/session/session_spec.rb

@@ -1,40 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
-describe Pairmill::Session do
-  let(:host) { "chad.pry@gmail.com" }
-  let(:name) { "testing-conference" }
-
-#  describe "when joining a session" do
-#    describe "the returned session" do
-#      let(:joined_session) { Pairmill::Session::JoinedSession.new(host, name) }
-#
-#      before do
-#        Pairmill::Session::JoinedSession.stub!(:new).and_return(joined_session)
-#      end
-#
-#      it "starts a joined session" do
-#        joined_session.should_receive(:start!)
-#        Pairmill::Session.join(:host => host, :session_name => name)
-#      end
-#    end
-#  end
-
-  describe "starting a session" do
-    let(:session_json) { FixtureHelper.api_joined_session }
-
-    before do
-      Pairmill::Api.stub!(:join_session).and_return(session_json)
-    end
-
-    it "fetches a session from the api" do
-      session = Pairmill::Session::JoinedSession.new(host, name)
-      session.should_receive(:fetch_session_details)
-      session.start!
-    end
-    
-    it "returns a joined session instance" do
-      session = Pairmill::Session::JoinedSession.new(host, name)
-      session.should be_a(Pairmill::Session::JoinedSession)
-    end
-  end
-end