bj 0.0.3 → 0.0.4

data/TODO

@@ -1,7 +1,8 @@
 
-- need a new signal, or no signal on windows
+- signals not operating properly on windows , non critical error tho...
 
-- ./script/console submission hangs on windows
+
+- need to figure out how to cache connections for Bj.in(...)
 
 - ttl will be added. maxing it out will cause auto-resubmission (Steve Midgley)
 
@@ -22,6 +23,9 @@
 
 ================================================================================
 
+X the whole gem_path thing is still fubar
+X commands need quoting, esp for windows, "c:\Documents And..." etc
+X ./script/console submission hangs on windows
 X default PATH setting
 X install issues for dave? - gem_path...
 X main only loaded for (bin|script)/bj

data/bin/bj

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 
-require "main"
 require "bj"
+require "main"
 
 Main {
   usage["description"] = <<-txt
@@ -418,8 +418,8 @@ BEGIN {
 #
 # see if we're running out of RAILS_ROOT/script/
 #
-unless defined?(BJ_IS_SCRIPT)
-  BJ_IS_SCRIPT =
+unless defined?(BJ_SCRIPT)
+  BJ_SCRIPT =
     if %w[ script config app ].map{|d| test ?d, "#{ File.dirname __FILE__ }/../#{ d }"}.all?
       __FILE__
     else
@@ -440,7 +440,7 @@ unless defined?(RAILS_ROOT)
 
   ### we know the rails_root if we are in RAILS_ROOT/script/ 
   unless rails_root 
-    if BJ_IS_SCRIPT
+    if BJ_SCRIPT
       rails_root = File.expand_path "#{ File.dirname __FILE__ }/.."
     end
   end
@@ -476,18 +476,6 @@ unless defined?(RAILS_ENV)
   RAILS_ENV = rails_env
 end
 #
-# setup $LOAD_PATH to detect plugin - iff it is installed and running out of
-# RAILS_ROOT/script
-#
-if RAILS_ROOT and BJ_IS_SCRIPT
-  if test(?d, "#{ RAILS_ROOT }/vendor/plugins/bj/lib")
-    $LOAD_PATH.unshift "#{ RAILS_ROOT }/vendor/plugins/bj/lib"
-  end
-  if test(?s, "#{ RAILS_ROOT }/vendor/plugins/bj/init.rb")
-    load "#{ RAILS_ROOT }/vendor/plugins/bj/init.rb"
-  end
-end
-#
 # ensure that rubygems is loaded
 #
   begin
@@ -496,7 +484,25 @@ end
     42
   end
 #
-# hack to_s of STDERR/STDOUT for nice help messages
+# load gems from plugin dir iff installed as plugin - otherwise load normally
+#
+if RAILS_ROOT and BJ_SCRIPT
+=begin
+  dir = Gem.dir
+  path = Gem.path
+  gem_home = File.join RAILS_ROOT, "vendor", "plugins", "bj", "gem_home"
+  gem_path = [gem_home]
+  Gem.send :use_paths, gem_home, gem_path
+  gem "bj"
+  require "bj"
+  gem "main"
+  require "main"
+=end
+  libdir = File.join(RAILS_ROOT, "vendor", "plugins", "bj", "lib")
+  $LOAD_PATH.unshift libdir
+end
+#
+# hack of #to_s of STDERR/STDOUT for nice help messages
 #
   class << STDERR
     def to_s() 'STDERR' end

data/lib/bj.rb

@@ -3,8 +3,7 @@ unless defined? Bj
   #
   # constants and associated attrs
   #
-    Bj::VERSION = "0.0.2" unless
-      defined? Bj::VERSION
+    Bj::VERSION = "0.0.4" #unless defined? Bj::VERSION
     def self.version() Bj::VERSION end
 
     Bj::LIBDIR = File.expand_path(File::join(File.dirname(__FILE__), "bj")) + File::SEPARATOR unless

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: bj
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2007-12-22 00:00:00 -07:00
+  version: 0.0.4
+date: 2007-12-23 00:00:00 -07:00
 summary: bj
 require_paths: 
 - lib