aws_sam_yarn_builder 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2540ed6bbdd9bfff7222124da1b6feaecbe13e69
-  data.tar.gz: d88b69ef4644e2fd65cc671b08854dc5015f8504
+SHA256:
+  metadata.gz: 0e465237a62e0e25560d584c7bc3807fa1c61d9acf0f3380efd92d6073ab1ebc
+  data.tar.gz: 4aa8a1f1069a3092a74164715f9591b70dd893c7a72a80797ffe05848519b4c3
 SHA512:
-  metadata.gz: 593fd08c6c34ec550bf0c1899664eead38b61a20114ed2bb903a5ce580c32690fcb67a2a3f6be5f6f6b89b3928939d547b575a751534bdc30c8c585b7aa8745b
-  data.tar.gz: a6d0b424e36881e7a22a89342b87d2f4961ad2c178dccde5dee84d04f721be5b01a35c9bc3ab06d51e14a3fc6783738df58934f1166b417b3281085014a463bc
+  metadata.gz: e34e5afbbe6875a7ea6342d29549418cafdbd2d742a0fa772d5fa67acb022d6a08e7d64a02aeb0ec13ff5a7124ada0a60657b91dac2fd95381c72928fc88b205
+  data.tar.gz: 9f9bb5efe92648b4cefbc76c01d2f8645d6cf4b44eaa130762ffa2ad88c2daa23e67d4bf58594757afdf9b8826a3ddbfd33ac50b78477cd417d22c21d1144d43

data/Gemfile.lock

@@ -2,20 +2,20 @@ PATH
   remote: .
   specs:
     aws_sam_yarn_builder (0.1.4)
-      activesupport (~> 5.2.2)
+      activesupport (~> 5.2.0)
       slop (~> 4.6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     coderay (1.1.2)
-    concurrent-ruby (1.1.4)
-    i18n (1.4.0)
+    concurrent-ruby (1.1.5)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
     minitest (5.11.3)

data/aws_sam_yarn_builder.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 
   spec.add_dependency "slop", "~> 4.6.0"
-  spec.add_dependency "activesupport", "~> 5.2.2"
+  spec.add_dependency "activesupport", "~> 5.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/aws_sam_yarn_builder/build.rb

@@ -23,7 +23,7 @@ module AwsSamYarnBuilder
         package.build function.name, destination_dir, destination_staging_dir
       end
 
-      template.write_to_output(destination_dir)
+      template.write_to_output(destination_dir, template_base_dir)
 
       FileUtils.rm_rf(destination_staging_dir)
     end

data/lib/aws_sam_yarn_builder/template.rb

@@ -2,6 +2,19 @@ require "yaml"
 
 module AwsSamYarnBuilder
   class Template
+    String.class_eval do
+      def indent(count, char = " ")
+        gsub(/([^\n]*)(\n|$)/) do |match|
+          last_iteration = ($1 == "" && $2 == "")
+          line = ""
+          line << (char * count) unless last_iteration
+          line << $1
+          line << $2
+          line
+        end
+      end
+    end
+
     class FunctionResource
       def initialize(name, properties = {})
         self.name = name
@@ -29,9 +42,9 @@ module AwsSamYarnBuilder
       self.contents = contents
     end
 
-    def write_to_output(output)
+    def write_to_output(output, source_directory)
       File.open(File.join(output, "template.yaml"), "w+") do |file|
-        file << contents_with_transformed_function_paths
+        file << transformed_contents(source_directory)
       end
     end
 
@@ -51,8 +64,22 @@ module AwsSamYarnBuilder
       @document ||= YAML.load(contents)
     end
 
-    def contents_with_transformed_function_paths
-      contents.gsub(/CodeUri:\s*(.*)/) do |_|
+    def transformed_contents(source_directory)
+      contents_with_transformed_step_function_definitions(contents_with_transformed_function_paths(contents), source_directory)
+    end
+
+    def contents_with_transformed_step_function_definitions(c, source_directory)
+      c.gsub(/^(\s*)DefinitionUri:\s*(.*)/) do |_|
+        "#{$1}DefinitionString: !Sub |\n#{resolve_step_function_definition_string($2, source_directory).indent($1.length + 2)}"
+      end
+    end
+
+    def resolve_step_function_definition_string(definition_uri, source_directory)
+      File.read(File.expand_path(File.join(source_directory, definition_uri)))
+    end
+
+    def contents_with_transformed_function_paths(c)
+      c.gsub(/CodeUri:\s*(.*)/) do |_|
         "CodeUri: ./#{find_function_name_for_code_uri($1)}"
       end
     end

data/lib/aws_sam_yarn_builder/version.rb

@@ -1,3 +1,3 @@
 module AwsSamYarnBuilder
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_sam_yarn_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Eric Allam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A command line program to produce builds for aws-sam-cli for nodejs/yarn