bananajour 2.2.2 → 2.6

data/Readme.md

@@ -28,7 +28,7 @@ Install it from [gemcutter](http://gemcutter.org/) via gems:
 Start it up:
 
     bananajour
-    
+
 Go into an existing project and add it to bananajour:
 
     cd ~/code/myproj
@@ -47,14 +47,43 @@ For a list of all the commands:
 
     bananajour help
 
+Optional configuration: you can override the hostname by setting a global git config option like so:
+
+    git config --global bananajour.hostname foobar
+
+If you set this setting, then bananajour will assume that you know precisely what you're doing, it will not append .local, it will not check this hostname is valid, or do anything to it.  If you set this, then you're on your own.
+
+Make sure you have these ports open on your firewall:
+9417 - git - bigbananajour
+9418 - git - bananajour
+9331 - bananajour
+9332 - bigbananajour
+
+
 Linux support
 -------------
 
-To install the dnssd gem on linux you'll need [avahi](http://avahi.org/). For Ubunutu peeps this means:
+To install the dnssd gem on Linux you'll need [avahi](http://avahi.org/). For Ubunutu peeps this means:
+
+  sudo apt-get install libavahi-compat-libdnssd-dev libavahi-discover
+
+You can debug whether or not Avahi can see Bananajour and git-daemon Bonjour statuses using the command 'avahi-browse'.  This command can be found in the package 'avahi-utils'.
+
+The following command will show you all of the Bonjour services running on your local network:
+
+  avahi-browse --all
+
+If you kill bananajour with kill -9 it doesn't get a chance to unregister the Bonjour services, and when it is restarted it will die with DNSSD::AlreadyRegisteredError.  Although not ideal, you can work around this my restarting avahi-daemon first.
+
+You will also need to uncomment the following line in your /etc/avahi/avahi-daemon.conf.
+
+  domain-name=local
+
+And then restart the Avahi service:
 
-    sudo apt-get install libavahi-compat-libdnssd-dev
+  sudo service avahi-daemon restart
 
-On Linux, if you kill bananajour with kill -9 it doesn't get a chance to unregister the Bonjour services, and when it is restarted it will die with DNSSD::AlreadyRegisteredError.  Although not ideal, you can work around this my restarting avahi-daemon first.
+Note: You might have to restart the avahi-daemon sometimes if you are having problems seeing other bananajours.
 
 Using with Ginatra
 ------------------
@@ -107,4 +136,4 @@ All directories and files are MIT Licensed.
 
 Warning to all those who still believe secrecy will save their revenue stream
 -----------------------------------------------------------------------------
-Bananas were meant to be shared. There are no secret bananas.
+Bananas were meant to be shared. There are no secret bananas.

data/bin/bananajour

@@ -9,13 +9,24 @@ Bananajour.setup! if !Bananajour.setup?
 Bananajour.check_git!
 Bananajour.check_git_config!
 
+parent_process_pid = Process.pid
+pids = []
+at_exit do 
+  if Process.pid == parent_process_pid
+    pids.each do |pid| 
+      Process.kill("TERM", pid) rescue nil
+      sleep 0.2
+    end
+  end
+end
+
 case ARGV.first
 
 when nil
-  Bananajour.serve_web!
-  Bananajour.serve_git!
-  Bananajour.advertise!
-  Process.wait
+  pids << Bananajour.serve_web!
+  pids << Bananajour.serve_git!
+  pids << Bananajour.advertise!
+  Process.waitall
 
 when "add", "init"
   repo = Bananajour.add!(ARGV[1] || File.expand_path("."))

data/lib/bananajour/bonjour/advertiser.rb

@@ -15,7 +15,7 @@ class Bananajour::Bonjour::Advertiser
       tr["uri"] = Bananajour.web_uri
       tr["gravatar"] = Bananajour.gravatar
       tr["version"] = Bananajour::VERSION
-      DNSSD.register("#{Bananajour.config.name}'s bananajour", "_http._tcp,_bananajour", nil, Bananajour.web_port, tr) {}
+      DNSSD.register("#{Bananajour.config.name}'s bananajour", "_http._tcp,_bananajour", nil, Bananajour.web_port, tr)
     end
     def register_repos
       loop do
@@ -45,7 +45,7 @@ class Bananajour::Bonjour::Advertiser
         tr["bjour-uri"] = Bananajour.web_uri
         tr["bjour-gravatar"] = Bananajour.gravatar
         tr["bjour-version"] = Bananajour::VERSION
-        service = DNSSD.register(new_repo.name, "_git._tcp,_bananajour", nil, 9418, tr) {}
+        service = DNSSD.register(new_repo.name, "_git._tcp,_bananajour", nil, 9418, tr)
         service.class.instance_eval { attr_accessor(:repository) }
         service.repository = new_repo
         @services << service

data/lib/bananajour/bonjour/browser.rb

@@ -20,41 +20,37 @@ class Bananajour::Bonjour::Browser
   def initialize(service)
     @service = service
     @mutex = Mutex.new
-    @replies = []
+    @replies = {}
     watch!
   end
   def replies
-    @mutex.synchronize do
-      @replies.clone
-    end
+    @mutex.synchronize { @replies.values }
   end
   private
     def watch!
-      DNSSD.browse(@service) do |br|
+      Thread.new(@service, @mutex, @replies) do |service, mutex, replies|
         begin
-          Timeout.timeout(5) do
-            DNSSD.resolve(br) do |rr|
+          DNSSD.browse!(service) do |reply|
+            Thread.new(reply, replies, mutex) do |reply, replies, mutex|
               begin
-                @mutex.synchronize do
-                  rr_exists = Proc.new {|existing_rr| existing_rr.target == rr.target && existing_rr.fullname == rr.fullname}
-                  if (DNSSD::Flags::Add & br.flags.to_i) != 0
-                    @replies << rr unless @replies.any?(&rr_exists)
-                  else
-                    @replies.delete_if(&rr_exists)
+                DNSSD.resolve!(reply.name, reply.type, reply.domain) do |resolve_reply|
+                  mutex.synchronize do
+                    if reply.flags.add?
+                      replies[reply.fullname] = resolve_reply
+                    else
+                      replies.delete(reply.fullname)
+                    end
                   end
+                  resolve_reply.service.stop unless resolve_reply.service.stopped?
                 end
-              rescue DNSSD::UnknownError
-                $stderr.puts "unknown error occurred in dnssd: #{$!.message}"
-              ensure
-                rr.service.stop unless rr.service.stopped?
+              rescue DNSSD::BadParamError
+                # Ignore em
               end
             end
           end
-        rescue DNSSD::UnknownError
-          $stderr.puts "unknown error occurred in dnssd: #{$!.message}"
-        rescue Timeout::Error
-          # Do nothing
+        rescue DNSSD::BadParamError
+          # Ignore em
         end
       end
     end
-end
+end

data/lib/bananajour/commands.rb

@@ -11,15 +11,16 @@ module Bananajour::Commands
     abort(config_message["user.name", "My Name"]) if config.name.empty?
     abort(config_message["user.email", "name@domain.com"]) if config.email.empty?
   end
-  
+
+  # Start sinatra app.
   def serve_web!
+    puts "* Starting " + web_uri.foreground(:yellow)
     fork { exec "/usr/bin/env ruby #{File.dirname(__FILE__)}/../../sinatra/app.rb -p #{web_port} -e production" }
-    puts "* Started " + web_uri.foreground(:yellow)
   end
 
   def serve_git!
+    puts "* Starting " + "#{git_uri}".foreground(:yellow)
     fork { exec "git daemon --base-path=#{repositories_path} --export-all" }
-    puts "* Started " + "#{git_uri}".foreground(:yellow)
   end
   
   def advertise!

data/lib/bananajour/gem_dependencies.rb

@@ -10,8 +10,6 @@ module Bananajour
       %w( rainbow              1.0.1 ),
       %w( grit                 1.1.1 ),
       %w( dnssd                1.3.1 ),
-      %w( rack                 1.0.0 ),
-      %w( thin                 1.0.0 ),
       %w( haml                 2.0.9 ),
       %w( activesupport        2.3.2 )
     ]

data/lib/bananajour/version.rb

@@ -1,3 +1,3 @@
 module Bananajour
-  VERSION = '2.2.2'
+  VERSION = '2.6'
 end

data/lib/bananajour.rb

@@ -65,6 +65,11 @@ module Bananajour
     end
     
     def host_name
+      hn = get_git_global_config("bananajour.hostname")
+      unless hn.nil? or hn.empty?
+        return hn
+      end
+
       hn = Socket.gethostname
 
       # if there is more than one period in the hostname then assume it's a FQDN

data/sinatra/app.rb

@@ -20,12 +20,10 @@ set :server, 'thin' # Things go weird with anything else - let's lock it down to
 set :haml, {:format => :html5, :attr_wrapper => '"'}
 set :logging, false
 
-require "#{__DIR__}/lib/browsers" # to prevent reloading
 require "#{__DIR__}/lib/mock_browsers" if Sinatra::Application.development?
-before do
-  @bananajour_browser = BANANAJOUR_BROWSER
-  @repository_browser = REPO_BROWSER
-end
+
+set :bananajour_browser, Bananajour::Bonjour::BananajourBrowser.new
+set :repository_browser, Bananajour::Bonjour::RepositoryBrowser.new
 
 load "#{__DIR__}/lib/diff_helpers.rb"
 helpers DiffHelpers
