funktor 0.2.19 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 215509407881bb7d177a5b1e917211f9e5adf3a1784109ffbd4fb63fcb9ec433
-  data.tar.gz: b4db3877393474e0f510e18b9460e2a1a96400379dc60ed23be546f6884e3c59
+  metadata.gz: 5dad52e1f8c07a2cf42ec9029920e80cc4152870a0fc863c35ad8015dfe5eac1
+  data.tar.gz: a22bbf4322188071bb1290f4d189f2fb3c6f80fe2ec6a8fe8c8e150887808007
 SHA512:
-  metadata.gz: ae3a977afab0505ead85b4d22c971cf51ed778a2a4964999990a5c2d74c2adc98d3a92dad19c3a4ea1e9dcf21e0e149d7da44e73ea6aea26c504687f1fa39b95
-  data.tar.gz: 86372b3097334bf619a3b23ad639c5e73b669b129899f9697b705010de37528ba0145dca7d15cee0d02183e8477a3e87ca38ceedb15027cb9a9e6c1f13b8b573
+  metadata.gz: 669ee84b2d8e0261886484e365631eaea64ea7a8bb3c3528fce1edebdfa2bb4da61be55e64346a3a4f3b4f7eb5c4dbaebc0ce622a81ae887dc056effa983caa4
+  data.tar.gz: d5ef08ff4ca811a24131fc16fb38dffb8f0ddb9ff777d96408bd0ab9c4c6d498a9d430cee8af2feba6cad38090a26f952480ead4e16a7336095fe21e28fedc31

data/lib/funktor/cli/bootstrap.rb

@@ -9,6 +9,10 @@ module Funktor
         :type => :string, :desc => "The bootstrap file to generate.",
         :default => "funktor_init.yml"
 
+      class_option :directory, :aliases => "-d",
+        :type => :string, :desc => "The directory in which to place the bootstrap file.",
+        :default => nil
+
       desc <<~DESC
         Description:
           Bootstrap a new funktor application by generating a funktor_init.yml file."
@@ -26,7 +30,11 @@ module Funktor
 
       private
       def funktor_file_target
-        File.join name, options[:file]
+        File.join funktor_directory_target, options[:file]
+      end
+
+      def funktor_directory_target
+        options[:directory] || name
       end
 
     end

data/lib/funktor/cli/init.rb

@@ -32,11 +32,11 @@ module Funktor
 
       def funktor_config_yml
         #template "funktor_config.yml", File.join("funktor_config.yml")
-        template File.join("config", "funktor.yml"), File.join("config", "funktor.yml")
-        template File.join("config", "ruby_layer.yml"), File.join("config", "ruby_layer.yml")
-        template File.join("config", "package.yml"), File.join("config", "package.yml")
-        template File.join("config", "environment.yml"), File.join("config", "environment.yml")
-        template File.join("config", "boot.rb"), File.join("config", "boot.rb")
+        template File.join("funktor_config", "funktor.yml"), File.join("funktor_config", "funktor.yml")
+        template File.join("funktor_config", "ruby_layer.yml"), File.join("funktor_config", "ruby_layer.yml")
+        template File.join("funktor_config", "package.yml"), File.join("funktor_config", "package.yml")
+        template File.join("funktor_config", "environment.yml"), File.join("funktor_config", "environment.yml")
+        template File.join("funktor_config", "boot.rb"), File.join("funktor_config", "boot.rb")
       end
 
       def package_json
@@ -56,33 +56,33 @@ module Funktor
       end
 
       def resources
-        template File.join("config", "resources", "incoming_job_queue.yml"), File.join("config", "resources", "incoming_job_queue.yml")
-        template File.join("config", "resources", "incoming_job_queue_user.yml"), File.join("config", "resources", "incoming_job_queue_user.yml")
+        template File.join("funktor_config", "resources", "incoming_job_queue.yml"), File.join("funktor_config", "resources", "incoming_job_queue.yml")
+        template File.join("funktor_config", "resources", "incoming_job_queue_user.yml"), File.join("funktor_config", "resources", "incoming_job_queue_user.yml")
         # TODO - Figure out how to make the dashboard aware of various queues...
-        template File.join("config", "resources", "cloudwatch_dashboard.yml"), File.join("config", "resources", "cloudwatch_dashboard.yml")
+        template File.join("funktor_config", "resources", "cloudwatch_dashboard.yml"), File.join("funktor_config", "resources", "cloudwatch_dashboard.yml")
         queues.each do |queue_details|
           @work_queue_name = queue_details.keys.first
           @work_queue_config = queue_details.values.first
-          template File.join("config", "resources", "work_queue.yml"), File.join("config", "resources", "#{work_queue_name.underscore}_queue.yml")
+          template File.join("funktor_config", "resources", "work_queue.yml"), File.join("funktor_config", "resources", "#{work_queue_name.underscore}_queue.yml")
         end
       end
 
       def iam_permissions
-        template File.join("config", "iam_permissions", "ssm.yml"), File.join("config", "iam_permissions", "ssm.yml")
-        template File.join("config", "iam_permissions", "incoming_job_queue.yml"), File.join("config", "iam_permissions", "incoming_job_queue.yml")
+        template File.join("funktor_config", "iam_permissions", "ssm.yml"), File.join("funktor_config", "iam_permissions", "ssm.yml")
+        template File.join("funktor_config", "iam_permissions", "incoming_job_queue.yml"), File.join("funktor_config", "iam_permissions", "incoming_job_queue.yml")
         queues.each do |queue_details|
           @work_queue_name = queue_details.keys.first
           @work_queue_config = queue_details.values.first
-          template File.join("config", "iam_permissions", "work_queue.yml"), File.join("config", "iam_permissions", "#{work_queue_name.underscore}_queue.yml")
+          template File.join("funktor_config", "iam_permissions", "work_queue.yml"), File.join("funktor_config", "iam_permissions", "#{work_queue_name.underscore}_queue.yml")
         end
       end
 
       def function_definitions
-        template File.join("config", "function_definitions", "incoming_job_handler.yml"), File.join("config", "function_definitions", "incoming_job_handler.yml")
+        template File.join("funktor_config", "function_definitions", "incoming_job_handler.yml"), File.join("funktor_config", "function_definitions", "incoming_job_handler.yml")
         queues.each do |queue_details|
           @work_queue_name = queue_details.keys.first
           @work_queue_config = queue_details.values.first
-          template File.join("config", "function_definitions", "work_queue_handler.yml"), File.join("config", "function_definitions", "#{work_queue_name.underscore}_queue_handler.yml")
+          template File.join("funktor_config", "function_definitions", "work_queue_handler.yml"), File.join("funktor_config", "function_definitions", "#{work_queue_name.underscore}_queue_handler.yml")
         end
       end
 

data/lib/funktor/cli/templates/{config → funktor_config}/package.yml

@@ -3,7 +3,7 @@ individually: false
 include:
   - Gemfile
   - Gemfile.lock
-  - config/boot.rb
+  - funktor_config/boot.rb
   - app/**
 # Evertyting is excluded by default with serverless-ruby-layer, but you could use
 # the lines below to exlude files that are inside an include path.

data/lib/funktor/cli/templates/funktor_init.yml.tt

@@ -66,4 +66,4 @@ package:
     - Gemfile
     - Gemfile.lock
     - app/**
-    - config/**
+    - funktor_config/**

data/lib/funktor/cli/templates/lambda_event_handlers/incoming_job_handler.rb

@@ -1,7 +1,4 @@
-# For this handler we don't need to know about your app, or any of the other gems,
-# so instead of doing `require_relative '../config/boog'` we just manually require
-# the one gem that we do need.
-require 'funktor'
+require_relative '../funktor_config/boot'
 
 $handler = Funktor::IncomingJobHandler.new
 

data/lib/funktor/cli/templates/lambda_event_handlers/work_queue_handler.rb

@@ -1,4 +1,4 @@
-require_relative '../config/boot'
+require_relative '../funktor_config/boot'
 
 $handler = Funktor::ActiveJobHandler.new
 

data/lib/funktor/cli/templates/serverless.yml

@@ -24,7 +24,7 @@ provider:
   name: aws
   runtime: <%= runtime %>
   lambdaHashingVersion: 20201221
-  environment: ${file(config/environment.yml)}
+  environment: ${file(funktor_config/environment.yml)}
   versionFunctions: false # Reduces the amount of storage used since all Lambdas together are limited to 75GB
   iamRoleStatements:
     <%- all_iam_permissions.each do |iam_permission| -%>
@@ -36,10 +36,10 @@ custom:
   # Our stage is based on what is passed in when running serverless
   # commands. Or fallsback to what we have set in the provider section.
   stage: ${self:provider.stage, 'dev'}
-  funktor: ${file(config/funktor.yml)}
-  rubyLayer: ${file(config/ruby_layer.yml)}
+  funktor: ${file(funktor_config/funktor.yml)}
+  rubyLayer: ${file(funktor_config/ruby_layer.yml)}
 
-package: ${file(config/package.yml)}
+package: ${file(funktor_config/package.yml)}
 
 functions:
   <%- all_function_definitions.each do |function_definition| -%>

data/lib/funktor/version.rb

@@ -1,3 +1,3 @@
 module Funktor
-  VERSION = "0.2.19"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funktor
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.3.0
 platform: ruby
 authors:
 - Jeremy Green
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
@@ -116,20 +116,20 @@ files:
 - lib/funktor/cli/init.rb
 - lib/funktor/cli/templates/Gemfile
 - lib/funktor/cli/templates/app/workers/hello_worker.rb
-- lib/funktor/cli/templates/config/boot.rb
-- lib/funktor/cli/templates/config/environment.yml
-- lib/funktor/cli/templates/config/function_definitions/incoming_job_handler.yml
-- lib/funktor/cli/templates/config/function_definitions/work_queue_handler.yml
-- lib/funktor/cli/templates/config/funktor.yml
-- lib/funktor/cli/templates/config/iam_permissions/incoming_job_queue.yml
-- lib/funktor/cli/templates/config/iam_permissions/ssm.yml
-- lib/funktor/cli/templates/config/iam_permissions/work_queue.yml
-- lib/funktor/cli/templates/config/package.yml
-- lib/funktor/cli/templates/config/resources/cloudwatch_dashboard.yml
-- lib/funktor/cli/templates/config/resources/incoming_job_queue.yml
-- lib/funktor/cli/templates/config/resources/incoming_job_queue_user.yml
-- lib/funktor/cli/templates/config/resources/work_queue.yml
-- lib/funktor/cli/templates/config/ruby_layer.yml
+- lib/funktor/cli/templates/funktor_config/boot.rb
+- lib/funktor/cli/templates/funktor_config/environment.yml
+- lib/funktor/cli/templates/funktor_config/function_definitions/incoming_job_handler.yml
+- lib/funktor/cli/templates/funktor_config/function_definitions/work_queue_handler.yml
+- lib/funktor/cli/templates/funktor_config/funktor.yml
+- lib/funktor/cli/templates/funktor_config/iam_permissions/incoming_job_queue.yml
+- lib/funktor/cli/templates/funktor_config/iam_permissions/ssm.yml
+- lib/funktor/cli/templates/funktor_config/iam_permissions/work_queue.yml
+- lib/funktor/cli/templates/funktor_config/package.yml
+- lib/funktor/cli/templates/funktor_config/resources/cloudwatch_dashboard.yml
+- lib/funktor/cli/templates/funktor_config/resources/incoming_job_queue.yml
+- lib/funktor/cli/templates/funktor_config/resources/incoming_job_queue_user.yml
+- lib/funktor/cli/templates/funktor_config/resources/work_queue.yml
+- lib/funktor/cli/templates/funktor_config/ruby_layer.yml
 - lib/funktor/cli/templates/funktor_init.yml.tt
 - lib/funktor/cli/templates/gitignore
 - lib/funktor/cli/templates/lambda_event_handlers/incoming_job_handler.rb
@@ -168,7 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubyforge_project:
+rubygems_version: 2.7.6.3
 signing_key:
 specification_version: 4
 summary: Background processing in AWS Lambda.