lono 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74d30f8bdd10b8530f8aef55dc52047b04d2c612f599bc353f9605e2609badd1
-  data.tar.gz: 77d3c804e551daea9997b121af4462158e7fcfbaa19b00b6c015f637f226a2c0
+  metadata.gz: a36f1ee3d7076e1e93fa9a395c984978510b9961657de60b026cd4a666b46ab6
+  data.tar.gz: 9d4104ceab9f1673057374aa86d31800d75ebe89652348a400b6bd481ccac444
 SHA512:
-  metadata.gz: 915c66c0c9d85bb9877f594bca34a1be9bb3ac0c13b949b2cf5bf26631d673a584247a3ea6b6f6d8ff01d77e30531fac1f7acc3e724ff9601f5143653a1cf66f
-  data.tar.gz: 0a9e4ac8705aabdbc1d975dd6809290723c17215fe0668554684eec5e48e442e89a4292dfe4d8620424c2470b5772a3942af2796836ffd49bea4be8c7852d49f
+  metadata.gz: 40ad69f3970916114081b028085f5a55c65511793571466db2a7fa0229c804491742a5394106838204495432303090ae40b5476232bdcee8fdd7689d5282a180
+  data.tar.gz: 34e2fd774d94f30b594d7ba602d1d6f0597bedb1127f0821f223f383109c85f38ee332cc05f196ab5834fafb9e01fd2134b9d008c5f7c9e32074c6f69f18b68b

data/.gitmodules

@@ -1,6 +1,3 @@
 [submodule "vendor/cfn-status"]
 	path = vendor/cfn-status
 	url = https://github.com/tongueroo/cfn-status
-[submodule "vendor/cfn_camelizer"]
-	path = vendor/cfn_camelizer
-	url = https://github.com/tongueroo/cfn_camelizer

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [5.1.1]
+- use cfn_camelizer as gem
+
 ## [5.1.0]
 - change `lono blueprint` to subcommand: `lono blueprint new` and `lono blueprint list` commands
 - change `lono configure` to `lono seed`. Seed interface is the same but the path is different: `seed/configs.rb`

data/lib/lono.rb

@@ -9,13 +9,12 @@ require 'plissken'
 require 'rainbow/ext/string'
 require 'render_me_pretty'
 require 'yaml'
+require 'cfn_camelizer'
 
 gem_root = File.dirname(__dir__)
 $:.unshift("#{gem_root}/lib")
 $:.unshift("#{gem_root}/vendor/cfn-status/lib")
 require "cfn/status"
-$:.unshift("#{gem_root}/vendor/cfn_camelizer/lib")
-require "cfn_camelizer"
 
 require "lono/autoloader"
 Lono::Autoloader.setup

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "5.1.0"
+  VERSION = "5.1.1"
 end

data/lono.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "aws-sdk-ec2" # lono seed
   gem.add_dependency "aws-sdk-iam" # lono seed
   gem.add_dependency "aws-sdk-s3"
-  # gem.add_dependency "cfn_camelizer" # use vendor/cfn_camelizer instead for now
+  gem.add_dependency "cfn_camelizer"
   gem.add_dependency "filesize"
   gem.add_dependency "graph" # lono xgraph command dependency
   gem.add_dependency "guard"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cfn_camelizer
+  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: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -569,19 +583,6 @@ files:
 - vendor/cfn-status/spec/fixtures/cfn/stack-events-in-progress.json
 - vendor/cfn-status/spec/fixtures/cfn/stack-events-update-rollback-complete.json
 - vendor/cfn-status/spec/spec_helper.rb
