pairjour 0.1.0.pre1

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/History.txt

@@ -0,0 +1,26 @@
+== 6.6.0 2009-08-18
+
+* Rely on latest DNSSD (1.3)
+
+== 6.5.0 2009-03-17
+
+* Added web command to launch and announce instaweb
+* Added browse command to see all available instawebs
+
+== 6.4.0 2009-03-13
+
+* Add pull command
+* Support git 1.6+
+* Require dnssd 0.7.1+ to support Avahi
+
+== 6.3.0 2008-08-23
+
+* Simplify project layout, remove newgem dependency
+* Add a prefix to projects' served name
+
+[...]
+
+== 0.0.1 2008-05-29
+
+* 1 major enhancement:
+  * Initial release

data/Manifest.txt

@@ -0,0 +1,9 @@
+History.txt
+Manifest.txt
+README.rdoc
+Rakefile
+bin/pairjour
+lib/pairjour.rb
+lib/pairjour/browser.rb
+test/test_pairjour.rb
+test/test_helper.rb

data/README.md

@@ -0,0 +1,37 @@
+Pairjour
+===
+
+
+Use the power of gitjour and git for easy pair programming, This originated as a fork of gitjour
+
+
+3 simple commands
+---
+
+- pairjour start [project_name]
+- pairjour switch
+- pairjour finish
+
+
+
+
+Recommended workfow
+---
+
+Concept
+---
+
+    pairjour start [project_name]
+      ENV[project_name] = project_name
+      clear ENV[remote_project_name]
+  
+      `pairjour serve . project_name`
+      git checkout -b 'pairing'
+
+    pairjour switch
+      unless ENV[remote_project_name]
+        ENV['remote_project_name'] = taylorluk-project_name
+      end
+  
+      git commit -am 'pair session commit Timestamp'
+      gitjour pull [remote_project_name]

data/Rakefile

@@ -0,0 +1,20 @@
+# -*- ruby -*-
+
+require File.dirname(__FILE__) + '/lib/pairjour'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.version = Pairjour::VERSION
+    s.name = "pairjour"
+    s.summary = "pair programming using bonjour and git"
+    s.description = "pair programming using bonjour and git, originalted as a fork of gitjour"
+    s.email = "taylor.luk@idealian.net"
+    s.homepage = "http://github.com/idealian/pairjour"
+    s.authors = ["Taylor luk", "Khoa Nguyne", 'Chad Fowler', 'Evan Phoenix', 'Rich Kilmer', 'Phil Hagelberg']
+    s.add_dependency 'dnssd', "~> 1.3"
+    
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: gem install jeweler"
+end

data/bin/pairjour

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'pairjour'
+
+trap "INT" do
+  exit!
+end
+
+Pairjour::Application.run(*ARGV)

data/lib/pairjour.rb

