modulator 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47cf37130795f8925c365ee1e43cd8bf46b07687408528c9b442fe17be44e4c8
-  data.tar.gz: 6f5ef13b185c9f9a03fb3251a3a75f5a855794e166ad2f27022987512c3e76f9
+  metadata.gz: cf9eda6c7aeb7daf8526aac0767993dc35471f65256855aa85b5d4c6c56a686c
+  data.tar.gz: 3ae5a06f601fd8322d62e598d2ea635ca94e81fa3376872a955807a2dfc819d1
 SHA512:
-  metadata.gz: bbb43e73d5d19ebe9eb8a656c5c9900a35b725b0addf9e5571b17f2c168b2e4ad7b008a7b3d17cdcb38f45abd487d9a922b86c874f8f59e56d8509bcb676ce00
-  data.tar.gz: 687c197af7a07504717faf13488bf546edeb1fcd08dc5af79ae3531a91f9b2929404eefae9a4dcb02298977aef7a80bffe9cb756f23f1c719abc3e7a0d374fda
+  metadata.gz: 0a825922fc2856960261470b9c026354c8d0e22a673e0cf67e3ad4d86315f26946f869f5b46acb3b0e21860a3ac0a86d218561fe7934affe9fe98417f5cc7bea
+  data.tar.gz: '0348230bb3c640c875af29374d06f0ed15c90daa36851679d773df46911b9034a84c9278035a0c96cea85bcb8bcc8b713ef98de4c1a7239b4056f24cf8771b21'

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+.DS_Store
 
 # rspec failure tracking
 .rspec_status

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    modulator (0.2.0)
+    modulator (0.2.1)
       aws-sdk-cloudformation
       aws-sdk-s3
       puma
@@ -19,11 +19,11 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.0.3)
-    aws-partitions (1.155.0)
+    aws-partitions (1.156.0)
     aws-sdk-cloudformation (1.19.0)
       aws-sdk-core (~> 3, >= 3.48.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.48.6)
+    aws-sdk-core (3.49.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.1)

data/lib/modulator/lambda/aws_stack_builder.rb

@@ -9,7 +9,8 @@ module AwsStackBuilder
   LAMBDA_HANDLER_FILE_NAME = 'lambda-handler'
 
   class << self
-    attr_accessor :app_name, :stack, :api_gateway_deployment, :gateway_id, :app_path, :app_dir, :bucket, :stack_opts
+    attr_accessor :app_name, :stack, :api_gateway_deployment, :gateway_id
+    attr_accessor :app_path, :app_dir, :hidden_dir, :bucket, :stack_opts
   end
 
   def init(app_name:, bucket:, **stack_opts)
@@ -18,6 +19,7 @@ module AwsStackBuilder
     @bucket     = bucket
     @app_path   = Pathname.getwd
     @app_dir    = app_path.basename.to_s
+    @hidden_dir = '.modulator'
     @stack_opts = stack_opts
     @stack      = Humidifier::Stack.new(name: @app_name, aws_template_format_version: '2010-09-09')
 
@@ -35,7 +37,7 @@ module AwsStackBuilder
   def upload_files
     upload_lambda_handler
     puts 'Generating layers'
-    app_path.join('.modulator').mkpath
+    app_path.join(hidden_dir).mkpath
     upload_gems_layer
     upload_app_layer
   end

data/lib/modulator/lambda/aws_stack_uploader.rb

@@ -11,9 +11,7 @@ module AwsStackBuilder
     bucket_name = Humidifier.ref("S3Bucket").reference
     lambda_handler_key = LAMBDA_HANDLER_FILE_NAME + '.rb.zip'
     source = <<~SOURCE
-      # see handler AwsApiGatewayEventHandler.call(event: event, context: context) in required file
       require 'modulator/lambda/aws_lambda_handler'
-      Dir.chdir('/opt/ruby/lib/' + ENV['app_dir'])
     SOURCE
 
     existing_handler = S3Client.get_object(
@@ -47,13 +45,13 @@ module AwsStackBuilder
     end
 
     # calculate Gemfile checksum
-    checksum_path = app_path.join('.modulator/gemfile_checksum')
+    checksum_path = app_path.join(hidden_dir, 'gemfile_checksum')
     old_checksum  = (checksum_path.read rescue nil)
     new_checksum  = Digest::MD5.hexdigest(File.read(app_path.join('Gemfile.lock')))
 
     zip_file_name = app_dir + '_gems.zip'
-    gems_path = app_path.join('.modulator/gems')
-    gems_zip_path = gems_path.parent.join(zip_file_name)
+    gems_path = app_path.join(hidden_dir, 'gems')
+    gems_zip_path = app_path.join(hidden_dir, zip_file_name)
 
     if old_checksum != new_checksum
       puts '- uploading gems layer'
@@ -62,7 +60,7 @@ module AwsStackBuilder
       # bundle gems
       Bundler.with_clean_env do
         Dir.chdir(app_path) do
-          `bundle install --path=./.modulator/gems --clean`
+          `bundle install --path=./#{hidden_dir}/gems --clean`
         end
       end
       ZipFileGenerator.new(gems_path, gems_zip_path).write
@@ -90,19 +88,25 @@ module AwsStackBuilder
   end
 
   def upload_app_layer
-    wd = Pathname.getwd
     zip_file_name = app_dir + '.zip'
-    app_zip_path  = wd.join(zip_file_name)
+    app_zip_path  = app_path.join(hidden_dir, zip_file_name)
+
+    # copy app code to ruby/lib in use outside temp dir
+    temp_dir_name = '.modulator_temp'
+    ruby_lib_dirs = 'ruby/lib'
+    temp_path     = app_path.parent.join(temp_dir_name)
+    temp_path.join(ruby_lib_dirs).mkpath
+    FileUtils.copy_entry app_path, temp_path.join(ruby_lib_dirs)
 
     # calculate checksum for app folder
-    checksum_path = app_path.join('.modulator/app_checksum')
+    checksum_path = app_path.join(hidden_dir, 'app_checksum')
     old_checksum  = (checksum_path.read rescue nil)
     new_checksum  = checksum(app_path)
 
     if old_checksum != new_checksum
       puts '- uploading app layer'
       checksum_path.write(new_checksum)
-      ZipFileGenerator.new(app_path, app_zip_path).write
+      ZipFileGenerator.new(temp_path, app_zip_path).write
       # upload zipped file
       app_layer = S3Client.put_object(
         bucket: bucket,
@@ -116,6 +120,9 @@ module AwsStackBuilder
       app_layer = S3Client.get_object(bucket: bucket, key: zip_file_name)
     end
 
+    # delete temp dir
+    FileUtils.remove_dir(temp_path)
+
     add_layer(
       name: app_name,
       description: "App source. MD5: #{new_checksum}",

data/lib/modulator/version.rb

@@ -1,3 +1,3 @@
 module Modulator
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Damir Roso
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2019-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler