kumogata 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTg3ZWZjNjE5YzRhM2IwMDVjNDQ1ZDg0ODE3ZmRiMjIyZmZiNjVkZA==
-  data.tar.gz: !binary |-
-    MDhhMGQyNjdkZGRhYjc4NDY3MjFmNjVkYTExZmM1ODM5Y2QzMGQ1Nw==
+SHA1:
+  metadata.gz: db60c6a575c8c56ed2ba12127b18b12a99ed8574
+  data.tar.gz: dcdeb75938b99e1a0a2b0e292eaf98e62591d08c
 SHA512:
-  metadata.gz: !binary |-
-    MDc3NWQzOWVlMTc3ODg4OThlMjFkYTg0NDcxNjA2NDVhY2E4M2FlZDJhNTZm
-    MWFhYWI4ZDA5ZTYwODJmNGY3ZWIzNGFmMjA0NTgxNDA1NTExNmJhZGUxMDJl
-    YzdkNjEwNmJhZmFjZGNhNmY3MDEzNDM5YTI0Y2QwNmYzOTcyNmE=
-  data.tar.gz: !binary |-
-    YmRmNjI1YTk5NjdlNDExMTZmZTY3Yjk3NDc2ZGYzMjdkN2I3M2Q2YmI4OGRk
-    NDkwOGY4MzEyOWU0MDZmNjQ2ZmFkZGNhYjU0N2VmNzY0NTM2OTVhMzJjYTU1
-    ZjJmYTZmYWM4NzMyNjQyYmI3ZDU3NTc0ZDk1NjA3NjUyNDI3NTU=
+  metadata.gz: 0fd37ebd51c74951cd9e239d788cd4b0cba744a8ab41e6d2d584cb77a889439f439c7c1594f6181c6a866b2bbc103370a0b30f9cf7aedca599fd73333161795a
+  data.tar.gz: 31ee88842b7d4d6829972d0e3f45ecf506f40a9090793ccc99a1a6c0de6147f50a1ce032385a18e66a1097e874308743c8e41c5a37f0a81172b3ddb1b09ccd50

data/README.md

@@ -5,8 +5,8 @@
 
 Kumogata is a tool for [AWS CloudFormation](https://aws.amazon.com/cloudformation/).
 
-[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403051030)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403051030)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403051942)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403051942)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 
@@ -163,6 +163,48 @@ end
 }
 ```
 
+### Split of configuration
+
+* template.rb
+
+```ruby
+Resources do
+  require 'template2'
+end
+```
+
+* template2.rb
+
+```ruby
+myEC2Instance do
+  Type "AWS::EC2::Instance"
+  Properties do
+    ImageId "ami-XXXXXXXX"
+    InstanceType { Ref "InstanceType" }
+    KeyName "your_key_name"
+  end
+end
+```
+
+* Converted JSON template
+
+```javascript
+{
+  "Resources": {
+    "myEC2Instance": {
+      "Type": "AWS::EC2::Instance",
+      "Properties": {
+        "ImageId": "ami-XXXXXXXX",
+        "InstanceType": {
+          "Ref": "InstanceType"
+        },
+        "KeyName": "your_key_name"
+      }
+    }
+  }
+}
+```
+
 ## Demo
 
 * Create resources

data/lib/kumogata/client.rb

@@ -107,7 +107,9 @@ class Kumogata::Client
     Dslh.eval(template.read, {
       :key_conv   => key_converter,
       :value_conv => value_converter,
-      :scope_hook => method(:define_template_func),
+      :scope_hook => proc {|scope|
+        define_template_func(scope, template.path)
+      },
       :filename   => template.path,
     })
   end
@@ -145,8 +147,28 @@ class Kumogata::Client
     Dslh.deval(template, :key_conv => key_conv, :value_conv => value_conv, :exclude_key => exclude_key)
   end
 
-  def define_template_func(scope)
-    scope.instance_eval(<<-'EOS')
+  def define_template_func(scope, path_or_url)
+    scope.instance_eval(<<-EOS)
+      def require(path)
+        unless path =~ %r|\\A/| or path =~ %r|\\A\\w+://|
+          path = File.expand_path(File.join(File.dirname(#{path_or_url.inspect}), path))
+        end
+
+        begin
+          if File.exist?(path + '.rb')
+            open(path + '.rb') {|f| instance_eval(f.read) }
+          else
+            open(path) {|f| instance_eval(f.read) }
+          end
+        rescue => e
+          begin
+            Kernel.require(file)
+          rescue
+            raise e
+          end
+        end
+      end
+
       def _path(path, value = nil, &block)
         if block
           value = Dslh::ScopeBlock.nest(binding, 'block')

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/kumogata_convert_spec.rb

@@ -512,6 +512,62 @@ end
       }
     }
   }
+}
+    EOS
+  end
+
+  it 'convert splitted Ruby template to JSON template' do
+    json_template = nil
+
+    part_of_template = <<-EOS
+myEC2Instance do
+  Type "AWS::EC2::Instance"
+  Properties do
+    ImageId "ami-XXXXXXXX"
+    InstanceType "t1.micro"
+  end
+end
+    EOS
+
+    tempfile(part_of_template, '.rb') do |f|
+      template = <<-EOS
+Resources do
+  require #{f.path.inspect}
+end
+
+Outputs do
+  AZ do
+    Value do
+      Fn__GetAtt "myEC2Instance", "AvailabilityZone"
+    end
+  end
+end
+      EOS
+
+      json_template = run_client(:convert, :template => template)
+    end
+
+    expect(json_template).to eq((<<-EOS).chomp)
+{
+  "Resources": {
+    "myEC2Instance": {
+      "Type": "AWS::EC2::Instance",
+      "Properties": {
+        "ImageId": "ami-XXXXXXXX",
+        "InstanceType": "t1.micro"
+      }
+    }
+  },
+  "Outputs": {
+    "AZ": {
+      "Value": {
+        "Fn::GetAtt": [
+          "myEC2Instance",
+          "AvailabilityZone"
+        ]
+      }
+    }
+  }
 }
     EOS
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Genki Sugawara
@@ -14,140 +14,140 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dslh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
 description: A tool for AWS CloudFormation. It can define a template in Ruby DSL.
@@ -195,17 +195,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A tool for AWS CloudFormation.
@@ -220,3 +220,4 @@ test_files:
 - spec/kumogata_update_spec.rb
 - spec/kumogata_validate_spec.rb
 - spec/spec_helper.rb
+has_rdoc: