squealer 2.2.0 → 2.2.1

data/.gitignore

@@ -1,2 +1,3 @@
 pkg/
 tags
+tmp/

data/.rvmrc

@@ -1,6 +1,6 @@
 # These are the rubies that squealer has been tested on. Uncomment the one you want to use right now.
 # 1.8.7-p249 segfaults postgres.
 #
-# rvm use 1.8.7-p174@squealer
-rvm use 1.9.1@squealer #-p378
+rvm use 1.8.7-p174@squealer
+# rvm use 1.9.1@squealer #-p378
 # rvm use 1.9.2@squealer #-preview3

data/README.md

@@ -22,9 +22,9 @@ where the squeal script includes a `require 'squealer'`.
 ### v2.2
 * Adds support for PostgreSQL database as an export target
 * Uses EXPORT_DBMS environment variable to specify database adapter
-** EXPORT_DMBS=mysql
-** EXPORT_DBMS=postgres
-** MySQL is default if not specified
+ * EXPORT_DMBS=mysql
+ * EXPORT_DBMS=postgres
+ * MySQL is default if not specified
 * Switched to using DataMapper's DataObjects SQL wrapper
 * Removed the need for some typecasting and export schema restrictions (e.g. true/false maps to whatever is idiomatic for the specified DBMS)
 * NB: The pg gem for PostgreSQL segfaults on Ruby 1.8.7-p249 so we've reverted to supporting up to 1.8.7-p174

data/Rakefile

@@ -4,13 +4,14 @@
 require 'rake'
 require 'spec/rake/spectask'
 require 'rake/rdoctask'
+require 'metric_fu'
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "squealer"
-    gemspec.summary = "Document-oriented to Relational database exporter"
-    gemspec.description = "Exports mongodb to mysql. More later."
+    gemspec.summary = "Document-oriented database to RDBMS exports"
+    gemspec.description = "Exports MongoDB to MySQL or PostgreSQL."
     gemspec.email = "joshua.graham@grahamis.com"
     gemspec.homepage = "http://github.com/delitescere/squealer/"
     gemspec.authors = ["Josh Graham", "Durran Jordan", "Matt Yoho", "Bernerd Schaefer"]
@@ -24,9 +25,7 @@ begin
 
     # export DBMS
     gemspec.add_dependency('data_objects', '>= 0.10.2')
-    gemspec.add_dependency('mysql', '>= 2.8.1')
     gemspec.add_dependency('do_mysql', '>= 0.10.2')
-    gemspec.add_dependency('pg', '>= 0.9.0')
     gemspec.add_dependency('do_postgres', '>= 0.10.2')
 
     gemspec.add_development_dependency('rspec', '>= 1.3.0')

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

data/lib/squealer/database.rb

@@ -1,8 +1,5 @@
 require 'mongo'
 require 'data_objects'
-require 'mysql'
-require 'do_mysql'
-require 'do_postgres'
 
 require 'singleton'
 
@@ -16,6 +13,8 @@ module Squealer
     end
 
     def export_to(adapter, host, username, password, name)
+      require "do_#{adapter}"
+
       @@all_export_connections ||= []
       @export_do.dispose if @export_do
 
@@ -32,7 +31,7 @@ module Squealer
     end
 
     def upsertable?
-      @export_do.is_a? DataObjects::Mysql::Connection
+      defined?(DataObjects::Mysql) && @export_do.is_a?(DataObjects::Mysql::Connection)
     end
 
     class Connection

data/spec/spec_helper_dbms_mysql.rb

@@ -1,4 +1,5 @@
 def create_export_db(name)
+  require 'do_mysql'
   $db_adapter = 'mysql'
   dbc = DataObjects::Connection.new("mysql://root@localhost/mysql")
   dbc.create_command("DROP DATABASE IF EXISTS #{name}").execute_non_query

data/spec/spec_helper_dbms_postgres.rb

@@ -1,4 +1,5 @@
 def create_export_db(name)
+  require 'do_postgres'
   $db_adapter = 'postgres'
   dbc = DataObjects::Connection.new("postgres://localhost/postgres")
   dbc.create_command("DROP DATABASE IF EXISTS #{name}").execute_non_query

data/squealer.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{squealer}
-  s.version = "2.2.0"
+  s.version = "2.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Graham", "Durran Jordan", "Matt Yoho", "Bernerd Schaefer"]
   s.date = %q{2010-06-23}
   s.default_executable = %q{skewer}
-  s.description = %q{Exports mongodb to mysql. More later.}
+  s.description = %q{Exports MongoDB to MySQL or PostgreSQL.}
   s.email = %q{joshua.graham@grahamis.com}
   s.executables = ["skewer"]
   s.extra_rdoc_files = [
@@ -50,8 +50,8 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/delitescere/squealer/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Document-oriented to Relational database exporter}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Document-oriented database to RDBMS exports}
   s.test_files = [
     "spec/integration/export_a_record_spec.rb",
      "spec/spec_helper.rb",
@@ -68,22 +68,18 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mongo>, [">= 0.18.3"])
       s.add_runtime_dependency(%q<bson_ext>, [">= 1.0.1"])
       s.add_runtime_dependency(%q<data_objects>, [">= 0.10.2"])
-      s.add_runtime_dependency(%q<mysql>, [">= 2.8.1"])
       s.add_runtime_dependency(%q<do_mysql>, [">= 0.10.2"])
-      s.add_runtime_dependency(%q<pg>, [">= 0.9.0"])
       s.add_runtime_dependency(%q<do_postgres>, [">= 0.10.2"])
       s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
     else
       s.add_dependency(%q<mongo>, [">= 0.18.3"])
       s.add_dependency(%q<bson_ext>, [">= 1.0.1"])
       s.add_dependency(%q<data_objects>, [">= 0.10.2"])
-      s.add_dependency(%q<mysql>, [">= 2.8.1"])
       s.add_dependency(%q<do_mysql>, [">= 0.10.2"])
-      s.add_dependency(%q<pg>, [">= 0.9.0"])
       s.add_dependency(%q<do_postgres>, [">= 0.10.2"])
       s.add_dependency(%q<rspec>, [">= 1.3.0"])
     end
@@ -91,9 +87,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mongo>, [">= 0.18.3"])
     s.add_dependency(%q<bson_ext>, [">= 1.0.1"])
     s.add_dependency(%q<data_objects>, [">= 0.10.2"])
-    s.add_dependency(%q<mysql>, [">= 2.8.1"])
     s.add_dependency(%q<do_mysql>, [">= 0.10.2"])
-    s.add_dependency(%q<pg>, [">= 0.9.0"])
     s.add_dependency(%q<do_postgres>, [">= 0.10.2"])
     s.add_dependency(%q<rspec>, [">= 1.3.0"])
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: squealer
 version: !ruby/object:Gem::Version 
-  hash: 7
   prerelease: false
   segments: 
   - 2
   - 2
-  - 0
-  version: 2.2.0
+  - 1
+  version: 2.2.1
 platform: ruby
 authors: 
 - Josh Graham
@@ -25,11 +24,9 @@ dependencies:
   name: mongo
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 81
         segments: 
         - 0
         - 18
@@ -41,11 +38,9 @@ dependencies:
   name: bson_ext
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 1
         - 0
@@ -57,11 +52,9 @@ dependencies:
   name: data_objects
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
         segments: 
         - 0
         - 10
@@ -69,87 +62,49 @@ dependencies:
         version: 0.10.2
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mysql
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 2
-        - 8
-        - 1
-        version: 2.8.1
-  type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: do_mysql
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
         segments: 
         - 0
         - 10
         - 2
         version: 0.10.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: pg
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
-        version: 0.9.0
-  type: :runtime
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: do_postgres
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
         segments: 
         - 0
         - 10
         - 2
         version: 0.10.2
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 3
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id008
-description: Exports mongodb to mysql. More later.
+  version_requirements: *id006
+description: Exports MongoDB to MySQL or PostgreSQL.
 email: joshua.graham@grahamis.com
 executables: 
 - skewer
@@ -196,30 +151,26 @@ rdoc_options:
 require_paths: 
 - lib
 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 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Document-oriented to Relational database exporter
+summary: Document-oriented database to RDBMS exports
 test_files: 
 - spec/integration/export_a_record_spec.rb
 - spec/spec_helper.rb