Skip to content
This repository
Browse code

Remove Jeweler and (correctly) use Bundler to manage dependencies

  • Loading branch information...
commit 8269ce7c968942daad39b16981d344f25dba1c6d 1 parent e316444
Jérémy Lecour authored September 25, 2010
13  Gemfile
... ...
@@ -1,14 +1,3 @@
1 1
 source :rubygems
2 2
 
3  
-gem 'rails', '~> 3.0.0'
4  
-
5  
-gem 'geokit', '~> 1.5.0'
6  
-
7  
-group :development do
8  
-  gem "bundler", "~> 1.0.0"
9  
-  gem "jeweler", "~> 1.5.0.pre3"
10  
-  gem "rcov", ">= 0"
11  
-  gem "mocha", "~> 0.9.8"
12  
-  
13  
-  gem "mysql", "~> 2.8.1"
14  
-end
  3
+gemspec
24  Gemfile.lock
... ...
@@ -1,3 +1,10 @@
  1
+PATH
  2
+  remote: .
  3
+  specs:
  4
+    geokit-rails (0.0.2)
  5
+      geokit (~> 1.5.0)
  6
+      rails (~> 3.0.0)
  7
+
1 8
 GEM
2 9
   remote: http://rubygems.org/
3 10
   specs:
@@ -34,13 +41,8 @@ GEM
34 41
     erubis (2.6.6)
35 42
       abstract (>= 1.0.0)
36 43
     geokit (1.5.0)
37  
-    git (1.2.5)
38 44
     i18n (0.4.1)
39  
-    jeweler (1.5.0.pre3)
40  
-      bundler (~> 1.0.0)
41  
-      git (>= 1.2.5)
42  
-      rake
43  
-    mail (2.2.5)
  45
+    mail (2.2.6.1)
44 46
       activesupport (>= 2.3.6)
45 47
       mime-types
46 48
       treetop (>= 1.4.5)
@@ -52,7 +54,7 @@ GEM
52 54
     rack (1.2.1)
53 55
     rack-mount (0.6.13)
54 56
       rack (>= 1.0.0)
55  
-    rack-test (0.5.4)
  57
+    rack-test (0.5.5)
56 58
       rack (>= 1.0)
57 59
     rails (3.0.0)
58 60
       actionmailer (= 3.0.0)
@@ -68,8 +70,8 @@ GEM
68 70
       rake (>= 0.8.4)
69 71
       thor (~> 0.14.0)
70 72
     rake (0.8.7)
71  
-    rcov (0.9.8)
72  
-    thor (0.14.0)
  73
+    rcov (0.9.9)
  74
+    thor (0.14.2)
73 75
     treetop (1.4.8)
74 76
       polyglot (>= 0.3.1)
75 77
     tzinfo (0.3.23)
@@ -78,9 +80,9 @@ PLATFORMS
78 80
   ruby
79 81
 
80 82
 DEPENDENCIES
81  
-  bundler (~> 1.0.0)
  83
+  bundler (>= 1.0.0)
82 84
   geokit (~> 1.5.0)
83  
-  jeweler (~> 1.5.0.pre3)
  85
+  geokit-rails!
84 86
   mocha (~> 0.9.8)
85 87
   mysql (~> 2.8.1)
86 88
   rails (~> 3.0.0)
31  Rakefile
... ...
@@ -1,34 +1,5 @@
1  
-require 'rubygems'
2 1
 require 'bundler'
3  
-
4  
-begin
5  
-  Bundler.setup(:default, :development)
6  
-rescue Bundler::BundlerError => e
7  
-  $stderr.puts e.message
8  
-  $stderr.puts "Run `bundle install` to install missing gems"
9  
-  exit e.status_code
10  
-end
11  
-require 'rake'
12  
-
13  
-require 'jeweler'
14  
-Jeweler::Tasks.new do |gem|
15  
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
16  
-  gem.name = "geokit-rails"
17  
-  gem.summary = %Q{Use Geokit with Rails 3}
18  
-  gem.description = %Q{Integrate Geokit with Rails 3}
19  
-  gem.email = ["andre@earthcode.com", "bill_eisenhauer@yahoo.com"]
20  
-  gem.homepage = 'http://github.com/andre/%s' % gem.name
21  
-  gem.authors = ["Andre Lewis", "Bill Eisenhauer", "Jeremy Lecour"]
22  
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
23  
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
24  
-  #  spec.add_runtime_dependency 'jabber4r', '> 0.1'
25  
-  #  spec.add_development_dependency 'rspec', '> 1.2.3'
26  
-  gem.add_runtime_dependency "rails", "~> 3.0.0"
27  
-  gem.add_development_dependency "bundler", "~> 1.0.0"
28  
-  gem.add_development_dependency "jeweler", "~> 1.5.0.pre3"
29  
-  gem.add_development_dependency "rcov", ">= 0"
30  
-end
31  
-Jeweler::RubygemsDotOrgTasks.new
  2
+Bundler::GemHelper.install_tasks
32 3
 
33 4
 require 'rake/rdoctask'
34 5
 Rake::RDocTask.new do |rdoc|
