Rake package task now builds a gem with a Cruise executable that runs…

… the app on *nix. Some Rakefile cleanup.

.gitignore

@@ -20,6 +20,7 @@ dist/
 vendor/plugins/rails_upgrade
 vendor/ruby/
 vendor/jruby/
+vendor/bundle
 server_jar/target/
 
 config/ccrb.properties

Gemfile

@@ -9,6 +9,8 @@ gem "api_cache", "0.2.0"
 gem "xml-simple", '1.0.16', :require => 'xmlsimple'
 gem "rake", "0.8.7"
 gem "jquery-rails", '1.0.9'
+gem "rake", "0.8.7"
+gem "abstract", "1.0.0"
 
 group :development do
   gem "rcov", '0.9.9'

Gemfile.lock

@@ -84,6 +84,7 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
+  abstract (= 1.0.0)
   api_cache (= 0.2.0)
   httparty (= 0.6.1)
   jquery-rails (= 1.0.9)

Rakefile

@@ -3,16 +3,4 @@
 
 require File.expand_path('../config/application', __FILE__)
 
-require 'rake'
-require 'rake/rdoctask'
-
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-
 CruiseControl::Application.load_tasks
-
-PKG_NAME      = 'cruisecontrol'
-PKG_VERSION   = CruiseControl::VERSION::STRING
-PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
-
-RELEASE_NAME  = "REL #{PKG_VERSION}"

cruisecontrolrb.gemspec

@@ -1,8 +1,8 @@
 require 'rake'
 require 'pathname'
-require Pathname.new(__FILE__).expand_path.dirname.join('lib', 'cruise_control', 'version')
+require File.expand_path('../config/application', __FILE__)
 
-Gem::Specification.new do |s|
+GEMSPEC = Gem::Specification.new do |s|
   s.name = 'cruisecontrolrb'
   s.summary = 'CruiseControl for Ruby. Keep it simple.'
   s.version = CruiseControl::VERSION::STRING
@@ -15,9 +15,11 @@ Gem::Specification.new do |s|
   s.email = 'cruisecontrolrb-developers@rubyforge.org'
   s.homepage = 'http://cruisecontrolrb.thoughtworks.com'
   s.has_rdoc = false
+  s.bindir = "."
+  s.executables << "cruise"
 
   s.files = FileList[
-    '[A-Z]*', 
+    '[a-zA-Z0-9]*', 
     'app/**/*.rb', 
     'bin/**/*',
     'config/**/*',
@@ -28,7 +30,8 @@ Gem::Specification.new do |s|
     'script/**/*',
     'server_jar/**/*',
     'tasks/**/*',
-    "vendor/#{RUBY_ENGINE}/**/*"
+    "vendor/bundle/**/*",
+    ".bundle/*"
   ]
 
   s.test_files = FileList['test/**/*']

lib/tasks/package.rake

@@ -1,11 +1,36 @@
-Rake::PackageTask.new("cruisecontrolrb", CruiseControl::VERSION::STRING) do |p|
-  p.need_tar = true
-  p.need_zip = true
-
-  p.package_files.include("**/**")
-
-
-  %w(log/** tmp/** pkg/** vendor/jruby/** vendor/cache/** vendor/java/** server_jar/** vendor/**/cache/**).each do |f|
-    p.package_files.exclude(f)
+load Rails.root.join("cruisecontrolrb.gemspec")
+
+task :package => ["package:gem"]
+
+namespace :package do
+  def gem_file
+    if gem_spec.platform == Gem::Platform::RUBY
+      "#{gem_spec.full_name}.gem"
+    else
+      "#{gem_spec.full_name}-#{gem_spec.platform}.gem"
+    end
+  end
+
+  def package_dir
+    "pkg"
+  end
+
+  def gem_spec
+    GEMSPEC
+  end
+
+  task :gem => :prepare do
+    Gem::Builder.new(gem_spec).build
+    verbose(true) { mv gem_file, "#{package_dir}/#{gem_file}" }
+  end
+
+  desc "Remove all existing packaged files."
+  task :clean do
+    verbose(true) { rm_f package_dir }
+  end
+
+  desc "Install all dependencies using Bundler's deployment mode."
+  task :prepare => :clean do
+    system "bundle install --deployment"
   end
 end