forger 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6a2c42b3903e698ada5e5ea866c96132f5de9013ab48e6a3ebab3164ef376a2
-  data.tar.gz: 8aee63e946e05d816eb6978d9ce3b504a50f8ae413287d181d2cf05717020078
+  metadata.gz: 7fc8c6d76b747fc55f5fc08740f4c43807f7d9d2a7a74da43f6bdd5814179e5c
+  data.tar.gz: dbb1fb1fdd04a2e2ae227ae9313aa2f8f361aeff7b2f7f361a155b38e83020d6
 SHA512:
-  metadata.gz: 3c8acac50ce6b424cb2dfe29069cb92b774903b8ff6d7eb07ab043a98c82ad916d8f610841f9ad1ecd18b39829903d259221f588b726bc8d80d867a9e81f80f0
-  data.tar.gz: 90bfbe3f61a0f05a0ac893b0250678204b25c0be844ef300f2c2d0be3df849512beac1708729fe857c4b7382310922d8e4d3c7730c73f52e201d370949a55efa
+  metadata.gz: d2c4fd91ba29783675f06bbcb7b07955ba9ecfeca86cbf5d8f87de71cdb328567191d6cb9c03703c202078c848827c99f89008ac897916456f91f6375802e2c5
+  data.tar.gz: a2a01d68a8e4f53774bc6a977de6e13145e057a0e34047e115586ad7799e5bf7cbd05110c63df1690728b524074c7b0f0fac5aa2f501670b79f4beb5fc096c42

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 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.
 
+## [3.0.1]
+- edge case when reserverations not immediately found yet
+- fix `sync_scripts_to_s3` with clean slate no forger bucket created yet
+- simplify app/scripts upload s3 bucket logic
+
 ## [3.0.0]
 * there are some breaking changes with this release
 * automatically created a forger managed s3 bucket when extract_scripts usage detected

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    forger (2.0.5)
+    forger (3.0.0)
       activesupport
       aws-sdk-cloudformation
       aws-sdk-ec2

data/lib/forger/create.rb

@@ -8,8 +8,8 @@ module Forger
 
     def run
       Profile.new(@options).check!
-
       Hook.run(:before_run_instances, @options)
+
       sync_scripts_to_s3
 
       puts "Creating EC2 instance #{@name.color(:green)}"
@@ -19,6 +19,7 @@ module Forger
         puts "NOOP mode enabled. EC2 instance not created."
         return
       end
+
       resp = run_instances(params)
 
       instance_id = resp.instances.first.instance_id
@@ -38,7 +39,6 @@ module Forger
 
     def sync_scripts_to_s3
       upload = Script::Upload.new(@options)
-      return if upload.empty?
       upload.run
     end
 

data/lib/forger/create/info.rb

@@ -34,6 +34,7 @@ class Forger::Create
       reservation = resp.reservations.first
       # Super edge case when reserverations not immediately found yet
       until reservation
+        resp = ec2.describe_instances(instance_ids: [instance_id])
         reservation = resp.reservations.first
         seconds = 0.5
         puts "Reserveration not found. Sleeping for #{seconds} and will try again."
@@ -45,13 +46,6 @@ class Forger::Create
       puts "Spot instance request id: #{spot_id}"
     end
 
-    def monthly_spot_price
-      max_price = @params[:instance_market_options][:spot_options][:max_price].to_f
-      monthly_price = max_price * 24 * 30
-      "%.2f" % monthly_price
-    rescue
-    end
-
     def launch_template
       launch_template = params[:launch_template]
       return unless launch_template

data/lib/forger/script/upload.rb

@@ -14,8 +14,9 @@ class Forger::Script
     end
 
     def run
-      compiler.compile_scripts if @compile
+      return if empty?
       ensure_bucket_exists
+      compiler.compile_scripts if @compile
       compressor.compress
       upload(tarball_path)
       compressor.clean
@@ -23,7 +24,7 @@ class Forger::Script
     end
 
     def ensure_bucket_exists
-      Forger::S3::Bucket.ensure_exists! if Forger::Template::Helper.extract_scripts_registered?
+      Forger::S3::Bucket.ensure_exists!
     end
 
     def upload(tarball_path)

data/lib/forger/template/helper.rb

@@ -8,10 +8,5 @@ module Forger::Template
     include ScriptHelper
     include SshKeyHelper
     extend self
-
-    @@extract_scripts_registered = false
-    def extract_scripts_registered?
-      @@extract_scripts_registered
-    end
   end
 end

data/lib/forger/template/helper/script_helper.rb

@@ -1,8 +1,6 @@
 module Forger::Template::Helper::ScriptHelper
   # Bash code that is meant to included in user-data
   def extract_scripts(options={})
-    @@extract_scripts_registered = true
-
     settings_options = settings["extract_scripts"] || {}
     options = settings_options.merge(options)
     # defaults also here in case they are removed from settings

data/lib/forger/version.rb

@@ -1,3 +1,3 @@
 module Forger
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forger
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-01 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport