kumogata 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 737dc652de39e3d5aeeddda9e7c173aab549a4a7
-  data.tar.gz: 39afb226eeabe86714367d84eb14dc7316acd8e5
+  metadata.gz: 05df0dd35de66dcfff11541b428ece4688d17f65
+  data.tar.gz: 2f6c5363c47f71d9b2a936fa340ad1f48ae601fd
 SHA512:
-  metadata.gz: 03e90e8b9266662df9bcb11158c2a60950fe0c1e3f81046bdbb30ae4c5d322e57d7fe1748bee8d4f90bd8b00134b9eb79692a42ec7489d20f61a8a9d98e7134b
-  data.tar.gz: d128303f7165458dd6a149551d0226abc0c29929ea894ad30e637eb1d654e5c23a3f22366a0f9a999759f04740e5521f8d208103a2c32122761f5bd668c27eac
+  metadata.gz: e3de82eaf417eaf49fc4e724d1aaeb261751d0d4b4fddd8e874879804eaa84513cc040e448b222718eda69ee4aef14bc9daaaf8594f44d538d2cc9ac7d2e1de5
+  data.tar.gz: fba3eb7bcb2569b066f3eb9e474f8bbbe69c6a655beac8cf035d961ba1e575ef8595cd0b2e2a34c64a0a4396b23131effc4b14f1c48d876e4f16c791b46bfa2a

data/.gitignore

@@ -19,3 +19,4 @@ packer_cache
 test.rb
 result.json
 command_result.json
+/_site

data/README.md

@@ -93,6 +93,7 @@ Options:
     -r, --region REGION
         --profile CONFIG_PROFILE
         --credentials-path PATH
+        --config-path PATH
         --format TMPLATE_FORMAT
         --output-format FORMAT
         --skip-replace-underscore
@@ -199,7 +200,7 @@ end
 
 ```ruby
 Resources do
-  _include 'template2.rb'
+  _include 'template2.rb', :ami_id => 'ami-XXXXXXXX'
 end
 ```
 
@@ -209,7 +210,7 @@ end
 myEC2Instance do
   Type "AWS::EC2::Instance"
   Properties do
-    ImageId "ami-XXXXXXXX"
+    ImageId args[:ami_id]
     InstanceType { Ref "InstanceType" }
     KeyName "your_key_name"
   end
@@ -623,10 +624,5 @@ aws_session_token=texample123324
 * Create a stack and run post commands
   * https://asciinema.org/a/8088
 
-## Contributing
-
-1. Fork it ( http://github.com/winebarrel/kumogata/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+## Similar tools
+* [Codenize.tools](http://codenize.tools/)

data/bin/kumogata

@@ -29,8 +29,12 @@ begin
 
     provider = AWS::Core::CredentialProviders::SharedCredentialFileProvider.new(credentials_opts)
     aws_opts[:credential_provider] = provider
+  end
 
-    region = provider.send(:load_profile)['region']
+  if File.exist?(options.config_path) and File.readable?(options.config_path)
+    ini = AWS::Core::IniParser.parse(File.read(options.config_path))
+    profile = options.config_profile || 'default'
+    region = ini[profile]['region']
     aws_opts[:region] = region if region
   end
 

data/kumogata.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['sgwr_dts@yahoo.co.jp']
   spec.summary       = %q{A tool for AWS CloudFormation.}
   spec.description   = %q{A tool for AWS CloudFormation. It can define a template in Ruby DSL.}
-  spec.homepage      = 'https://github.com/winebarrel/kumogata'
+  spec.homepage      = 'http://kumogata.codenize.tools/'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/kumogata/argument_parser.rb

@@ -8,6 +8,7 @@ class Kumogata::ArgumentParser
     :command_result_log => File.join(Dir.pwd, 'command_result.json'),
     :color => $stdout.tty?,
     :debug => false,
+    :config_path => File.expand_path('~/.aws/config'),
   }
 
   COMMANDS = {
@@ -86,6 +87,7 @@ class Kumogata::ArgumentParser
         opt.on('-r', '--region REGION')                            {|v| options[:region]                  = v     }
         opt.on(''  , '--profile CONFIG_PROFILE')                   {|v| options[:config_profile]          = v     }
         opt.on(''  , '--credentials-path PATH')                    {|v| options[:credentials_path]        = v     }
+        opt.on(''  , '--config-path PATH')                         {|v| options[:config_path]             = v     }
         opt.on(''  , '--format TMPLATE_FORMAT', supported_formats) {|v| options[:format]                  = v     }
         opt.on(''  , '--output-format FORMAT', supported_formats)  {|v| options[:output_format]           = v     }
         opt.on(''  , '--skip-replace-underscore')                  {    options[:skip_replace_underscore] = false }

data/lib/kumogata/client.rb

@@ -291,7 +291,7 @@ class Kumogata::Client
 
   def define_template_func(scope, path_or_url)
     scope.instance_eval(<<-EOS)
-      def _include(file)
+      def _include(file, args = {})
         path = file.dup
 
         unless path =~ %r|\\A/| or path =~ %r|\\A\\w+://|

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 end

data/spec/kumogata_convert_spec.rb

@@ -940,6 +940,62 @@ Resources do
   _include #{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
+
+  it 'convert splitted Ruby template to JSON template with args' do
+    json_template = nil
+
+    part_of_template = <<-EOS
+myEC2Instance do
+  Type "AWS::EC2::Instance"
+  Properties do
+    ImageId args[:ami_id]
+    InstanceType "t1.micro"
+  end
+end
+    EOS
+
+    tempfile(part_of_template, '.rb') do |f|
+      template = <<-EOS
+Resources do
+  _include #{f.path.inspect}, {:ami_id => "ami-XXXXXXXX"}
+end
+
 Outputs do
   AZ do
     Value do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -321,7 +321,7 @@ files:
 - spec/spec_helper.rb
 - spec/string_stream_spec.rb
 - spec/vpc-knowhow-2014-04.template
-homepage: https://github.com/winebarrel/kumogata
+homepage: http://kumogata.codenize.tools/
 licenses:
 - MIT
 metadata: {}