duck_duck_duck 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20ab64a22819731148fd285dab0e88ffb6d55865
-  data.tar.gz: 772d54ecb03a4e998e38ca84ed1c0b556c8deabb
+  metadata.gz: 408c8ff124e2c853f32fc6f5d3620d12107805e6
+  data.tar.gz: c6c87955b7ac26a994ecbf8d95638b7562ced0a2
 SHA512:
-  metadata.gz: 0bc860a684065b65e9dfcf924c77d9f3b241525b73ff3e584ad9757d43a1e69c30e98f01a62581a9b0a485500b326eaf1f9223f6785b1d68f09d021e432ce7c3
-  data.tar.gz: 97d096b52826386a9590c9daade0bf40f48627d728fb7c20ea5546c23acf35c06c5de60522c910c20dfebc87367c8e748b94403c2ed23c84458f0e38c97a64e0
+  metadata.gz: 91a70919b41eba20e83627c848a45f01f5d242247cbf3a0defaca1202227d72ffe7b3e8760c6a7eb3599d81c7824b17b851b7c121a9288f2a9c22e58f11c771c
+  data.tar.gz: c5b85fa17c3464c3eda293090429cffc75b1b9c4e6f98b372f5030e7b3f0a21c1ba1bec9a8c131f522d88f0a54a85f2fcced11553c09c971b5f54b8abcf6eeb6

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.1.0

data/lib/duck_duck_duck.rb

@@ -25,6 +25,27 @@ class Duck_Duck_Duck
       EOF
     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
+
+        case val
+        when 'UP', :UP, :DOWN, 'DOWN'
+          dir = val.to_sym
+        when ''
+          # do nothing
+        else
+          meta[dir] << val
+        end
+
+        [dir, meta]
+      end
+      meta = raw.last
+      {:UP=>meta[:UP].join("\n"), :DOWN=>meta[:DOWN].join("\n")}
+    end
+
     %w{reset up down}.each { |meth|
       eval <<-EOF, nil, __FILE__, __LINE__ + 1
         def #{meth} name = nil
@@ -77,7 +98,7 @@ class Duck_Duck_Duck
     files = @files.sort.map { |f|
       ver = file_to_ver(f)
       if ver > rec[:version]
-        [ ver, File.read(f).split('-- DOWN').first ]
+        [ ver, Duck_Duck_Duck.read_file(f)[:UP] ]
       end
     }.compact
 
@@ -116,7 +137,7 @@ class Duck_Duck_Duck
     files = @files.sort.reverse.map { |f|
       ver = file_to_ver(f)
       next unless ver <= rec[:version]
-      [ ver, File.read(f).split('-- DOWN').last ]
+      [ ver, Duck_Duck_Duck.read_file(f)[:DOWN] ]
     }.compact
 
     if files.empty?

data/specs/duck_duck_duck.rb

@@ -3,7 +3,7 @@ require 'sequel'
 require 'Exit_0'
 
 schema = ENV['SCHEMA_TABLE'] = '_test_schema'
-DB = Sequel.connect ENV['DATABASE_URL']
+DB     = Sequel.connect ENV['DATABASE_URL']
 MODELS = Dir.glob('*/migrates').map { |dir|  File.basename File.dirname(dir) }
 
 # === Reset tables ===========================================================
@@ -45,6 +45,17 @@ describe :initialize do
 
 end # === describe :initialize
 
+describe "read_file" do
+
+  it "returns: {:UP=>STRING, :DOWN=>STRING}" do
+    file = "/tmp/ddd_up_down.sql"
+    File.write(file, ["-- DOWN", "2", "-- UP", "1", "-- DOWN", "2", "-- UP", "1"].join("\n"))
+    Duck_Duck_Duck.read_file(file).
+      should == {:UP=>"1\n1", :DOWN=>"2\n2"}
+  end # === it
+
+end # === describe "read_file"
+
 describe "create" do
 
   before {
@@ -125,5 +136,20 @@ describe 'down model' do
 
 end # === describe down model
 
+describe '-- UP/-- DOWN model' do
+
+  before { reset }
+
+  it "runs UPs in proper order" do
+    Exit_0("duck_duck_duck up 0030_model")
+    get(%^SELECT title FROM "0030_model"^).
+      should == [
+        {:title=>"record 1-1: 0030_model"},
+        {:title=>"record 2-1: 0030_model"},
+        {:title=>"record 2-2: 0030_model"},
+    ]
+  end # === it
+
+end # === describe '-- UP/-- DOWN model'
 
 

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

@@ -1,13 +1,14 @@
+-- DOWN
+
+INSERT INTO "0030_model" (title)
+VALUES ('DROP 0030_model');
 
+-- UP
 CREATE TABLE "0030_model" (
   id serial NOT NULL PRIMARY KEY,
   title varchar(100)
 );
 
 
--- DOWN
-
-INSERT INTO "0030_model" (title)
-VALUES ('DROP 0030_model');
 
 

data/specs/lib/models/0030_model/migrates/0020-insert_1.sql

@@ -1,11 +1,12 @@
+-- DOWN
 
 INSERT INTO "0030_model" (title)
-VALUES ('record 1: 0030_model');
-
+VALUES ('DROP record 1: 0030_model');
 
--- DOWN
 
+-- UP
 INSERT INTO "0030_model" (title)
-VALUES ('DROP record 1: 0030_model');
+VALUES ('record 1-1: 0030_model');
+
 
 

data/specs/lib/models/0030_model/migrates/0030-insert_2.sql

@@ -1,11 +1,19 @@
-
+-- DOWN
 INSERT INTO "0030_model" (title)
-VALUES ('record 1: 0030_model');
+VALUES ('DROP record 2-1: 0030_model');
 
+-- UP
+INSERT INTO "0030_model" (title)
+VALUES ('record 2-1: 0030_model');
 
 -- DOWN
+INSERT INTO "0030_model" (title)
+VALUES ('DROP record 2-1: 0030_model');
 
+-- UP
 INSERT INTO "0030_model" (title)
-VALUES ('DROP record 2: 0030_model');
+VALUES ('record 2-2: 0030_model');
+
+
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duck_duck_duck
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - da99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -145,8 +145,6 @@ 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/user/migrates/001-user.js
-- specs/lib/user/migrates/002-two.js
 homepage: https://github.com/da99/duck_duck_duck
 licenses:
 - MIT
@@ -167,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Migrations for apps composed of mini-apps.

data/specs/lib/user/migrates/001-user.js

@@ -1,3 +0,0 @@
-exports.migrate = function (dir, river) {
-  river.finish();
-};

data/specs/lib/user/migrates/002-two.js

@@ -1,3 +0,0 @@
-exports.migrate = function (dir, river) {
-  river.finish();
-};