bananajour 2.2 → 2.2.1

data/Rakefile

@@ -1,9 +1,7 @@
-require "rubygems"
-
 $:.unshift "#{File.dirname(__FILE__)}/lib"
 
-require "bananajour/version"
 require "bananajour/gem_dependencies"
+require "bananajour/version"
 
 gem = Gem::Specification.new do |gem|
   gem.name             = "bananajour"

data/lib/bananajour/gem_dependencies.rb

@@ -1,8 +1,10 @@
+require 'rubygems'
+
 module Bananajour
   # DRYs version number dependencies and provides a simple way require them
   module GemDependencies
     DEPENDENCIES = [
-      %w( sinatra              0.9.2 ),
+      %w( sinatra              0.9.4 ),
       %w( json                 1.1.7 ),
       %w( fancypath            0.5.13 ),
       %w( rainbow              1.0.1 ),

data/lib/bananajour/version.rb

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

data/lib/bananajour.rb

@@ -66,6 +66,11 @@ module Bananajour
     
     def host_name
       hn = Socket.gethostname
+
+      # if there is more than one period in the hostname then assume it's a FQDN
+      # and the user knows what they're doing
+      return hn if hn.count('.') > 1
+
       if hn =~ /\.local$/
         hn
       else

data/sinatra/app.rb

@@ -2,14 +2,9 @@ Thread.abort_on_exception = true
 
 __DIR__ = File.dirname(__FILE__)
 
-require 'rubygems'
-
 require "#{__DIR__}/../lib/bananajour"
 
-Bananajour.require_gem 'rack'
-
-# Must require 'sinatra' from this file for Sinatra's magic to pick up lots of free stuff
-Bananajour::GemDependencies.for_name('sinatra').require_gem
+Bananajour.gem 'sinatra'
 require 'sinatra'
 
 Bananajour.require_gem 'haml'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bananajour
 version: !ruby/object:Gem::Version 
-  version: "2.2"
+  version: 2.2.1
 platform: ruby
 authors: 
 - Tim Lucas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 +11:00
+date: 2009-10-15 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: json