forger 1.5.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6401d2b3074b193b1431144dd3e6cbe7177625d9e715de4ad8019aeea09c349a
-  data.tar.gz: 7cb781ddeca6cd0feffceb2cf0e8793b8b724b6fd0fd9640d71b9a6fc1b3bafd
+  metadata.gz: e7f8632fbacedf3fef18dd35609c6be4d1562529addb42070483aabcf3440327
+  data.tar.gz: 97d4a488cd4a376e09888d9724a9ba4ec20c88ddb6c290aa3b5f5257e496572e
 SHA512:
-  metadata.gz: b398774cdaad5a23e82f5f61e4d0bff62a632e14d69d0a8d7d99f331801524e4d50d79c20f3afcc76102b5ccd3d29c5063a480851d1691c6bc25d629f1e8f829
-  data.tar.gz: 71369dcaca32ceae5a4051ac3040d7be3fdc300262e5b39f4fd1657b3fd27df7193aaac27c7c2fe33538789105edbc0ffc45a57c55e450bf9fbbc397f1a9e9d0
+  metadata.gz: 1f20c8838736d1e26fa8ddc7da67aa453ab7975043e87ee1612cf4cb69f1e28ada67d2eebb507859341e387ee7a3a0864320c1fff699dcf7bd6e008750983da3
+  data.tar.gz: e931dad7f1c96d2915fc6cc3a3cc3c6574a9a6130a510cfe6c4809627a21f1976fbf6575fb072b197bef555938d8795187b5b49ba481ab8cb533956da5968e40

data/CHANGELOG.md

@@ -3,6 +3,14 @@
 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.
 
+## [1.6.0]
+- Merge pull request #10 from tongueroo/waiter
+- forger destroy command
+- forger create --ssh
+- forger create --wait
+- refactor display logic to create/info
+- add aws_profile support for s3_folder setting
+
 ## [1.5.4]
 - rename FORGER_S3_ENDPOINT env variable setting
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    forger (1.5.2)
+    forger (1.5.4)
       activesupport
       aws-sdk-ec2
       aws-sdk-s3
@@ -9,6 +9,7 @@ PATH
       dotenv
       filesize
       hashie
+      memoist
       render_me_pretty
       thor
 
@@ -20,18 +21,18 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    aws-partitions (1.80.0)
-    aws-sdk-core (3.19.0)
+    aws-partitions (1.82.0)
+    aws-sdk-core (3.20.2)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.29.0)
+    aws-sdk-ec2 (1.30.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
     aws-sdk-kms (1.5.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.9.0)
+    aws-sdk-s3 (1.9.1)
       aws-sdk-core (~> 3)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
@@ -44,7 +45,7 @@ GEM
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     docile (1.1.5)
-    dotenv (2.2.2)
+    dotenv (2.4.0)
     ffi (1.9.23)
     filesize (0.1.1)
     formatador (0.2.5)
@@ -76,6 +77,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
+    memoist (0.16.0)
     method_source (0.9.0)
     minitest (5.11.3)
     nenv (0.3.0)

data/forger.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "hashie"
   spec.add_dependency "render_me_pretty"
   spec.add_dependency "thor"
+  spec.add_dependency "memoist"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"

data/lib/forger.rb

@@ -11,6 +11,7 @@ module Forger
   autoload :Profile, "forger/profile"
   autoload :Base, "forger/base"
   autoload :Create, "forger/create"
+  autoload :Destroy, "forger/destroy"
   autoload :Ami, "forger/ami"
   autoload :Wait, "forger/wait"
   autoload :Clean, "forger/clean"

data/lib/forger/cli.rb

@@ -21,6 +21,9 @@ module Forger
     option :ami_name, desc: "when specified, an ami creation script is appended to the user-data script"
     option :randomize, type: :boolean, desc: "append random characters to end of name"
     option :source_ami, desc: "override the source image_id in profile"
+    option :wait, desc: "Wait until the instance is ready and report dns name"
+    option :ssh, desc: "Wait until the instance is ready and ssh into instance"
+    option :ssh_user, default: "ec2-user", desc: "User to use to with the ssh option to log into instance"
     common_options.call
     def create(name)
       Create.new(options.merge(name: name)).run
@@ -47,6 +50,12 @@ module Forger
       Script::Upload.new(options).upload
     end
 
+    desc "destroy", "Destroys instance accounting for spot request"
+    long_desc Help.text("destroy")
+    def destroy(instance_id)
+      Destroy.new(options).run(instance_id)
+    end
+
     desc "completion *PARAMS", "Prints words for auto-completion."
     long_desc Help.text("completion")
     def completion(*params)

data/lib/forger/create.rb

@@ -5,6 +5,8 @@ module Forger
   class Create < Base
     autoload :Params, "forger/create/params"
     autoload :ErrorMessages, "forger/create/error_messages"
+    autoload :Waiter, "forger/create/waiter"
+    autoload :Info, "forger/create/info"
 
     include AwsService
     include ErrorMessages
@@ -16,17 +18,21 @@ module Forger
       sync_scripts_to_s3
 
       puts "Creating EC2 instance #{@name.colorize(:green)}"
-      display_ec2_info
+      info = Info.new(@options, params)
+      info.ec2_params
       if @options[:noop]
         puts "NOOP mode enabled. EC2 instance not created."
         return
       end
       resp = run_instances(params)
+
       instance_id = resp.instances.first.instance_id
-      display_spot_info(instance_id)
+      info.spot(instance_id)
       puts "EC2 instance #{@name} created: #{instance_id} 🎉"
       puts "Visit https://console.aws.amazon.com/ec2/home to check on the status"
-      display_cloudwatch_info(instance_id)
+      info.cloudwatch(instance_id)
+
+      Waiter.new(@options.merge(instance_id: instance_id)).wait
     end
 
     def run_instances(params)
@@ -38,123 +44,26 @@ module Forger
     # Configured by config/settings.yml.
     # Example: config/settings.yml:
     #
+    # Format 1: Simple String
+    #
+    #   development:
+    #     s3_folder: mybucket/path/to/folder
+    #
+    # Format 2: Hash
+    #
     #   development:
-    #     s3_folder: my-bucket/folder
+    #     s3_folder:
+    #       default: mybucket/path/to/folder
+    #       dev_profile1: mybucket/path/to/folder
+    #       dev_profile1: another-bucket/storage/path
     def sync_scripts_to_s3
-      if Forger.settings["s3_folder"]
-        Script::Upload.new(@options).run
-      end
+      return unless Forger.settings["s3_folder"]
+      Script::Upload.new(@options).run
     end
 
     # params are main derived from profile files
     def params
       @params ||= Params.new(@options).generate
     end
-
-    def display_spot_info(instance_id)
-      resp = ec2.describe_instances(instance_ids: [instance_id])
-      spot_id = resp.reservations.first.instances.first.spot_instance_request_id
-      return unless spot_id
-
-      puts "Spot instance request id: #{spot_id}"
-    end
-
-    def display_ec2_info
-      puts "Using the following parameters:"
-      pretty_display(params)
-
-      display_launch_template
-    end
-
-    def display_launch_template
-      launch_template = params[:launch_template]
-      return unless launch_template
-
-      resp = ec2.describe_launch_template_versions(
-        launch_template_id: launch_template[:launch_template_id],
-        launch_template_name: launch_template[:launch_template_name],
-      )
-      versions = resp.launch_template_versions
-      launch_template_data = {} # combined launch_template_data
-      versions.sort_by { |v| v[:version_number] }.each do |v|
-        launch_template_data.merge!(v[:launch_template_data])
-      end
-      puts "launch template data (versions combined):"
-      pretty_display(launch_template_data)
-    rescue Aws::EC2::Errors::InvalidLaunchTemplateNameNotFoundException => e
-      puts "ERROR: The specified launched template #{launch_template.inspect} was not found."
-      puts "Please double check that it exists."
-      exit
-    end
-
-    def display_cloudwatch_info(instance_id)
-      return unless @options[:cloudwatch]
-
-      region = cloudwatch_log_region
-      stream = "#{instance_id}/var/log/cloud-init-output.log"
-      url = "https://#{region}.console.aws.amazon.com/cloudwatch/home?region=#{region}#logEventViewer:group=ec2;stream=#{stream}"
-      cw_init_log = "cw tail -f ec2 #{stream}"
-      puts "To view instance's cloudwatch logs visit:"
-      puts "  #{url}"
-
-      puts "  #{cw_init_log}" if ENV['FORGER_CW']
-      if ENV['FORGER_CW'] && @options[:auto_terminate]
-        cw_terminate_log = "cw tail -f ec2 #{instance_id}/var/log/auto-terminate.log"
-        puts "  #{cw_terminate_log}"
-      end
-
-      puts "Note: It takes a little time for the instance to launch and report logs."
-
-      paste_command = ENV['FORGER_CW'] ? cw_init_log : url
-      add_to_clipboard(paste_command)
-    end
-
-    def add_to_clipboard(text)
-      return unless RUBY_PLATFORM =~ /darwin/
-      return unless system("type pbcopy > /dev/null")
-
-      system(%[echo "#{text}" | pbcopy])
-      puts "Pro tip: The CloudWatch Console Link has been added to your copy-and-paste clipboard."
-    end
-
-    def cloudwatch_log_region
-      # Highest precedence: FORGER_REGION env variable. Only really used here.
-      # This is useful to be able to override when running tool in codebuild.
-      # Codebuild can be running in different region then the region which the
-      # instance is launched in.
-      # Getting the region from the the profile and metadata doesnt work in
-      # this case.
-      if ENV['FORGER_REGION']
-        return ENV['FORGER_REGION']
-      end
-
-      # Pretty high in precedence: AWS_PROFILE and ~/.aws/config and
-      aws_found = system("type aws > /dev/null")
-      if aws_found
-        region = `aws configure get region`.strip
-        return region
-      end
-
-      # Assumes instance same region as the calling ec2 instance.
-      # It is possible for curl not to be installed.
-      curl_found = system("type curl > /dev/null")
-      if curl_found
-        region = `curl --connect-timeout 3  -s 169.254.169.254/latest/meta-data/placement/availability-zone | sed s'/.$//'`
-        return region unless region == ''
-      end
-
-      return 'us-east-1' # fallback default
-    end
-
-    def pretty_display(data)
-      data = data.deep_stringify_keys
-
-      if data["user_data"]
-        message = "base64-encoded: cat tmp/user-data.txt to view"
-        data["user_data"] = message
-      end
-
-      puts YAML.dump(data)
-    end
   end
 end

data/lib/forger/create/info.rb

@@ -0,0 +1,130 @@
+class Forger::Create
+  class Info
+    include Forger::AwsService
+
+    attr_reader :params
+    def initialize(options, params)
+      @options = options
+      @params = params
+    end
+
+    def ec2_params
+      puts "Using the following parameters:"
+      pretty_display(params)
+
+      launch_template
+    end
+
+    def spot(instance_id)
+      retries = 0
+      begin
+        resp = ec2.describe_instances(instance_ids: [instance_id])
+      rescue Aws::EC2::Errors::InvalidInstanceIDNotFound
+        retries += 1
+        puts "Aws::EC2::Errors::InvalidInstanceIDNotFound error. Retry: #{retries}"
+        sleep 2**retries
+        retry if retries <= 3
+      end
+      spot_id = resp.reservations.first.instances.first.spot_instance_request_id
+      return unless spot_id
+
+      puts "Spot instance request id: #{spot_id}"
+    end
+
+    def launch_template
+      launch_template = params[:launch_template]
+      return unless launch_template
+
+      resp = ec2.describe_launch_template_versions(
+        launch_template_id: launch_template[:launch_template_id],
+        launch_template_name: launch_template[:launch_template_name],
+      )
+      versions = resp.launch_template_versions
+      launch_template_data = {} # combined launch_template_data
+      versions.sort_by { |v| v[:version_number] }.each do |v|
+        launch_template_data.merge!(v[:launch_template_data])
+      end
+      puts "launch template data (versions combined):"
+      pretty_display(launch_template_data)
+    rescue Aws::EC2::Errors::InvalidLaunchTemplateNameNotFoundException => e
+      puts "ERROR: The specified launched template #{launch_template.inspect} was not found."
+      puts "Please double check that it exists."
+      exit
+    end
+
+    def cloudwatch(instance_id)
+      return unless @options[:cloudwatch]
+
+      region = cloudwatch_log_region
+      stream = "#{instance_id}/var/log/cloud-init-output.log"
+      url = "https://#{region}.console.aws.amazon.com/cloudwatch/home?region=#{region}#logEventViewer:group=ec2;stream=#{stream}"
+      cw_init_log = "cw tail -f ec2 #{stream}"
+      puts "To view instance's cloudwatch logs visit:"
+      puts "  #{url}"
+
+      puts "  #{cw_init_log}" if show_cw
+      if show_cw && @options[:auto_terminate]
+        cw_terminate_log = "cw tail -f ec2 #{instance_id}/var/log/auto-terminate.log"
+        puts "  #{cw_terminate_log}"
+      end
+
+      puts "Note: It takes a little time for the instance to launch and report logs."
+
+      paste_command = show_cw ? cw_init_log : url
+      add_to_clipboard(paste_command)
+    end
+
+    def cloudwatch_log_region
+      # Highest precedence: FORGER_REGION env variable. Only really used here.
+      # This is useful to be able to override when running tool in codebuild.
+      # Codebuild can be running in different region then the region which the
+      # instance is launched in.
+      # Getting the region from the the profile and metadata doesnt work in
+      # this case.
+      if ENV['FORGER_REGION']
+        return ENV['FORGER_REGION']
+      end
+
+      # Pretty high in precedence: AWS_PROFILE and ~/.aws/config and
+      aws_found = system("type aws > /dev/null")
+      if aws_found
+        region = `aws configure get region`.strip
+        return region
+      end
+
+      # Assumes instance same region as the calling ec2 instance.
+      # It is possible for curl not to be installed.
+      curl_found = system("type curl > /dev/null")
+      if curl_found
+        region = `curl --connect-timeout 3  -s 169.254.169.254/latest/meta-data/placement/availability-zone | sed s'/.$//'`
+        return region unless region == ''
+      end
+
+      return 'us-east-1' # fallback default
+    end
+
+    def pretty_display(data)
+      data = data.deep_stringify_keys
+
+      if data["user_data"]
+        message = "base64-encoded: cat tmp/user-data.txt to view"
+        data["user_data"] = message
+      end
+
+      puts YAML.dump(data)
+    end
+
+    def show_cw
+      ENV['FORGER_CW'] || system("type cw > /dev/null 2>&1")
+    end
+
+    def add_to_clipboard(text)
+      return unless RUBY_PLATFORM =~ /darwin/
+      return unless system("type pbcopy > /dev/null")
+
+      system(%[echo "#{text}" | pbcopy])
+      copy_item = show_cw ? "cw command" : "CloudWatch Console Link"
+      puts "Pro tip: The #{copy_item} has been added to your copy-and-paste clipboard."
+    end
+  end
+end

data/lib/forger/create/waiter.rb

@@ -0,0 +1,70 @@
+class Forger::Create
+  class Waiter < Forger::Base
+    include Forger::AwsService
+
+    def wait
+      @instance_id = @options[:instance_id]
+      handle_wait if @options[:wait]
+      handle_ssh if @options[:ssh]
+    end
+
+    def handle_wait
+      puts "Waiting for instance #{@instance_id} to be ready."
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/developer-guide/using-waiters.html
+      ec2.wait_until(:instance_running, instance_ids:[@instance_id]) do |w|
+        w.interval = 5
+        w.before_wait do |n, resp|
+          print '.'
+        end
+      end
+      puts "" # newline
+
+      resp = ec2.describe_instances(instance_ids:[@instance_id])
+      i = resp.reservations.first.instances.first
+      puts "Instance #{@instance_id} is ready"
+      dns = i.public_dns_name ? i.public_dns_name : 'nil'
+      puts "Instance public_dns_name: #{dns}"
+      i
+    end
+
+    def handle_ssh
+      instance = handle_wait
+      unless instance.public_dns_name
+        puts "This instance does not have a public dns for ssh."
+        return
+      end
+
+      command = build_ssh_command(instance.public_dns_name)
+      puts "=> #{command.join(' ')}".colorize(:green)
+      retry_until_success(command)
+      Kernel.exec(*command) unless @options[:noop]
+    end
+
+    def build_ssh_command(host)
+      user = @options[:ssh_user] || "ec2-user"
+      [
+        "ssh",
+        ENV['SSH_OPTIONS'],
+        "#{user}@#{host}"
+      ].compact
+    end
+
+    def retry_until_success(*command)
+      retries = 0
+      uptime = command + ['uptime', '2>&1']
+      uptime = uptime.join(' ')
+      out = `#{uptime}`
+      while out !~ /load average/ do
+        puts "Can't ssh into the server yet.  Retrying until success." if retries == 0
+        print '.'
+        retries += 1
+        if retries > 600 # Timeout after 10 minutes
+          raise "ERROR: Timeout after 600 seconds, cannot connect to the server."
+        end
+        sleep 1
+        out = `#{uptime}`
+      end
+      puts ""
+    end
+  end
+end

data/lib/forger/destroy.rb

@@ -0,0 +1,23 @@
+module Forger
+  class Destroy < Base
+    include AwsService
+
+    def run(instance_id)
+      puts "Destroying #{instance_id}"
+      return if ENV['TEST']
+
+      cancel_spot_request(instance_id)
+      ec2.terminate_instances(instance_ids: [instance_id])
+      puts "Instance #{instance_id} terminated."
+    end
+
+    def cancel_spot_request(instance_id)
+      resp = ec2.describe_instances(instance_ids: [instance_id])
+      spot_id = resp.reservations.first.instances.first.spot_instance_request_id
+
+      return unless spot_id
+      ec2.cancel_spot_instance_requests(spot_instance_request_ids: [spot_id])
+      puts "Spot instance request #{spot_id} cancelled."
+    end
+  end
+end

data/lib/forger/help/create.md

@@ -1,7 +1,17 @@
 Examples:
 
-    $ forger create my-instance
+    forger create my-instance
 
 To see the snippet of code that gets added to the user-data script you can use the `--noop` option and then view the generated tmp/user-data.txt.
 
-    $ forger create myscript --noop
+    forger create myscript --noop
+
+You can tell forger to wait until the instance is ready with the `--wait` option.
+
+    forger create my-instance --wait
+
+You can also tell forger to ssh into the instance immediately after it's ready with the `--ssh` option.  Examples:
+
+    forger create my-instance --ssh # default is to login as ec2-user
+    forger create my-instance --ssh --ssh-user ubuntu
+    SSH_OPTIONS "-A" forger create my-instance --ssh --ssh-user ubuntu

data/lib/forger/help/destroy.md

@@ -0,0 +1,5 @@
+Examples:
+
+    $ forger destroy i-12345 # instance id
+
+Destroys the instance and also cancels the spot request associated with the instance.

data/lib/forger/help/upload.md

@@ -6,5 +6,12 @@ Compiles the app/scripts and app/user-data files to the tmp folder. Then uploads
 
 ```yaml
 development:
+  # Format 1: Simple String
   s3_folder: my-bucket/folder # enables auto sync to s3
+
+  # Format 2: Hash
+  # s3_folder:
+  #   default: mybucket/path/to/folder
+  #   dev_profile1: mybucket/path/to/folder
+  #   dev_profile1: another-bucket/storage/path
 ```

data/lib/forger/script/upload.rb

@@ -1,10 +1,13 @@
 require 'filesize'
 require 'aws-sdk-s3'
 require 'fileutils'
+require 'memoist'
 
 # Class for forger upload command
 class Forger::Script
   class Upload < Forger::Base
+    extend Memoist
+
     def initialize(options={})
       @options = options
       @compile = @options[:compile] ? @options[:compile] : true
@@ -25,12 +28,23 @@ class Forger::Script
       if @options[:noop]
         puts "NOOP: Not uploading file to s3"
       else
-        obj.upload_file(tarball_path)
+        upload_to_s3(obj, tarball_path)
       end
       time_took = pretty_time(Time.now-start_time).colorize(:green)
       puts "Time to upload code to s3: #{time_took}"
     end
 
+    def upload_to_s3(obj, tarball_path)
+      obj.upload_file(tarball_path)
+    rescue Aws::S3::Errors::PermanentRedirect => e
+      puts "ERROR: #{e.class} #{e.message}".colorize(:red)
+      puts "The bucket you are trying to upload to is in a different region than the region the instance is being launched in."
+      puts "You must configured FORGER_S3_ENDPOINT env variable to prevent this error. Example:"
+      puts "  FORGER_S3_ENDPOINT=https://s3.us-west-2.amazonaws.com"
+      puts "Check your ~/.aws/config for the region being used for the ec2 instance."
+      exit 1
+    end
+
     def tarball_path
       IO.read(SCRIPTS_INFO_PATH).strip
     end
@@ -69,8 +83,6 @@ class Forger::Script
     end
 
     def s3_resource
-      return @s3_resource if @s3_resource
-
       options = {}
       # allow override of region for s3 client to avoid warning:
       # S3 client configured for "us-east-1" but the bucket "xxx" is in "us-west-2"; Please configure the proper region to avoid multiple unnecessary redirects and signing attempts
@@ -79,8 +91,9 @@ class Forger::Script
       if options[:endpoint]
         options[:region] = options[:endpoint].split('.')[1]
       end
-      @s3_resource = Aws::S3::Resource.new(options)
+      Aws::S3::Resource.new(options)
     end
+    memoize :s3_resource
 
     # http://stackoverflow.com/questions/4175733/convert-duration-to-hoursminutesseconds-or-similar-in-rails-3-or-ruby
     def pretty_time(total_seconds)

data/lib/forger/setting.rb

@@ -20,6 +20,39 @@ module Forger
       all_envs = load_file(project_settings_path)
       all_envs = merge_base(all_envs)
       @@data = all_envs[Forger.env] || all_envs["base"] || {}
+      @@data = flatten_s3_folder(@@data)
+      @@data
+    end
+
+    # So we can access settings['s3_folder'] transparently
+    def flatten_s3_folder(data)
+      # data = data.clone
+      if data['s3_folder'].is_a?(Hash)
+        data['s3_folder'] = s3_folder
+      end
+      data
+    end
+
+    # Special helper method to support multiple formats for s3_folder setting.
+    # Format 1: Simple String
+    #
+    #   development:
+    #     s3_folder: mybucket/path/to/folder
+    #
+    # Format 2: Hash
+    #
+    #   development:
+    #     s3_folder:
+    #       default: mybucket/path/to/folder
+    #       dev_profile1: mybucket/path/to/folder
+    #       dev_profile1: another-bucket/storage/path
+    #
+    def s3_folder
+      s3_folder = data['s3_folder']
+      return s3_folder if s3_folder.nil? or s3_folder.is_a?(String)
+
+      # If reach here then the s3_folder is a Hash
+      s3_folder[ENV['AWS_PROFILE']] || s3_folder["default"]
     end
 
   private

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

@@ -11,7 +11,9 @@ module Forger::Template::Helper::CoreHelper
     name = File.basename(name, '.sh')
 
     layout_path = layout_path(layout)
-    path = "#{Forger.root}/app/user-data/#{name}.sh"
+    ext = File.extname(name)
+    name += ".sh" if ext.empty?
+    path = "#{Forger.root}/app/user-data/#{name}"
     result = RenderMePretty.result(path, context: self, layout: layout_path)
     # Must prepend and append scripts in user_data here because we need to
     # encode the user_data script for valid yaml to load in the profile.

data/lib/forger/version.rb

@@ -1,3 +1,3 @@
 module Forger
-  VERSION = "1.5.4"
+  VERSION = "1.6.0"
 end

data/spec/lib/cli_spec.rb

@@ -31,6 +31,11 @@ describe Forger::CLI do
       expect(out).to include("Cleaning out old AMIs")
     end
 
+    it "destroy" do
+      out = execute("exe/forger destroy i-123")
+      expect(out).to include("Destroying i-123")
+    end
+
     commands = {
       "am" => "ami",
       "compile" => "--profile",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forger
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-21 00:00:00.000000000 Z
+date: 2018-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: memoist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -264,7 +278,10 @@ files:
 - lib/forger/core.rb
 - lib/forger/create.rb
 - lib/forger/create/error_messages.rb
+- lib/forger/create/info.rb
 - lib/forger/create/params.rb
+- lib/forger/create/waiter.rb
+- lib/forger/destroy.rb
 - lib/forger/dotenv.rb
 - lib/forger/help.rb
 - lib/forger/help/ami.md
@@ -273,6 +290,7 @@ files:
 - lib/forger/help/completion.md
 - lib/forger/help/completion_script.md
 - lib/forger/help/create.md
+- lib/forger/help/destroy.md
 - lib/forger/help/upload.md
 - lib/forger/help/wait/ami.md
 - lib/forger/hook.rb