Updating to latest Jeweler

Gemfile

@@ -1,3 +1,8 @@
 source 'http://rubygems.org'
 
-gemspec
+group :development do
+    gem 'jeweler', '1.6.2'
+    gem "mocha"
+    gem "rails"
+    gem "hanna"
+end

Rakefile

@@ -11,12 +11,9 @@ begin
     gem.email = "jim@autonomousmachine.com"
     gem.homepage = "http://github.com/jim/carmen"
     gem.authors = ["Jim Benton"]
-    gem.add_development_dependency 'jeweler', '1.4'
-    gem.add_development_dependency "mocha"
-    gem.add_development_dependency "rails"
-    gem.add_development_dependency "hanna"
+
   end
-  Jeweler::GemcutterTasks.new
+  Jeweler::RubygemsDotOrgTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
@@ -41,8 +38,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 desc 'Generate RDoc documentation for the carmen plugin.'

carmen.gemspec

@@ -1,6 +1,6 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
@@ -9,72 +9,66 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jim Benton"]
-  s.date = %q{2011-03-11}
+  s.date = %q{2011-06-01}
   s.description = %q{A collection of geographic country and state names for Ruby. Also includes replacements for Rails' country_select and state_select plugins}
   s.email = %q{jim@autonomousmachine.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "Gemfile",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "carmen.gemspec",
-     "data/countries/de.yml",
-     "data/countries/en.yml",
-     "data/states/au.yml",
-     "data/states/br.yml",
-     "data/states/ca.yml",
-     "data/states/cu.yml",
-     "data/states/de.yml",
-     "data/states/dk.yml",
-     "data/states/es.yml",
-     "data/states/hr.yml",
-     "data/states/in.yml",
-     "data/states/it.yml",
-     "data/states/mx.yml",
-     "data/states/no.yml",
-     "data/states/nz.yml",
-     "data/states/ua.yml",
-     "data/states/us.yml",
-     "lib/carmen.rb",
-     "lib/carmen/action_view_helpers.rb",
-     "lib/carmen/railtie.rb",
-     "test/carmen_test.rb",
-     "test/carmen_view_helper_test.rb",
-     "test/test_helper.rb"
+    "Gemfile",
+    "MIT-LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "carmen.gemspec",
+    "data/countries/de.yml",
+    "data/countries/en.yml",
+    "data/countries/hi.yml",
+    "data/countries/nl.yml",
+    "data/states/au.yml",
+    "data/states/br.yml",
+    "data/states/ca.yml",
+    "data/states/cu.yml",
+    "data/states/de.yml",
+    "data/states/dk.yml",
+    "data/states/es.yml",
+    "data/states/hr.yml",
+    "data/states/in.yml",
+    "data/states/it.yml",
+    "data/states/mx.yml",
+    "data/states/no.yml",
+    "data/states/nz.yml",
+    "data/states/ua.yml",
+    "data/states/us.yml",
+    "lib/carmen.rb",
+    "lib/carmen/action_view_helpers.rb",
+    "lib/carmen/railtie.rb",
+    "test/carmen_test.rb",
+    "test/carmen_view_helper_test.rb",
+    "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/jim/carmen}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A collection of geographic country and state names for Ruby}
-  s.test_files = [
-    "test/carmen_test.rb",
-     "test/carmen_view_helper_test.rb",
-     "test/test_helper.rb"
-  ]
 
   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_development_dependency(%q<jeweler>, ["= 1.4"])
+      s.add_development_dependency(%q<jeweler>, ["= 1.6.2"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<rails>, [">= 0"])
       s.add_development_dependency(%q<hanna>, [">= 0"])
     else
-      s.add_dependency(%q<jeweler>, ["= 1.4"])
+      s.add_dependency(%q<jeweler>, ["= 1.6.2"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 0"])
       s.add_dependency(%q<hanna>, [">= 0"])
     end
   else
-    s.add_dependency(%q<jeweler>, ["= 1.4"])
+    s.add_dependency(%q<jeweler>, ["= 1.6.2"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 0"])
     s.add_dependency(%q<hanna>, [">= 0"])