communard 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d160711820fe427786947a0718c53cb73a2167df5fb714196ffc81e77fe148a
-  data.tar.gz: 5642f174554fbbdbf006726823d34e582f5b0791fa1e5ee86541fd69f3ec8c3e
+  metadata.gz: f086c0a2c7f0988d298bdcd68152554e54bec59a2b85eeca132110958a26f8cb
+  data.tar.gz: 816c4d1bc57fa5f1bce109f4bd684c00db9d8bcecfbbf6b8de5a3513f42ed3f1
 SHA512:
-  metadata.gz: 0a5811b7dd25ef9aba12a113b12b8b50b22a176c7023ed190356eee6e874840ec0c6a99476252401bef88a06eddc158bb875c4beed249036ebb5286c52544af8
-  data.tar.gz: b098d85743d78519bcb4e57e08dfedc0c574237e3600d97af023524b2ec0a2740c511c153de01681d1cc6c4efe49caa619aa6c7045cb714d72cfe63e693ab692
+  metadata.gz: d1a267acc98b76429df1a667ca24baee1ce2f7994c49a91c6465332f9c37ff41f0199b19b19760b1f2e2493f601462b7ef710524048eb323ebb935fd7e136274
+  data.tar.gz: 07647b8d8a88d8cd3907f1d56c1974643ee03445ae9c3df5d070ba48cf3c443747245c98b3ccc74d2f3b2356e06189c5ad7b2b5fffaffbf8abc3250f35f2b353

data/README.md

@@ -59,8 +59,8 @@ Other configuration options, can be set via a block:
 namespace :db do
   Communard::Rake.add_tasks do |config|
 
-    # Change where the application is located, defaults to Dir.pwd
-    config.root_path = Dir.pwd
+    # Change where the application is located (default: db)
+    config.db_path = File.join(Dir.pwd, "db")
 
     # Automatically generate schema (default: false)
     config.dump_after_migrating = false

data/lib/communard/commands.rb

@@ -12,7 +12,7 @@ module Communard
                    :adapter,
                    :database_name,
                    :options,
-                   :root_path
+                   :db_path
 
     def initialize(configuration)
       @configuration = configuration
@@ -49,6 +49,10 @@ module Communard
       load seeds_file if seeds_file.exist?
     end
 
+    def check_current
+      Sequel::Migrator.check_current(connection, migrations_dir)
+    end
+
     def rollback(step: 1)
       available = applied_migrations
       if available.size == 1
@@ -122,15 +126,15 @@ module Communard
     end
 
     def schema_file
-      root_path.join("db/schema.rb")
+      db_path.join("schema.rb")
     end
 
     def seeds_file
-      root_path.join("db/seeds.rb")
+      db_path.join("seeds.rb")
     end
 
     def migrations_dir
-      root_path.join("db/migrate")
+      db_path.join("migrate")
     end
 
     Status = Struct.new(:file, :applied, :available) do

data/lib/communard/configuration.rb

@@ -28,7 +28,7 @@ module Communard
         raise ArgumentError, "Sequel::Database.connect takes either a Hash or a String, given: #{conn_string.inspect}"
       end
 
-      self.root_path = Dir.pwd
+      self.db_path = Pathname(Dir.pwd).join("db")
       self.logger = nil
       self.dump_after_migrating = true
       self.same_db = true
@@ -42,10 +42,10 @@ module Communard
 
     attr_accessor :dump_after_migrating
 
-    attr_reader :root_path
+    attr_reader :db_path
 
-    def root_path=(path)
-      @root_path = Pathname(path)
+    def db_path=(path)
+      @db_path = Pathname(path)
     end
 
     def connection

data/lib/communard/rake.rb

@@ -43,6 +43,11 @@ module Communard
         @_communard_commands.rollback(step: step)
       end
 
+      desc "Checks if the database is fully migrated"
+      task check_current: :_load_communard do
+        @_communard_commands.check_current
+      end
+
       namespace :test do
         desc "Cleans the test database"
         task prepare: :_load_communard do
@@ -52,7 +57,8 @@ module Communard
             "RUBY_ENV"     => "test",
             "DATABASE_URL" => nil,
           }
-          Process.spawn(env, $PROGRAM_NAME, "db:drop", "db:create", "db:schema:load")
+          cmd = @_communard_commands.schema_file.exist? ? "db:schema:load" : "db:migrate"
+          Process.spawn(env, $PROGRAM_NAME, "db:drop", "db:create", cmd)
           _pid, status = Process.wait2
           fail "Failed to re-create test database" if status.exitstatus != 0
         end

data/lib/communard/version.rb

@@ -1,5 +1,5 @@
 module Communard
 
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: communard
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-12 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel