convergence 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +2 -2
  3. data/README.md +8 -0
  4. data/lib/convergence/command/apply.rb +3 -1
  5. data/lib/convergence/command/dryrun.rb +3 -1
  6. data/lib/convergence/dsl.rb +7 -2
  7. data/lib/convergence/version.rb +1 -1
  8. data/spec/convergence/dsl_spec.rb +2 -2
  9. metadata +31 -31
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cee0b72015626223c127eed7acc9c03bc22d6f43
4
- data.tar.gz: 6808f1b1410f9d13cc16d262041a8bebce648032
3
+ metadata.gz: 936e7c949711e9a5c96cd226c4ffca7807fbcc4c
4
+ data.tar.gz: 40aa3de0301f0697145784872ffd6f91d51a5ca5
5
5
  SHA512:
6
- metadata.gz: eb06eb3d249a49e916da9504216c66ff5f0de9b7f91245dbdaa17c23d0c6ca855cd0bbb7967e17e1ed8eb47d441dd66de2c4c3e1b3dd30205d36611d049c4de0
7
- data.tar.gz: f7e76021eda3071e9223ac80c175bfb2b79de681451c3cece17a26c38041013296cec5ba08a86b777c6890c23da63160c36abe8c0bc200de1ad74df5925ff0a5
6
+ metadata.gz: edb58ceded8667d95e491654d10039713ccd33703f3cb94e9142a388e5e02e06f38bc94734f722851e52a45b119756ce330dbe706b29d68fa51f126c20d99c8f
7
+ data.tar.gz: 74462bde2adc4b40ba9a02b6828812bf5070de5c118f8512420533c632477f5c706d9b98b09a0c30a48fd1626909a457b7f0b98d0021d75133a8ed6cb9b98ebb
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- convergence (0.0.4)
4
+ convergence (0.0.5)
5
5
  diff-lcs
6
6
  diffy
7
7
  mysql2
@@ -36,7 +36,7 @@ GEM
36
36
  rb-inotify (>= 0.9)
37
37
  lumberjack (1.0.9)
38
38
  method_source (0.8.2)
39
- mysql2 (0.3.17)
39
+ mysql2 (0.3.18)
40
40
  parser (2.2.0.pre.5)
41
41
  ast (>= 1.1, < 3.0)
42
42
  slop (~> 3.4, >= 3.4.5)
data/README.md CHANGED
@@ -201,6 +201,14 @@ $ convergence -c database.yml -i example.schema --dryrun
201
201
  $ convergence -c database.yml -i example.schema --apply
