merb_datamapper 1.1.2 → 1.1.3

data/lib/merb_datamapper.rb

@@ -1,6 +1,7 @@
 require "merb-core"
 
 require "dm-core"
+require "dm-migrations"
 require "merb_datamapper/connection"
 
 Merb::Plugins.add_rakefiles "merb_datamapper" / "merbtasks"

data/lib/merb_datamapper/merbtasks.rb

@@ -51,13 +51,16 @@ namespace :db do
   desc "Create the database"
   task :create do
     config = Merb::Orms::DataMapper.config
-    puts "Creating database '#{config[:database]}'"
+    puts "Creating database '%s'" % (config[:adapter] == 'sqlite3' ? config[:path] : config[:database])
     case config[:adapter]
     when 'postgres'
-      `createdb -U #{config[:username]} #{config[:database]}`
+      system('createdb', "-U #{config[:username]}", config[:database].to_s)
     when 'mysql'
       user, password, database = config[:username], config[:password], config[:database]
-      `mysql -u #{user} #{password ? "-p #{password}" : ''} -e "create database #{database}"`
+      args = ["--user=#{user}"]
+      args << "--password=#{password}" if password
+      args << "-e create database #{database}"
+      system('mysql', *args)
     when 'sqlite3'
       Rake::Task['rake:db:automigrate'].invoke
     else
@@ -71,10 +74,13 @@ namespace :db do
     puts "Dropping database '#{config[:database]}'"
     case config[:adapter]
     when 'postgres'
-      `dropdb -U #{config[:username]} #{config[:database]}`
+      system('dropdb', "-U #{config[:username]}", config[:database].to_s)
     when 'mysql'
       user, password, database = config[:username], config[:password], config[:database]
-      `mysql -u #{user} #{password ? "-p #{password}" : ''} -e "drop database #{database}"`
+      args = ["--user=#{user}"]
+      args << "--password=#{password}" if password
+      args << "-e drop database #{database}"
+      system('mysql', *args)
     else
       raise "Adapter #{config[:adapter]} not supported for dropping databases yet.\ntry db:automigrate"
     end

data/lib/merb_datamapper/version.rb

@@ -1,6 +1,6 @@
 module Merb
   module DataMapper
-    VERSION                = '1.1.2'.freeze
-    DM_VERSION_REQUIREMENT = '>= 0.10.2'.freeze
+    VERSION                = '1.1.3'.freeze
+    DM_VERSION_REQUIREMENT = '>= 1.0'.freeze
   end
 end

metadata

@@ -1,162 +1,124 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: merb_datamapper
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 2
-  version: 1.1.2
+version: !ruby/object:Gem::Version
+  version: 1.1.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jason Toy
 - Jonathan Stott
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-07-03 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-05-03 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: merb-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &22072060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: dm-core
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *22072060
+- !ruby/object:Gem::Dependency
+  name: dm-core
+  requirement: &22071580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 10
-        - 2
-        version: 0.10.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: dm-migrations
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *22071580
+- !ruby/object:Gem::Dependency
+  name: dm-migrations
+  requirement: &22071120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 10
-        - 2
-        version: 0.10.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *22071120
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &22070680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.9
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *22070680
 description: Merb plugin that provides support for datamapper
 email: jonathan.stott@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - LICENSE
 - TODO
-files: 
+files:
 - Generators
 - Rakefile
-- lib/merb_datamapper.rb
-- lib/generators/data_mapper_resource_controller.rb
+- lib/generators/data_mapper_migration.rb
 - lib/generators/data_mapper_model.rb
-- lib/generators/templates/views/index.html.erb
-- lib/generators/templates/views/new.html.erb
-- lib/generators/templates/views/show.html.erb
-- lib/generators/templates/views/edit.html.erb
+- lib/generators/data_mapper_resource_controller.rb
 - lib/generators/templates/migration.rb
 - lib/generators/templates/model.rb
 - lib/generators/templates/model_migration.rb
 - lib/generators/templates/resource_controller.rb
-- lib/generators/data_mapper_migration.rb
+- lib/generators/templates/views/edit.html.erb
+- lib/generators/templates/views/index.html.erb
+- lib/generators/templates/views/new.html.erb
+- lib/generators/templates/views/show.html.erb
+- lib/merb_datamapper.rb
+- lib/merb_datamapper/connection.rb
 - lib/merb_datamapper/data_mapper_session.rb
+- lib/merb_datamapper/database.yml.sample
 - lib/merb_datamapper/merbtasks.rb
-- lib/merb_datamapper/connection.rb
 - lib/merb_datamapper/version.rb
-- lib/merb_datamapper/database.yml.sample
-- spec/session_store_spec.rb
-- spec/spec.opts
 - spec/connection_spec.rb
-- spec/identity_map_spec.rb
-- spec/spec_helper.rb
 - spec/datamapper_id_map_controller.rb
-- spec/session_spec.rb
-- spec/datamapper_session_controller.rb
 - spec/datamapper_model.rb
+- spec/datamapper_session_controller.rb
+- spec/identity_map_spec.rb
+- spec/session_spec.rb
+- spec/session_store_spec.rb
+- spec/spec_helper.rb
+- spec/spec.opts
 - README
 - LICENSE
 - TODO
-has_rdoc: true
 homepage: http://github.com/merb/merb_datamapper
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Merb plugin that allows you to use datamapper with your merb app
 test_files: []
-
+has_rdoc: true