ardb 0.1.0 → 0.2.0

data/lib/ardb.rb

@@ -1,9 +1,10 @@
-require 'active_record'
-require 'ns-options'
 require 'pathname'
 require 'singleton'
+require 'active_record'
+require 'ns-options'
 
-require "ardb/version"
+require 'ardb/version'
+require 'ardb/root_path'
 
 module Ardb
   NotConfiguredError = Class.new(RuntimeError)
@@ -42,11 +43,8 @@ module Ardb
 
     option :root_path,       Pathname, :required => true
     option :logger,                    :required => true
-    option :migrations_path, String,   :default => proc{ default_migrations_path }
-    option :schema_path,     String,   :default => proc{ default_schema_path }
-
-    def self.default_migrations_path; root_path.join("db/migrations"); end
-    def self.default_schema_path;     root_path.join("db/schema.rb");  end
+    option :migrations_path, RootPath, :default => proc{ "db/migrations" }
+    option :schema_path,     RootPath, :default => proc{ "db/schema.rb" }
 
   end
 

data/lib/ardb/root_path.rb

@@ -0,0 +1,12 @@
+# This takes a path string relative to the configured root path and tranforms
+# to the full qualifed root path.  The goal here is to specify path options
+# with root-relative path strings.
+
+module Ardb; end
+class Ardb::RootPath < String
+
+  def initialize(path_string)
+    super(Ardb.config.root_path.join(path_string).to_s)
+  end
+
+end

data/lib/ardb/runner/create_command.rb

@@ -14,6 +14,8 @@ class Ardb::Runner::CreateCommand
     rescue Ardb::Runner::CmdError => e
       raise e
     rescue Exception => e
+      $stderr.puts e
+      $stderr.puts "error dropping #{Ardb.config.db.database.inspect} database"
       raise Ardb::Runner::CmdFail
     end
   end

data/lib/ardb/runner/drop_command.rb

@@ -14,6 +14,8 @@ class Ardb::Runner::DropCommand
     rescue Ardb::Runner::CmdError => e
       raise e
     rescue Exception => e
+      $stderr.puts e
+      $stderr.puts "error dropping #{Ardb.config.db.database.inspect} database"
       raise Ardb::Runner::CmdFail
     end
   end

data/lib/ardb/runner/generate_command.rb

@@ -22,7 +22,7 @@ class Ardb::Runner::GenerateCommand
     rescue Ardb::Runner::CmdError => e
       raise e
     rescue Exception => e
-      $stderr.puts e, *(e.backtrace)
+      $stderr.puts e
       $stderr.puts "error generating #{@item}."
       raise Ardb::Runner::CmdFail
     end

data/lib/ardb/runner/migrate_command.rb

@@ -21,7 +21,7 @@ class Ardb::Runner::MigrateCommand
     rescue Ardb::Runner::CmdError => e
       raise e
     rescue Exception => e
-      $stderr.puts e, *(e.backtrace)
+      $stderr.puts e
       $stderr.puts "error migrating #{Ardb.config.db.database.inspect} database"
       raise Ardb::Runner::CmdFail
     end

data/lib/ardb/version.rb

@@ -1,3 +1,3 @@
 module Ardb
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ardb
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-03 00:00:00 Z
+date: 2013-04-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -103,6 +103,7 @@ files:
 - lib/ardb/adapter/sqlite.rb
 - lib/ardb/cli.rb
 - lib/ardb/migration_helpers.rb
+- lib/ardb/root_path.rb
 - lib/ardb/runner.rb
 - lib/ardb/runner/create_command.rb
 - lib/ardb/runner/drop_command.rb