lib/bananajour/gem_dependencies.rb @@ -1,18 +1,10 @@ -begin - $: << 'lib'; %w( rubygems rake/gempackagetask rake/clean ).each { |dep| require dep } -rescue LoadError => e - puts "LoadError: you might want to try running the setup task first." - raise e -end +require "rubygems" + +$:.unshift "#{File.dirname(__FILE__)}/lib" + +require "bananajour/version" +require "bananajour/gem_dependencies" -require "./lib/bananajour/version" - -runtime_deps = { - :sinatra => '0.9.1.1', :json => "1.1.2", "chrislloyd-fancypath" => '0.5.8', - :rainbow => '1.0.1', 'mojombo-grit' => '1.1.1', :dnssd => '0.7.1', :rack => "0.9.1", - :thin => "1.0.0", :haml => "2.0.9", "activesupport" => "2.3.2" -} - gem = Gem::Specification.new do |gem| gem.name = "bananajour" gem.version = Bananajour::VERSION @@ -25,44 +17,50 @@ gem = Gem::Specification.new do |gem| gem.homepage = "http://github.com/toolmantim/bananajour" gem.require_path = "lib" gem.files = %w(Readme.md Rakefile) + Dir.glob("{bin,lib,sinatra}/**/*") - runtime_deps.each { | name, version | gem.add_runtime_dependency( name.to_s, version ) } - gem.has_rdoc = false - gem.bindir = 'bin' - gem.executables = [ 'bananajour' ] + gem.has_rdoc = false + gem.bindir = 'bin' + gem.executables = [ 'bananajour' ] + Bananajour::GemDependencies.all.each {|dep| gem.add_runtime_dependency( dep.name, dep.version ) } +end + +task :clean do + FileUtils.rm_rf Dir['*.gem', '*.gemspec'] end -desc "Create the gem" -task( :package => [ :clean, "gem:spec:generate" ] ) { Gem::Builder.new( gem ).build } - -desc "Clean build artifacts" -task( :clean ) { FileUtils.rm_rf Dir['*.gem', '*.gemspec'] } - -desc "Rebuild and bananajour as a gem" -task( :install => [ :package, :install_gem ] ) - -desc "Install bananajour as a local gem" -task( :install_gem ) do +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 - -namespace :gem do + 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" + + 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 + puts "#{spec} - Good to go!" end + end -end + +end \ No newline at end of file Rakefile @@ -2,56 +2,59 @@ Gem::Specification.new do |s| s.name = %q{bananajour} - s.version = "1.2.6" + s.version = "1.4.0" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Tim Lucas"] - s.date = %q{2009-05-17} + s.date = %q{2009-05-23} s.default_executable = %q{bananajour} - s.description = %q{Local git repository hosting with a sexy web interface and bonjour discovery. It's like a adhoc, local, network-aware github!} + s.description = %q{Local git repository hosting with a sexy web interface and bonjour discovery. It's like your own little adhoc, network-aware github!} s.email = %q{t.lucas@toolmantim.com} s.executables = ["bananajour"] s.extra_rdoc_files = ["Readme.md"] - s.files = ["Readme.md", "Rakefile", "bin/bananajour", "lib/bananajour", "lib/bananajour/bonjour.rb", "lib/bananajour/grit_extensions.rb", "lib/bananajour/repository.rb", "lib/bananajour/version.rb", "lib/bananajour.rb", "sinatra/app.rb", "sinatra/lib", "sinatra/lib/date_helpers.rb", "sinatra/lib/diff_helpers.rb", "sinatra/public", "sinatra/public/javascripts", "sinatra/public/javascripts/jquery-1.3.2.min.js", "sinatra/public/logo.png", "sinatra/views", "sinatra/views/commit.haml", "sinatra/views/home.haml", "sinatra/views/layout.haml", "sinatra/views/network_activity.haml", "sinatra/views/readme.haml"] + s.files = ["Readme.md", "Rakefile", "bin/bananajour", "lib/bananajour", "lib/bananajour/bonjour.rb", "lib/bananajour/gem_dependencies.rb", "lib/bananajour/grit_extensions.rb", "lib/bananajour/repository.rb", "lib/bananajour/version.rb", "lib/bananajour.rb", "sinatra/app.rb", "sinatra/lib", "sinatra/lib/date_helpers.rb", "sinatra/lib/diff_helpers.rb", "sinatra/public", "sinatra/public/javascripts", "sinatra/public/javascripts/jquery-1.3.2.min.js", "sinatra/public/logo.png", "sinatra/public/pbjt.swf", "sinatra/public/peanut.png", "sinatra/views", "sinatra/views/commit.haml", "sinatra/views/home.haml", "sinatra/views/layout.haml", "sinatra/views/network_activity.haml", "sinatra/views/readme.haml"] s.homepage = %q{http://github.com/toolmantim/bananajour} s.require_paths = ["lib"] s.rubygems_version = %q{1.3.1} - s.summary = %q{Local git repository hosting with a sexy web interface and bonjour discovery. It's like a adhoc, local, network-aware github!} + s.summary = %q{Local git repository hosting with a sexy web interface and bonjour discovery. It's like your own little adhoc, network-aware github!} if s.respond_to? :specification_version then current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION s.specification_version = 2 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q<thin>, ["= 1.0.0"]) - s.add_runtime_dependency(%q<sinatra>, ["= 0.9.1.1"]) - s.add_runtime_dependency(%q<haml>, ["= 2.0.9"]) + s.add_runtime_dependency(%q<sinatra>, ["= 0.9.2"]) s.add_runtime_dependency(%q<json>, ["= 1.1.2"]) - s.add_runtime_dependency(%q<rainbow>, ["= 1.0.1"]) s.add_runtime_dependency(%q<chrislloyd-fancypath>, ["= 0.5.8"]) - s.add_runtime_dependency(%q<dnssd>, ["= 0.7.1"]) + s.add_runtime_dependency(%q<rainbow>, ["= 1.0.1"]) s.add_runtime_dependency(%q<mojombo-grit>, ["= 1.1.1"]) - s.add_runtime_dependency(%q<rack>, ["= 0.9.1"]) + s.add_runtime_dependency(%q<dnssd>, ["= 0.7.1"]) + s.add_runtime_dependency(%q<rack>, ["= 1.0.0"]) + s.add_runtime_dependency(%q<thin>, ["= 1.0.0"]) + s.add_runtime_dependency(%q<haml>, ["= 2.0.9"]) + s.add_runtime_dependency(%q<activesupport>, ["= 2.3.2"]) else - s.add_dependency(%q<thin>, ["= 1.0.0"]) - s.add_dependency(%q<sinatra>, ["= 0.9.1.1"]) - s.add_dependency(%q<haml>, ["= 2.0.9"]) + s.add_dependency(%q<sinatra>, ["= 0.9.2"]) s.add_dependency(%q<json>, ["= 1.1.2"]) - s.add_dependency(%q<rainbow>, ["= 1.0.1"]) s.add_dependency(%q<chrislloyd-fancypath>, ["= 0.5.8"]) - s.add_dependency(%q<dnssd>, ["= 0.7.1"]) + s.add_dependency(%q<rainbow>, ["= 1.0.1"]) s.add_dependency(%q<mojombo-grit>, ["= 1.1.1"]) - s.add_dependency(%q<rack>, ["= 0.9.1"]) + s.add_dependency(%q<dnssd>, ["= 0.7.1"]) + s.add_dependency(%q<rack>, ["= 1.0.0"]) + s.add_dependency(%q<thin>, ["= 1.0.0"]) + s.add_dependency(%q<haml>, ["= 2.0.9"]) + s.add_dependency(%q<activesupport>, ["= 2.3.2"]) end else - s.add_dependency(%q<thin>, ["= 1.0.0"]) - s.add_dependency(%q<sinatra>, ["= 0.9.1.1"]) - s.add_dependency(%q<haml>, ["= 2.0.9"]) + s.add_dependency(%q<sinatra>, ["= 0.9.2"]) s.add_dependency(%q<json>, ["= 1.1.2"]) - s.add_dependency(%q<rainbow>, ["= 1.0.1"]) s.add_dependency(%q<chrislloyd-fancypath>, ["= 0.5.8"]) - s.add_dependency(%q<dnssd>, ["= 0.7.1"]) + s.add_dependency(%q<rainbow>, ["= 1.0.1"]) s.add_dependency(%q<mojombo-grit>, ["= 1.1.1"]) - s.add_dependency(%q<rack>, ["= 0.9.1"]) + s.add_dependency(%q<dnssd>, ["= 0.7.1"]) + s.add_dependency(%q<rack>, ["= 1.0.0"]) + s.add_dependency(%q<thin>, ["= 1.0.0"]) + s.add_dependency(%q<haml>, ["= 2.0.9"]) + s.add_dependency(%q<activesupport>, ["= 2.3.2"]) end end bananajour.gemspec @@ -1,12 +1,7 @@ #!/usr/bin/env ruby require "rubygems" - -gem 'chrislloyd-fancypath', '0.5.8' -require 'fancypath' - -file = Fancypath(__FILE__) -require file.symlink? ? "bananajour" : file.dirname/'../lib/bananajour' +require "#{File.dirname(__FILE__)}/../lib/bananajour" Bananajour.check_git! Bananajour.check_git_config! bin/bananajour @@ -3,20 +3,18 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir) require 'yaml' require 'ostruct' - -gem 'rainbow', '1.0.1' -require 'rainbow' - require 'socket' -gem 'dnssd', '0.7.1' -require 'dnssd' - +require 'bananajour/gem_dependencies' require 'bananajour/repository' require 'bananajour/grit_extensions' require 'bananajour/version' require 'bananajour/bonjour' +Bananajour.require_gem 'rainbow' +Bananajour.require_gem 'dnssd' +Bananajour.require_gem 'chrislloyd-fancypath', 'fancypath' + module Bananajour class << self lib/bananajour.rb @@ -1,5 +1,4 @@ -gem 'mojombo-grit', '1.1.1' -require 'grit' +Bananajour.require_gem 'mojombo-grit', 'grit' module Bananajour class Repository lib/bananajour/repository.rb @@ -1,3 +1,3 @@ module Bananajour - VERSION = '1.2.6' + VERSION = '1.4.0' end lib/bananajour/version.rb @@ -1,28 +1,25 @@ require 'rubygems' +require 'md5' -gem 'chrislloyd-fancypath', '0.5.8' -require 'fancypath' +__DIR__ = File.dirname(__FILE__) -require "#{File.dirname(__FILE__)}/../lib/bananajour" +require "#{__DIR__}/../lib/bananajour" -gem 'sinatra', '0.9.1.1' +# Must require 'sinatra' from this file for Sinatra's magic to pick up lots of free stuff +Bananajour::GemDependencies.for_name('sinatra').require_gem require 'sinatra' -gem 'json', '1.1.2' -require 'json' - -gem 'activesupport', '2.3.2' -require 'active_support/core_ext/enumerable' - -require 'md5' +Bananajour.require_gem 'haml' +Bananajour.require_gem 'json' +Bananajour.require_gem 'activesupport', 'active_support/core_ext/enumerable' -disable :logging set :environment, Bananajour.env - set :haml, {:format => :html5, :attr_wrapper => '"'} +disable :logging + +load "#{__DIR__}/lib/date_helpers.rb" +load "#{__DIR__}/lib/diff_helpers.rb" -load "#{File.dirname(__FILE__)}/lib/date_helpers.rb" -load "#{File.dirname(__FILE__)}/lib/diff_helpers.rb" helpers DateHelpers, DiffHelpers helpers do sinatra/app.rb 64522f1ab690d01651ec0b139350972069f1150d user.email t.lucas@toolmantim.com http://github.com/toolmantim/bananajour/commit/0696c078652481dced59a00e50796d9449c0a0d4 0696c078652481dced59a00e50796d9449c0a0d4 2009-05-23T00:24:25-07:00 2009-05-23T00:24:25-07:00 DRY'd the dependencies and cleaned up the rake task f622af744c00140c41be71550be1407087db54da user.email t.lucas@toolmantim.com