1  VERSION
... ...
@@ -1 +0,0 @@
1  
-0.0.1
89  geokit-rails.gemspec
... ...
@@ -1,75 +1,28 @@
1  
-# Generated by jeweler
2  
-# DO NOT EDIT THIS FILE DIRECTLY
3  
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
4 1
 # -*- encoding: utf-8 -*-
  2
+require File.expand_path("../lib/geokit-rails/version", __FILE__)
5 3
 
6 4
 Gem::Specification.new do |s|
7  
-  s.name = %q{geokit-rails}
8  
-  s.version = "0.0.1"
  5
+  s.name        = "geokit-rails"
  6
+  s.version     = Geokit::Rails::VERSION
  7
+  s.platform    = Gem::Platform::RUBY
  8
+  s.authors     = ["Andre Lewis", "Bill Eisenhauer", "Jeremy Lecour"]
  9
+  s.email       = ["andre@earthcode.com", "bill_eisenhauer@yahoo.com", "jeremy.lecour@gmail.com"]
  10
+  s.homepage    = "http://rubygems.org/gems/test_gem"
  11
+  s.summary     = "Integrate Geokit with Rails 3"
  12
+  s.description = "Integrate Geokit with Rails 3"
9 13
 
10  
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11  
-  s.authors = ["Andre Lewis", "Bill Eisenhauer", "Jeremy Lecour"]
12  
-  s.date = %q{2010-09-11}
13  
-  s.description = %q{Integrate Geokit with Rails 3}
14  
-  s.email = ["andre@earthcode.com", "bill_eisenhauer@yahoo.com"]
15  
-  s.extra_rdoc_files = [
16  
-    "README.markdown"
17  
-  ]
18  
-  s.files = [
19  
-    ".gitignore",
20  
-    "CHANGELOG.rdoc",
21  
-    "Gemfile",
22  
-    "Gemfile.lock",
23  
-    "MIT-LICENSE",
24  
-    "README.markdown",
25  
-    "Rakefile",
26  
-    "VERSION",
27  
-    "geokit-rails.gemspec",
28  
-    "lib/geokit-rails.rb",
29  
-    "lib/geokit-rails/acts_as_mappable.rb",
30  
-    "lib/geokit-rails/core_extensions.rb",
31  
-    "lib/geokit-rails/railtie.rb"
32  
-  ]
33  
-  s.homepage = %q{http://github.com/andre/geokit-rails}
34  
-  s.require_paths = ["lib"]
35  
-  s.rubygems_version = %q{1.3.7}
36  
-  s.summary = %q{Use Geokit with Rails 3}
  14
+  s.required_rubygems_version = ">= 1.3.6"
  15
+  # s.rubyforge_project         = "test_gem"
37 16
 
38  
-  if s.respond_to? :specification_version then
39  
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
40  
-    s.specification_version = 3
  17
+  s.add_runtime_dependency 'rails', '~> 3.0.0'
  18
+  s.add_runtime_dependency 'geokit', '~> 1.5.0'
41 19
 
42  
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
43  
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
44  
-      s.add_runtime_dependency(%q<geokit>, ["~> 1.5.0"])
45  
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
46  
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre3"])
47  
-      s.add_development_dependency(%q<rcov>, [">= 0"])
48  
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
49  
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
50  
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre3"])
51  
-      s.add_development_dependency(%q<rcov>, [">= 0"])
52  
-    else
53  
-      s.add_dependency(%q<rails>, ["~> 3.0.0"])
54  
-      s.add_dependency(%q<geokit>, ["~> 1.5.0"])
55  
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
56  
-      s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre3"])
57  
-      s.add_dependency(%q<rcov>, [">= 0"])
58  
-      s.add_dependency(%q<rails>, ["~> 3.0.0"])
59  
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
60  
-      s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre3"])
61  
-      s.add_dependency(%q<rcov>, [">= 0"])
62  
-    end
63  
-  else
64  
-    s.add_dependency(%q<rails>, ["~> 3.0.0"])
65  
-    s.add_dependency(%q<geokit>, ["~> 1.5.0"])
66  
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
67  
-    s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre3"])
68  
-    s.add_dependency(%q<rcov>, [">= 0"])
69  
-    s.add_dependency(%q<rails>, ["~> 3.0.0"])
70  
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
71  
-    s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre3"])
72  
-    s.add_dependency(%q<rcov>, [">= 0"])
73  
-  end
74  
-end
  20
+  s.add_development_dependency "bundler", ">= 1.0.0"
  21
+  s.add_development_dependency "rcov", "~> 0.9.9"
  22
+  s.add_development_dependency "mocha", "~> 0.9.8"
  23
+  s.add_development_dependency "mysql", "~> 2.8.1"
75 24
 
  25
+  s.files        = `git ls-files`.split("\n")
  26
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
  27
+  s.require_path = 'lib'
  28
+end
5  lib/geokit-rails/version.rb
... ...
@@ -0,0 +1,5 @@
  1
+module Geokit
  2
+  module Rails
  3
+    VERSION = "0.0.2"
  4
+  end
  5
+end

0 notes on commit 8269ce7

Please sign in to comment.
Something went wrong with that request. Please try again.