specjour 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/specjour/db_scrub.rb

@@ -3,21 +3,31 @@ module Specjour
     extend self
 
     def scrub
+      load 'Rakefile'
       begin
         ActiveRecord::Base.connection
       rescue # assume the database doesn't exist
-        create_db_and_schema
+        Rake::Task['db:test:load'].invoke
       else
-        ActiveRecord::Base.connection.tables.each do |table|
-          ActiveRecord::Base.connection.delete "delete from #{table}"
+        if pending_migrations?
+          Rake::Task['db:migrate'].invoke
         end
+
+        purge_tables
       end
     end
 
-    def create_db_and_schema
-      load 'Rakefile'
-      Rake::Task['db:create'].invoke
-      Rake::Task['db:schema:load'].invoke
+    protected
+
+    def purge_tables
+      tables = ActiveRecord::Base.connection.tables - ['schema_migrations']
+      tables.each do |table|
+        ActiveRecord::Base.connection.delete "delete from #{table}"
+      end
+    end
+
+    def pending_migrations?
+      ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations.any?
     end
   end
 end

data/lib/specjour/manager.rb

@@ -10,12 +10,8 @@ module Specjour
       @batch_size = 25
     end
 
-    def project_path=(name)
-      @project_path = name
-    end
-
     def project_path
-      @project_path ||= File.join("/tmp", project_name)
+      File.join("/tmp", project_name)
     end
 
     def dispatch

data/lib/specjour.rb

@@ -18,5 +18,5 @@ module Specjour
   autoload :RsyncDaemon, 'specjour/rsync_daemon'
   autoload :Worker, 'specjour/worker'
 
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Sandro Turriate