ridgepole 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04ff9c0b5b25d5bed40e085992ae9f4a605381e6
-  data.tar.gz: 799269ed647277c33317a16596cbb068498592d6
+  metadata.gz: 4c25d9aef1cc8cf9681a16b2ae0c2716ba5ea2f6
+  data.tar.gz: d1c1b753ee684549250adfad53fda34b3650755c
 SHA512:
-  metadata.gz: 6717299b01c508286c13ee9dffcfcfb5cc6066a4629de48a0f7000bdcc2b6059b4a480dc7589307036c7fd5eb7be6cb0f761db8b738dc8a54e47b8be60054da4
-  data.tar.gz: 4a82f7ae17dcbdafd2748f22142bdf5986d4005bb7ca6400dd0a57a13e0543c4f4f4cf51f0e14aa5bf27ca14029424221fe4234984f8a739adab64c3ea362ae2
+  metadata.gz: 63e2d23d8cf04c4fdbd66d46ddffbc37cc5371a38652372d2f9fca5f362f9d55f70e4edcb404f74c209c6b7c981689c37478a7b6076228f3b919fc06aaf52cca
+  data.tar.gz: ea794d306d4a9e3d86e7207cb0f042df1d5532e6e0c867d84196c12b0267cca7f3009b1219acd9a041483aacae0a6e5edcca0118484552e16d426cc6fe8dbbf9

data/lib/ridgepole/delta.rb

@@ -59,7 +59,7 @@ class Ridgepole::Delta
         end
 
         Ridgepole::ExecuteExpander.without_operation(callback) do
-          eval_script(script, buf)
+          eval_script(script, options.merge(:out => buf))
         end
 
         buf.string.strip
@@ -67,13 +67,13 @@ class Ridgepole::Delta
         ActiveRecord::Migration.disable_logging = disable_logging_orig
       end
     else
-      eval_script(script)
+      eval_script(script, options)
     end
   end
 
-  def eval_script(script, out = $stdout)
+  def eval_script(script, options = {})
     begin
-      with_pre_post_query(out) do
+      with_pre_post_query(options) do
         ActiveRecord::Schema.new.instance_eval(script, SCRIPT_NAME, 1)
       end
     rescue => e
@@ -81,9 +81,11 @@ class Ridgepole::Delta
     end
   end
 
-  def with_pre_post_query(out = $stdout)
+  def with_pre_post_query(options = {})
+    out = options[:out] || $stdout
+
     if (pre_query = @options[:pre_query])
-      if @options[:noop]
+      if options[:noop]
         out.puts(pre_query)
       else
         ActiveRecord::Base.connection.execute(pre_query)
@@ -93,7 +95,7 @@ class Ridgepole::Delta
     retval = yield
 
     if (post_query = @options[:post_query])
-      if @options[:noop]
+      if options[:noop]
         out.puts(post_query)
       else
         ActiveRecord::Base.connection.execute(post_query)

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.3.7'
+  VERSION = '0.3.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord