bananajour 2.1.9 → 2.2

data/Readme.md

@@ -5,7 +5,6 @@ Local git repository hosting with a sexy web interface and Bonjour discovery. It
 
 Unlike Gitjour, the repositories you're serving are not your working git repositories, they're served from `~/.bananajour/repositories`. You can push to your bananajour repositories from your working copies just like you do with github.
 
-Bananajour is the baby of [Tim Lucas](http://toolmantim.com/) with much railscamp hackage by [Nathan de Vries](http://github.com/atnan), [Lachlan Hardy](http://github.com/lachlanhardy), [Josh Bassett](http://github.com/nullobject), [Myles Byrne](http://github.com/quackingduck), [Ben Hoskings](http://github.com/benhoskings), [Brett Goulder](http://github.com/brettgo1), [Tony Issakov](https://github.com/tissak), and [Mark Bennett](http://github.com/MarkBennett). The rad logo was by [Carla Hackett](http://carlahackettdesign.com/). Other various fixes and contributions by [Travis Swicegood](http://github.com/tswicegood) and [Nate Haas](http://github.com/natehaas).
 
 ![Screenshot of local view of Bananajour 2.1.3](http://cloud.github.com/downloads/toolmantim/bananajour/screenshot.png)
 
@@ -14,11 +13,11 @@ Installation and usage
 
 You'll need at least [git version 1.6](http://git-scm.com/). Run `git --version` if you're unsure.
 
-Install it from github via gems:
+Install it from [gemcutter](http://gemcutter.org/) via gems:
 
-    gem install toolmantim-bananajour
+    gem install bananajour
 
-(you might need to do a `gem sources -a http://gems.github.com` beforehand!)
+(you might need to do a `gem sources -a http://gemcutter.org` beforehand!)
 
 Start it up:
 
@@ -49,6 +48,8 @@ To install the dnssd gem on linux you'll need [avahi](http://avahi.org/). For Ub
 
     sudo apt-get install libavahi-compat-libdnssd-dev
 
+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.
+
 Using with Ginatra
 ------------------
 
@@ -76,6 +77,22 @@ If you then want to run your working copy as your public bananajour rebuild and
 
     sudo rake gem:install
 
+Contributors
+------------
+
+* [Carla Hackett](http://carlahackettdesign.com/) (logo)
+* [Nathan de Vries](http://github.com/atnan)
+* [Lachlan Hardy](http://github.com/lachlanhardy)
+* [Josh Bassett](http://github.com/nullobject)
+* [Myles Byrne](http://github.com/quackingduck)
+* [Ben Hoskings](http://github.com/benhoskings)
+* [Brett Goulder](http://github.com/brettgo1)
+* [Tony Issakov](https://github.com/tissak)
+* [Mark Bennett](http://github.com/MarkBennett)
+* [Travis Swicegood](http://github.com/tswicegood)
+* [Nate Haas](http://github.com/natehaas)
+* [James Sadler](http://github.com/freshtonic)
+
 License
 -------
 

data/lib/bananajour/bonjour/bananajour_browser.rb

@@ -2,9 +2,9 @@ module Bananajour::Bonjour
 class BananajourBrowser
 
   def initialize
-    @browser = Browser.new('_bananajour._http._tcp')
+    @browser = Browser.new('_http._tcp,_bananajour')
   end
-  
+
   def bananajours
     @browser.replies.map do |reply|
       Person.new(

data/lib/bananajour/bonjour/browser.rb

@@ -8,8 +8,8 @@ Thread.abort_on_exception = true
 # Generic bonjour browser
 #
 # Example use:
-# 
-#   browser = BonjourBrowser.new("_bananajour._git._tcp")
+#
+#   browser = BonjourBrowser.new("_git._tcp,_bananajour")
 #   loop do
 #     sleep(1)
 #     pp browser.replies.map {|r| r.name}
@@ -17,19 +17,23 @@ Thread.abort_on_exception = true
 #
 # Probably gem-worthy
 class Bananajour::Bonjour::Browser
-  attr_reader :replies
   def initialize(service)
     @service = service
     @mutex = Mutex.new
     @replies = []
     watch!
   end
+  def replies
+    @mutex.synchronize do
+      @replies.clone
+    end
+  end
   private
     def watch!
       DNSSD.browse(@service) do |br|
         begin
           Timeout.timeout(5) do
-            DNSSD.resolve(br.name, br.type, br.domain) do |rr|
+            DNSSD.resolve(br) do |rr|
               begin
                 @mutex.synchronize do
                   rr_exists = Proc.new {|existing_rr| existing_rr.target == rr.target && existing_rr.fullname == rr.fullname}
@@ -39,11 +43,15 @@ class Bananajour::Bonjour::Browser
                     @replies.delete_if(&rr_exists)
                   end
                 end
+              rescue DNSSD::UnknownError
+                $stderr.puts "unknown error occurred in dnssd: #{$!.message}"
               ensure
-                rr.service.stop
+                rr.service.stop unless rr.service.stopped?
               end
             end
           end
+        rescue DNSSD::UnknownError
+          $stderr.puts "unknown error occurred in dnssd: #{$!.message}"
         rescue Timeout::Error
           # Do nothing
         end

data/lib/bananajour/bonjour/repository_browser.rb

@@ -2,9 +2,9 @@ module Bananajour::Bonjour
 class RepositoryBrowser
 
   def initialize
-    @browser = Browser.new('_bananajour._git._tcp')
+    @browser = Browser.new('_git._tcp,_bananajour')
   end
-  
+
   def repositories
     @browser.replies.map do |reply|
       Repository.new(

data/lib/bananajour/gem_dependencies.rb

@@ -4,10 +4,10 @@ module Bananajour
     DEPENDENCIES = [
       %w( sinatra              0.9.2 ),
       %w( json                 1.1.7 ),
-      %w( chrislloyd-fancypath 0.5.8 ),
+      %w( fancypath            0.5.13 ),
       %w( rainbow              1.0.1 ),
-      %w( mojombo-grit         1.1.1 ),
-      %w( dnssd                0.7.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 ),

data/lib/bananajour/repository.rb

@@ -1,4 +1,4 @@
-Bananajour.require_gem 'mojombo-grit', 'grit'
+Bananajour.require_gem 'grit'
 
 module Bananajour
   class Repository

data/lib/bananajour/version.rb

@@ -1,3 +1,3 @@
 module Bananajour
-  VERSION = '2.1.9'
+  VERSION = '2.2'
 end

data/lib/bananajour.rb

@@ -10,7 +10,7 @@ require 'bananajour/gem_dependencies'
 
 Bananajour.require_gem 'rainbow'
 Bananajour.require_gem 'dnssd'
-Bananajour.require_gem 'chrislloyd-fancypath', 'fancypath'
+Bananajour.require_gem 'fancypath'
 
 require 'bananajour/repository'
 require 'bananajour/grit_extensions'
@@ -65,7 +65,12 @@ module Bananajour
     end
     
     def host_name
-      Socket.gethostname
+      hn = Socket.gethostname
+      if hn =~ /\.local$/
+        hn
+      else
+        hn + ".local"
+      end
     end
     
     def git_uri
@@ -96,4 +101,4 @@ module Bananajour
     
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bananajour
 version: !ruby/object:Gem::Version 
-  version: 2.1.9
+  version: "2.2"
 platform: ruby
 authors: 
 - Tim Lucas
@@ -33,14 +33,14 @@ dependencies:
         version: 1.1.7
     version: 
 - !ruby/object:Gem::Dependency 
-  name: chrislloyd-fancypath
+  name: fancypath
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.5.8
+        version: 0.5.13
     version: 
 - !ruby/object:Gem::Dependency 
   name: rainbow
@@ -53,7 +53,7 @@ dependencies:
         version: 1.0.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mojombo-grit
+  name: grit
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.1
+        version: 1.3.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack