ridgepole 0.6.1 → 0.6.2.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c287d5249583bb0731d62c35c07cf21e5f31832
-  data.tar.gz: 48eef8cdf214e8116abd3af5839f24bd48545d02
+  metadata.gz: 10751a0be8715415c49e53c36c3a680fd750c588
+  data.tar.gz: 26e11384576d90d1990ce4fb3b97cebd49b28977
 SHA512:
-  metadata.gz: b59228292c232bed171304c90e40130c2ed7d36d2a7ce7cf97d3170214fea5fc28f60b85239d85c5253463b083564e47f8d021ee0b56ce1523a119449bc4d7fe
-  data.tar.gz: 08316ff60e257ae2898b0b9c3033657703a15cb831f3a18aa9112855e06bf394cee10356c985142b36759ba1524578ccf2e80525ae66742cb42d76dd0d8e4b6e
+  metadata.gz: 8934dbf80a48ec8c5f702648b625dc4f531536ce59cfc55f5e214c9490562529bc1e095aa360cf292e1da49040976f8290ae343bb4a0806bbf3f803c155aac0e
+  data.tar.gz: 672e590d27876c45095256d74e3cb769f0f04d055517a60306a25c9562875d5ee3fe2021f5ee9e2d70ccba746e88af74a4a391e05d09d9a34efffd954b5ee667

data/lib/ridgepole/client.rb

@@ -41,9 +41,9 @@ class Ridgepole::Client
       logger = Ridgepole::Logger.instance
 
       logger.verbose_info('# Parse DSL1')
-      definition1, execute1 = load_definition(dsl_or_config1)
+      definition1, execute1 = load_definition(dsl_or_config1, options)
       logger.verbose_info('# Parse DSL2')
-      definition2, execute2 = load_definition(dsl_or_config2)
+      definition2, execute2 = load_definition(dsl_or_config2, options)
 
       logger.verbose_info('# Compare definitions')
       diff = Ridgepole::Diff.new(options)

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.1'
+  VERSION = '0.6.2.beta'
 end

data/spec/mysql/collation/collation_spec.rb

@@ -128,6 +128,20 @@ if mysql_awesome_enabled?
         delta.migrate
         expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
       }
+
+      describe '#diff' do
+        it {
+          Tempfile.open("#{File.basename __FILE__}.#{$$}") do |f|
+            f.puts(actual_dsl)
+            f.flush
+
+            out, status = run_ridgepole('--diff', "'#{JSON.dump(conn_spec)}'", f.path, '--enable-mysql-awesome', '--dump-without-table-options')
+
+            expect(out).to be_empty
+            expect(status.success?).to be_truthy
+          end
+        }
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -220,3 +220,10 @@ end
 def unsigned_false_if_enabled2(prefix = ', ', suffix = '')
   if_mysql_awesome_enabled("#{prefix}:unsigned=>false#{suffix}")
 end
+
+def run_ridgepole(*args)
+  Dir.chdir(File.expand_path('../..', __FILE__)) do
+    cmd = [:bundle, :exec, './bin/ridgepole'] + args
+    Open3.capture2e(cmd.join(' '))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-16 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -244,9 +244,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14