pingpongpear 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 398675b7d66d9103e11e13a4c5e16d6dc4084dac
-  data.tar.gz: ebe8152549dae3433f437f563af4f6abe22b49b6
+  metadata.gz: 7c0839e52767ce0d7c55c2089253fba002345785
+  data.tar.gz: c83a92f8743ae021c67edb43022946df58eadce4
 SHA512:
-  metadata.gz: 2794b44623036b5b525c332fe52e676e9b751585c0406ba63c77fb5fcc9b712b7956131114c00a12794a4de425be655a144b8202dc7a2d39e95a20a496a4a9bb
-  data.tar.gz: b61c396a9d1fd66ca26d9604e3f508f5969e7377c671378b690c0ea1abe72140d09c01fc5755511fd2e1e0a5baaca80f655a4ebf1d660d4d1fb66d9e5323de53
+  metadata.gz: ab94cabb5d3a0ec278810519fa08f9416c2baac554819ce3eafdd33819dd8b247c3e99edb14b66ffba62339ef7fefe2e765c030a72c785eeb745b1f9ca7dca14
+  data.tar.gz: 7294e1f3f09f9dca66f6ff5b317d8f95e59b6a6abc15015714e86afa0ee51c1195de12cbaf8a786eb73665170cd5065b7be7f18edeac2122afff61ca0b0a22da

data/bin/pingpongpear

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'ping_pong_pear'
-PingPongPear::Commands.run ARGV
+PingPongPear.run(ARGV)

data/lib/ping_pong_pear.rb

@@ -1,143 +1,167 @@
-require 'socket'
-require 'ipaddr'
-require 'json'
-
-module PingPongPear
-  VERSION        = '1.0.0'
-  UDP_PORT       = 4545
-  MULTICAST_ADDR = "224.0.0.1"
-
-  class Broadcaster
-    def self.my_public_address
-      Socket.ip_address_list.reject { |addr|
-        addr.ipv4_loopback? || addr.ipv6_loopback? || addr.ipv6_linklocal?
-      }.first
-    end
+require 'dnssd'
+require 'webrick'
+require 'securerandom'
+require 'set'
+require 'net/http'
+require 'logger'
+require 'shellwords'
+
+class PingPongPear
+  VERSION = '2.0.0'
+
+  SERVICE = "_http._tcp,pingpongpear"
+
+  def self.run args
+    new.public_send args.first, *args.drop(1)
+  rescue
+    cmds = public_instance_methods(false).find_all { |x|
+      instance_method(x).arity < 0
+    }
+    $stderr.puts "USAGE: pingpongpear #{cmds}"
+    exit 1
+  end
 
-    def self.send_update args
-      new.send ['commit'] + args
-    end
+  attr_reader :pull_requests, :peers, :logger
 
-    def self.send_location name, address, port
-      new.send ['source', name, address, port]
-    end
+  def initialize
+    @pull_requests      = Queue.new
+    @send_pull_requests = Queue.new
+    @peers              = Set.new
+    @logger             = Logger.new $stdout
+  end
 
-    def self.where_is? name
-      listener_t = Thread.new {
-        listener = Listener.new
-        listener.start { |cmd, n, *rest|
-          break(rest) if cmd == 'source' && n == name
-        }
-      }
-      broadcast = new
-      while listener_t.alive?
-        broadcast.send ['locate', name]
-      end
-      addr, port = listener_t.value
-      "http://#{addr}:#{port}/"
-    end
+  def start name = File.basename(Dir.pwd)
+    post_commit_hook = '.git/hooks/post-commit'
+    pidfile = '.git/pingpongpear.pid'
 
-    def initialize
-      @multicast_addr = MULTICAST_ADDR
-      @port           = UDP_PORT
-      @socket         = UDPSocket.open
-      @socket.setsockopt :IPPROTO_IP, :IP_MULTICAST_TTL, 1
+    if File.exist? pidfile
+      raise "Another instance of Ping Pong Pear is running"
+    else
+      File.open(pidfile, 'w') { |f| f.write $$ }
     end
 
