duck_duck_duck 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc9d363fc3f2add54ba7cc80a1f272fffd6ad9fe
-  data.tar.gz: becb37dc9a4644a240d85115f1bdd59d6b7ced6e
+  metadata.gz: 8cacb764c7bac60b37b5c7fb1f33f1a3cd92cec9
+  data.tar.gz: e98767ef7e164d740e98dfec026c4e7cb4355da7
 SHA512:
-  metadata.gz: 8f8e635b02307254b949e69967d07b689a6c1e5c919ad24fcbce22f3ec78397652e7f9929038fbe98c3b65e3485fcc605aa49adba0c61f4ff7ba3220281c9574
-  data.tar.gz: b3a25e2d1cf9ec7a7544e2ec2a6f6a82343e8c22e7a5e5b3b8d843992a6349f635be4df266d0bee276afeb4f57e5528fcbafbe363448a37f77ff2fd1d5717bdb
+  metadata.gz: db90519964eac0fdf5f04be0dcb16d12cd557c4f93e5bc9f65c342466a1fa9f34ee7e5c6d379c6c85f1e5f6b8b57da5cdfef44334a601f8a381f0c5b295fb8f9
+  data.tar.gz: fc0566148fc87998478d195501be34bad00ada634426962c501e78a37cd7b55d57500fc01298955a0a8bd6c66ed24306f1a0a27b6306f8bf1db1c31029762969

data/VERSION

@@ -1 +1 @@
-4.2.0
+4.3.0

data/lib/duck_duck_duck.rb

@@ -30,25 +30,32 @@ class Duck_Duck_Duck
     end
 
     def read_file f
-      raw = File.read(f).split(/\s*--\s+(UP|DOWN):?\s*/).
-      inject([:UP, { :UP => [], :DOWN => [] }]) do |memo, val|
-        dir  = memo.first
-        meta = memo.last
+      raw = File.read(f).split(/\s*--\s+(UP|BOTH|DOWN):?\s*/).
+      inject([:UP, {:UP=>[], :DOWN=>[]}]) do |memo, val|
+        dir   = memo.first
+        meta  = memo.last
 
         case val
-        when 'UP', :UP, :DOWN, 'DOWN'
+        when 'UP', :UP, :DOWN, 'DOWN', 'BOTH', :BOTH
           dir = val.to_sym
         when ''
           # do nothing
         else
-          meta[dir] << val
+          case dir
+          when :BOTH
+            meta[:UP] << val
+            meta[:DOWN] << val
+          else
+            meta[dir] << val
+          end
         end
 
         [dir, meta]
       end
+
       meta = raw.last
       {:UP=>meta[:UP].join("\n"), :DOWN=>meta[:DOWN].join("\n")}
-    end
+    end # === def read_file
 
     %w{reset up down}.each { |meth|
       eval <<-EOF, nil, __FILE__, __LINE__ + 1

data/specs/duck_duck_duck.rb

@@ -187,12 +187,14 @@ describe '-- UP/-- DOWN model' do
       should == [
         {:title=>"record 1-1: 0030_model"},
         {:title=>"record 2-1: 0030_model"},
-        {:title=>"record 2-2: 0030_model"},
-    ]
+        {:title=>"record 2-2: 0030_model"}
+      ]
   end # === it
 
 end # === describe '-- UP/-- DOWN model'
 
+
+
 describe '__-...sql files' do
 
   before { reset }
@@ -226,3 +228,26 @@ describe '__-...sql files' do
 
 end # === describe '__-...sql files'
 
+
+describe '-- BOTH' do
+
+  before { reset }
+
+  it "runs -- BOTH each time" do
+    Exit_0("duck_duck_duck up   0050_model")
+    Exit_0("duck_duck_duck down 0050_model")
+    get(%^SELECT title FROM "0050_model"^).
+      should == [
+        {:title=>"__ both 1"},
+        {:title=>"__ up 1"},
+        {:title=>"__ both 2"},
+        {:title=>"CREATE 0050_model"},
+        {:title=>"DROP 0050_model"},
+        {:title=>"__ both 1"},
+        {:title=>"__ down 1"},
+        {:title=>"__ both 2"}
+    ]
+  end # === it
+
+end # === describe '-- BOTH'
+

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

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

data/specs/lib/models/0050_model/migrates/__-both.sql

@@ -0,0 +1,24 @@
+
+-- BOTH
+CREATE TABLE IF NOT EXISTS "0050_model" (
+  id serial NOT NULL PRIMARY KEY,
+  title varchar(100)
+);
+
+
+INSERT INTO "0050_model" (title)
+VALUES ('__ both 1');
+
+
+-- UP
+INSERT INTO "0050_model" (title)
+VALUES ('__ up 1');
+
+
+-- DOWN
+INSERT INTO "0050_model" (title)
+VALUES ('__ down 1');
+
+-- BOTH
+INSERT INTO "0050_model" (title)
+VALUES ('__ both 2');

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duck_duck_duck
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - da99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -147,6 +147,8 @@ files:
 - 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
+- specs/lib/models/0050_model/migrates/0010-table.sql
+- specs/lib/models/0050_model/migrates/__-both.sql
 homepage: https://github.com/da99/duck_duck_duck
 licenses:
 - MIT