dohruby 0.1.26 → 0.1.27

data/CHANGELOG

@@ -80,3 +80,5 @@
  * DohDb::DatabaseCreator - use convention for default data_directory
 *0.1.26* (May 28th, 2008)
  * fixed unit_test_logging invalid require
+*0.1.27* (May 30th, 2008)
+ * rework DohApp stuff to be simpler and more flexible

data/bin/run_tests.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'doh/app/home'
+require 'doh/app/init'
 
 what_to_run = ARGV[0] || '.'
 if File.directory?(what_to_run)
@@ -7,8 +7,7 @@ if File.directory?(what_to_run)
 else
   start_dir = File.dirname(what_to_run)
 end
-DohApp::find_home(start_dir)
-require 'doh/app_init'
+DohApp::init(start_dir)
 
 if File.directory?(what_to_run)
   require 'doh/util/run_tests'

data/lib/doh/app/home.rb

@@ -2,17 +2,18 @@ module DohApp
 
 @@home = nil
 def self.home
+  raise "must call DohApp::find_home before calling DohApp::home" if @@home.nil?
   @@home
 end
 
 def self.find_home(dir, max_tries = 20)
-  abspath = File.expand_path(dir)
-  raise "unable to find a DohApp home" if (abspath == '/') || (max_tries <= 0)
+  path = File.expand_path(dir)
+  raise "unable to find a DohApp home" if (path == '/') || (max_tries <= 0)
 
-  if File.exist?(File.join(abspath, 'dohapp_home'))
-    @@home = abspath
+  if File.exist?(File.join(path, 'dohapp_home'))
+    @@home = path
   else
-    find_home(File.join(abspath, '..'), max_tries - 1)
+    find_home(File.join(path, '..'), max_tries - 1)
   end
 end
 

data/lib/doh/app/init.rb

@@ -0,0 +1,15 @@
+require 'doh/app/home'
+
+module DohApp
+
+def self.init(file_or_directory)
+  if File.directory?(file_or_directory)
+    find_home(file_or_directory)
+  else
+    find_home(File.dirname(file_or_directory))
+  end
+  $LOAD_PATH.push(File.join(DohApp::home, 'lib'))
+  require 'doh/app_util'
+end
+
+end

data/lib/doh/app.rb

@@ -1,2 +1,2 @@
-require 'doh/app/find_home_from_main_source'
-require 'doh/app_init'
+require 'doh/app/init'
+DohApp::init($PROGRAM_NAME)

data/lib/doh/app_util.rb

@@ -0,0 +1 @@
+require 'doh/app/options'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dohruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors: 
 - Makani & Kem Mason
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-28 00:00:00 -06:00
+date: 2008-05-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,12 +37,11 @@ files:
 - bin/run_tests.rb
 - lib/doh
 - lib/doh/app
-- lib/doh/app/add_lib_to_load_path.rb
-- lib/doh/app/find_home_from_main_source.rb
 - lib/doh/app/home.rb
+- lib/doh/app/init.rb
 - lib/doh/app/options.rb
 - lib/doh/app.rb
-- lib/doh/app_init.rb
+- lib/doh/app_util.rb
 - lib/doh/core
 - lib/doh/core/bigdecimal.rb
 - lib/doh/core/date.rb

data/lib/doh/app/add_lib_to_load_path.rb

@@ -1,3 +0,0 @@
-require 'doh/app/home'
-
-$LOAD_PATH.push(File.join(DohApp::home, 'lib'))

data/lib/doh/app/find_home_from_main_source.rb

@@ -1,3 +0,0 @@
-require 'doh/app/home'
-
-DohApp::find_home(File.dirname($PROGRAM_NAME))

data/lib/doh/app_init.rb

@@ -1,2 +0,0 @@
-require 'doh/app/add_lib_to_load_path'
-require 'doh/app/options'