-- vendor/cfn_camelizer/CHANGELOG.md
-- vendor/cfn_camelizer/Gemfile
-- vendor/cfn_camelizer/LICENSE.txt
-- vendor/cfn_camelizer/README.md
-- vendor/cfn_camelizer/Rakefile
-- vendor/cfn_camelizer/bin/console
-- vendor/cfn_camelizer/bin/setup
-- vendor/cfn_camelizer/cfn_camelizer.gemspec
-- vendor/cfn_camelizer/lib/camelizer.yml
-- vendor/cfn_camelizer/lib/cfn_camelizer.rb
-- vendor/cfn_camelizer/lib/cfn_camelizer/version.rb
-- vendor/cfn_camelizer/spec/cfn_camelizer_spec.rb
-- vendor/cfn_camelizer/spec/spec_helper.rb
 homepage: https://lono.cloud
 licenses:
 - https://boltops.com/boltops-community-license

data/vendor/cfn_camelizer/CHANGELOG.md

@@ -1,20 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
-
-## [0.4.0]
-- add AWS::ApiGateway::Authorizer cases
-
-## [0.3.0]
-- camelizer.yml: scope camelizing rules more finely with resource_keys rule
-- add NotificationTargetARN
-- add AWS::Events::Rule RoleArn
-- add VpcZoneIdentifier
-- add ScalableTarget
-
-## [0.2.0]
-- add AWS special key
-
-## [0.1.0]
-- Initial release

data/vendor/cfn_camelizer/Gemfile

@@ -1,4 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in cfn_camelizer.gemspec
-gemspec

data/vendor/cfn_camelizer/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2019 Tung Nguyen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/vendor/cfn_camelizer/README.md

@@ -1,40 +0,0 @@
-# CfnCamelizer
-
-Camelizer for CloudFormation.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'cfn_camelizer'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install cfn_camelizer
-
-## Usage
-
-```ruby
-data = {my_data: 1}
-CfnCamelizer.transform(data) => {"MyData" => 1}
-```
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/cfn_camelizer.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/vendor/cfn_camelizer/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/vendor/cfn_camelizer/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "cfn_camelizer"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/vendor/cfn_camelizer/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/vendor/cfn_camelizer/cfn_camelizer.gemspec

@@ -1,32 +0,0 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "cfn_camelizer/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "cfn_camelizer"
-  spec.version       = CfnCamelizer::VERSION
-  spec.authors       = ["Tung Nguyen"]
-  spec.email         = ["tongueroo@gmail.com"]
-
-  spec.summary       = "Cfn Camelizer"
-  spec.homepage      = "https://github.com/tongueroo/cfn_camelizer"
-  spec.license       = "MIT"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "activesupport"
-  spec.add_dependency "memoist"
-  spec.add_dependency "rainbow"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-end

data/vendor/cfn_camelizer/lib/camelizer.yml

@@ -1,37 +0,0 @@
----
-special_keys:
-  Aws: AWS
-# Very fine grain control, since these map rules are scoped to specific resources
-# After the special_keys map for backwards compatibility.
-resource_keys: # specific to resource types
-  AWS::ApiGateway::Authorizer:
-    ProviderArns: ProviderARNs
-  AWS::ApplicationAutoScaling::ScalableTarget:
-    RoleArn: RoleARN
-  AWS::AutoScaling::AutoScalingGroup:
-    ServiceLinkedRoleArn: ServiceLinkedRoleARN
-    TargetGroupArns: TargetGroupARNs
-    VpcZoneIdentifier: VPCZoneIdentifier
-  AWS::AutoScaling::LifecycleHook:
-    NotificationTargetArn: NotificationTargetARN
-    RoleArn: RoleARN
-  AWS::CloudFormation::Stack:
-    NotificationArns: NotificationARNs
-    TemplateUrl: TemplateURL
-  AWS::Events::Rule:
-    RoleARN: RoleArn
-  AWS::Route53::RecordSet:
-    Ttl: TTL
-  AWS::RDS::DBSubnetGroup:
-    DbSubnetGroupDescription: DBSubnetGroupDescription
-    DbSubnetGroupName: DBSubnetGroupName
-  AWS::SQS::Queue:
-    DeadLetterTargetArn: deadLetterTargetArn # under RedrivePolicy
-    MaxReceiveCount: maxReceiveCount # under RedrivePolicy
-  AutoScaling::LaunchConfiguration:
-    ClassicLinkVpcId: ClassicLinkVPCId
-    ClassicLinkVpcSecurityGroups: ClassicLinkVPCSecurityGroups
-passthrough_parent_keys:
-- Fn::Sub # https://amzn.to/2HKwxri
-- ResponseParameters # API Gateway MethodResponse https://amzn.to/2HKw0Wk
-- Variables # Lambda Environment Variables https://amzn.to/2HLlttV

