aws-ec2 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d2b33737beb7cc7f0b0f62447883b3cb7ad5235a4b534359f2128b42cde928b
-  data.tar.gz: b49727f0247691d3f21370fad4ba618064d3c7d69031500241e322edf33ce4bf
+  metadata.gz: 42b56c4659b31e265e4cf80becf741303ea43fb9a1885724f12e6a0e76fbfb1e
+  data.tar.gz: e23f45d1462ee2897a20ad52fe2d57ed207090c8d38eee1d3869b0261f100fc7
 SHA512:
-  metadata.gz: fe62f5a533ba85f766c956e500c3ca5b7771df36936948c1f89c44f359fec08218343dcbbedef841f9a005f3f7127907cda62d3d8b1c9635232985c4741309db
-  data.tar.gz: e0c4b8db0bf9195693e3be9321376ffa752740d4ee6ac6584b2f44ccbd95f2162e4b489546de2a7672b06b3424f8038dd13d630414d2a2f87255c48b6e327aa7
+  metadata.gz: a7b83b59c84b4da126a0d1e6ea7df4ba88c340da499edd2ef35b4d94c69c05d318e5542d0d60ba9698a5633666cfd0c81315c2a56370bb0e0dc5684b2e86ed89
+  data.tar.gz: c8e7a78cbff83c6f40366b5c90d235fc84f3605fa1a2052185a37b9bacc65373ad8b19c2af1ec8430973d7a0db78342b1809ae752a6199e208ba296507647341

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.
 
+## [0.6.0]
+- add scripts_s3_bucket config option
+- halt script if hooks fail
+
 ## [0.5.2]
 - remove byebug debugging
 

data/README.md

@@ -91,7 +91,7 @@ db_subnet_group_name: default
   - subnet-789
 security_group_ids:
   - sg-123
-s3_bucket: mybucket # for the user-data shared scripts
+scripts_s3_bucket: mybucket # enables s3 uploading of generated app/scripts
 ```
 
 The variables are accessible via the `config` helper method. Example (only showing the part of the profile), `profiles/default.yml`:

data/lib/aws-ec2.rb

@@ -17,6 +17,7 @@ module AwsEc2
   autoload :Dotenv, "aws_ec2/dotenv"
   autoload :Hook, "aws_ec2/hook"
   autoload :Compile, "aws_ec2/compile"
+  autoload :S3, "aws_ec2/s3"
 
   extend Core
 end

data/lib/aws_ec2/compile.rb

@@ -24,7 +24,7 @@ module AwsEc2
     end
 
     def clean
-      FileUtils.rm_rf(BUILD_ROOT)
+      FileUtils.rm_rf("#{BUILD_ROOT}/app")
     end
   end
 end

data/lib/aws_ec2/create.rb

@@ -15,11 +15,22 @@ module AwsEc2
       end
 
       Hook.run(:before_run_instances, @options)
+      sync_scripts_to_s3
       resp = ec2.run_instances(params)
       puts "EC2 instance #{@options[:name]} created! 🎉"
       puts "Visit https://console.aws.amazon.com/ec2/home to check on the status"
     end
 
+    # Configured by config/[AWS_EC2_ENV].yml.
+    # Example: config/development.yml:
+    #
+    #   scripts_s3_bucket: my-bucket
+    def sync_scripts_to_s3
+      if AwsEc2.config["scripts_s3_bucket"]
+        S3.new(@options).upload
+      end
+    end
+
     # params are main derived from profile files
     def params
       @params ||= Params.new(@options).generate

data/lib/aws_ec2/hook.rb

@@ -22,7 +22,8 @@ module AwsEc2
 
     def sh(command)
       puts "=> #{command}".colorize(:cyan)
-      system(command)
+      success = system(command)
+      abort("Command failed") unless success
     end
 
     def self.run(name, options={})

data/lib/aws_ec2/s3.rb

@@ -0,0 +1,29 @@
+module AwsEc2
+  class S3
+    def initialize(options={})
+      @options = options
+    end
+
+    def upload(skip_compile=false)
+      compiler.compile unless skip_compile
+      sync_scripts_to_s3
+      compiler.clean unless ENV['AWS_EC2_KEEP'] || skip_compile
+    end
+
+    def sync_scripts_to_s3
+      puts "Uploading tmp/app to s3..."
+      s3_bucket = AwsEc2.config["scripts_s3_bucket"]
+      s3_path = AwsEc2.config["scripts_s3_path"] || "ec2/app"
+      sh "aws s3 sync tmp/app s3://#{s3_bucket}/#{s3_path}"
+    end
+
+    def sh(command)
+      puts "=> #{command}"
+      system command
+    end
+
+    def compiler
+      @compiler ||= Compile.new(@options)
+    end
+  end
+end

data/lib/aws_ec2/version.rb

@@ -1,3 +1,3 @@
 module AwsEc2
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-ec2
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Tung Nguyen
@@ -215,6 +215,7 @@ files:
 - lib/aws_ec2/help/compile.md
 - lib/aws_ec2/help/create.md
 - lib/aws_ec2/hook.rb
+- lib/aws_ec2/s3.rb
 - lib/aws_ec2/script.rb
 - lib/aws_ec2/scripts/ami_creation.sh
 - lib/aws_ec2/scripts/auto_terminate.sh