Bundler + RSpec 2

.gitignore

@@ -20,3 +20,4 @@ pkg
 
 ## PROJECT::SPECIFIC
 *.rbc
+Gemfile.lock

Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

Rakefile

@@ -1,39 +1,20 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name        = "ffi-icu"
-    gem.summary     = %Q{Simple FFI wrappers for things I need from ICU.}
-    gem.description = %Q{Provides charset detection, locale sensitive collation and more. Depends on libicu.}
-    gem.email       = "jari.bakken@gmail.com"
-    gem.homepage    = "http://github.com/jarib/ffi-icu"
-    gem.authors     = ["Jari Bakken"]
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-    gem.add_dependency "ffi", ">= 0.6.3"
-    gem.add_development_dependency "rspec", ">= 1.3.0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
+task :spec
 
 task :default => :spec
 

ffi-icu.gemspec

@@ -3,71 +3,31 @@
 # Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
+require File.expand_path("../lib/ffi-icu/version", __FILE__)
+
 Gem::Specification.new do |s|
-  s.name = %q{ffi-icu}
-  s.version = "0.0.2"
+  s.name                      = %q{ffi-icu}
+  s.version                   = ICU::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jari Bakken"]
-  s.date = %q{2010-08-23}
-  s.description = %q{Provides charset detection, locale sensitive collation and more. Depends on libicu.}
-  s.email = %q{jari.bakken@gmail.com}
-  s.extra_rdoc_files = [
+  s.authors                   = ["Jari Bakken"]
+  s.date                      = %q{2010-08-23}
+  s.description               = %q{Provides charset detection, locale sensitive collation and more. Depends on libicu.}
+  s.email                     = %q{jari.bakken@gmail.com}
+  s.extra_rdoc_files          = [
     "LICENSE",
      "README.rdoc"
   ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "benchmark/detect.rb",
-     "benchmark/shared.rb",
-     "ffi-icu.gemspec",
-     "lib/ffi-icu.rb",
-     "lib/ffi-icu/chardet.rb",
-     "lib/ffi-icu/collation.rb",
-     "lib/ffi-icu/lib.rb",
-     "lib/ffi-icu/normalization.rb",
-     "lib/ffi-icu/transliteration.rb",
-     "lib/ffi-icu/uchar.rb",
-     "spec/chardet_spec.rb",
-     "spec/collation_spec.rb",
-     "spec/normalization_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/transliteration_spec.rb",
-     "test.c"
-  ]
-  s.homepage = %q{http://github.com/jarib/ffi-icu}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Simple FFI wrappers for things I need from ICU.}
-  s.test_files = [
-    "spec/chardet_spec.rb",
-     "spec/normalization_spec.rb",
-     "spec/transliteration_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/collation_spec.rb"
-  ]
+  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"]
+  
+  s.homepage                  = %q{http://github.com/jarib/ffi-icu}
+  s.rdoc_options              = ["--charset=UTF-8"]
+  s.summary                   = %q{Simple FFI wrappers for things I need from ICU.}
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ffi>, [">= 0.6.3"])
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
-    else
-      s.add_dependency(%q<ffi>, [">= 0.6.3"])
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
-    end
-  else
-    s.add_dependency(%q<ffi>, [">= 0.6.3"])
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
-  end
+  s.add_runtime_dependency(%q<ffi>, ["~> 1.0.9"])
+  s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
 end
 

lib/ffi-icu/version.rb

@@ -0,0 +1,3 @@
+module ICU
+  VERSION = "0.0.2"
+end

spec/spec_helper.rb

@@ -3,10 +3,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require "rubygems"
 require 'ffi-icu'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 
 end