@@ -0,0 +1,303 @@
+require 'rubygems'
+require 'dnssd'
+require 'set'
+require 'timeout'
+require 'fileutils'
+
+Thread.abort_on_exception = true
+
+module Pairjour
+  VERSION = "0.1.0.pre1"
+  GitService = Struct.new(:name, :host, :port, :description)
+
+  class Application
+
+    class << self
+      def run(*args)
+        case args.shift
+        when "list"
+          list
+        when "pull"
+          pull(*args)
+        when "clone"
+          clone(*args)
+        when "serve"
+          serve(*args)
+        when "remote"
+          remote(*args)
+        when "web"
+          web(*args)
+        when "browse"
+          browse(*args)
+        when "start"
+          start(*args)
+        when "finish"
+          finish(*args)
+        when "switch"
+          switch(*args)
+        else
+          help
+        end
+      end
+
+      private
+
+      # 
+      def start(name)
+        set 'project-name', name
+        
+        `git config --unset pairjour.service-name`
+
+        system "pairjour serve . #{name} &"
+      
+        `git checkout -b pairing`
+      end
+      
+      
+      def switch
+        project = get('project-name')
+        service_name = get('service-name')
+        
+        if service_name == ''
+          service = service_list.find do |s|
+            s.name.include?(project) && !s.name.include?(prefix)
+          end
+          
+          set 'service-name', service_name = service.name
+        end
+
+        `git commit -am "pair session switch #{Time.now.to_s}"`
+        `pairjour pull #{service_name} pairing`
+      end
+      
+      def pid_file_path
+        path = ENV['HOME'] + '/.pairjour/'
+        
+        FileUtils.mkdir_p path
+        
+        path + '.pid'
+      end
+      
+      def finish
+        `kill #{open(pid_file_path).read}`
+      end
+
+      def get(name)
+        `git config pairjour.#{name}`.chomp
+      end
+      
+      def set(name, value)
+        `git config pairjour.#{name} #{value}`
+      end
+
+      def prefix
+        prefix = get('prefix')
+        prefix = ENV["USER"] if prefix.empty?
+        
+        prefix
+      end
+      
+      def service_name(name)
+        # If the name starts with ^, then don't apply the prefix
+        if name[0] == ?^
+          name = name[1..-1]
+        else
+          name = [prefix, name].compact.join("-")
+        end
+        name
+      end
+
+      def list
+        service_list.each do |service|
+          puts "=== #{service.name} on #{service.host}:#{service.port} ==="
+          puts "  pairjour (clone|pull) #{service.name}"
+          if service.description != '' && service.description !~ /^Unnamed repository/
+            puts "  #{service.description}"
+          end
+          puts
+        end
+      end
+
+      def pull(repository_name, branch = "master")
+        service = locate_repo(repository_name) or
+          abort "ERROR: Unable to find project named '#{repository_name}'"
+
+        puts "Connecting to #{service.host}:#{service.port}"
+
+        system "git pull git://#{service.host}:#{service.port}/ #{branch}"
+      end
+
+      def clone(repository_name, *rest)
+        dir = rest.shift || repository_name
+        if File.exists?(dir)
+          abort "ERROR: Clone directory '#{dir}' already exists."
+        end
+
+        puts "Cloning '#{repository_name}' into directory '#{dir}'..."
+
+        service = locate_repo(repository_name) or
+          abort "ERROR: Unable to find project named '#{repository_name}'"
+
+        puts "Connecting to #{service.host}:#{service.port}"
+
+        system "git clone git://#{service.host}:#{service.port}/ #{dir}"
+      end
+
+      def remote(repository_name, *rest)
+        dir = rest.shift || repository_name
+        service = locate_repo repository_name
+        system "git remote add #{dir} git://#{service.host}:#{service.port}/"
+      end
+
+      def serve(path=Dir.pwd, *rest)
+        path = File.expand_path(path)
+        name = service_name(rest.shift || File.basename(path))
+        port = rest.shift || 9418
+
+        if File.exists?("#{path}/.git")
+          announce_git(path, name, port.to_i)
+        else
+          Dir["#{path}/*"].each do |dir|
+            if File.directory?(dir)
+              name = File.basename(dir)
+              announce_git(dir, name, 9418)
+            end
+          end
+        end
+        
+        system "git daemon --verbose --export-all --port=#{port} --base-path=#{path} --base-path-relaxed --pid-file=#{pid_file_path}"
+      end
+
+      def web(path=Dir.pwd, *rest)
+        path = File.expand_path(path)
+        name = service_name(rest.shift || File.basename(path))
+        port = rest.shift || 1234
+        httpd = rest.shift || "webrick"
+
+        system("git instaweb --httpd=#{httpd} --port=#{port}") or
+          abort "Unable to launch git instaweb."
+
+        announce_web(path, name, port.to_i)
+
+        trap("INT") do
+          puts "Stopping instaweb..."
+          system "git instaweb stop"
+          exit
+        end
+
+        Thread.stop
+      end
+
+      def help
+        puts "Pairjour #{Pairjour::VERSION}"
+        puts "Serve up and use git repositories via ZeroConf."
+        puts "\nUsage: pairjour <command> [args]"
+        puts
+        puts "  list"
+        puts "      Lists available repositories."
+        puts
+        puts "  clone <project> [<directory>]"
+        puts "      Clone a pairjour-served repository."
+        puts
+        puts "  serve <path_to_project> [<name_of_project>] [<port>] or"
+        puts "        <path_to_projects>"
+        puts "      Serve up the current directory or projects via pairjour."
+        puts
+        puts "      The name of your project is automatically prefixed with"
+        puts "      `git config --get pairjour.prefix` or your username (preference"
+        puts "      in that order). If you don't want a prefix, put a ^ on the front"
+        puts "      of the name_of_project (the ^ is removed before announcing)."
+        puts
+        puts "  pull <project> [<branch>]"
+        puts "      Pull from a pairjour-served repository."
+        puts
+        puts "  remote <project> [<name>]"
+        puts "      Add a ZeroConf remote into your current repository."
+        puts "      Optionally pass name to not use pwd."
+        puts
+        puts "  web <path_to_project> [<name_of_project>] [<port>] [<httpd_daemon>]"
+        puts "      Serve up the current directory via git instaweb for browsers."
+        puts "      The default port is 1234 and the httpd_daemon is defaulted to"
+        puts "      webrick. Other options are 'lighttpd' and 'apache2' (See the"
+        puts "      git-instaweb man page for more details)"
+        puts
+        puts "  browse [<port>] [<browser>]"
+        puts "      Browse git repositories published with the 'web' command (see"
+        puts "      above). This command takes two optional arguments: the first"
+        puts "      is the port for the local web server (default 9850), the second"
+        puts "      is the path to your web browser (see man git-web--browse for"
+        puts "      details)."
+        puts
+      end
+
+      class Done < RuntimeError; end
+
+      def discover(timeout=5)
+        waiting_thread = Thread.current
+
+        dns = DNSSD.browse "_git._tcp" do |reply|
+          DNSSD.resolve reply.name, reply.type, reply.domain do |resolve_reply|
+            service = GitService.new(reply.name,
+                                     resolve_reply.target,
+                                     resolve_reply.port,
+                                     resolve_reply.text_record['description'].to_s)
+            begin
+              yield service
+            rescue Done
+              waiting_thread.run
+            end
+          end
+        end
+
+        puts "Gathering for up to #{timeout} seconds..."
+        sleep timeout
+        dns.stop
+      end
+
+      def locate_repo(name)
+        found = nil
+
+        discover do |obj|
+          if obj.name == name
+            found = obj
+            raise Done
+          end
+        end
+
+        return found
+      end
+
+      def service_list
+        list = Set.new
+        discover { |obj| list << obj }
+
+        return list
+      end
+
+      def browse(*args)
+        require "pairjour/browser"
+        Browser.new(*args).start
+      end
+
+      def announce_repo(path, name, port, type)
+        return unless File.exists?("#{path}/.git")
+
+        tr = DNSSD::TextRecord.new
+        tr['description'] = File.read("#{path}/.git/description") rescue "a git project"
+        tr['pairjour'] = 'true' # distinguish instaweb from other HTTP servers
+
+        DNSSD.register(name, type, 'local', port, tr) do |rr|
+          puts "Registered #{name} on port #{port}. Starting service."
+        end
+      end
+
+      def announce_git(path, name, port)
+        announce_repo(path, name, port, "_git._tcp")
+      end
+
+      def announce_web(path, name, port)
+        announce_repo(path, name, port, "_http._tcp")
+      end
+    end
+  end
+end

