duck_duck_duck 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 730c26a37602ac9968f9c396bbe1132693a91c08
-  data.tar.gz: a45ea124b26a4844a9c95aa8c0e6b6f3080a47cb
+  metadata.gz: fc9d363fc3f2add54ba7cc80a1f272fffd6ad9fe
+  data.tar.gz: becb37dc9a4644a240d85115f1bdd59d6b7ced6e
 SHA512:
-  metadata.gz: 1da85bc4c920e2e480ec32fb08ae6bf4eaeb6b62a872a292c2ec765d37b82cd3746b4426ee8ce7a43519e019ca7eecd7e9db9c6d04f1ee73793a704b459f8d69
-  data.tar.gz: f4eca66662ca2d2c577058b5490b74bf556b6a363686cc5742dde7f22ba5a7cbc441d7d02914412518d759d2209db948c87bfffc3c4cefae80e1aaa3db350012
+  metadata.gz: 8f8e635b02307254b949e69967d07b689a6c1e5c919ad24fcbce22f3ec78397652e7f9929038fbe98c3b65e3485fcc605aa49adba0c61f4ff7ba3220281c9574
+  data.tar.gz: b3a25e2d1cf9ec7a7544e2ec2a6f6a82343e8c22e7a5e5b3b8d843992a6349f635be4df266d0bee276afeb4f57e5528fcbafbe363448a37f77ff2fd1d5717bdb

data/VERSION

@@ -1 +1 @@
-4.1.0
+4.2.0

data/lib/duck_duck_duck.rb

@@ -74,11 +74,18 @@ class Duck_Duck_Duck
       fail ArgumentError, "Name required."
     end
 
-    @files = `find . -iregex ".+/#{name}/migrates/.+\.sql"`
+    @__files = `find . -iregex ".+/#{name}/migrates/__.+\.sql"`
     .strip
     .split("\n")
-    .grep(/\/\d+\-/)
     .sort
+
+    @files = (
+      `find . -iregex ".+/#{name}/migrates/.+\.sql"`
+      .strip
+      .split("\n")
+      .grep(/\/\d+\-/)
+      .sort
+    )
   end
 
   def stdout *args
@@ -130,6 +137,15 @@ class Duck_Duck_Duck
       end
     }.compact
 
+    if @__files.empty? && files.empty?
+      stdout "#{name} is already the latest: #{rec[:version]}"
+    end
+
+    @__files.each { |f|
+      DB << Duck_Duck_Duck.read_file(f)[:UP]
+      stdout "ran file: #{f}"
+    }
+
     files.each { |pair|
       ver = pair.first
       sql = pair[1]
@@ -138,32 +154,29 @@ class Duck_Duck_Duck
       stdout "#{name} schema is now : #{ver}"
     }
 
-    if files.empty?
-      stdout "#{name} is already the latest: #{rec[:version]}"
-    end
   end # === def up
 
   def down
     rec = init_model_in_schema
 
-    if rec[:version] == 0
-      stdout "#{name} is already the latest: #{rec[:version]}\n"
-      exit 0
-    end
-
     if rec[:version] < 0
       stdout "#{name} is at invalid version: #{rec[:version]}\n"
       exit 1
     end
 
-    files = @files.sort.reverse.map { |f|
-      ver = file_to_ver(f)
-      next unless ver <= rec[:version]
-      [ ver, Duck_Duck_Duck.read_file(f)[:DOWN] ]
-    }.compact
-
-    if files.empty?
+    files = if rec[:version] == 0
+              []
+            else
+              @files.sort.reverse.map { |f|
+                ver = file_to_ver(f)
+                next unless ver <= rec[:version]
+                [ ver, Duck_Duck_Duck.read_file(f)[:DOWN] ]
+              }.compact
+            end
+
+    if @__files.empty? && files.empty?
       stdout "#{name} is already the latest: #{rec[:version]}\n"
+      exit 0
     end
 
     new_ver = nil
@@ -177,6 +190,11 @@ class Duck_Duck_Duck
       stdout "#{name} schema is now : #{ver}"
     }
 
+    @__files.reverse.each { |f|
+      DB << Duck_Duck_Duck.read_file(f)[:DOWN]
+      stdout "down: #{f}"
+    }
+
   end # === def down
 
   def create

data/specs/duck_duck_duck.rb

@@ -193,4 +193,36 @@ describe '-- UP/-- DOWN model' do
 
 end # === describe '-- UP/-- DOWN model'
 
+describe '__-...sql files' do
+
+  before { reset }
+
+  it "runs file on each migrate up" do
+    Exit_0("duck_duck_duck up 0040_model")
+    Exit_0("duck_duck_duck up 0040_model")
+    Exit_0("duck_duck_duck up 0040_model")
+    get(%^SELECT title FROM "0040_model"^).
+      should == [
+        {:title=>"__ up"},
+        {:title=>"CREATE 0040_model"},
+        {:title=>"__ up"},
+        {:title=>"__ up"}
+    ]
+  end # === it
+
+  it "runs file on each migrate down" do
+    Exit_0("duck_duck_duck up   0040_model")
+    Exit_0("duck_duck_duck down 0040_model")
+    Exit_0("duck_duck_duck down 0040_model")
+    get(%^SELECT title FROM "0040_model"^).
+      should == [
+        {:title=>"__ up"},
+        {:title=>"CREATE 0040_model"},
+        {:title=>"DROP 0040_model"},
+        {:title=>"__ down"},
+        {:title=>"__ down"}
+    ]
+  end # === it
+
+end # === describe '__-...sql files'
 

data/specs/lib/models/0030_model/migrates/0010-table.sql

@@ -1,7 +1,3 @@
--- DOWN
-
-INSERT INTO "0030_model" (title)
-VALUES ('DROP 0030_model');
 
 -- UP:
 CREATE TABLE "0030_model" (
@@ -10,5 +6,11 @@ CREATE TABLE "0030_model" (
 );
 
 
+-- DOWN
+
+INSERT INTO "0030_model" (title)
+VALUES ('DROP 0030_model');
+
+
 
 

data/specs/lib/models/0040_model/migrates/0010-table.sql

@@ -0,0 +1,14 @@
+
+-- UP:
+INSERT INTO "0040_model" (title)
+VALUES ('CREATE 0040_model');
+
+
+-- DOWN
+
+INSERT INTO "0040_model" (title)
+VALUES ('DROP 0040_model');
+
+
+
+

data/specs/lib/models/0040_model/migrates/__-insert-1.sql

@@ -0,0 +1,16 @@
+
+
+CREATE TABLE IF NOT EXISTS "0040_model" (
+  id serial NOT NULL PRIMARY KEY,
+  title varchar(100)
+);
+
+INSERT INTO "0040_model" (title)
+VALUES ('__ up');
+
+-- DOWN:
+
+
+INSERT INTO "0040_model" (title)
+VALUES ('__ down');
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duck_duck_duck
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - da99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -145,6 +145,8 @@ files:
 - specs/lib/models/0030_model/migrates/0010-table.sql
 - specs/lib/models/0030_model/migrates/0020-insert_1.sql
 - specs/lib/models/0030_model/migrates/0030-insert_2.sql
+- specs/lib/models/0040_model/migrates/0010-table.sql
+- specs/lib/models/0040_model/migrates/__-insert-1.sql
 homepage: https://github.com/da99/duck_duck_duck
 licenses:
 - MIT