Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removing Jeweler and using straight Bundler instead. Also tidied up a…

… dependency issue so jruby-ehcache can be used on its own. Installing the jruby-ehcache-rails* gems will ensure jruby-ehcache is installed as well. This references issue #3.
  • Loading branch information...
commit 78b558b23006436aa1ad666bb82e41073b44cde9 1 parent 453eb30
Dylan Stamat authored
View
75 Rakefile
@@ -1,62 +1,13 @@
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-task :default => [ :test ]
-
-desc "Executes the test suite"
-Rake::TestTask.new do |t|
- t.name = :test
- t.libs << 'lib' << 'ext' << 'test'
- t.pattern = "test/test_*.rb"
-end
-
-begin
- require 'jeweler'
-rescue LoadError
- puts "Jeweler not available. Install it with: gem install jeweler"
-end
-
-def defaults(gemspec)
- gemspec.rubyforge_project = 'ehcache'
- gemspec.homepage = "http://ehcache.rubyforge.org"
- gemspec.authors = ["Dylan Stamat", "Jason Voegele"]
- gemspec.email = ['dstamat@elctech.com', 'jvoegele@terracotta.org']
-end
-
-Jeweler::Tasks.new do |gemspec|
- defaults(gemspec)
- gemspec.name = "jruby-ehcache"
- gemspec.summary = "JRuby interface to Ehcache"
- gemspec.description = "JRuby interface to the popular Java caching library Ehcache"
- gemspec.files.exclude '.gitignore'
-
- # These files go in the jruby-ehcache-rails2 and jruby-ehcache-rails3 gems
- gemspec.files.exclude 'lib/active_support/**/*'
- gemspec.files.exclude 'lib/ehcache/active_support_store.rb'
- gemspec.add_dependency 'activesupport'
- gemspec.add_dependency 'i18n' # activesupport 'requires' this but not in a bundler friendly way
- gemspec.add_development_dependency 'rake'
- gemspec.add_development_dependency 'jeweler'
-end
-
-Jeweler::Tasks.new do |gemspec|
- defaults(gemspec)
- gemspec.name = 'jruby-ehcache-rails3'
- gemspec.summary = 'Rails 3 cache store provider using Ehcache'
- gemspec.description = 'Rails 3 cache store provider using Ehcache'
- gemspec.files = FileList['lib/active_support/**/*', 'lib/ehcache/active_support_store.rb']
- gemspec.test_files = []
- gemspec.add_dependency 'jruby-ehcache', ">=1.2.0"
-end
-
-Jeweler::Tasks.new do |gemspec|
- defaults(gemspec)
- gemspec.name = 'jruby-ehcache-rails2'
- gemspec.summary = 'Rails 2 cache store provider using Ehcache'
- gemspec.description = 'Rails 2 cache store provider using Ehcache'
- gemspec.files = FileList['lib/active_support/**/*', 'lib/ehcache/active_support_store.rb']
- gemspec.test_files = []
- gemspec.add_dependency 'jruby-ehcache', ">=1.2.0"
-end
-
-Jeweler::GemcutterTasks.new
+require "bundler/gem_helper"
+Bundler::GemHelper.install_tasks :name => "jruby-ehcache"
+
+task :default => [ :test ]
+
+require 'rdoc/task'
+require 'rake/testtask'
+desc "Executes the test suite"
+Rake::TestTask.new do |t|
+ t.name = :test
+ t.libs << 'lib' << 'ext' << 'test'
+ t.pattern = "test/test_*.rb"
+end
View
BIN  jruby-ehcache-1.2.0.gem
Binary file not shown
View
BIN  jruby-ehcache-rails2-1.2.0.gem
Binary file not shown
View
60 jruby-ehcache-rails2.gemspec
@@ -1,60 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "ehcache/version"
Gem::Specification.new do |s|
s.name = %q{jruby-ehcache-rails2}
- s.version = "1.2.0"
-
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+ s.version = Ehcache::VERSION
s.authors = [%q{Dylan Stamat}, %q{Jason Voegele}]
s.date = %q{2012-03-14}
- s.description = %q{Rails 2 cache store provider using Ehcache}
+ s.description = %q{The Ehcache cache store provider for Rails 2}
s.email = [%q{dstamat@elctech.com}, %q{jvoegele@terracotta.org}]
- s.executables = [%q{ehcache}]
- s.extra_rdoc_files = [
- "README.txt"
- ]
- s.files = [
- "lib/active_support/cache/ehcache_store.rb",
- "lib/active_support/ehcache_store.rb",
- "lib/ehcache/active_support_store.rb"
- ]
+ s.extra_rdoc_files = [ "README.txt" ]
s.homepage = %q{http://ehcache.rubyforge.org}
- s.require_paths = [%q{lib}]
s.rubyforge_project = %q{ehcache}
s.rubygems_version = %q{1.8.9}
s.summary = %q{Rails 2 cache store provider using Ehcache}
- if s.respond_to? :specification_version then
- s.specification_version = 3
+ s.files = `git ls-files`.split("\n").concat(
+ ["lib/active_support/ehcache_store.rb",
+ "lib/ehcache/active_support_store.rb"])
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
- s.add_runtime_dependency(%q<jruby-ehcache>, [">= 0"])
- s.add_development_dependency(%q<rake>, [">= 0"])
- s.add_development_dependency(%q<jeweler>, [">= 0"])
- s.add_development_dependency(%q<rake>, [">= 0"])
- s.add_development_dependency(%q<jeweler>, [">= 0"])
- s.add_runtime_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
- else
- s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
- s.add_dependency(%q<jruby-ehcache>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
- end
- else
- s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
- s.add_dependency(%q<jruby-ehcache>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
- end
-end
+ s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+ s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+ s.require_paths = ["lib"]
+ s.add_runtime_dependency "i18n"
+ s.add_runtime_dependency "jruby-ehcache"
+end
View
BIN  jruby-ehcache-rails3-1.2.0.gem
Binary file not shown
View
60 jruby-ehcache-rails3.gemspec
@@ -1,60 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "ehcache/version"
Gem::Specification.new do |s|
s.name = %q{jruby-ehcache-rails3}
- s.version = "1.2.0"
-
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+ s.version = Ehcache::VERSION
s.authors = [%q{Dylan Stamat}, %q{Jason Voegele}]
s.date = %q{2012-03-14}
- s.description = %q{Rails 3 cache store provider using Ehcache}
+ s.description = %q{The Ehcache cache store provider for Rails 3}
s.email = [%q{dstamat@elctech.com}, %q{jvoegele@terracotta.org}]
- s.executables = [%q{ehcache}]
- s.extra_rdoc_files = [
- "README.txt"
- ]
- s.files = [
- "lib/active_support/cache/ehcache_store.rb",
- "lib/active_support/ehcache_store.rb",
- "lib/ehcache/active_support_store.rb"
- ]
+ s.extra_rdoc_files = [ "README.txt" ]
s.homepage = %q{http://ehcache.rubyforge.org}
- s.require_paths = [%q{lib}]
s.rubyforge_project = %q{ehcache}
s.rubygems_version = %q{1.8.9}
s.summary = %q{Rails 3 cache store provider using Ehcache}
- if s.respond_to? :specification_version then
- s.specification_version = 3
+ s.files = `git ls-files`.split("\n").concat(
+ ["lib/active_support/cache/ehcache_store.rb",
+ "lib/ehcache/active_support_store.rb"])
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
- s.add_runtime_dependency(%q<jruby-ehcache>, [">= 0"])
- s.add_development_dependency(%q<rake>, [">= 0"])
- s.add_development_dependency(%q<jeweler>, [">= 0"])
- s.add_development_dependency(%q<rake>, [">= 0"])
- s.add_development_dependency(%q<jeweler>, [">= 0"])
- s.add_runtime_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
- else
- s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
- s.add_dependency(%q<jruby-ehcache>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
- end
- else
- s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
- s.add_dependency(%q<jruby-ehcache>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<jruby-ehcache>, [">= 1.2.0"])
- end
-end
+ s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+ s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+ s.require_paths = ["lib"]
+ s.add_runtime_dependency "i18n"
+ s.add_runtime_dependency "jruby-ehcache"
+end
View
111 jruby-ehcache.gemspec
@@ -1,117 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "ehcache/version"
Gem::Specification.new do |s|
s.name = %q{jruby-ehcache}
- s.version = "1.2.0"
-
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+ s.version = Ehcache::VERSION
s.authors = [%q{Dylan Stamat}, %q{Jason Voegele}]
s.date = %q{2012-03-14}
s.description = %q{JRuby interface to the popular Java caching library Ehcache}
s.email = [%q{dstamat@elctech.com}, %q{jvoegele@terracotta.org}]
- s.executables = [%q{ehcache}]
- s.extra_rdoc_files = [
- "README.txt"
- ]
- s.files = [
- "Gemfile",
- "Gemfile.lock",
- "History.txt",
- "License.txt",
- "Manifest.txt",
- "PostInstall.txt",
- "README.txt",
- "Rakefile",
- "VERSION",
- "bin/ehcache",
- "config/ehcache.yml",
- "config/ehcache_manual_rmi.yml",
- "examples/ehcache.xml",
- "examples/jruby-ehcache.rb",
- "ext/ehcache-2.4.6/ehcache-core-2.4.6.jar",
- "ext/ehcache-2.4.6/ehcache-terracotta-2.4.6.jar",
- "ext/ehcache-2.4.6/slf4j-api-1.6.1.jar",
- "ext/ehcache-2.4.6/slf4j-jdk14-1.6.1.jar",
- "ext/ehcache-2.4.6/terracotta-toolkit-1.3-runtime-3.3.0.jar",
- "jruby-ehcache-rails2.gemspec",
- "jruby-ehcache-rails3.gemspec",
- "jruby-ehcache.gemspec",
- "lib/ehcache.rb",
- "lib/ehcache/cache.rb",
- "lib/ehcache/cache_manager.rb",
- "lib/ehcache/config.rb",
- "lib/ehcache/element.rb",
- "lib/ehcache/extensions.rb",
- "lib/ehcache/java.rb",
- "lib/ehcache/yaml_config.rb",
- "script/console",
- "script/destroy",
- "script/generate",
- "script/txt2html",
- "spec/cache_manager_spec.rb",
- "spec/cache_spec.rb",
- "spec/spec.opts",
- "spec/spec_helper.rb",
- "tasks/deployment.rake",
- "tasks/environment.rake",
- "tasks/website.rake",
- "test/ehcache.xml",
- "test/ehcache.yml",
- "test/test_cache.rb",
- "test/test_cache_manager.rb",
- "test/test_configuration.rb",
- "test/test_ehcache.rb",
- "test/test_element.rb",
- "test/test_helper.rb",
- "test/test_yaml_config.rb",
- "website/index.html",
- "website/javascripts/rounded_corners_lite.inc.js",
- "website/stylesheets/screen.css",
- "website/template.html.erb"
- ]
+ s.extra_rdoc_files = [ "README.txt" ]
s.homepage = %q{http://ehcache.rubyforge.org}
- s.require_paths = [%q{lib}]
s.rubyforge_project = %q{ehcache}
s.rubygems_version = %q{1.8.9}
s.summary = %q{JRuby interface to Ehcache}
- if s.respond_to? :specification_version then
- s.specification_version = 3
+ s.files = `git ls-files`.split("\n")
+ s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+ s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+ s.require_paths = ["lib"]
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<jruby-ehcache>, [">= 0"])
- s.add_development_dependency(%q<rake>, [">= 0"])
- s.add_development_dependency(%q<jeweler>, [">= 0"])
- s.add_development_dependency(%q<rake>, [">= 0"])
- s.add_development_dependency(%q<jeweler>, [">= 0"])
- s.add_runtime_dependency(%q<activesupport>, [">= 0"])
- s.add_runtime_dependency(%q<i18n>, [">= 0"])
- s.add_development_dependency(%q<rake>, [">= 0"])
- s.add_development_dependency(%q<jeweler>, [">= 0"])
- else
- s.add_dependency(%q<jruby-ehcache>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<activesupport>, [">= 0"])
- s.add_dependency(%q<i18n>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- end
- else
- s.add_dependency(%q<jruby-ehcache>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<activesupport>, [">= 0"])
- s.add_dependency(%q<i18n>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- end
+ s.add_runtime_dependency "i18n"
end
-
View
3  lib/ehcache/version.rb
@@ -0,0 +1,3 @@
+module Ehcache
+ VERSION = "1.2.0"
+end
Please sign in to comment.
Something went wrong with that request. Please try again.