forger 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 833f4ee033176e828f5a04b0fd2fce2544a335113156304db55d24c3b35f2427
-  data.tar.gz: e75cf80f65bead5108455185132b1a03de4ce5421349a0eb7c5bbd7c572afeba
+  metadata.gz: 6551f0c2a373f261855464a53423a8857597d5defde345906c85d6bad2bb9a25
+  data.tar.gz: b9e2d641ffd5ecb2c2c738f344457f5206a0b135b4651db524cbfccaf42ae594
 SHA512:
-  metadata.gz: 4114553f5e2cc98fd4d7dae6409652ad03fa16cf49f9c658974b164b8146233a974359f2466cdcb9da05b776580dc8243be87557173acd31f93ba0eedacf07de
-  data.tar.gz: 99905c00a84d3ae79e2155044e40024d98acbd684438f7a4f4597b298810d427b385026d3c326e281a97c63f239b778ea95366c22cc33e8b798a8c5fa376025d
+  metadata.gz: 1285b67f2407a48b432f8da375e32ec78bdad5b376ae3ddd5895d54700102df5a2f41a8fbe33cc989c32fb0e0af498ef4d0fe85f3b29209af75e2190d3bbb01f
+  data.tar.gz: 900c2a261d3db83789abdac6587b09b9ce57bb2cff977cebf48acf9e082934861d8844a9911893da5a498080c9b7dc09b5198fcc66e299d39c369ed1da742993

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.
 
+## [2.0.3]
+- fix noop option for s3 upload
+- remove -eux bash flags to quiet scripts
+
 ## [2.0.2]
 - Merge pull request #14 from tongueroo/fixes
 - allow cloudwatch support for amzn ami

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    forger (2.0.2)
+    forger (2.0.3)
       activesupport
       aws-sdk-ec2
       aws-sdk-s3
@@ -16,39 +16,39 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     aws-eventstream (1.0.1)
-    aws-partitions (1.106.0)
-    aws-sdk-core (3.35.0)
+    aws-partitions (1.123.0)
+    aws-sdk-core (3.44.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.54.0)
-      aws-sdk-core (~> 3, >= 3.26.0)
+    aws-sdk-ec2 (1.63.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-kms (1.11.0)
-      aws-sdk-core (~> 3, >= 3.26.0)
+    aws-sdk-kms (1.13.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.23.0)
-      aws-sdk-core (~> 3, >= 3.26.0)
+    aws-sdk-s3 (1.30.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.3)
     byebug (10.0.2)
     coderay (1.1.2)
     colorize (0.8.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.3)
     diff-lcs (1.3)
     dotenv (2.5.0)
     ffi (1.9.25)
     filesize (0.2.0)
     formatador (0.2.5)
-    guard (2.14.2)
+    guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -67,7 +67,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashie (3.6.0)
-    i18n (1.1.1)
+    i18n (1.2.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     listen (3.1.5)
@@ -76,16 +76,16 @@ GEM
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
     memoist (0.16.0)
-    method_source (0.9.0)
+    method_source (0.9.2)
     minitest (5.11.3)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rake (12.3.1)
+    rake (12.3.2)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -108,9 +108,9 @@ GEM
     rspec-support (3.8.0)
     ruby_dep (1.5.0)
     shellany (0.0.1)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.9)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
@@ -127,4 +127,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.16.3
+   1.17.1

data/docs/example/app/scripts/hello.sh

@@ -1,3 +1,3 @@
-#!/bin/bash -exu
+#!/bin/bash
 
 echo "hello world"

data/docs/example/app/user_data/bootstrap.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash
 
 export HOME=/root # user-data env runs in weird shell where user is root but HOME is not set
 

data/lib/forger/script/templates/ami_creation.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -eux
+#!/bin/bash
+
+set -e
 
 # Create AMI Bundle
 AMI_NAME="<%= @ami_name %>"
@@ -10,3 +12,5 @@ SOURCE_AMI_ID=$(wget -q -O - http://169.254.169.254/latest/meta-data/ami-id)
 echo "$SOURCE_AMI_ID" > /var/log/source-ami-id.txt
 mkdir -p /opt/forger/data
 aws ec2 create-image --name "$AMI_NAME" --instance-id "$INSTANCE_ID" --region "$REGION" > /opt/forger/data/ami-id.txt
+
+set +e

data/lib/forger/script/templates/auto_terminate.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -eux
+#!/bin/bash
+
+set -e
 
 /opt/forger/auto_terminate/setup.sh
 
@@ -9,3 +11,5 @@
 /opt/forger/auto_terminate.sh now # terminate immediately
   <% end -%>
 <% end -%>
+
+set +e

data/lib/forger/script/templates/auto_terminate_after_timeout.sh

@@ -1,5 +1,9 @@
-#!/bin/bash -eux
+#!/bin/bash
+
+set -e
 
 /opt/forger/auto_terminate/setup.sh
 
 /opt/forger/auto_terminate.sh after_timeout
+
+set +e

data/lib/forger/script/templates/cloudwatch.sh

@@ -1,3 +1,7 @@
-#!/bin/bash -eux
+#!/bin/bash
+
+set -e
 
 /opt/forger/cloudwatch.sh forger # forger will be the cloudwatch log group name
+
+set +e

data/lib/forger/script/templates/extract_forger_scripts.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -eux
+#!/bin/bash
 
 # extract forger happens very early and the top of the user data script.
 # Set the -e flag here to stop the script if there any errors.
@@ -70,3 +70,5 @@ function extract_forger_scripts() {
 }
 
 extract_forger_scripts
+
+set +e

data/lib/forger/script/upload.rb

@@ -22,14 +22,15 @@ class Forger::Script
     end
 
     def upload(tarball_path)
-      puts "Uploading scripts.tgz (#{filesize}) to #{s3_dest}".colorize(:green)
-      obj = s3_resource.bucket(bucket_name).object(key)
-      start_time = Time.now
       if @options[:noop]
         puts "NOOP: Not uploading file to s3"
-      else
-        upload_to_s3(obj, tarball_path)
+        return
       end
+
+      puts "Uploading scripts.tgz (#{filesize}) to #{s3_dest}".colorize(:green)
+      obj = s3_resource.bucket(bucket_name).object(key)
+      start_time = Time.now
+      upload_to_s3(obj, tarball_path)
       time_took = pretty_time(Time.now-start_time).colorize(:green)
       puts "Time to upload code to s3: #{time_took}"
     end

data/lib/forger/scripts/auto_terminate.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash
 
 if [ $# -eq 0 ]; then
   command=$(basename "$0")

data/lib/forger/scripts/auto_terminate/after_timeout.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash
 
 # This is another copy the /opt/forger/auto_terminate.sh script because the
 # /opt/forger/auto_terminate.sh also gets removed when it gets called.  Specifically,

data/lib/forger/scripts/auto_terminate/functions.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -eux
+#!/bin/bash
 
 # Key is that instance will not be terminated if source image is the same as the
 # original image id.

data/lib/forger/scripts/auto_terminate/functions/amzn.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -eux
+#!/bin/bash
 function schedule_termination() {
   chmod +x /etc/rc.d/rc.local
   echo "/opt/forger/auto_terminate.sh after_ami >> /var/log/auto-terminate.log 2>&1" >> /etc/rc.d/rc.local

data/lib/forger/scripts/auto_terminate/functions/amzn2.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -eux
+#!/bin/bash
 function schedule_termination() {
   chmod +x /etc/rc.d/rc.local
   echo "/opt/forger/auto_terminate.sh after_ami >> /var/log/auto-terminate.log 2>&1" >> /etc/rc.d/rc.local

data/lib/forger/scripts/auto_terminate/functions/ubuntu.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -eux
+#!/bin/bash
 function schedule_termination() {
   chmod +x /etc/rc.local
   sed -i 's/exit 0//' /etc/rc.local

data/lib/forger/scripts/auto_terminate/setup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -eux
+#!/bin/bash
 function install_jq() {
   if ! type jq > /dev/null ; then
     wget "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64"

data/lib/forger/scripts/cloudwatch.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -eux
+#!/bin/bash
 
 if [ $# -eq 0 ]; then
   command=$(basename "$0")

data/lib/forger/scripts/cloudwatch/configure.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -eux
+#!/bin/bash
 
 if [ $# -eq 0 ]; then
   command=$(basename "$0")

data/lib/forger/scripts/cloudwatch/install.sh

@@ -1,3 +1,3 @@
-#!/bin/bash -eux
+#!/bin/bash
 
 /opt/forger/cloudwatch/install/"$OS".sh

data/lib/forger/scripts/cloudwatch/install/amzn.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -eux
+#!/bin/bash
 
 # Install awslogs and the jq JSON parser
 yum install -y awslogs jq

data/lib/forger/scripts/cloudwatch/install/amzn2.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -eux
+#!/bin/bash
 
 # Install awslogs and the jq JSON parser
 yum install -y awslogs jq

data/lib/forger/scripts/cloudwatch/install/ubuntu.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -eux
+#!/bin/bash
 
 # https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/QuickStartEC2Instance.html
 

data/lib/forger/scripts/cloudwatch/service.sh

@@ -1,3 +1,3 @@
-#!/bin/bash -eux
+#!/bin/bash
 
 /opt/forger/cloudwatch/service/"$OS".sh

data/lib/forger/scripts/cloudwatch/service/amzn.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash
 
 cat > /etc/init/awslogs.conf <<- EOL
 #upstart-job

data/lib/forger/scripts/cloudwatch/service/amzn2.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash
 
 # yum install already has configured
 #   /usr/lib/systemd/system/awslogsd.service

data/lib/forger/scripts/cloudwatch/service/ubuntu.sh

@@ -1,4 +1,4 @@
-#/bin/bash -exu
+#/bin/bash
 
 # The awslogs-agent-setup.py setup creates a systemd unit is called awslogs.
 systemctl daemon-reload

data/lib/forger/scripts/shared/functions.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -eux
+#!/bin/bash
 
 function configure_aws_cli() {
   local home_dir

data/lib/forger/version.rb

@@ -1,3 +1,3 @@
 module Forger
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/lib/templates/default/app/scripts/install/common.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash
 
 # https://forums.aws.amazon.com/thread.jspa?threadID=270511
 (

data/lib/templates/default/app/scripts/personalize/tung.sh

@@ -1,3 +1,3 @@
-#!/bin/bash -exu
+#!/bin/bash
 
 yum install htop -y

data/lib/templates/default/app/user_data/layouts/default.sh.tt

@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash
 
 export HOME=/root # In user-data env USER=root but HOME is not set
 cd ~ # user-data starts off in / so go to $HOME

data/spec/fixtures/demo_project/app/user_data/bootstrap.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash
 
 # test env variables from config/[ENV].yml file
 # test_key: <%= config["test_key"] %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forger
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport