[BioRuby-cvs] bioruby/bin bioruby,1.19,1.20

[Katayama Toshiaki]

Update of /home/repository/bioruby/bioruby/bin
In directory dev.open-bio.org:/tmp/cvs-serv23553

Modified Files:
	bioruby 
Log Message:
* changed to use gem instead of require_gem


Index: bioruby
===================================================================
RCS file: /home/repository/bioruby/bioruby/bin/bioruby,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** bioruby	5 Apr 2007 23:35:39 -0000	1.19
--- bioruby	26 Jul 2007 10:40:39 -0000	1.20
***************
*** 3,7 ****
  # = BioRuby shell - command line interface for the BioRuby library
  #
! # Copyright::   Copyright (C) 2005, 2006
  #               Toshiaki Katayama <k at bioruby.org>
  # License::     The Ruby License
--- 3,7 ----
  # = BioRuby shell - command line interface for the BioRuby library
  #
! # Copyright::   Copyright (C) 2005, 2006, 2007
  #               Toshiaki Katayama <k at bioruby.org>
  # License::     The Ruby License
***************
*** 12,20 ****
  begin
    require 'rubygems'
!   require_gem 'bio', '>= 1.1.0'
  rescue LoadError
  end
  require 'bio/shell'
  
  # required to run commands (getseq, ls etc.)
  include Bio::Shell
--- 12,26 ----
  begin
    require 'rubygems'
!   gem 'bio', '>= 1.1.0'
  rescue LoadError
+   require 'bio'
  end
  require 'bio/shell'
  
+ # utilize existing rails application
+ if File.exists?("./config/environment.rb")
+   load("./config/environment.rb")
+ end
+ 
  # required to run commands (getseq, ls etc.)
  include Bio::Shell
***************
*** 39,42 ****
--- 45,53 ----
  end
  
+ # utilize existing rails application
+ if File.exists?("./config/environment.rb")
+   load("./config/environment.rb")
+ end
+ 
  # saving workspace, command history and configuration before exit
  Bio::Shell.save_session