@@ -34,6 +32,8 @@ require "bananajour/helpers"
 helpers Bananajour::GravatarHelpers, Bananajour::DateHelpers
 
 helpers do
+  def bananajour_browser() options.bananajour_browser end
+  def repository_browser() options.repository_browser end
   def json(body)
     content_type "application/json"
     params[:callback] ? "#{params[:callback]}(#{body});" : body
@@ -52,8 +52,8 @@ end
 
 get "/" do
   @my_repositories     = Bananajour.repositories
-  @other_repos_by_name = @repository_browser.other_repositories.group_by {|r| r.name}
-  @people              = @bananajour_browser.other_bananajours
+  @other_repos_by_name = repository_browser.other_repositories.group_by {|r| r.name}
+  @people              = bananajour_browser.other_bananajours
   haml :home
 end
 

data/sinatra/views/home.haml

@@ -237,7 +237,7 @@
                 &= commit.author
     - else
       %ul.network
-        - for repo in @repository_browser.repositories_similar_to(repository)
+        - for repo in repository_browser.repositories_similar_to(repository)
           %li.loading{'data-json-uri' => repo.json_uri}
             %a.name{:href => "#{repo.person.uri}##{repo.html_id}"}= repo.person.name
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bananajour
 version: !ruby/object:Gem::Version 
-  version: 2.2.2
+  version: "2.6"
 platform: ruby
 authors: 
 - Tim Lucas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-17 00:00:00 +11:00
+date: 2009-11-23 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,26 +72,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.3.1
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: thin
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: haml
   type: :runtime
@@ -139,7 +119,6 @@ files:
 - lib/bananajour/version.rb
 - lib/bananajour.rb
 - sinatra/app.rb
-- sinatra/lib/browsers.rb
 - sinatra/lib/diff_helpers.rb
 - sinatra/lib/mock_browsers.rb
 - sinatra/public/jquery-1.3.2.min.js

data/sinatra/lib/browsers.rb

@@ -1,2 +0,0 @@
-BANANAJOUR_BROWSER = Bananajour::Bonjour::BananajourBrowser.new
-REPO_BROWSER = Bananajour::Bonjour::RepositoryBrowser.new