bananajour 2.6.1 → 2.6.2

data/Rakefile

@@ -1,64 +1,25 @@
-$:.unshift "#{File.dirname(__FILE__)}/lib"
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
 
-require "bananajour/gem_dependencies"
-require "bananajour/version"
-
-gem = Gem::Specification.new do |gem|
-  gem.name             = "bananajour"
-  gem.version          = Bananajour::VERSION
-  gem.platform         = Gem::Platform::RUBY
-  gem.extra_rdoc_files = ["Readme.md"]
-  gem.summary          = "Local git repository hosting with a sexy web interface and bonjour discovery. It's like your own little adhoc, network-aware github!"
-  gem.description      = gem.summary
-  gem.authors          = ["Tim Lucas"]
-  gem.email            = "t.lucas@toolmantim.com"
-  gem.homepage         = "http://github.com/toolmantim/bananajour"
-  gem.require_path     = "lib"
-  gem.files            = %w(Readme.md Rakefile) + Dir.glob("{bin,lib,sinatra}/**/*")
-  gem.has_rdoc         = false
-  gem.bindir           = 'bin'
-  gem.executables      = [ 'bananajour' ]
-  Bananajour::GemDependencies.all.each {|dep| gem.add_runtime_dependency( dep.name, dep.version ) }
+desc "Boot up the web interface"
+task :web do
+  exec "bundle exec ruby -I#{lib} sinatra/app.rb -p 4567 -s thin"
 end
 
-task :clean do
-  FileUtils.rm_rf Dir['*.gem', '*.gemspec']
+desc "Boot up the web interface with shotgun"
+task :shotgun do
+  exec "bundle exec shotgun sinatra/app.rb -s thin"
 end
- 
-namespace :gem do
-
-  desc "Rebuild and install bananajour as a gem"
-  task :install => :package do
-    require 'rubygems/installer'
-    Dir['*.gem'].each do |gem|
-      Gem::Installer.new(gem).install
-    end
-  end
-
-  desc "Create the gem"
-  task :package => [:clean, "spec:generate"] do
-    require 'rubygems/builder'
-    Gem::Builder.new( gem ).build
-  end
-
-  namespace :spec do
 
-    desc "Update #{gem.name}.gemspec"
-    task :generate do
-      File.open("#{gem.name}.gemspec", "w") do |f|
-        f.puts(gem.to_ruby)
-      end
-    end
-
-    desc "Test spec in github cleanroom"
-    task :test => :generate do
-      require 'rubygems/specification'
-      data = File.read("#{gem.name}.gemspec")
-      spec = nil
-      Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join
-      puts "#{spec} - Good to go!"
-    end
+require "bananajour/version"
+gem_file_name = "bananajour-#{Bananajour::VERSION}"
+ 
+desc "Build the gem"
+task :build do
+  system "gem build bananajour.gemspec"
+end
 
-  end
-  
-end
+desc "Release gem"
+task :release => :build do
+  system "gem push #{gem_file_name}.gem"
+end

data/Readme.md

@@ -53,13 +53,6 @@ Optional configuration: you can override the hostname by setting a global git co
 
 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
 -------------
 
@@ -85,11 +78,6 @@ And then restart the Avahi service:
 
 Note: You might have to restart the avahi-daemon sometimes if you are having problems seeing other bananajours.
 
-Using with Ginatra
-------------------
-
-Rumour has it [ginatra](http://github.com/lenary/ginatra) can be used to provide richer gitweb-like browsing of your bananajour repositories. Symlink ginatra's `repos` directory to `~/.bananajour/repositories` to serve up your bananajour repositories.
-
 Official repository and support
 -------------------------------
 
@@ -100,17 +88,8 @@ Feature and support discussions live at [groups.google.com/group/bananajour](htt
 Developing
 ----------
 
-If you want to hack on the sinatra app then do so from a local clone but run your actual bananjour from the gem version. Running the sinatra app directly won't broadcast it onto the network and it'll run on a different port:
-
-    ruby sinatra/app.rb -s thin
-
-If you want code reloading use [shotgun](http://github.com/rtomayko/shotgun) instead:
-
-    shotgun sinatra/app.rb -s thin
-
-If you then want to run your working copy as your public bananajour rebuild and install it as a gem:
-
-    sudo rake gem:install
+    bundle install
+    rake -T
 
 Contributors
 ------------

data/bin/bananajour

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
-require "rubygems"
-require (File.symlink?(__FILE__) ? "bananajour" : File.join(File.dirname(__FILE__), "/../lib/bananajour"))
+lib = File.expand_path('../../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
+require 'bananajour'
 
 Thread.abort_on_exception = true
 

data/lib/bananajour/bonjour/browser.rb

@@ -1,4 +1,4 @@
-Bananajour.require_gem 'dnssd'
+require 'dnssd'
 
 require 'thread'
 require 'timeout'

data/lib/bananajour/commands.rb

@@ -15,7 +15,13 @@ module Bananajour::Commands
   # 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" }
+    fork do
+      ENV["RACK_ENV"] = "production"
+      require "bananajour/../../sinatra/app"
+      Sinatra::Application.set :port, web_port
+      Sinatra::Application.set :server, "thin"
+      Sinatra::Application.run!
+    end
   end
 
   def serve_git!

data/lib/bananajour/repository.rb

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

data/lib/bananajour/version.rb

@@ -1,3 +1,3 @@
 module Bananajour
-  VERSION = '2.6.1'
+  VERSION = '2.6.2'
 end

data/lib/bananajour.rb

@@ -6,11 +6,9 @@ require 'ostruct'
 require 'socket'
 require 'md5'
 
-require 'bananajour/gem_dependencies'
-
-Bananajour.require_gem 'rainbow'
-Bananajour.require_gem 'dnssd'
-Bananajour.require_gem 'fancypath'
+require 'rainbow'
+require 'dnssd'
+require 'fancypath'
 
 require 'bananajour/repository'
 require 'bananajour/grit_extensions'

data/sinatra/app.rb

@@ -2,21 +2,16 @@ Thread.abort_on_exception = true
 
 __DIR__ = File.dirname(__FILE__)
 
-require "#{__DIR__}/../lib/bananajour"
+require "bananajour"
 
-Bananajour.gem 'sinatra'
 require 'sinatra'
+require 'haml'
+require 'json'
 
-Bananajour.require_gem 'haml'
-Bananajour.require_gem 'json'
-
-Bananajour.gem 'activesupport'
 require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/array'
 
-require 'forwardable' # Fix for issue #8 - Thin borking on uninitialized constant Forwardable
-
-set :server, 'thin' # Things go weird with anything else - let's lock it down to thin
+set :server, 'thin'
 set :haml, {:format => :html5, :attr_wrapper => '"'}
 set :logging, false
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bananajour
 version: !ruby/object:Gem::Version 
-  version: 2.6.1
+  hash: 19
+  prerelease: false
+  segments: 
+  - 2
+  - 6
+  - 2
+  version: 2.6.2
 platform: ruby
 authors: 
 - Tim Lucas
@@ -9,107 +15,161 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 +11:00
+date: 2010-08-06 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: json
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  name: sinatra
+  requirement: *id001
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 1
+        - 7
         version: 1.1.7
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: fancypath
+  name: json
+  requirement: *id002
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 5
+        - 13
         version: 0.5.13
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rainbow
+  name: fancypath
+  requirement: *id003
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: grit
+  name: rainbow
+  requirement: *id004
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 1
+        - 1
         version: 1.1.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dnssd
+  name: grit
+  requirement: *id005
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
         version: 1.3.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: haml
+  name: dnssd
+  requirement: *id006
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 2
+        - 0
+        - 9
         version: 2.0.9
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: haml
+  requirement: *id007
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 3
+        - 2
         version: 2.3.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: thin
+  name: activesupport
+  requirement: *id008
+  prerelease: false
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
+        hash: 17
+        segments: 
+        - 1
+        - 2
+        - 7
+        version: 1.2.7
+  name: thin
+  requirement: *id009
+  prerelease: false
+  type: :runtime
 description: Local git repository hosting with a sexy web interface and bonjour discovery. It's like your own little adhoc, network-aware github!
 email: t.lucas@toolmantim.com
 executables: 
 - bananajour
 extensions: []
 
-extra_rdoc_files: 
-- Readme.md
+extra_rdoc_files: []
+
 files: 
 - Readme.md
 - Rakefile
@@ -122,7 +182,6 @@ files:
 - lib/bananajour/bonjour/repository_browser.rb
 - lib/bananajour/bonjour.rb
 - lib/bananajour/commands.rb
-- lib/bananajour/gem_dependencies.rb
 - lib/bananajour/grit_extensions.rb
 - lib/bananajour/helpers.rb
 - lib/bananajour/repository.rb
@@ -140,7 +199,7 @@ files:
 - sinatra/views/home.haml
 - sinatra/views/layout.haml
 - sinatra/views/readme.haml
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/toolmantim/bananajour
 licenses: []
 
@@ -150,23 +209,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Local git repository hosting with a sexy web interface and bonjour discovery. It's like your own little adhoc, network-aware github!
+summary: Local git repository hosting
 test_files: []
 

data/lib/bananajour/gem_dependencies.rb

@@ -1,35 +0,0 @@
-require 'rubygems'
-
-module Bananajour
-  # DRYs version number dependencies and provides a simple way require them
-  module GemDependencies
-    DEPENDENCIES = [
-      %w( sinatra              0.9.4 ),
-      %w( json                 1.1.7 ),
-      %w( fancypath            0.5.13 ),
-      %w( rainbow              1.0.1 ),
-      %w( grit                 1.1.1 ),
-      %w( dnssd                1.3.1 ),
-      %w( haml                 2.0.9 ),
-      %w( activesupport        2.3.2 ),
-      %w( thin                 1.0.0 )
-    ]
-    class Dependency < Struct.new(:name, :version)
-      def require_gem; gem name, version end
-    end
-    def self.all
-      DEPENDENCIES.map {|(name, version)| Dependency.new(name, version)}
-    end
-    def self.for_name(name)
-      all.find {|d| d.name == name }
-    end
-  end
-
-  def self.gem(name)
-    Bananajour::GemDependencies.for_name(name).require_gem
-  end
-  def self.require_gem(name, lib=nil)
-    self.gem(name)
-    Kernel.require(lib || name)
-  end
-end