202
202
  ```
203
203
 
204
+ ### Include Other Schema files
205
+
206
+ ```
207
+ include 'first_schema.schema'
208
+ include 'other_file.schema'
209
+ ```
210
+
211
+
204
212
  ## Detail About Convergence DSL
205
213
 
206
214
  ### support column types
data/lib/convergence/command/apply.rb CHANGED
@@ -1,4 +1,5 @@
1
1
  require 'benchmark'
2
+ require 'pathname'
2
3
 
3
4
  class Convergence::Command::Apply < Convergence::Command
4
5
  def validate!
@@ -8,7 +9,8 @@ class Convergence::Command::Apply < Convergence::Command
8
9
 
9
10
  def execute
10
11
  validate!
11
- input_tables = Convergence::DSL.parse(File.open(@opts[:input]).read)
12
+ current_dir_path = Pathname.new(@opts[:input]).realpath.dirname
13
+ input_tables = Convergence::DSL.parse(File.open(@opts[:input]).read, current_dir_path)
12
14
  current_tables = dumper.dump
13
15
  execute_sql(input_tables, current_tables)
14
16
  end
data/lib/convergence/command/dryrun.rb CHANGED
@@ -1,3 +1,4 @@
1
+ require 'pathname'
1
2
  class Convergence::Command::Dryrun < Convergence::Command
2
3
  def validate!
3
4
  fail ArgumentError.new('--config required') if @config.nil?
@@ -6,7 +7,8 @@ class Convergence::Command::Dryrun < Convergence::Command
6
7
 
7
8
  def execute
8
9
  validate!
9
- input_tables = Convergence::DSL.parse(File.open(@opts[:input]).read)
10
+ current_dir_path = Pathname.new(@opts[:input]).realpath.dirname
11
+ input_tables = Convergence::DSL.parse(File.open(@opts[:input]).read, current_dir_path)
10
12
  current_tables = dumper.dump
11
13
  # -- maybe it's redundant output
12
14
  # output_diff(input_tables, current_tables)
data/lib/convergence/dsl.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  class Convergence::DSL
2
- attr_accessor :tables
2
+ attr_accessor :tables, :current_dir_path
3
3
 
4
4
  def initialize
5
5
  @tables = {}
@@ -12,8 +12,13 @@ class Convergence::DSL
12
12
  table
13
13
  end
14
14
 
15
- def self.parse(code)
15
+ def include(path)
16
+ @tables.merge!(Convergence::DSL.parse(File.open("#{current_dir_path}/#{path}").read, current_dir_path))
17
+ end
18
+
19
+ def self.parse(code, current_dir_path)
16
20
  parser = new
21
+ parser.current_dir_path = current_dir_path
17
22
  parser.instance_eval(code)
18
23
  parser.tables
19
24
  end
data/lib/convergence/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Convergence
2
- VERSION = '0.0.4'
2
+ VERSION = '0.0.5'
3
3
  end
data/spec/convergence/dsl_spec.rb CHANGED
@@ -33,7 +33,7 @@ describe Convergence::DSL do
33
33
 
34
34
  describe '#parse' do
35
35
  context 'when exist only one table' do
36
- subject { Convergence::DSL.parse(dsl_single_table) }
36
+ subject { Convergence::DSL.parse(dsl_single_table, '') }
37
37
 
38
38
  it 'should be able to parse tables' do
39
39
  expect(subject['users']).not_to be_nil
@@ -67,7 +67,7 @@ describe Convergence::DSL do
67
67
  end
68
68
 
69
69
  context 'when multiple tables exists' do
70
- subject { Convergence::DSL.parse(dsl_multi_table) }
70
+ subject { Convergence::DSL.parse(dsl_multi_table, '') }
71
71
 
72
72
  it 'should be able to parse tables' do
73
73
  expect(subject['users']).not_to be_nil
metadata CHANGED
@@ -1,167 +1,167 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: convergence
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.4
4
+ version: 0.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Shinsuke Nishio
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-01-12 00:00:00.000000000 Z
11
+ date: 2015-03-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mysql2
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: diff-lcs
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: diffy
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: slop
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '>='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - '>='
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bundler
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ~>
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
75
  version: '1.7'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ~>
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: '1.7'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rake
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ~>
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
89
  version: '10.0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ~>
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: '10.0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rspec
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - '>='
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - '>='
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: rubocop
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - '>='
115
+ - - ">="
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - '>='
122
+ - - ">="
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: pry
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - '>='
129
+ - - ">="
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - '>='
136
+ - - ">="
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: guard
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - '>='
143
+ - - ">="
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - '>='
150
+ - - ">="
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: guard-rspec
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - '>='
157
+ - - ">="
158
158
  - !ruby/object:Gem::Version
159
159
  version: '0'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - '>='
164
+ - - ">="
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  description: DB Schema management tool
@@ -172,10 +172,10 @@ executables:
172
172
  extensions: []
173
173
  extra_rdoc_files: []
174
174
  files:
175
- - .gitignore
176
- - .rspec
177
- - .rubocop.yml
178
- - .travis.yml
175
+ - ".gitignore"
176
+ - ".rspec"
177
+ - ".rubocop.yml"
178
+ - ".travis.yml"
179
179
  - Gemfile
180
180
  - Gemfile.lock
181
181
  - Guardfile
@@ -238,17 +238,17 @@ require_paths:
238
238
  - lib
239
239
  required_ruby_version: !ruby/object:Gem::Requirement
240
240
  requirements:
241
- - - '>='
241
+ - - ">="
242
242
  - !ruby/object:Gem::Version
243
243
  version: '0'
244
244
  required_rubygems_version: !ruby/object:Gem::Requirement
245
245
  requirements:
246
- - - '>='
246
+ - - ">="
247
247
  - !ruby/object:Gem::Version
248
248
  version: '0'
249
249
  requirements: []
250
250
  rubyforge_project:
251
- rubygems_version: 2.0.14
251
+ rubygems_version: 2.4.5
252
252
  signing_key:
253
253
  specification_version: 4
254
254
  summary: DB Schema management tool