<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>anvil-db/lib/anvil-db.rb</filename>
    </added>
    <added>
      <filename>anvil-db/lib/anvil-db/version.rb</filename>
    </added>
    <added>
      <filename>anvil/lib/anvil/console.rb</filename>
    </added>
    <added>
      <filename>anvil/lib/anvil/core_ext/object.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,2 +1,4 @@
+anvil/pkg/
+anvil-db/pkg/
 anvil-gui/pkg/
 anvil-gui-fox/pkg/</diff>
      <filename>.gitignore</filename>
    </modified>
    <modified>
      <diff>@@ -11,27 +11,33 @@ module Anvil
     attr_accessor :environment, :root, :load_paths, :toolkit_name
     
     def launch!(argv=ARGV)
-      @config = Configuration.new
+      if argv === Hash
+        @config = Configuration.setup(argv)
+      else
+        @config = Console.parse_args(argv)
+      end
       Anvil.environment = @config[:environment]
-      Anvil.root = @config[:root]
+      Anvil.root = @config[:anvil_root]
       Anvil.toolkit_name = @config[:toolkit_name]
       Launcher.new(@config)
     end
     
+    Anvil.load_paths = Hash.new { [Anvil.root] } unless Anvil.load_paths.is_a?(Hash)
+    
     def push_path(type, path, file_glob = &quot;**/*.rb&quot;) 
       enforce!(type =&gt; Symbol)
       load_paths[type] = [path, file_glob]
     end
   
     def root_path(path)
-      File.join(root, path)                         
+      File.join(root, path)
     end
     
     def log_path
       if @config[:log_file]
         File.dirname(@config[:log_file])
       else
-        Merb.root_path(&quot;log&quot;)
+        Anvil.root_path(&quot;log&quot;)
       end
     end
   end</diff>
      <filename>anvil/lib/anvil.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>1c465907f8af810b25d41050ef1d7b5ddff3c5f4</id>
    </parent>
  </parents>
  <author>
    <name>Lance Carlson</name>
    <email>lancecarlson@gmail.com</email>
  </author>
  <url>http://github.com/lancecarlson/anvil/commit/cd4ce5cb41c9d211f4b4707a00a8577ed15d2f57</url>
  <id>cd4ce5cb41c9d211f4b4707a00a8577ed15d2f57</id>
  <committed-date>2008-07-27T03:09:01-07:00</committed-date>
  <authored-date>2008-07-27T03:09:01-07:00</authored-date>
  <message>anvil-db version and include file and anvil specs now pass</message>
  <tree>24555dc38b9413f711a05f58f4a036d223348abe</tree>
  <committer>
    <name>Lance Carlson</name>
    <email>lancecarlson@gmail.com</email>
  </committer>
</commit>
