ardb 0.4.1 → 0.5.0

data/bin/ardb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2011-Present Kelly Redding and Collin Redding
+# Copyright (c) 2013-Present Kelly Redding and Collin Redding
 #
 
 require 'ardb/cli'

data/lib/ardb/cli.rb

@@ -10,11 +10,7 @@ module Ardb
     end
 
     def initialize
-      @cli = CLIRB.new do
-        option 'root_path', 'root path Ardb should use (`Dir.pwd`)', {
-          :abbrev => 'p', :value => String
-        }
-      end
+      @cli = CLIRB.new
     end
 
     def run(*args)

data/lib/ardb/runner.rb

@@ -1,18 +1,19 @@
 require 'ardb'
 
+ENV['ARDB_CONFIG_FILE'] ||= 'config/db'
+
 module Ardb; end
 class Ardb::Runner
   UnknownCmdError = Class.new(ArgumentError)
   CmdError = Class.new(RuntimeError)
   CmdFail = Class.new(RuntimeError)
 
-  attr_reader :cmd_name, :cmd_args, :opts, :root_path
+  attr_reader :cmd_name, :cmd_args, :opts
 
   def initialize(args, opts)
     @opts = opts
     @cmd_name = args.shift || ""
     @cmd_args = args
-    @root_path = @opts.delete('root_path') || Dir.pwd
   end
 
   def run
@@ -43,22 +44,10 @@ class Ardb::Runner
   private
 
   def setup_run
-    Ardb.config.root_path = @root_path
-    DbConfigFile.new.require_if_exists
+    require ENV['ARDB_CONFIG_FILE']
     Ardb.init(false) # don't establish a connection
   end
 
-  class DbConfigFile
-    PATH = 'config/db.rb'
-    def initialize
-      @path = Ardb.config.root_path.join(PATH)
-    end
-
-    def require_if_exists
-      require @path.to_s if File.exists?(@path.to_s)
-    end
-  end
-
   class NullCommand
     def run
       # if this was a real command it would do something here

data/lib/ardb/version.rb

@@ -1,3 +1,3 @@
 module Ardb
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/test/helper.rb

@@ -2,23 +2,10 @@
 # put any test helpers here
 
 # add the root dir to the load path
-ROOT_PATH = File.expand_path("../..", __FILE__)
-$LOAD_PATH.unshift(ROOT_PATH)
+$LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 
 # require pry for debugging (`binding.pry`)
 require 'pry'
 
-require 'fileutils'
-TESTDB_PATH = File.join(ROOT_PATH, 'tmp', 'testdb')
-FileUtils.mkdir_p TESTDB_PATH
-
-require 'logger'
-require 'ardb'
-Ardb.configure do |c|
-  c.root_path = TESTDB_PATH
-  c.logger = Logger.new($stdout)
-
-  c.db.adapter  'postgresql'
-  c.db.database 'ardbtest'
-
-end
+ENV['ARDB_CONFIG_FILE'] = 'tmp/testdb/config/db'
+require ENV['ARDB_CONFIG_FILE']

data/test/unit/runner_tests.rb

@@ -12,7 +12,7 @@ class Ardb::Runner
     end
     subject{ @runner }
 
-    should have_readers :cmd_name, :cmd_args, :opts, :root_path
+    should have_readers :cmd_name, :cmd_args, :opts
 
     should "know its cmd, cmd_args, and opts" do
       assert_equal 'null', subject.cmd_name
@@ -20,28 +20,17 @@ class Ardb::Runner
       assert_equal 'opts', subject.opts['some']
     end
 
-    should "default the 'root_path' opt to `Dir.pwd`" do
-      assert_equal Dir.pwd, subject.root_path
-    end
-
   end
 
   class RunTests < BaseTests
     desc "when running a command"
     setup do
-      @orig_root_path = Ardb.config.root_path
-      @runner = Ardb::Runner.new(['null', 1, 2], 'root_path' => '/some/path')
+      @runner = Ardb::Runner.new(['null', 1, 2], {})
     end
     teardown do
-      Ardb.config.root_path = @orig_root_path
       Ardb::Adapter.reset
     end
 
-    should "set the Ardb config root_path" do
-      subject.run
-      assert_equal Pathname.new('/some/path'), Ardb.config.root_path
-    end
-
     should "validate the configs" do
       orig_adapter = Ardb.config.db.adapter
       Ardb.config.db.adapter = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ardb
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-05 00:00:00 Z
+date: 2013-04-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -129,7 +129,7 @@ files:
 - test/unit/runner_tests.rb
 - test/unit/test_helpers_tests.rb
 - tmp/.gitkeep
-- tmp/msqltest/.gitkeep
+- tmp/mysqltest/.gitkeep
 - tmp/pgtest/.gitkeep
 - tmp/pgtest/Gemfile
 - tmp/pgtest/Gemfile.lock
@@ -138,6 +138,8 @@ files:
 - tmp/sqlitetest/Gemfile
 - tmp/sqlitetest/Gemfile.lock
 - tmp/sqlitetest/config/.gitkeep
+- tmp/testdb/config/.gitkeep
+- tmp/testdb/config/db.rb
 homepage: http://github.com/redding/ardb
 licenses: []