data/lib/pairjour/browser.rb

@@ -0,0 +1,111 @@
+require "webrick"
+require "erb"
+require "set"
+require "thread"
+
+module Pairjour
+  class Browser
+
+    def initialize(*args)
+      @port = args.shift || 9850
+      @browser = args.shift
+      @services = Set.new
+      @mutex = Mutex.new
+    end
+
+    def start
+      DNSSD.browse("_http._tcp") do |reply|
+        begin
+          DNSSD.resolve reply.name, reply.type, reply.domain do |resolve_reply|
+            next unless resolve_reply.text_record['pairjour']
+            service = GitService.new(reply.name,
+                                     resolve_reply.target,
+                                     resolve_reply.port,
+                                     resolve_reply.text_record['description'].to_s)
+
+            @mutex.synchronize do
+              if @services.member? service
+                @services.delete service
+              else
+                @services << service
+              end
+            end
+          end
+        rescue ArgumentError # usually a jacked DNS text record
+        end
+      end
+
+      http = WEBrick::HTTPServer.new(:Port => @port.to_i)
+      http.mount_proc("/") { |req, res| index(req, res) }
+      http.mount_proc("/style.css") { |req, res| stylesheet(req, res) }
+      trap("INT") { http.shutdown }
+      t = Thread.new { http.start }
+
+      url = "http://localhost:#{@port}"
+      if @browser
+        `git web--browse -b '#{@browser}' http://localhost:9850`
+      else
+        `git web--browse -c "instaweb.browser" http://localhost:9850`
+      end
+      t.join
+    end
+
+    def index(req, res)
+      res['Content-Type'] = 'text/html'
+      res.body = index_html.result(binding)
+    end
+
+    def index_html
+      @index_html ||= ERB.new(<<-HTML)
+        <html>
+          <body>
+            <head>
+              <link rel="stylesheet" href="/style.css" type="text/css" media="screen"/>
+              <title>Browseable Git Repositories</title>
+            </head>
+            <h1>Browseable Git Repositories</h1>
+            <ul>
+            <% @mutex.synchronize do %>
+              <% @services.map do |s| %>
+                <li>
+                  <a href='http://<%= s.host %>:<%= s.port %>' target="_new">
+                    <%= s.name %>
+                  </a>
+                  <%= s.description unless s.description =~ /^Unnamed repository/ %>
+                </li>
+              <% end %>
+            <% end %>
+            </ul>
+          </body>
+        </html>
+      HTML
+    end
+
+    def stylesheet(req, res)
+      res['Content-Type'] = 'text/css'
+      res.body = css
+    end
+
+    def css
+      @css ||= <<-CSS
+        body {
+          font-family: sans-serif;
+          font-size: 12px;
+          background-color: #fff;
+        }
+
+        h1 {
+          font-size: 20px;
+          font-weight: bold;
+        }
+
+        ul {
+          border: 1px dashed #999;
+          padding: 10 10 10 20;
+          background-color: #ccc;
+        }
+      CSS
+    end
+  end
+
+end

