dslh 0.4.10 → 0.4.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/dslh.gemspec +5 -5
- data/lib/dslh.rb +10 -5
- data/lib/dslh/version.rb +1 -1
- data/spec/dslh_spec.rb +22 -11
- metadata +19 -19
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7439fa4d8684ca0e0a79663b5a4e5e5a196c60b87ec63cc7ab7dcfccd8c1f560
|
4
|
+
data.tar.gz: 36c0a30ea08790857fc99606f8929bed77cb1029feb15cab853ef9d278bf1ecd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: eb68c0b1a1107fb6eff5f45e74913d5fc7cf3905b75b21d269daa99a93160e19ca5383a76b48335151bfbce55bd480b36ee1b4813c352108493cf369f0510487
|
7
|
+
data.tar.gz: cc8afbb7e725b9c889e6b2ff9e12b401d4535db81d1f7b358aafeb2b361957142984eeeb5a1a67e6f2d1ceb5f69db19c29f4d1adfddda55075a502ebe863176c
|
data/dslh.gemspec
CHANGED
@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
|
|
9
9
|
spec.authors = ['Genki Sugawara']
|
10
10
|
spec.email = ['sugawara@cookpad.com']
|
11
11
|
spec.summary = %q{It define Hash as a DSL.}
|
12
|
-
spec.description = %q{It define Hash as a DSL.}
|
12
|
+
spec.description = %q{It define Hash as a DSL gem.}
|
13
13
|
spec.homepage = 'https://github.com/kumogata/dslh'
|
14
14
|
spec.license = 'MIT'
|
15
15
|
|
@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
|
|
18
18
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
19
19
|
spec.require_paths = ['lib']
|
20
20
|
|
21
|
-
spec.add_development_dependency 'bundler'
|
22
|
-
spec.add_development_dependency 'rake'
|
23
|
-
spec.add_development_dependency 'rspec', '
|
24
|
-
spec.add_development_dependency 'kwalify'
|
21
|
+
spec.add_development_dependency 'bundler', '~> 1.16'
|
22
|
+
spec.add_development_dependency 'rake', '~> 12.3'
|
23
|
+
spec.add_development_dependency 'rspec', '~> 3.0'
|
24
|
+
spec.add_development_dependency 'kwalify', '~> 0.7'
|
25
25
|
end
|
data/lib/dslh.rb
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
require 'dslh/version'
|
2
2
|
require 'stringio'
|
3
3
|
require 'pp'
|
4
|
-
require 'json'
|
5
4
|
require 'yaml'
|
6
5
|
|
7
6
|
class Dslh
|
@@ -194,12 +193,13 @@ class Dslh
|
|
194
193
|
key_conv = @options[:key_conv]
|
195
194
|
|
196
195
|
if exclude_keys?(hash.keys)
|
197
|
-
|
196
|
+
buf.puts(<<-EOS
|
198
197
|
(
|
199
|
-
#{
|
198
|
+
#{hash.pretty_inspect.strip.gsub("\n", "\n" + indent)}
|
200
199
|
)
|
201
200
|
EOS
|
202
|
-
|
201
|
+
)
|
202
|
+
return
|
203
203
|
end
|
204
204
|
|
205
205
|
hash.each do |key, value|
|
@@ -242,7 +242,12 @@ EOS
|
|
242
242
|
case value
|
243
243
|
when Hash
|
244
244
|
if exclude_keys?(value.keys)
|
245
|
-
value_buf.puts(
|
245
|
+
value_buf.puts(<<-EOS
|
246
|
+
(
|
247
|
+
#{next_indent}#{value.pretty_inspect.strip.gsub("\n", "\n" + next_indent)}
|
248
|
+
#{indent})
|
249
|
+
EOS
|
250
|
+
)
|
246
251
|
else
|
247
252
|
nested = true
|
248
253
|
value_buf.puts(@options[:use_braces_instead_of_do_end] ? ' {' : ' do')
|
data/lib/dslh/version.rb
CHANGED
data/spec/dslh_spec.rb
CHANGED
@@ -991,7 +991,8 @@ Mappings do
|
|
991
991
|
"c1.xlarge"=>{"Arch"=>"64"},
|
992
992
|
"cc1.4xlarge"=>{"Arch"=>"64HVM"},
|
993
993
|
"cc2.8xlarge"=>{"Arch"=>"64HVM"},
|
994
|
-
"cg1.4xlarge"=>{"Arch"=>"64HVM"}}
|
994
|
+
"cg1.4xlarge"=>{"Arch"=>"64HVM"}}
|
995
|
+
)
|
995
996
|
AWSRegionArch2AMI(
|
996
997
|
{"us-east-1"=>
|
997
998
|
{"32"=>"ami-a0cd60c9", "64"=>"ami-aecd60c7", "64HVM"=>"ami-a8cd60c1"},
|
@@ -1008,7 +1009,8 @@ Mappings do
|
|
1008
1009
|
"ap-northeast-1"=>
|
1009
1010
|
{"32"=>"ami-2a19aa2b", "64"=>"ami-2819aa29", "64HVM"=>"NOT_YET_SUPPORTED"},
|
1010
1011
|
"sa-east-1"=>
|
1011
|
-
{"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}}
|
1012
|
+
{"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}}
|
1013
|
+
)
|
1012
1014
|
end
|
1013
1015
|
Resources do
|
1014
1016
|
S3Bucket do
|
@@ -1143,12 +1145,14 @@ Resources do
|
|
1143
1145
|
"libcurl-devel"=>[],
|
1144
1146
|
"libxml2-devel"=>[],
|
1145
1147
|
"openssl-devel"=>[],
|
1146
|
-
"mailcap"=>[]}
|
1148
|
+
"mailcap"=>[]}
|
1149
|
+
)
|
1147
1150
|
end
|
1148
1151
|
sources(
|
1149
1152
|
{"/var/www/html"=>"http://ftp.drupal.org/files/projects/drupal-7.8.tar.gz",
|
1150
1153
|
"/home/ec2-user"=>"http://ftp.drupal.org/files/projects/drush-7.x-4.5.tar.gz",
|
1151
|
-
"/home/ec2-user/s3fs"=>"http://s3fs.googlecode.com/files/s3fs-1.61.tar.gz"}
|
1154
|
+
"/home/ec2-user/s3fs"=>"http://s3fs.googlecode.com/files/s3fs-1.61.tar.gz"}
|
1155
|
+
)
|
1152
1156
|
files(
|
1153
1157
|
{"/etc/passwd-s3fs"=>
|
1154
1158
|
{"content"=>
|
@@ -1203,7 +1207,8 @@ Resources do
|
|
1203
1207
|
"ini_set('session.cookie_lifetime', 2000000);\n"]]},
|
1204
1208
|
"mode"=>"000400",
|
1205
1209
|
"owner"=>"root",
|
1206
|
-
"group"=>"root"}}
|
1210
|
+
"group"=>"root"}}
|
1211
|
+
)
|
1207
1212
|
services do
|
1208
1213
|
sysvinit do
|
1209
1214
|
httpd do
|
@@ -1610,7 +1615,8 @@ Mappings do
|
|
1610
1615
|
"c1.xlarge"=>{"Arch"=>"64"},
|
1611
1616
|
"cc1.4xlarge"=>{"Arch"=>"64HVM"},
|
1612
1617
|
"cc2.8xlarge"=>{"Arch"=>"64HVM"},
|
1613
|
-
"cg1.4xlarge"=>{"Arch"=>"64HVM"}}
|
1618
|
+
"cg1.4xlarge"=>{"Arch"=>"64HVM"}}
|
1619
|
+
)
|
1614
1620
|
AWSRegionArch2AMI(
|
1615
1621
|
{"us-east-1"=>
|
1616
1622
|
{"32"=>"ami-a0cd60c9", "64"=>"ami-aecd60c7", "64HVM"=>"ami-a8cd60c1"},
|
@@ -1627,7 +1633,8 @@ Mappings do
|
|
1627
1633
|
"ap-northeast-1"=>
|
1628
1634
|
{"32"=>"ami-2a19aa2b", "64"=>"ami-2819aa29", "64HVM"=>"NOT_YET_SUPPORTED"},
|
1629
1635
|
"sa-east-1"=>
|
1630
|
-
{"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}}
|
1636
|
+
{"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}}
|
1637
|
+
)
|
1631
1638
|
end
|
1632
1639
|
Resources do
|
1633
1640
|
S3Bucket do
|
@@ -1762,7 +1769,8 @@ Resources do
|
|
1762
1769
|
"libcurl-devel"=>[],
|
1763
1770
|
"libxml2-devel"=>[],
|
1764
1771
|
"openssl-devel"=>[],
|
1765
|
-
"mailcap"=>[]}
|
1772
|
+
"mailcap"=>[]}
|
1773
|
+
)
|
1766
1774
|
end
|
1767
1775
|
sources do
|
1768
1776
|
_path "/var/www/html", "http://ftp.drupal.org/files/projects/drupal-7.8.tar.gz"
|
@@ -2235,7 +2243,8 @@ Mappings do
|
|
2235
2243
|
"c1.xlarge"=>{"Arch"=>"64"},
|
2236
2244
|
"cc1.4xlarge"=>{"Arch"=>"64HVM"},
|
2237
2245
|
"cc2.8xlarge"=>{"Arch"=>"64HVM"},
|
2238
|
-
"cg1.4xlarge"=>{"Arch"=>"64HVM"}}
|
2246
|
+
"cg1.4xlarge"=>{"Arch"=>"64HVM"}}
|
2247
|
+
)
|
2239
2248
|
AWSRegionArch2AMI(
|
2240
2249
|
{"us-east-1"=>
|
2241
2250
|
{"32"=>"ami-a0cd60c9", "64"=>"ami-aecd60c7", "64HVM"=>"ami-a8cd60c1"},
|
@@ -2252,7 +2261,8 @@ Mappings do
|
|
2252
2261
|
"ap-northeast-1"=>
|
2253
2262
|
{"32"=>"ami-2a19aa2b", "64"=>"ami-2819aa29", "64HVM"=>"NOT_YET_SUPPORTED"},
|
2254
2263
|
"sa-east-1"=>
|
2255
|
-
{"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}}
|
2264
|
+
{"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}}
|
2265
|
+
)
|
2256
2266
|
end
|
2257
2267
|
Resources do
|
2258
2268
|
WebServer do
|
@@ -2271,7 +2281,8 @@ Resources do
|
|
2271
2281
|
"mysql"=>[],
|
2272
2282
|
"mysql-server"=>[],
|
2273
2283
|
"mysql-devel"=>[],
|
2274
|
-
"mysql-libs"=>[]}
|
2284
|
+
"mysql-libs"=>[]}
|
2285
|
+
)
|
2275
2286
|
end
|
2276
2287
|
sources do
|
2277
2288
|
_path "/var/www/html", "http://ftp.drupal.org/files/projects/drupal-7.8.tar.gz"
|
metadata
CHANGED
@@ -1,72 +1,72 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dslh
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.11
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Genki Sugawara
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-07-
|
11
|
+
date: 2018-07-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - "
|
17
|
+
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '
|
19
|
+
version: '1.16'
|
20
20
|
type: :development
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- - "
|
24
|
+
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: '
|
26
|
+
version: '1.16'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: rake
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- - "
|
31
|
+
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: '
|
33
|
+
version: '12.3'
|
34
34
|
type: :development
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
|
-
- - "
|
38
|
+
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: '
|
40
|
+
version: '12.3'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: rspec
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- - "
|
45
|
+
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 3.0
|
47
|
+
version: '3.0'
|
48
48
|
type: :development
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- - "
|
52
|
+
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 3.0
|
54
|
+
version: '3.0'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: kwalify
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- - "
|
59
|
+
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: '0'
|
61
|
+
version: '0.7'
|
62
62
|
type: :development
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
|
-
- - "
|
66
|
+
- - "~>"
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: '0'
|
69
|
-
description: It define Hash as a DSL.
|
68
|
+
version: '0.7'
|
69
|
+
description: It define Hash as a DSL gem.
|
70
70
|
email:
|
71
71
|
- sugawara@cookpad.com
|
72
72
|
executables: []
|