toolmantim-bananajour 2.1.3 → 2.1.4

data/Readme.md

@@ -7,6 +7,8 @@ Unlike Gitjour, the repositories you're serving are not your working git reposit
 
 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/).
 
+![Screenshot of local view of Bananajour 2.1.3](http://cloud.github.com/downloads/toolmantim/bananajour/screenshot.png)
+
 Installation and usage
 ----------------------
 
@@ -36,10 +38,16 @@ Fire up [http://localhost:9331/](http://localhost:9331/) to check it out.
 If somebody starts sharing a Bananajour repository with the same name on the
 network, it'll automatically show up in the network thanks to the wonder that is Bonjour.
 
+For a list of all the commands:
+
+    bananajour help
+
 Official repository and support
 -------------------------------
 
-[http://github.com/toolmantim/bananajour](http://github.com/toolmantim/bananajour) is where Bananajour lives along with all of its support issues.
+The official repo and support issues/tickets live at [github.com/toolmantim/bananajour](http://github.com/toolmantim/bananajour).
+
+Feature and support discussions live at [groups.google.com/group/bananajour](http://groups.google.com/group/bananajour).
 
 Developing
 ----------

data/lib/bananajour/bonjour/advertiser.rb

@@ -8,12 +8,13 @@ class Bananajour::Bonjour::Advertiser
   end
   private
     def register_app
-      STDERR.puts "Registering #{Bananajour.web_uri}"
+      STDOUT.puts "Registering #{Bananajour.web_uri}"
       tr = DNSSD::TextRecord.new
       tr["name"] = Bananajour.config.name
       tr["email"] = Bananajour.config.email
       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) {}
     end
     def register_repos
@@ -25,7 +26,7 @@ class Bananajour::Bonjour::Advertiser
     end
     def stop_old_services
       old_services.each do |old_service|
-        STDERR.puts "Unregistering #{old_service.repository.uri}"
+        STDOUT.puts "Unregistering #{old_service.repository.uri}"
         old_service.stop
         @services.delete(old_service)
       end
@@ -35,7 +36,7 @@ class Bananajour::Bonjour::Advertiser
     end
     def register_new_repositories
       new_repositories.each do |new_repo|
-        STDERR.puts "Registering #{new_repo.uri}"
+        STDOUT.puts "Registering #{new_repo.uri}"
         tr = DNSSD::TextRecord.new
         tr["name"] = new_repo.name
         tr["uri"] = new_repo.uri
@@ -43,6 +44,7 @@ class Bananajour::Bonjour::Advertiser
         tr["bjour-email"] = Bananajour.config.email
         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.class.instance_eval { attr_accessor(:repository) }
         service.repository = new_repo

data/lib/bananajour/bonjour/repository.rb

@@ -6,8 +6,8 @@ class Bananajour::Bonjour::Repository
     @name, @uri, @person = name, uri, person
   end
   
-  def html_friendly_name
-    Bananajour::Repository.html_friendly_name(name)
+  def html_id
+    Bananajour::Repository.html_id(name)
   end
 
   def ==(other)
@@ -23,7 +23,7 @@ class Bananajour::Bonjour::Repository
   end
   
   def web_uri
-    "#{person.uri}##{html_friendly_name}"
+    "#{person.uri}##{html_id}"
   end
   
   def to_hash

data/lib/bananajour/commands.rb

@@ -13,9 +13,6 @@ module Bananajour::Commands
   end
   
   def serve_web!
-    if repositories.empty?
-      STDERR.puts "Warning: you don't have any bananajour repositories. Use: bananajour init"
-    end
     fork { exec "/usr/bin/env ruby #{File.dirname(__FILE__)}/../../sinatra/app.rb -p #{web_port} -e production" }
     puts "* Started " + web_uri.foreground(:yellow)
   end
@@ -25,11 +22,6 @@ module Bananajour::Commands
     puts "* Started " + "#{git_uri}".foreground(:yellow)
   end
   
-  def serve_git!
-    fork { exec "git daemon --base-path=#{repositories_path} --export-all" }
-    puts "* Started " + "#{git_uri}".foreground(:yellow)
-  end
-  
   def advertise!
     fork { Bananajour::Bonjour::Advertiser.new.go! }
   end

data/lib/bananajour/grit_extensions.rb

@@ -1,5 +1,3 @@
-require 'md5'
-
 Grit::Commit.class_eval do
   def ==(other)
     self.id == other.id

data/lib/bananajour/helpers.rb

@@ -1,3 +1,5 @@
+require 'md5'
+
 module Bananajour
   module GravatarHelpers
     def gravatar

data/lib/bananajour/repository.rb

@@ -5,7 +5,7 @@ module Bananajour
     def self.for_name(name)
       new(Bananajour.repositories_path.join(name + ".git"))
     end
-    def self.html_friendly_name(name)
+    def self.html_id(name)
       name.gsub(/[^A-Za-z-]+/, '').downcase
     end
     def initialize(path)
@@ -25,8 +25,8 @@ module Bananajour
     def name
       dirname.sub(".git",'')
     end
-    def html_friendly_name
-      self.class.html_friendly_name(name)
+    def html_id
+      self.class.html_id(name)
     end
     def dirname
       path.split.last.to_s
@@ -38,7 +38,7 @@ module Bananajour
       Bananajour.git_uri + dirname
     end
     def web_uri
-      Bananajour.web_uri + "#" + html_friendly_name
+      Bananajour.web_uri + "#" + html_id
     end
     def grit_repo
       @grit_repo ||= Grit::Repo.new(path)
@@ -68,7 +68,8 @@ module Bananajour
       heads = grit_repo.heads
       {
         "name" => name,
-        "html_friendly_name" => html_friendly_name,
+        "html_friendly_name" => html_id, # TODO: Deprecate in v3. Renamed to html_id since 2.1.4
+        "html_id" => html_id,
         "uri" => uri,
         "heads" => heads.map {|h| h.name},
         "recent_commits" => recent_commits.collect do |c|

data/lib/bananajour/version.rb

@@ -1,3 +1,3 @@
 module Bananajour
-  VERSION = '2.1.3'
+  VERSION = '2.1.4'
 end

data/lib/bananajour.rb

@@ -87,6 +87,7 @@ module Bananajour
         "uri"  => web_uri,
         "git-uri" => git_uri,
         "gravatar" => Bananajour.gravatar,
+        "version" => Bananajour::VERSION,
         "repositories" => repositories.collect do |r|
           {"name" => r.name, "uri" => r.uri}
         end

data/sinatra/views/home.haml

@@ -204,10 +204,9 @@
       :border-color #980
   
 - for repository in @my_repositories
-  - repository_id = repository.html_friendly_name
   - heads = repository.grit_repo.heads
   
-  .repository{:id => repository_id, 'data-name' => repository.name}
+  .repository{:id => repository.html_id, 'data-name' => repository.name}
 
     - if repository.readme_file && !local?
       %p.readme
@@ -227,7 +226,7 @@
           %li
             %img.gravatar{:src => commit.author.gravatar_uri}
             %p.message
-              %a{:href => "/#{repository.html_friendly_name}/#{commit.id}"}&= commit.short_message
+              %a{:href => "/#{URI.escape(repository.name)}/#{commit.id}"}&= commit.short_message
               %span.meta
                 - if head = heads.find {|h| h.commit == commit}
                   \-
@@ -240,7 +239,7 @@
       %ul.network
         - 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_friendly_name}"}= repo.person.name
+            %a.name{:href => "#{repo.person.uri}##{repo.html_id}"}= repo.person.name
 
 - if local?
   :javascript
@@ -267,7 +266,7 @@
           $(data.recent_commits).each(function(i) {
             var commit = this;
             var message = $("<p class='message'/>").html(
-              $("<a/>").attr("href", data.bananajour.uri + data.html_friendly_name + "/" + commit.id).text(commit.message)
+              $("<a/>").attr("href", data.bananajour.uri + encodeURIComponent(data.name) + "/" + commit.id).text(commit.message)
             ).appendTo(repoLi).append(
               $("<span class='meta'/>")
                 .append($("<em class='branch'/>").text(commit.head && (" - " + commit.head)))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toolmantim-bananajour
 version: !ruby/object:Gem::Version 
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors: 
 - Tim Lucas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-09 00:00:00 -07:00
+date: 2009-06-12 00:00:00 -07:00
 default_executable: bananajour
 dependencies: 
 - !ruby/object:Gem::Dependency