Updated dm-couchdb-adapter, dm-rest-adapter, dm-adjust, dm-aggregates…

… to use better namespacing for VERSION, and to use gem "dm-core" linked to their own VERSION.
pangloss · Jul 20, 2008 · 7c2a30c · 7c2a30c
1 parent 6f6e29e
commit 7c2a30c
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 25 deletions.
diff --git a/adapters/dm-couchdb-adapter/Rakefile b/adapters/dm-couchdb-adapter/Rakefile
@@ -9,7 +9,7 @@ require ROOT + 'lib/couchdb_adapter/version'
 AUTHOR = "Bernerd Schaefer"
 EMAIL  = "bj.schaefer@gmail.com"
 GEM_NAME = "dm-couchdb-adapter"
-GEM_VERSION = DataMapper::Adapters::CouchDBAdapter::VERSION
+GEM_VERSION = DataMapper::More::CouchDBAdapter::VERSION
 GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
 GEM_CLEAN = ["log", "pkg"]
 GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }

diff --git a/adapters/dm-couchdb-adapter/lib/couchdb_adapter.rb b/adapters/dm-couchdb-adapter/lib/couchdb_adapter.rb
@@ -1,10 +1,11 @@
 require 'rubygems'
-gem 'dm-core', '=0.9.3'
-require 'base64'
+require 'pathname'
+require Pathname(__FILE__).dirname + 'couchdb_adapter/version'
+gem 'dm-core', DataMapper::More::CouchDBAdapter::VERSION
 require 'dm-core'
+require 'base64'
 require 'json'
 require 'net/http'
-require 'pathname'
 require 'uri'
 require Pathname(__FILE__).dirname + 'couchdb_adapter/json_object'
 require Pathname(__FILE__).dirname + 'couchdb_adapter/view'

diff --git a/adapters/dm-couchdb-adapter/lib/couchdb_adapter/version.rb b/adapters/dm-couchdb-adapter/lib/couchdb_adapter/version.rb
@@ -1,5 +1,5 @@
 module DataMapper
-  module Adapters
+  module More
     class CouchDBAdapter
       VERSION = "0.9.3"
     end

diff --git a/adapters/dm-rest-adapter/Rakefile b/adapters/dm-rest-adapter/Rakefile
@@ -9,7 +9,7 @@ require ROOT + 'lib/rest_adapter/version'
 AUTHOR = "Potomac Ruby Hackers"
 EMAIL  = "potomac-ruby-hackers@googlegroups.com"
 GEM_NAME = "dm-rest-adapter"
-GEM_VERSION = DataMapper::Adapters::RestAdapter::VERSION
+GEM_VERSION = DataMapper::More::RestAdapter::VERSION
 GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
 GEM_CLEAN = ["log", "pkg"]
 GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }

diff --git a/adapters/dm-rest-adapter/lib/rest_adapter.rb b/adapters/dm-rest-adapter/lib/rest_adapter.rb
@@ -1,9 +1,10 @@
 require 'rubygems'
-gem 'dm-core', '=0.9.3'
+require 'pathname'
+require Pathname(__FILE__).dirname + 'rest_adapter/version'
+gem 'dm-core', DataMapper::More::RestAdapter::VERSION
 require 'dm-core'
 require 'extlib'
 require 'dm-serializer'
-require 'pathname'
 require 'net/http'
 require 'rexml/document'
 

diff --git a/adapters/dm-rest-adapter/lib/rest_adapter/version.rb b/adapters/dm-rest-adapter/lib/rest_adapter/version.rb
@@ -1,5 +1,5 @@
 module DataMapper
-  module Adapters
+  module More
     class RestAdapter
       VERSION = "0.9.3"
     end

diff --git a/dm-adjust/Rakefile b/dm-adjust/Rakefile
@@ -9,7 +9,7 @@ require ROOT + 'lib/dm-adjust/version'
 AUTHOR = "Sindre Aarsaether"
 EMAIL  = "sindre [a] identu [d] no"
 GEM_NAME = "dm-adjust"
-GEM_VERSION = DataMapper::Adjust::VERSION
+GEM_VERSION = DataMapper::More::Adjust::VERSION
 GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
 GEM_CLEAN = ["log", "pkg"]
 GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }

diff --git a/dm-adjust/lib/dm-adjust.rb b/dm-adjust/lib/dm-adjust.rb
@@ -1,6 +1,9 @@
 require 'rubygems'
+require 'pathname'
 
-gem 'dm-core', '=0.9.3'
+require Pathname(__FILE__).dirname + 'dm-adjust/version'
+
+gem 'dm-core', DataMapper::More::Adjust::VERSION
 require 'dm-core'
 
 dir = Pathname(__FILE__).dirname.expand_path / 'dm-adjust'

diff --git a/dm-adjust/lib/dm-adjust/version.rb b/dm-adjust/lib/dm-adjust/version.rb
@@ -1,5 +1,7 @@
 module DataMapper
-  module Adjust
-    VERSION = "0.9.3"
+  module More
+    module Adjust
+      VERSION = "0.9.3"
+    end
   end
 end
diff --git a/dm-aggregates/Rakefile b/dm-aggregates/Rakefile
@@ -9,7 +9,7 @@ require ROOT + 'lib/dm-aggregates/version'
 AUTHOR = "Foy Savas"
 EMAIL  = "foysavas@gmail.com"
 GEM_NAME = "dm-aggregates"
-GEM_VERSION = DataMapper::Aggregates::VERSION
+GEM_VERSION = DataMapper::More::Aggregates::VERSION
 GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
 GEM_CLEAN = ["log", "pkg"]
 GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }

diff --git a/dm-aggregates/lib/dm-aggregates.rb b/dm-aggregates/lib/dm-aggregates.rb
@@ -1,13 +1,15 @@
 require 'rubygems'
 
-gem 'dm-core', '=0.9.3'
+dir = Pathname(__FILE__).dirname.expand_path + 'dm-aggregates'
+
+require dir + 'version'
+gem 'dm-core', DataMapper::More::Aggregates::VERSION
 require 'dm-core'
 
-dir = Pathname(__FILE__).dirname.expand_path / 'dm-aggregates'
 
-require dir / 'aggregate_functions'
-require dir / 'model'
-require dir / 'repository'
-require dir / 'collection'
-require dir / 'adapters' / 'data_objects_adapter'
-require dir / 'support' / 'symbol'
+require dir + 'aggregate_functions'
+require dir + 'model'
+require dir + 'repository'
+require dir + 'collection'
+require dir + 'adapters' + 'data_objects_adapter'
+require dir + 'support' + 'symbol'
diff --git a/dm-aggregates/lib/dm-aggregates/version.rb b/dm-aggregates/lib/dm-aggregates/version.rb
@@ -1,5 +1,7 @@
 module DataMapper
-  module Aggregates
-    VERSION = "0.9.3"
+  module More
+    module Aggregates
+      VERSION = "0.9.3"
+    end
   end
 end
diff --git a/merb_datamapper/lib/merb_datamapper.rb b/merb_datamapper/lib/merb_datamapper.rb
@@ -1,7 +1,8 @@
 if defined?(Merb::Plugins)
   require 'rubygems'
+  require 'merb_datamapper/version'
 
-  gem 'dm-core', '=0.9.3'
+  gem 'dm-core', DataMapper::MerbDataMapper::VERSION
   require 'dm-core'
 
   if File.file?(Merb.dir_for(:config) / "database.yml")