diff --git a/Gemfile.lock b/Gemfile.lock index 9750bfb..41ee56d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,28 +2,16 @@ PATH remote: . specs: jruby-ehcache (1.2.1) - activesupport i18n - jruby-ehcache GEM remote: http://rubygems.org/ specs: - activesupport (3.1.1) - multi_json (~> 1.0) - git (1.2.5) i18n (0.6.0) - jeweler (1.6.4) - bundler (~> 1.0) - git (>= 1.2.5) - rake - multi_json (1.0.3) - rake (0.8.7) PLATFORMS java + ruby DEPENDENCIES - jeweler jruby-ehcache! - rake diff --git a/Rakefile b/Rakefile index cf581c3..7db67ac 100644 --- a/Rakefile +++ b/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.1" -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.1" -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 diff --git a/jruby-ehcache-rails2.gemspec b/jruby-ehcache-rails2.gemspec index 1467b8d..7975d01 100644 --- a/jruby-ehcache-rails2.gemspec +++ b/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.1" - - 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.1') then - s.add_runtime_dependency(%q, [">= 1.2.1"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 1.2.1"]) - else - s.add_dependency(%q, [">= 1.2.1"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 1.2.1"]) - end - else - s.add_dependency(%q, [">= 1.2.1"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 1.2.1"]) - 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 diff --git a/jruby-ehcache-rails3.gemspec b/jruby-ehcache-rails3.gemspec index 9528ca6..53381cb 100644 --- a/jruby-ehcache-rails3.gemspec +++ b/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.1" - - 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.1') then - s.add_runtime_dependency(%q, [">= 1.2.1"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 1.2.1"]) - else - s.add_dependency(%q, [">= 1.2.1"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 1.2.1"]) - end - else - s.add_dependency(%q, [">= 1.2.1"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 1.2.1"]) - 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 diff --git a/jruby-ehcache.gemspec b/jruby-ehcache.gemspec index 43cf7b5..96ce415 100644 --- a/jruby-ehcache.gemspec +++ b/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.1" - - 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.1') then - s.add_runtime_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - end - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - end + s.add_runtime_dependency "i18n" end - diff --git a/lib/ehcache/version.rb b/lib/ehcache/version.rb new file mode 100644 index 0000000..630ecf5 --- /dev/null +++ b/lib/ehcache/version.rb @@ -0,0 +1,3 @@ +module Ehcache + VERSION = "1.2.1" +end