data/pairjour.gemspec

@@ -0,0 +1,56 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{pairjour}
+  s.version = "0.1.0.pre1"
+
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Taylor luk", "Khoa Nguyne", "Chad Fowler", "Evan Phoenix", "Rich Kilmer", "Phil Hagelberg"]
+  s.date = %q{2010-08-30}
+  s.default_executable = %q{pairjour}
+  s.description = %q{pair programming using bonjour and git, originalted as a fork of gitjour}
+  s.email = %q{taylor.luk@idealian.net}
+  s.executables = ["pairjour"]
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "Manifest.txt",
+     "README.md",
+     "Rakefile",
+     "bin/pairjour",
+     "lib/pairjour.rb",
+     "lib/pairjour/browser.rb",
+     "pairjour.gemspec",
+     "test/test_helper.rb",
+     "test/test_pairjour.rb"
+  ]
+  s.homepage = %q{http://github.com/idealian/pairjour}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{pair programming using bonjour and git}
+  s.test_files = [
+    "test/test_helper.rb",
+     "test/test_pairjour.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<dnssd>, ["~> 1.3"])
+    else
+      s.add_dependency(%q<dnssd>, ["~> 1.3"])
+    end
+  else
+    s.add_dependency(%q<dnssd>, ["~> 1.3"])
+  end
+end
+

data/test/test_helper.rb

@@ -0,0 +1,3 @@
+require 'test/unit'
+require 'fileutils'
+require File.dirname(__FILE__) + '/../lib/pairjour'

data/test/test_pairjour.rb

@@ -0,0 +1,23 @@
+require 'net/telnet'
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestPairjour < Test::Unit::TestCase
+  def test_thread_friendly
+    repo = File.dirname(__FILE__) + '/repo'
+    port = 3289
+    FileUtils.rm_rf repo
+    `mkdir -p #{repo}; cd #{repo}; git init`
+    
+    thread = Thread.new do
+      Pairjour::Application.send(:serve, repo, 'test', port)
+    end
+
+    sleep 1
+    Net::Telnet::new("Host" => "localhost", "Port" => port)
+
+    thread.kill
+    assert_raises(Errno::ECONNREFUSED) do
+      Net::Telnet::new("Host" => "localhost", "Port" => port)
+    end
+  end
+end

metadata

@@ -0,0 +1,96 @@
+--- !ruby/object:Gem::Specification 
+name: pairjour
+version: !ruby/object:Gem::Version 
+  prerelease: true
+  segments: 
+  - 0
+  - 1
+  - 0
+  - pre1
+  version: 0.1.0.pre1
+platform: ruby
+authors: 
+- Taylor luk
+- Khoa Nguyne
+- Chad Fowler
+- Evan Phoenix
+- Rich Kilmer
+- Phil Hagelberg
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-08-30 00:00:00 +10:00
+default_executable: pairjour
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: dnssd
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :runtime
+  version_requirements: *id001
+description: pair programming using bonjour and git, originalted as a fork of gitjour
+email: taylor.luk@idealian.net
+executables: 
+- pairjour
+extensions: []
+
+extra_rdoc_files: 
+- README.md
+files: 
+- .gitignore
+- History.txt
+- Manifest.txt
+- README.md
+- Rakefile
+- bin/pairjour
+- lib/pairjour.rb
+- lib/pairjour/browser.rb
+- pairjour.gemspec
+- test/test_helper.rb
+- test/test_pairjour.rb
+has_rdoc: true
+homepage: http://github.com/idealian/pairjour
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.7
+signing_key: 
+specification_version: 3
+summary: pair programming using bonjour and git
+test_files: 
+- test/test_helper.rb
+- test/test_pairjour.rb