Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Gem dependencies now specified in gemspec; accordingly, several gems …

…were updated. This builds for me in JRuby 1.6.3 and Ruby 1.9.2.
  • Loading branch information...
commit 2e851a0c1260456ad8ac915d27f31334dfe4ebd7 1 parent a7b64f3
@bguthrie bguthrie authored
View
22 Gemfile
@@ -1,23 +1,3 @@
source "http://rubygems.org"
-gem "rails", "3.0.7"
-gem "tzinfo", "0.3.27"
-gem "rack", "1.2.3"
-gem "bundler", "~> 1.0.12"
-
-gem "httparty", "0.6.1"
-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 "abstract", "1.0.0"
-
-group :development do
- gem "rcov", '0.9.9'
- gem "mocha", "0.9.12", :require => false
- gem "rack-test", :require => "rack/test"
-end
-
-platform :jruby do
- gem 'jruby-openssl'
-end
+gemspec
View
38 Gemfile.lock
@@ -1,3 +1,18 @@
+PATH
+ remote: .
+ specs:
+ cruisecontrolrb (2.0.0pre1)
+ abstract (= 1.0.0)
+ api_cache (= 0.2.0)
+ bundler
+ httparty (= 0.6.1)
+ jquery-rails (= 1.0.9)
+ rack (= 1.2.3)
+ rails (= 3.0.7)
+ rake
+ tzinfo (= 0.3.27)
+ xml-simple (= 1.0.16)
+
GEM
remote: http://rubygems.org/
specs:
@@ -30,7 +45,6 @@ GEM
activesupport (3.0.7)
api_cache (0.2.0)
arel (2.0.10)
- bouncy-castle-java (1.5.0146.1)
builder (2.1.2)
crack (0.1.8)
erubis (2.6.6)
@@ -41,8 +55,6 @@ GEM
jquery-rails (1.0.9)
railties (~> 3.0)
thor (~> 0.14)
- jruby-openssl (0.7.4)
- bouncy-castle-java
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
@@ -50,7 +62,7 @@ GEM
treetop (~> 1.4.8)
mime-types (1.16)
mocha (0.9.12)
- polyglot (0.3.1)
+ polyglot (0.3.2)
rack (1.2.3)
rack-mount (0.6.14)
rack (>= 1.0.0)
@@ -69,11 +81,12 @@ GEM
activesupport (= 3.0.7)
rake (>= 0.8.7)
thor (~> 0.14.4)
- rake (0.8.7)
+ rake (0.9.2)
rcov (0.9.9)
rcov (0.9.9-java)
thor (0.14.6)
- treetop (1.4.9)
+ treetop (1.4.10)
+ polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.27)
xml-simple (1.0.16)
@@ -81,20 +94,9 @@ GEM
PLATFORMS
java
ruby
- x86-mingw32
DEPENDENCIES
- abstract (= 1.0.0)
- api_cache (= 0.2.0)
- bundler (~> 1.0.12)
- httparty (= 0.6.1)
- jquery-rails (= 1.0.9)
- jruby-openssl
+ cruisecontrolrb!
mocha (= 0.9.12)
- rack (= 1.2.3)
rack-test
- rails (= 3.0.7)
- rake (= 0.8.7)
rcov (= 0.9.9)
- tzinfo (= 0.3.27)
- xml-simple (= 1.0.16)
View
3  config/application.rb
@@ -6,6 +6,7 @@
require "rails/test_unit/railtie"
require 'fileutils'
+require 'xmlsimple'
# If you have a Gemfile, require the gems listed there, including any gems
# you've limited to :test, :development, or :production.
@@ -39,6 +40,8 @@ def self.data_root
end
class Application < Rails::Application
+ include Rake::DSL
+
# Add additional load paths for your own custom dirs
config.autoload_paths << Rails.root.join('lib')
config.autoload_paths << Rails.root.join('lib', 'builder_plugins')
View
46 cruisecontrolrb.gemspec
@@ -1,8 +1,6 @@
-require 'rake'
-require 'pathname'
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('../lib/cruise_control/version', __FILE__)
-GEMSPEC = Gem::Specification.new do |s|
+Gem::Specification.new do |s|
s.name = 'cruisecontrolrb'
s.summary = 'CruiseControl for Ruby. Keep it simple.'
s.version = CruiseControl::VERSION::STRING
@@ -15,26 +13,28 @@ GEMSPEC = 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.add_dependency "bundler", "1.0.12"
+ s.add_dependency "rails", "3.0.7"
+ s.add_dependency "tzinfo", "0.3.27"
+ s.add_dependency "rack", "1.2.3"
+ s.add_dependency "bundler"
+
+ s.add_dependency "httparty", "0.6.1"
+ s.add_dependency "api_cache", "0.2.0"
+ s.add_dependency "xml-simple", '1.0.16'
+ s.add_dependency "rake"
+ s.add_dependency "jquery-rails", '1.0.9'
+ s.add_dependency "abstract", "1.0.0"
- s.files = FileList[
- '[a-zA-Z0-9]*',
- 'app/**/*',
- 'bin/**/*',
- 'config/**/*',
- 'daemon/**/*',
- 'db/**/*',
- 'lib/**/*.rb',
- 'public/**/*',
- 'script/**/*',
- 'server_jar/**/*',
- 'tasks/**/*',
- "vendor/bundle/**/*",
- ".bundle/*"
- ]
+ s.add_development_dependency "rcov", '0.9.9'
+ s.add_development_dependency "mocha", "0.9.12"
+ s.add_development_dependency "rack-test"
+
+ s.bindir = "."
+ s.executables << "cruise"
- s.test_files = FileList['test/**/*']
+ all_files = Dir.glob("**/*")
+ excluded = all_files.grep(%r!(log/)|(test/)|(tmp/)|(vendor/cache)|(pkg)|(dist)|(.bundle)!)
+ s.files = all_files - excluded
+ s.test_files = all_files.grep(%r!(test/)!)
end
View
6 lib/tasks/package.rake
@@ -1,4 +1,4 @@
-load Rails.root.join("cruisecontrolrb.gemspec")
+gem_spec = load(Rails.root.join("cruisecontrolrb.gemspec"))
task :package => ["package:gem"]
@@ -15,10 +15,6 @@ namespace :package do
"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}" }
View
BIN  vendor/cache/bouncy-castle-java-1.5.0146.1.gem
Binary file not shown
View
BIN  vendor/cache/jruby-openssl-0.7.4.gem
Binary file not shown
View
BIN  vendor/cache/polyglot-0.3.1.gem
Binary file not shown
View
BIN  vendor/cache/polyglot-0.3.2.gem
Binary file not shown
View
BIN  vendor/cache/rake-0.8.7.gem
Binary file not shown
View
BIN  vendor/cache/rake-0.9.2.gem
Binary file not shown
View
BIN  vendor/cache/treetop-1.4.10.gem
Binary file not shown
View
BIN  vendor/cache/treetop-1.4.9.gem
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.