almost there.

jeremyevans · Jan 2, 2008 · 2b70eb9 · 2b70eb9
1 parent 451aca9
commit 2b70eb9
Show file tree

Hide file tree

Showing 25 changed files with 19 additions and 253 deletions.
diff --git a/sequel_core/examples/csv.rb b/sequel_core/examples/csv.rb
@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'faster_csv'
-require File.join(File.dirname(__FILE__), '../lib/sequel/sqlite')
+require File.join(File.dirname(__FILE__), '../lib/sequel_core')
 
 DB = Sequel.open 'sqlite:///test.db'
 DB.create_table :countries do

diff --git a/sequel_core/examples/view.rb b/sequel_core/examples/view.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require File.join(File.dirname(__FILE__), '../lib/sequel/sqlite')
+require File.join(File.dirname(__FILE__), '../lib/sequel_core')
 
 db = Sequel.open("sqlite:/:memory:")
 db << "create table k1 (id integer primary key autoincrement, f1 text)"

diff --git a/sequel_core/spec/database_spec.rb b/sequel_core/spec/database_spec.rb
@@ -559,7 +559,7 @@ class CCC < Sequel::Database
 
 context "A broken adapter (lib is there but the class is not)" do
   setup do
-    @fn = File.join(File.dirname(__FILE__), '../lib/sequel/adapters/blah.rb')
+    @fn = File.join(File.dirname(__FILE__), '../lib/sequel_core/adapters/blah.rb')
     FileUtils.touch(@fn)
   end
 

diff --git a/sequel_core/spec/sequelizer_spec.rb b/sequel_core/spec/sequelizer_spec.rb
@@ -8,7 +8,7 @@ def require(*args); raise LoadError; end
     end
     old_verbose = $VERBOSE
     $VERBOSE = nil
-    load(File.join(File.dirname(__FILE__), '../lib/sequel/dataset/sequelizer.rb'))
+    load(File.join(File.dirname(__FILE__), '../lib/sequel_core/dataset/sequelizer.rb'))
     $VERBOSE = old_verbose
     @db = Sequel::Database.new
     @ds = @db[:items]
@@ -20,7 +20,7 @@ module Kernel
     end
     old_verbose = $VERBOSE
     $VERBOSE = nil
-    load(File.join(File.dirname(__FILE__), '../lib/sequel/dataset/sequelizer.rb'))
+    load(File.join(File.dirname(__FILE__), '../lib/sequel_core/dataset/sequelizer.rb'))
     $VERBOSE = old_verbose
   end
 
@@ -37,7 +37,7 @@ def require(name); raise LoadError if name == 'ruby2ruby'; end
     end
     old_verbose = $VERBOSE
     $VERBOSE = nil
-    load(File.join(File.dirname(__FILE__), '../lib/sequel/dataset/sequelizer.rb'))
+    load(File.join(File.dirname(__FILE__), '../lib/sequel_core/dataset/sequelizer.rb'))
     $VERBOSE = old_verbose
     @db = Sequel::Database.new
     @ds = @db[:items]
@@ -49,7 +49,7 @@ module Kernel
     end
     old_verbose = $VERBOSE
     $VERBOSE = nil
-    load(File.join(File.dirname(__FILE__), '../lib/sequel/dataset/sequelizer.rb'))
+    load(File.join(File.dirname(__FILE__), '../lib/sequel_core/dataset/sequelizer.rb'))
     $VERBOSE = old_verbose
   end
 

diff --git a/sequel_core/stress/access_perf.rb b/sequel_core/stress/access_perf.rb
@@ -1,6 +1,6 @@
 require 'benchmark'
 require 'rubygems'
-require File.join(File.dirname(__FILE__), '../lib/sequel/sqlite')
+require File.join(File.dirname(__FILE__), '../lib/sequel_core/adapters/sqlite')
 
 DB = Sequel.sqlite
 

diff --git a/sequel_core/stress/dataset_perf.rb b/sequel_core/stress/dataset_perf.rb
@@ -1,6 +1,6 @@
 require 'benchmark'
 require 'rubygems'
-require File.join(File.dirname(__FILE__), '../lib/sequel/sqlite')
+require File.join(File.dirname(__FILE__), '../lib/sequel_core/adapters/sqlite')
 
 DB = Sequel.sqlite
 

diff --git a/sequel_core/stress/filter_perf.rb b/sequel_core/stress/filter_perf.rb
@@ -1,6 +1,6 @@
   require 'benchmark'
   require 'rubygems'
-  require File.join(File.dirname(__FILE__), '../lib/sequel/sqlite')
+  require File.join(File.dirname(__FILE__), '../lib/sequel_core/adapters/sqlite')
 
   DB = Sequel.sqlite
   DS = DB[:t]

diff --git a/sequel_core/stress/hashes_vs_array_keys.rb b/sequel_core/stress/hashes_vs_array_keys.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../lib/sequel/array_keys')
+require File.join(File.dirname(__FILE__), '../lib/sequel_core/array_keys')
 require 'benchmark'
 
 N = 50_000

diff --git a/sequel_core/stress/mem_array.rb b/sequel_core/stress/mem_array.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../lib/sequel/array_keys')
+require File.join(File.dirname(__FILE__), '../lib/sequel_core/array_keys')
 
 N = 100_000
 

diff --git a/sequel_core/stress/mem_array_fields.rb b/sequel_core/stress/mem_array_fields.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../lib/sequel/array_keys')
+require File.join(File.dirname(__FILE__), '../lib/sequel_core/array_keys')
 
 N = 100_000
 

diff --git a/sequel_core/stress/mem_array_keys.rb b/sequel_core/stress/mem_array_keys.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../lib/sequel/array_keys')
+require File.join(File.dirname(__FILE__), '../lib/sequel_core/array_keys')
 
 N = 100_000
 

diff --git a/sequel_core/stress/mem_hashes.rb b/sequel_core/stress/mem_hashes.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../lib/sequel/array_keys')
+require File.join(File.dirname(__FILE__), '../lib/sequel_core/array_keys')
 
 N = 100_000
 

diff --git a/sequel_core/stress/postgres_perf.rb b/sequel_core/stress/postgres_perf.rb
@@ -1,7 +1,7 @@
 require 'benchmark'
 require 'rubygems'
 # require 'fastthread'
-require File.join(File.dirname(__FILE__), '../lib/sequel/postgres')
+require File.join(File.dirname(__FILE__), '../lib/sequel_core/adapters/postgres')
 
 DB = Sequel('postgres://postgres:postgres@localhost:5432/reality_development')
 

diff --git a/sequel_core/stress/proc_filter.rb b/sequel_core/stress/proc_filter.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-require File.join(File.dirname(__FILE__), '../lib/sequel/sqlite')
+require File.join(File.dirname(__FILE__), '../lib/sequel_core/adapters/sqlite')
 
 DB = Sequel.sqlite
 DS = DB[:t]

diff --git a/sequel_model/autotest/rspec_sequel.rb b/sequel_model/autotest/rspec_sequel.rb
@@ -14,13 +14,13 @@ def initialize(kernel=Kernel, separator=File::SEPARATOR, alt_separator=File::ALT
     # since Ruby compares the REGEXP source, not the resulting pattern
     @test_mappings = {
       %r%^spec/.*_spec\.rb$% => kernel.proc { |filename, _| filename },
-      %r%^lib/sequel/(.*)\.rb$% => kernel.proc do |_, m| 
+      %r%^lib/sequel_core/(.*)\.rb$% => kernel.proc do |_, m| 
         [
           "spec/#{m[1]}_spec.rb", 
           "spec/sequel/#{m[1]}_spec.rb"
         ]
       end,
-      %r%^lib/sequel/model/(.*)\.rb$% => kernel.proc do |_, m| 
+      %r%^lib/sequel_model/(.*)\.rb$% => kernel.proc do |_, m| 
         [
           "spec/model/#{m[1]}_spec.rb"#, 
           #"spec/sequel/#{m[1]}_spec.rb",

diff --git a/sequel_model/stress/access_perf.rb b/sequel_model/stress/access_perf.rb
diff --git a/sequel_model/stress/dataset_perf.rb b/sequel_model/stress/dataset_perf.rb
diff --git a/sequel_model/stress/filter_perf.rb b/sequel_model/stress/filter_perf.rb
diff --git a/sequel_model/stress/hashes_vs_array_keys.rb b/sequel_model/stress/hashes_vs_array_keys.rb
diff --git a/sequel_model/stress/mem_array.rb b/sequel_model/stress/mem_array.rb
diff --git a/sequel_model/stress/mem_array_fields.rb b/sequel_model/stress/mem_array_fields.rb
diff --git a/sequel_model/stress/mem_array_keys.rb b/sequel_model/stress/mem_array_keys.rb
diff --git a/sequel_model/stress/mem_hashes.rb b/sequel_model/stress/mem_hashes.rb
diff --git a/sequel_model/stress/postgres_perf.rb b/sequel_model/stress/postgres_perf.rb
diff --git a/sequel_model/stress/proc_filter.rb b/sequel_model/stress/proc_filter.rb