dslh 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52e8fca92396ff10604912350977f2d50a8c94fb85f88223adfc5296ca54f694
-  data.tar.gz: 73e0742000b6a98cae5de8020deb5e68c7a91f46c4f7821a70318a23dafd6fc3
+  metadata.gz: 7439fa4d8684ca0e0a79663b5a4e5e5a196c60b87ec63cc7ab7dcfccd8c1f560
+  data.tar.gz: 36c0a30ea08790857fc99606f8929bed77cb1029feb15cab853ef9d278bf1ecd
 SHA512:
-  metadata.gz: b2ded09c1ad8f1385b2cb05e0a93f29e6126205700bda9af4fcf7ed3a1b2446e58d32549ceba546aba3be41e307e25fcba4b8cc8df7d1739266056feecbd2a69
-  data.tar.gz: 1153bcb401924575bacc76cd7532345d14bc1f0de30311d8f50f81d3ddbeb10c3fece4b66d0ab9ef93d8a25b1440db89d85f50ebeca5be4644dd8c3e30dfd740
+  metadata.gz: eb68c0b1a1107fb6eff5f45e74913d5fc7cf3905b75b21d269daa99a93160e19ca5383a76b48335151bfbce55bd480b36ee1b4813c352108493cf369f0510487
+  data.tar.gz: cc8afbb7e725b9c889e6b2ff9e12b401d4535db81d1f7b358aafeb2b361957142984eeeb5a1a67e6f2d1ceb5f69db19c29f4d1adfddda55075a502ebe863176c

data/dslh.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Genki Sugawara']
   spec.email         = ['sugawara@cookpad.com']
   spec.summary       = %q{It define Hash as a DSL.}
-  spec.description   = %q{It define Hash as a DSL.}
+  spec.description   = %q{It define Hash as a DSL gem.}
   spec.homepage      = 'https://github.com/kumogata/dslh'
   spec.license       = 'MIT'
 
@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '>= 3.0.0'
-  spec.add_development_dependency 'kwalify'
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'kwalify', '~> 0.7'
 end

data/lib/dslh.rb

@@ -1,7 +1,6 @@
 require 'dslh/version'
 require 'stringio'
 require 'pp'
-require 'json'
 require 'yaml'
 
 class Dslh
@@ -194,12 +193,13 @@ class Dslh
     key_conv = @options[:key_conv]
 
     if exclude_keys?(hash.keys)
-      _buf = <<EOS
+      buf.puts(<<-EOS
 (
-#{JSON.pretty_generate(hash, { indent: indent })}
+  #{hash.pretty_inspect.strip.gsub("\n", "\n" + indent)}
 )
 EOS
-      return buf.puts(_buf)
+               )
+      return
     end
 
     hash.each do |key, value|
@@ -242,7 +242,12 @@ EOS
     case value
     when Hash
       if exclude_keys?(value.keys)
-        value_buf.puts('(' + ("\n" + value.pretty_inspect.strip).gsub("\n", "\n" + next_indent) + ')')
+        value_buf.puts(<<-EOS
+(
+#{next_indent}#{value.pretty_inspect.strip.gsub("\n", "\n" + next_indent)}
+#{indent})
+EOS
+                       )
       else
         nested = true
         value_buf.puts(@options[:use_braces_instead_of_do_end] ? ' {' : ' do')

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.4.10'
+  VERSION = '0.4.11'
 end

data/spec/dslh_spec.rb

@@ -991,7 +991,8 @@ Mappings do
      "c1.xlarge"=>{"Arch"=>"64"},
      "cc1.4xlarge"=>{"Arch"=>"64HVM"},
      "cc2.8xlarge"=>{"Arch"=>"64HVM"},
-     "cg1.4xlarge"=>{"Arch"=>"64HVM"}})
+     "cg1.4xlarge"=>{"Arch"=>"64HVM"}}
+  )
   AWSRegionArch2AMI(
     {"us-east-1"=>
       {"32"=>"ami-a0cd60c9", "64"=>"ami-aecd60c7", "64HVM"=>"ami-a8cd60c1"},
@@ -1008,7 +1009,8 @@ Mappings do
      "ap-northeast-1"=>
       {"32"=>"ami-2a19aa2b", "64"=>"ami-2819aa29", "64HVM"=>"NOT_YET_SUPPORTED"},
      "sa-east-1"=>
-      {"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}})
+      {"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}}
+  )
 end
 Resources do
   S3Bucket do
@@ -1143,12 +1145,14 @@ Resources do
                "libcurl-devel"=>[],
                "libxml2-devel"=>[],
                "openssl-devel"=>[],
-               "mailcap"=>[]})
+               "mailcap"=>[]}
+            )
           end
           sources(
             {"/var/www/html"=>"http://ftp.drupal.org/files/projects/drupal-7.8.tar.gz",
              "/home/ec2-user"=>"http://ftp.drupal.org/files/projects/drush-7.x-4.5.tar.gz",
-             "/home/ec2-user/s3fs"=>"http://s3fs.googlecode.com/files/s3fs-1.61.tar.gz"})
+             "/home/ec2-user/s3fs"=>"http://s3fs.googlecode.com/files/s3fs-1.61.tar.gz"}
+          )
           files(
             {"/etc/passwd-s3fs"=>
               {"content"=>
@@ -1203,7 +1207,8 @@ Resources do
                     "ini_set('session.cookie_lifetime', 2000000);\n"]]},
                "mode"=>"000400",
                "owner"=>"root",
-               "group"=>"root"}})
+               "group"=>"root"}}
+          )
           services do
             sysvinit do
               httpd do
@@ -1610,7 +1615,8 @@ Mappings do
      "c1.xlarge"=>{"Arch"=>"64"},
      "cc1.4xlarge"=>{"Arch"=>"64HVM"},
      "cc2.8xlarge"=>{"Arch"=>"64HVM"},
-     "cg1.4xlarge"=>{"Arch"=>"64HVM"}})
+     "cg1.4xlarge"=>{"Arch"=>"64HVM"}}
+  )
   AWSRegionArch2AMI(
     {"us-east-1"=>
       {"32"=>"ami-a0cd60c9", "64"=>"ami-aecd60c7", "64HVM"=>"ami-a8cd60c1"},
@@ -1627,7 +1633,8 @@ Mappings do
      "ap-northeast-1"=>
       {"32"=>"ami-2a19aa2b", "64"=>"ami-2819aa29", "64HVM"=>"NOT_YET_SUPPORTED"},
      "sa-east-1"=>
-      {"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}})
+      {"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}}
+  )
 end
 Resources do
   S3Bucket do
@@ -1762,7 +1769,8 @@ Resources do
                "libcurl-devel"=>[],
                "libxml2-devel"=>[],
                "openssl-devel"=>[],
-               "mailcap"=>[]})
+               "mailcap"=>[]}
+            )
           end
           sources do
             _path "/var/www/html", "http://ftp.drupal.org/files/projects/drupal-7.8.tar.gz"
@@ -2235,7 +2243,8 @@ Mappings do
      "c1.xlarge"=>{"Arch"=>"64"},
      "cc1.4xlarge"=>{"Arch"=>"64HVM"},
      "cc2.8xlarge"=>{"Arch"=>"64HVM"},
-     "cg1.4xlarge"=>{"Arch"=>"64HVM"}})
+     "cg1.4xlarge"=>{"Arch"=>"64HVM"}}
+  )
   AWSRegionArch2AMI(
     {"us-east-1"=>
       {"32"=>"ami-a0cd60c9", "64"=>"ami-aecd60c7", "64HVM"=>"ami-a8cd60c1"},
@@ -2252,7 +2261,8 @@ Mappings do
      "ap-northeast-1"=>
       {"32"=>"ami-2a19aa2b", "64"=>"ami-2819aa29", "64HVM"=>"NOT_YET_SUPPORTED"},
      "sa-east-1"=>
-      {"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}})
+      {"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}}
+  )
 end
 Resources do
   WebServer do
@@ -2271,7 +2281,8 @@ Resources do
                "mysql"=>[],
                "mysql-server"=>[],
                "mysql-devel"=>[],
-               "mysql-libs"=>[]})
+               "mysql-libs"=>[]}
+            )
           end
           sources do
             _path "/var/www/html", "http://ftp.drupal.org/files/projects/drupal-7.8.tar.gz"

metadata

@@ -1,72 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: dslh
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: kwalify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: It define Hash as a DSL.
+        version: '0.7'
+description: It define Hash as a DSL gem.
 email:
 - sugawara@cookpad.com
 executables: []