communard 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94f9d91890f50281fc8ce1d4678153cf2aff2c2068c00166774aeeafe80dfb16
-  data.tar.gz: cd21196d14631a2e3eda1435e16c4fd4afdabc1da2ab16d0d198290c1275e153
+  metadata.gz: 9d160711820fe427786947a0718c53cb73a2167df5fb714196ffc81e77fe148a
+  data.tar.gz: 5642f174554fbbdbf006726823d34e582f5b0791fa1e5ee86541fd69f3ec8c3e
 SHA512:
-  metadata.gz: 4968eb2fb22782695eb7335028f0d8fb76d58a3bb4fe437ec3e3da75fb8b1edc74cc66a8b2fceeabbad8c6c44aa7adf8c206566ba08fed93552ec8fe356521ae
-  data.tar.gz: 55000cbc291e4ca20050c1fff461b709f689aeea3a17f28d922ec8c69220d042dbd22ff628f5be8ce2889594ab9c0d8fa652ac82b9b60c6113d16d3e278e7101
+  metadata.gz: 0a5811b7dd25ef9aba12a113b12b8b50b22a176c7023ed190356eee6e874840ec0c6a99476252401bef88a06eddc158bb875c4beed249036ebb5286c52544af8
+  data.tar.gz: b098d85743d78519bcb4e57e08dfedc0c574237e3600d97af023524b2ec0a2740c511c153de01681d1cc6c4efe49caa619aa6c7045cb714d72cfe63e693ab692

data/lib/communard/commands.rb

@@ -50,11 +50,16 @@ module Communard
     end
 
     def rollback(step: 1)
-      target = applied_migrations[-step - 1]
-      if target
-        migrate(target: target.split(/_/, 2).first)
+      available = applied_migrations
+      if available.size == 1
+        migrate(target: 0)
       else
-        fail ArgumentError, "Cannot roll back to #{step}"
+        target = available[-step - 1]
+        if target
+          migrate(target: target.split(/_/, 2).first)
+        else
+          fail ArgumentError, "Cannot roll back to #{step}"
+        end
       end
     end
 
@@ -75,7 +80,7 @@ module Communard
       results = Hash.new { |h, k| h[k] = Status.new(k, false, false) }
       available = Pathname.glob(migrations_dir.join("*.rb")).map(&:basename).map(&:to_s)
       available.each { |migration| results[migration].available = true }
-      applied_migrations(available).each { |migration| results[migration].applied = true }
+      applied_migrations.each { |migration| results[migration].applied = true }
 
       $stdout.puts
       $stdout.puts "database: #{connection.opts.fetch(:database)}"
@@ -101,12 +106,13 @@ module Communard
 
     private
 
-    def applied_migrations(available)
+    def applied_migrations
+      available = Pathname.glob(migrations_dir.join("*.rb")).map(&:basename).map(&:to_s)
       m = migrator(allow_missing_migration_files: true)
       if m.is_a?(Sequel::IntegerMigrator)
         available.select { |f| f.split("_", 2).first.to_i <= m.current }
       else
-        instance.applied_migrations
+        m.applied_migrations
       end
     end
 

data/lib/communard/version.rb

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

data/spec/integration_spec.rb

@@ -6,6 +6,10 @@ RSpec.describe "Integration", type: :aruba do
     run_tests("sqlite://db/test.sqlite3")
   end
 
+  example "SQLite with timestamps" do
+    run_tests("sqlite://db/test.sqlite3", timestamps: true)
+  end
+
   example "PostgreSQL" do
     run_tests("postgresql://localhost:5432/communard_test")
   end
@@ -14,7 +18,7 @@ RSpec.describe "Integration", type: :aruba do
     run_tests("mysql2://root@localhost:3306/communard_test")
   end
 
-  def run_tests(database_config)
+  def run_tests(database_config, options = {})
     write_file "Rakefile", <<-FILE.gsub(/^\s{6}/, "")
       $LOAD_PATH.unshift(File.expand_path("../../../lib", __FILE__))
       require "communard/rake"
@@ -23,7 +27,11 @@ RSpec.describe "Integration", type: :aruba do
       end
     FILE
 
-    run_simple "bundle exec communard migration create_posts"
+    if options[:timestamps]
+      run_simple "bundle exec communard migration create_posts --timestamps"
+    else
+      run_simple "bundle exec communard migration create_posts"
+    end
 
     glob = Dir[expand_path("db/migrate/*_create_posts.rb")]
     file = glob.first
@@ -46,6 +54,8 @@ RSpec.describe "Integration", type: :aruba do
     run_simple "bundle exec rake db:create"
 
     run_simple "bundle exec rake db:migrate"
+
+    run_simple "bundle exec rake db:migrate:redo"
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: communard
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - iain