Get ready for specs to work

README.textile

@@ -6,9 +6,7 @@ Firstly, Clone this repo and then change to the top level directory.
 
 Next, run the following commands to prepare your database:
 
-  @./couchdb-setup/reset-database@
-
-  @./couchdb-setup/import-views@
+  @./couchdb-setup/initialize-database@
 
 Now, to use the irc bot, you'll need two things:
 

couchdb-setup/import-views → couchdb-setup/initialize-database

@@ -2,10 +2,14 @@
 require 'rubygems'
 require 'couchrest'
 
-puts "Importing views..."
+puts "Importing views..." unless ENV['SILENTIMPORT']
+
+db_uri = ARGV[0] || File.read(File.join(File.dirname(__FILE__), "..", "database_uri")).strip
+
+puts "Using database: #{db_uri}" unless ENV['SILENTIMPORT']
 
-db_uri = File.read(File.join(File.dirname(__FILE__), "..", "database_uri")).strip
 db = CouchRest.database!(db_uri)
+db.recreate!
 
 view_files = Dir[File.join(File.dirname(__FILE__), "views", "*", "*.*.js")]
 views = {}
@@ -17,9 +21,10 @@ view_files.each do |vf|
   end
 end
 
+docs = []
+
 views.each do |design, options|
-  if (doc = db.get("_design/#{design}") rescue nil)
-    db.delete_doc(doc)
-  end
-  db.save_doc({"_id" => "_design/#{design}", :views => views[design]}) unless ENV['SKIPADD']
-end
+  docs << {"_id" => "_design/#{design}", :views => views[design]}
+end
+
+db.bulk_save(docs) unless ENV['SKIPADD']

irc-bot/handlers/couch_logger.rb

@@ -1,5 +1,4 @@
 require 'couchrest'
-require 'stringex'
 
 class CouchLogger < Marvin::LoggingHandler
 

web-app/spec/application_spec.rb

@@ -12,7 +12,4 @@ def app
     last_response.should be_ok
   end
 
-  specify 'should have more specs' do
-    pending
-  end
 end

web-app/spec/spec_helper.rb

@@ -12,13 +12,17 @@
 
 require 'application'
 
+ENV['SILENTIMPORT'] = 'true'
+SiteConfig.db_uri += "-test"
+
+def reset_database!
+  system File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "couchdb-setup", "initialize-database")), SiteConfig.db_uri
+end
+
 Spec::Runner.configure do |config|
+
   config.before(:each) do
-    begin
-      CouchRest.delete((SiteConfig.url_base_db || '') + SiteConfig.db_name)
-    rescue RestClient::ResourceNotFound
-    ensure
-      CouchRest.database!((SiteConfig.url_base_db || '') + SiteConfig.db_name)
-    end
+    reset_database!
   end
+
 end