data/vendor/cfn_camelizer/lib/cfn_camelizer.rb

@@ -1,94 +0,0 @@
-require "cfn_camelizer/version"
-require "memoist"
-require "yaml"
-require "rainbow/ext/string"
-require "active_support/core_ext/string"
-require "active_support/core_ext/hash"
-
-# Custom Camelizer with CloudFormation specific handling.
-# Based on: https://stackoverflow.com/questions/8706930/converting-nested-hash-keys-from-camelcase-to-snake-case-in-ruby
-class CfnCamelizer
-  class << self
-    extend Memoist
-
-    def transform(value, parent_keys=[], resource_type=nil)
-      case value
-      when Array
-        value.map { |v| transform(v, parent_keys, resource_type) }
-      when Hash
-        if value.keys.include?(:type)
-          resource_type ||= value[:type]
-        end
-
-        initializer = value.map do |k, v|
-          new_key = camelize_key(k, parent_keys, resource_type)
-          [new_key, transform(v, parent_keys+[new_key], resource_type)]
-        end
-        Hash[initializer]
-      else
-        value # do not transform values
-      end
-    end
-
-    def camelize_key(k, parent_keys=[], resource_type=nil)
-      k = k.to_s
-
-      if passthrough?(k, parent_keys)
-        k # pass through untouch
-      elsif parent_keys.last == "EventPattern" # top-level
-        k.dasherize
-      elsif parent_keys.include?("EventPattern")
-        # Any keys at 2nd level under EventPattern will be pascalized
-        pascalize(k)
-      else
-        camelize(k, resource_type)
-      end
-    end
-
-    def passthrough?(k, parent_keys)
-      # Do not transform keys under certain parent keys or keys that contain - or /
-      passthrough = camelizer_yaml["passthrough_parent_keys"]
-      intersection = parent_keys & passthrough
-      !intersection.empty? || k.include?('-') || k.include?('/')
-    end
-
-    def camelize(value, resource_type=nil)
-      return value if value.is_a?(Integer)
-
-      value = value.to_s.camelize
-      v = special_map[value] || value # after the special_keys map
-      resource_map(resource_type)[v] || v
-    end
-
-    def pascalize(value)
-      new_value = value.camelize
-      first_char = new_value[0..0].downcase
-      new_value[0] = first_char
-      new_value
-    end
-
-    # Some keys have special mappings
-    def special_map
-      camelizer_yaml["special_keys"]
-    end
-
-    def resource_map(resource_type)
-      camelizer_yaml["resource_keys"][resource_type] || {}
-    end
-
-    def camelizer_yaml
-      # default
-      path = File.expand_path("camelizer.yml", File.dirname(__FILE__))
-      default = YAML.load_file(path)
-      # project specific
-      path = "#{Dir.pwd}/configs/camelizer.yml"
-      if File.exist?(path)
-        project = YAML.load_file(path)
-        default.deep_merge(project)
-      else
-        default
-      end
-    end
-    memoize :camelizer_yaml
-  end
-end

data/vendor/cfn_camelizer/lib/cfn_camelizer/version.rb

@@ -1,3 +0,0 @@
-class CfnCamelizer
-  VERSION = "0.4.0"
-end

data/vendor/cfn_camelizer/spec/cfn_camelizer_spec.rb

@@ -1,86 +0,0 @@
-RSpec.describe CfnCamelizer do
-  let(:camelizer) { CfnCamelizer }
-  context "not camelize the special cases" do
-    it "transform should not transform keys under Fn::Sub" do
-      data = {"UserData"=>{"Fn::Sub"=>["hello", {"k1"=>"v1", "k2"=>"v2"}]}}
-      result = camelizer.transform(data)
-      expect(result).to eq(data)
-    end
-  end
-
-  it "simple string" do
-    s = "foo_bar"
-    s = camelizer.camelize(s)
-    expect(s).to eq "FooBar"
-  end
-
-  it "transform keys" do
-    h = {foo_bar: 1}
-    result = camelizer.transform(h)
-    result.keys == ["FooBar"]
-  end
-
-  it "do not pasalize anything under Variables" do
-    h = {foo_bar: 1, variables: {dont_touch: 2}}
-    result = camelizer.transform(h)
-    # pp result
-    expect(result).to eq("FooBar"=>1, "Variables"=>{"dont_touch"=>2})
-  end
-
-  # CloudWatch Event patterns have slightly different casing
-  it "dasherize anything under EventPattern at the top level" do
-    h = {foo_bar: 1, event_pattern: {dash_me: 2}}
-    result = camelizer.transform(h)
-    # pp result
-    expect(result).to eq("FooBar"=>1, "EventPattern"=>{"dash-me"=>2})
-  end
-
-  it "camelize anything under EventPattern at any level beyond the top level" do
-    h = {foo_bar: 1, event_pattern: {dash_me: {camelize_me: 3}}}
-    result = camelizer.transform(h)
-    # pp result
-    expect(result).to eq("FooBar"=>1, "EventPattern"=>{"dash-me"=>{"camelizeMe"=>3}})
-  end
-
-  it "dont touch anything under ResponseParameters" do
-    h = {foo_bar: 1, response_parameters: {dont_touch: 3}}
-    result = camelizer.transform(h)
-    # pp result
-    expect(result).to eq("FooBar"=>1, "ResponseParameters"=>{"dont_touch"=>3})
-  end
-
-  it "dont touch anything with - or /" do
-    h = {foo_bar: 1, "has-dash": 2, "has/slash": 3,"application/json":4}
-    result = camelizer.transform(h)
-    # pp result
-    expect(result).to eq("FooBar"=>1, "has-dash"=>2,"has/slash"=>3,"application/json"=>4)
-  end
-
-  it "special map keys cloudformation stack" do
-    h = {type: "AWS::CloudFormation::Stack", properties: {template_url: 1}}
-    result = camelizer.transform(h)
-    # pp result
-    expect(result).to eq({"Type" => "AWS::CloudFormation::Stack", "Properties" => {"TemplateURL"=>1}})
-  end
-
-  it "special map keys cloudformation stack" do
-    h = {type: "AWS::Route53::RecordSet", properties: {ttl: 60}}
-    result = camelizer.transform(h)
-    # pp result
-    expect(result).to eq({"Type" => "AWS::Route53::RecordSet", "Properties" => {"TTL"=>60}})
-  end
-
-  it "role_arn property under AWS::Events::Rule type maintains normal RoleArn camelization" do
-    h = {
-      events_rule: {
-        type: "AWS::Events::Rule",
-        properties: {
-          role_arn: "some.arn"
-        }
-      }
-    }
-    result = camelizer.transform(h)
-    # pp result
-    expect(result).to eq({"EventsRule"=>{"Type"=>"AWS::Events::Rule", "Properties"=>{"RoleArn"=>"some.arn"}}})
-  end
-end

data/vendor/cfn_camelizer/spec/spec_helper.rb

@@ -1,14 +0,0 @@
-require "bundler/setup"
-require "cfn_camelizer"
-
-RSpec.configure do |config|
-  # Enable flags like --only-failures and --next-failure
-  config.example_status_persistence_file_path = ".rspec_status"
-
-  # Disable RSpec exposing methods globally on `Module` and `main`
-  config.disable_monkey_patching!
-
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-end