jets 1.8.6 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1363b9c561ffcb14e1c83b917eb1eed1fbaf4cf19c6a1a7d2346c7352a87c079
-  data.tar.gz: 7b1de276009c38da3e0fb2b684b231726aa2d268ba9e0e8c8452f402cfa38a69
+  metadata.gz: '0431191b2ee4bd922dfbb1d04ded0d27c80b9d7f5fbe5b8ed0d82fb818805f06'
+  data.tar.gz: 7be272e9d21a1d65d0bfe1cbcce921f8492f37af1763fb183e06909f17cb830a
 SHA512:
-  metadata.gz: 477e804b7ef7079d6a8d2ccc0dbcf47cd674b4c031ab66ba16378a84a796435e708ec39fdf5407f4a95459bb4611096b10a58db55a15c33d1e23545da20cc59a
-  data.tar.gz: b053eb4f120db2dd750bb63fcb87914fb873a372c6157d85cf4aa6cb60949c65f14aee4a473ae85e2dd3f89f9b6cf44d852836558d3027b0b7df400029b9f610
+  metadata.gz: 3e57ef81615d661a25d12e0503fd77b5622cdf2f78c837835aefdb6e26a261882b29b4b8c6226c1ede13561680986064a91dbe3ccb18c4df895ab30d5448acf0
+  data.tar.gz: a67756c55f8c52ff1f90279da7ed9dc156f5dbba676c5139b7c951aa5dde01a77c61fc576f85fa60ad8be24658e405d162105cc98f4a0a5dfff89c9ca47f8167

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [1.8.7]
+- #204 from CodingAnarchy/boot-missing-env
+- #205 rename to rule_event
+- add ref helper method
+- deprecate: events_rule and event_pattern
+
 ## [1.8.6]
 - #202 fix on_aws detection when using cloud9 hostname. Fixes #201
 - user friendly error message when s3 bucket name has already been taken

data/README.md

@@ -11,7 +11,7 @@ Ruby and Lambda splat out a baby and that child's name is [Jets](http://rubyonje
 
 **Upgrading**: If you are upgrading Jets, please check on the [Upgrading Notes](http://rubyonjets.com/docs/upgrading/).
 
-## What is Jets?
+## What is Ruby on Jets?
 
 Jets is a Ruby Serverless Framework.  Jets allows you to create serverless applications with a beautiful language: Ruby.  It includes everything required to build an application and deploy it to AWS Lambda.
 

data/lib/jets/booter.rb

@@ -112,7 +112,7 @@ class Jets::Booter
       ActiveRecord::Tasks::DatabaseTasks.database_configuration = db_configs
 
       current_config = db_configs[Jets.env]
-      if current_config.empty?
+      if current_config.blank?
         abort("ERROR: config/database.yml exists but no environment section configured for #{Jets.env}")
       end
       # Using ActiveRecord rake tasks outside of Rails, so we need to set up the

data/lib/jets/job/dsl.rb

@@ -1,3 +1,6 @@
+require 'active_support'
+require 'active_support/core_ext/class'
+
 # Jets::Job::Base < Jets::Lambda::Functions
 # Both Jets::Job::Base and Jets::Lambda::Functions have Dsl modules included.
 # So the Jets::Job::Dsl overrides some of the Jets::Lambda::Functions behavior.
@@ -8,12 +11,12 @@
 #
 module Jets::Job::Dsl
   extend ActiveSupport::Concern
-  autoload :CloudwatchEvent, "jets/job/dsl/cloudwatch_event"
   autoload :DynamodbEvent, "jets/job/dsl/dynamodb_event"
   autoload :EventSourceMapping, "jets/job/dsl/event_source_mapping" # base for sqs_event, etc
   autoload :IotEvent, "jets/job/dsl/iot_event"
   autoload :KinesisEvent, "jets/job/dsl/kinesis_event"
   autoload :LogEvent, "jets/job/dsl/log_event"
+  autoload :RuleEvent, "jets/job/dsl/rule_event"
   autoload :S3Event, "jets/job/dsl/s3_event"
   autoload :SnsEvent, "jets/job/dsl/sns_event"
   autoload :SqsEvent, "jets/job/dsl/sqs_event"
@@ -22,29 +25,25 @@ module Jets::Job::Dsl
     class << self
       include Jets::AwsServices
 
-      include CloudwatchEvent
       include DynamodbEvent
       include EventSourceMapping
       include IotEvent
       include KinesisEvent
       include LogEvent
+      include RuleEvent
       include S3Event
       include SnsEvent
       include SqsEvent
 
-      # Need to be in here
-      ASSOCIATED_PROPERTIES = %W[
-        description
-        state
-        schedule_expression
-      ]
-      define_associated_properties(ASSOCIATED_PROPERTIES)
-      alias_method :desc, :description
+      # Used to provide a little more identifiable event rule auto-descriptions
+      class_attribute :rule_counter
+      self.rule_counter = 0
 
+      # TODO: Get rid of default_associated_resource_definition concept.
+      # Also gets rid of the need to keep track of running @associated_properties too.
       def default_associated_resource_definition(meth)
         events_rule_definition
       end
-
     end
   end
 end

data/lib/jets/job/dsl/rule_event.rb

@@ -0,0 +1,75 @@
+module Jets::Job::Dsl
+  module RuleEvent
+    # Public: Creates CloudWatch Event Rule
+    #
+    # expression - The rate expression.
+    #
+    # Examples
+    #
+    #   rate("10 minutes")
+    #   rate("10 minutes", description: "Hard job")
+    #
+    def rate(expression, props={})
+      schedule_job("rate(#{expression})", props)
+    end
+
+    # Public: Creates CloudWatch Event Rule
+    #
+    # expression - The cron expression.
+    #
+    # Examples
+    #
+    #   cron("0 */12 * * ? *")
+    #   cron("0 */12 * * ? *", description: "Hard job")
+    #
+    def cron(expression, props={})
+      schedule_job("cron(#{expression})", props)
+    end
+
+    def schedule_job(expression, props={})
+      props = props.merge(schedule_expression: expression)
+      rule_event(props)
+    end
+
+    def rule_event(props={})
+      if props.key?(:detail)
+        description = props.key?(:description) ? props.delete(:description) : rule_description
+        rule_props = { event_pattern: props, description: description }
+      else # if props.key?(:event_pattern)
+        props[:description] ||= rule_description
+        rule_props = props
+      end
+
+      with_fresh_properties(multiple_resources: false) do
+        associated_properties(rule_props) # TODO: consider getting rid of @associated_properties concept
+        resource(events_rule_definition) # add associated resource immediately
+      end
+    end
+
+    def rule_description
+      self.rule_counter += 1
+      "#{self.name} event rule #{rule_counter}"
+    end
+
+    def events_rule_definition
+      resource = Jets::Resource::Events::Rule.new(associated_properties)
+      resource.definition # returns a definition to be added by associated_resources
+    end
+
+    # Deprecated methods, will be removed in the future
+    def events_rule(props)
+      puts "DEPRECATED: events_rule. Instead use rule_event. The events_rule will be removed in the future.  Pausing for 5 seconds".color(:yellow)
+      puts caller[0]
+      sleep 5
+      rule_event(props)
+    end
+    # Deprecated methods, will be removed in the future
+
+    def event_pattern(props)
+      puts "DEPRECATED: events_rule. Instead use rule_event. The events_rule will be removed in the future.  Pausing for 5 seconds".color(:yellow)
+      puts caller[0]
+      sleep 5
+      rule_event(props)
+    end
+  end
+end

data/lib/jets/lambda/dsl.rb

@@ -232,6 +232,10 @@ module Jets::Lambda::Dsl
         end
       end
 
+      def ref(name)
+        "!Ref #{name.to_s.camelize}"
+      end
+
       # meth is a Symbol
       def method_added(meth)
         return if %w[initialize method_missing].include?(meth.to_s)

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.8.6"
+  VERSION = "1.8.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.7
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-17 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -701,12 +701,12 @@ files:
 - lib/jets/job.rb
 - lib/jets/job/base.rb
 - lib/jets/job/dsl.rb
-- lib/jets/job/dsl/cloudwatch_event.rb
 - lib/jets/job/dsl/dynamodb_event.rb
 - lib/jets/job/dsl/event_source_mapping.rb
 - lib/jets/job/dsl/iot_event.rb
 - lib/jets/job/dsl/kinesis_event.rb
 - lib/jets/job/dsl/log_event.rb
+- lib/jets/job/dsl/rule_event.rb
 - lib/jets/job/dsl/s3_event.rb
 - lib/jets/job/dsl/sns_event.rb
 - lib/jets/job/dsl/sqs_event.rb

data/lib/jets/job/dsl/cloudwatch_event.rb

@@ -1,81 +0,0 @@
-module Jets::Job::Dsl
-  module CloudwatchEvent
-    # Public: Creates CloudWatch Event Rule
-    #
-    # expression - The rate expression.
-    #
-    # Examples
-    #
-    #   rate("10 minutes")
-    #   rate("10 minutes", description: "Hard job")
-    #
-    def rate(expression, props={})
-      schedule_job("rate(#{expression})", props)
-    end
-
-    # Public: Creates CloudWatch Event Rule
-    #
-    # expression - The cron expression.
-    #
-    # Examples
-    #
-    #   cron("0 */12 * * ? *")
-    #   cron("0 */12 * * ? *", description: "Hard job")
-    #
-    def cron(expression, props={})
-      schedule_job("cron(#{expression})", props)
-    end
-
-    def schedule_job(expression, props={})
-      with_fresh_properties(multiple_resources: false) do
-        props = props.merge(schedule_expression: expression)
-        associated_properties(props)
-        resource(events_rule_definition) # add associated resource immediately
-      end
-    end
-
-    def event_pattern(details={}, props={})
-      with_fresh_properties(multiple_resources: false) do
-        props = props.merge(event_pattern: details)
-        associated_properties(props)
-        resource(events_rule_definition) # add associated resource immediately
-      end
-      add_descriptions # useful: generic description in the Event Rule console
-    end
-
-    def events_rule(props={})
-      with_fresh_properties(multiple_resources: false) do
-        associated_properties(props)
-        resource(events_rule_definition) # add associated resource immediately
-      end
-    end
-
-    # Works with eager definitions
-    def add_descriptions
-      numbered_resources = []
-      n = 1
-      @associated_resources.map do |associated|
-        # definition = associated.definition
-        # puts "associated #{associated.inspect}"
-        # puts "definition #{definition.inspect}"
-
-        # logical_id = definition.keys.first
-        # attributes = definition.values.first
-
-        logical_id = associated.logical_id
-        attributes = associated.attributes
-
-        attributes[:properties][:description] ||= "#{self.name} Event Rule #{n}"
-        new_definition = { "#{logical_id}" => attributes }
-        numbered_resources << Jets::Resource::Associated.new(new_definition)
-        n += 1
-      end
-      @associated_resources = numbered_resources
-    end
-
-    def events_rule_definition
-      resource = Jets::Resource::Events::Rule.new(associated_properties)
-      resource.definition # returns a definition to be added by associated_resources
-    end
-  end
-end