-    def send message
-      @socket.send(JSON.dump(message), 0, @multicast_addr, @port)
-    end
-  end
+    File.open(post_commit_hook, 'w') { |f|
+      f.write <<-eof
+#!/bin/sh
+
+git update-server-info
+kill -INFO $(cat #{pidfile})
+      eof
+    }
+    File.chmod 0755, post_commit_hook
+
+    system "git update-server-info"
+
+    at_exit {
+      File.unlink pidfile
+      File.unlink post_commit_hook
+    }
+
+    identifier    = make_ident name
+
+    logger.info "SEND THIS TO YOUR PEAR `git clone #{name}`"
+    logger.info "CTRL-T sends pull requests to all peers"
+    logger.debug "MY PROJECT NAME: #{name} IDENT: #{identifier}"
 
-  class Listener
-    def initialize
-      @multicast_addr = MULTICAST_ADDR
-      @bind_addr      = "0.0.0.0"
-      @port           = UDP_PORT
+    server        = start_server pull_requests
+    http_port     = server.listeners.map { |x| x.addr[1] }.first
+    hostname      = Socket.gethostname
 
-      @socket = UDPSocket.new
-      membership = IPAddr.new(@multicast_addr).hton + IPAddr.new(@bind_addr).hton
+    discover identifier, name, peers
+    process_pull_requests pull_requests
+    process_send_pull_requests @send_pull_requests
 
-      @socket.setsockopt :IPPROTO_IP, :IP_ADD_MEMBERSHIP, membership
-      @socket.setsockopt :SOL_SOCKET, :SO_REUSEPORT, 1
+    trap('INFO') { send_pull_requests peers, hostname, http_port }
 
-      @socket.bind @bind_addr, @port
+    advertise(identifier, name, hostname, http_port).each { |x| x }
+  end
+
+  def clone name, dir = nil
+    browser = DNSSD::Service.browse SERVICE
+    browser.each do |response|
+      r = response.resolve
+      if r.text_record['project'] == name
+        url = "http://#{r.target}:#{r.port}"
+        system "git clone #{Shellwords.escape(url)} #{dir || Shellwords.escape(name)}"
+        break
+      end
     end
+  end
 
-    def start
-      loop do
-        message, _ = @socket.recvfrom 1024
-        yield JSON.parse(message)
+  private
+
+  def start_server pull_requests
+    server = WEBrick::HTTPServer.new Port: 0,
+                                     DocumentRoot: '.git',
+                                     Logger: logger
+    server.mount_proc '/pull' do |req, res|
+      host = req.query['host']
+      port = req.query['port']
+      if host && port
+        logger.info "ADDED PR: #{host}:#{port}"
+        pull_requests << [host, port.to_i]
       end
+      res.body = ''
     end
+    Thread.new { server.start }
+    server
+  end
+
+  def advertise ident, name, hostname, http_port
+    txt = DNSSD::TextRecord.new 'project' => name
+    DNSSD::Service.register ident, SERVICE, nil, http_port, hostname, txt
+  end
+
+  def make_ident name
+    "#{name} (#{SecureRandom.hex.slice(0, 4)})"
   end
 
-  module Commands
-    def self.start args
-      require 'webrick'
-      require 'securerandom'
-      require 'shellwords'
-
-      project_name     = args.first || File.basename(Dir.pwd)
-      post_commit_hook = '.git/hooks/post-commit'
-      uuid             = SecureRandom.uuid
-
-      system 'git update-server-info'
-
-      server = WEBrick::HTTPServer.new Port: 0, DocumentRoot: '.git'
-      http_port = server.listeners.map { |x| x.addr[1] }.first
-      my_address = Broadcaster.my_public_address.ip_address
-
-      File.open(post_commit_hook, 'w') { |f|
-        f.puts "#!/usr/bin/env ruby"
-        f.puts "ARGV[0] = 'update'"
-        f.puts "ARGV[1] = '#{project_name}'"
-        f.puts "ARGV[2] = '#{uuid}'"
-        f.puts "ARGV[3] = '#{my_address}'"
-        f.puts "ARGV[4] = '#{http_port}'"
-        f.write File.read __FILE__
-      }
-      File.chmod 0755, post_commit_hook
-
-      Thread.new {
-        listener = PingPongPear::Listener.new
-        listener.start { |cmd, name, *rest|
-          next unless name == project_name
-
-          case cmd
-          when 'locate' then Broadcaster.send_location project_name, my_address, http_port
-          when 'commit'
-            unless rest.first == uuid
-              url = "http://#{rest.drop(1).join(':')}"
-              system "git pull #{Shellwords.escape(url)}"
-            end
+  def discover ident, name, peers
+    browser = DNSSD::Service.browse SERVICE
+    browser.async_each do |response|
+      if response.flags.to_i > 0
+        logger.debug "SAW: #{response.name}"
+        unless response.name == ident
+          r = response.resolve
+          if r.text_record['project'] == name
+            logger.info "PEER: #{response.name}"
+            peers << [response.name, r.target, r.port]
           end
-        }
-      }
-
-      trap('INT') {
-        File.unlink post_commit_hook
-        server.shutdown
-      }
-      server.start
+        end
+      else
+        peers.delete_if { |id, _, _| id == response.name }
+        logger.info "REMOVED: #{response.name}"
+      end
     end
+  end
 
-    def self.clone args
-      require 'shellwords'
-      name = args.first
-      url = PingPongPear::Broadcaster.where_is? name
-      system "git clone #{Shellwords.escape(url)} #{Shellwords.escape(name)}"
+  def send_pull_requests peers, http_host, http_port
+    peers.each do |_, host, port|
+      @send_pull_requests << [host, port, http_host, http_port]
     end
+  end
 
-    def self.update args
-      system 'git update-server-info'
-      PingPongPear::Broadcaster.send_update args
+  def process_send_pull_requests requests
+    Thread.new do
+      while pr = requests.pop
+        host, port, http_host, http_port = *pr
+        http    = Net::HTTP.new host, port
+        request = Net::HTTP::Post.new '/pull'
+        request.set_form_data 'host' => http_host, 'port' => http_port
+        http.request request
+      end
     end
+  end
 
-    def self.run args
-      send args.first, args.drop(1)
+  def process_pull_requests pull_requests
+    Thread.new do
+      while pr = pull_requests.pop
+        url = "http://#{pr.join(':')}"
+        logger.debug "git pull #{Shellwords.escape(url)}"
+        system "git pull #{Shellwords.escape(url)}"
+      end
     end
   end
 end
 
-PingPongPear::Commands.run(ARGV) if $0 == __FILE__
+PingPongPear.run(ARGV) if $0 == __FILE__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pingpongpear
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest