kumogata 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef04284bfd6f09d16a95a4aff75186ab8c785223
-  data.tar.gz: 53a9ede92d15f96d5f0a4b75bdcf5046b247e5e3
+  metadata.gz: b31c25198207adf1d56654843c7529fbd62f2ff6
+  data.tar.gz: 7510a7e9a89a775a3869ab3d850f6ecaeb35a0e8
 SHA512:
-  metadata.gz: 385f8496d9e99b318dd9d0ff72317590c746694a5143d4a5e91863251dccfe3adecde91e94301356dd880a74115420ec49d0535a4330a9733109ad0cb3d0db8b
-  data.tar.gz: 3cb5fbc3e5b197f070d02fd7d0f920394ae3d4330eefb5fc2a90105b070e381ef7e4efe5429dbb7fd4e11d7dc02283462cc8fbba21ae4f71150a6e8406e35fae
+  metadata.gz: a1bc043a32b8d8ab4d9439e56190d3ecbac5246c67a0f5c95996d585d8365d6b0553e265f517f94428241888fa441ec09eed28bc3be4caef07516a96dbca5cff
+  data.tar.gz: 4fef527beb218337ff205adf84aa5ff149b3b2c41d3d13ef6e4b961210a1c510c362b37a9f062ce299f35c9cee388e2a074b6986e4c06f77ca9d9ea0bcbf9a01

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?201403051952)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403051952)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403061015)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403061015)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 
@@ -163,13 +163,13 @@ end
 }
 ```
 
-### Split of configuration
+### Split a template file
 
 * template.rb
 
 ```ruby
 Resources do
-  require 'template2'
+  _include 'template2'
 end
 ```
 

data/lib/kumogata/client.rb

@@ -149,26 +149,14 @@ class Kumogata::Client
 
   def define_template_func(scope, path_or_url)
     scope.instance_eval(<<-EOS)
-      def require(file)
+      def _include(file)
         path = file.dup
 
         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
+        open(path) {|f| instance_eval(f.read) }
       end
 
       def _path(path, value = nil, &block)

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/spec/kumogata_convert_spec.rb

@@ -532,7 +532,7 @@ end
     tempfile(part_of_template, '.rb') do |f|
       template = <<-EOS
 Resources do
-  require #{f.path.inspect}
+  _include #{f.path.inspect}
 end
 
 Outputs do
@@ -568,6 +568,56 @@ end
       }
     }
   }
+}
+    EOS
+  end
+
+  it 'convert Ruby template to JSON template with require' do
+    template = <<-EOS
+require 'fileutils'
+
+Resources do
+  myEC2Instance do
+    Type "AWS::EC2::Instance"
+    Properties do
+      ImageId "ami-XXXXXXXX"
+      InstanceType "t1.micro"
+    end
+  end
+end
+
+Outputs do
+  AZ do
+    Value do
+      Fn__GetAtt "myEC2Instance", "AvailabilityZone"
+    end
+  end
+end
+    EOS
+
+    json_template = run_client(:convert, :template => template)
+
+    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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk