cfdef 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1a0018c4e1873b8f79e5e3470a2e572eb087436
-  data.tar.gz: 187a7b1126bd8a5c14eb025f500f3412a3e13bdf
+  metadata.gz: 0f7569ecd16aca5421994ce854733c6593d79cae
+  data.tar.gz: 7f70f529230958a3113e232f140a95ef29c2ea53
 SHA512:
-  metadata.gz: 047161dfcf5b3e8583911223aaaef2cc78d26d23e9d2eb72f94e126e4c67a85b6770e7bb2199c50c72283c09755297c2d0d309e849a3c9b1cac618dca50769eb
-  data.tar.gz: 8204a92ce706ecf25abad78d3673dae78a4f1011a63a0d0b8ae62e761ff7ad8f54a0f71ebb89c8e11e3aa5abc2e8db8395780dc0a6afd04b352793de6e1af8fd
+  metadata.gz: f4110663867762259c075df419a806b491e1b821bd3692ba06a0f4e5a59d4d91e236ff90ddbb5486de098a723aeb0f12b3cec168e5cc50890acf81683416a1d5
+  data.tar.gz: bc7917e4e368cbc06804eb2b75967830272807e54f666b96ea657fd00e616bd23e8890108ec3323c077ba4eb62c05b3f56961267a52ca0f3600e9e16b172be38

data/README.md

@@ -47,6 +47,7 @@ Usage: cfdef [options]
     -o, --output FILE
         --split
         --target-origin ID_RGX
+        --use-braces
         --no-color
         --debug
 ```

data/cfdef.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'aws-sdk', '~> 2.3.0'
   spec.add_dependency 'diffy'
-  spec.add_dependency 'dslh', '>= 0.3.5'
+  spec.add_dependency 'dslh', '>= 0.3.6'
   spec.add_dependency 'term-ansicolor'
 
   spec.add_development_dependency 'bundler'

data/exe/cfdef

@@ -37,15 +37,16 @@ def parse_options(argv)
     options[:aws][:credentials][:path] = v
   end
 
-  opt.on('-a', '--apply')                {    options[:mode]    = :apply        }
-  opt.on('-f', '--file FILE')            {|v| options[:file]    = v             }
-  opt.on(''  , '--dry-run')              {    options[:dry_run] = true          }
-  opt.on('-e', '--export')               {    options[:mode]    = :export       }
-  opt.on('-o', '--output FILE')          {|v| options[:output]  = v             }
-  opt.on(''  , '--split')                {    options[:split]   = :true         }
-  opt.on(''  , '--target-origin ID_RGX') {|v| options[:target]  = Regexp.new(v) }
-  opt.on(''  , '--no-color')             {    options[:color]   = false         }
-  opt.on(''  , '--debug')                {    options[:debug]   = true          }
+  opt.on('-a', '--apply')                {    options[:mode]       = :apply        }
+  opt.on('-f', '--file FILE')            {|v| options[:file]       = v             }
+  opt.on(''  , '--dry-run')              {    options[:dry_run]    = true          }
+  opt.on('-e', '--export')               {    options[:mode]       = :export       }
+  opt.on('-o', '--output FILE')          {|v| options[:output]     = v             }
+  opt.on(''  , '--split')                {    options[:split]      = true          }
+  opt.on(''  , '--target-origin ID_RGX') {|v| options[:target]     = Regexp.new(v) }
+  opt.on(''  , '--use-braces')           {    options[:use_braces] = true          }
+  opt.on(''  , '--no-color')             {    options[:color]      = false         }
+  opt.on(''  , '--debug')                {    options[:debug]      = true          }
 
   opt.parse!(argv)
 

data/lib/cfdef/dsl/converter.rb

@@ -30,12 +30,22 @@ class Cfdef::DSL::Converter
   end
 
   def output_distribution(dist_id, distribution)
-    dist_conf = Dslh.deval(distribution, initial_depth: 1, force_dump_braces: true).strip
+    dslh_opts = {initial_depth: 1, force_dump_braces: true}
+    dslh_opts[:use_braces_instead_of_do_end] = true if @options[:use_braces]
+    dist_conf = Dslh.deval(distribution, dslh_opts).strip
 
-    <<-EOS
+    if @options[:use_braces]
+      <<-EOS
+distribution(#{dist_id.inspect}) {
+  #{dist_conf}
+}
+      EOS
+    else
+      <<-EOS
 distribution #{dist_id.inspect} do
   #{dist_conf}
 end
-    EOS
+      EOS
+    end
   end
 end

data/lib/cfdef/version.rb

@@ -1,3 +1,3 @@
 module Cfdef
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfdef
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - winebarrel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement