jack-eb 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76b0040e5d118b1213b149fe176b254c3205402b
-  data.tar.gz: 1c2e8104fd6e56b05e5de6d940ae8a37308e7a55
+  metadata.gz: a12aefa1e04666526e9afa664b848c27ab22c4a7
+  data.tar.gz: e0d8f2f0dd5b415bcd7381ed38de4ada5c31c714
 SHA512:
-  metadata.gz: 2d7c4d5fc2d1db074b7e77a8c2ad0d1e7f3578f3b522fb0be7feb51a36be0c8efdf1482032febfb7fd92b257c1f03cd33258e428f5fc7996797309393c2afb88
-  data.tar.gz: 18d00db24f042dd4d1d8ad18616b540c2e097656e16c490a572d1f7a7ce2c2f73f840fec094061ad2d8d6ec581b203e9ad772da1336cbc81afdb22619e4db3c7
+  metadata.gz: 8964f711975df4c4bac1b028592639a6bbf16998246c1fbbabf38ebb4bd7ef3bda9779591c08c48c999a1c43a2f03a5024b826cfe18289181372be1b1975a235
+  data.tar.gz: 3d6c0322d650e684d0bad994addc80dbab14a5c2bedbaddf6d5bb4b69b6d7500bda53543fba86161949bed836bfab18fb01f2ad9c9d624a81ca79c2c605383b1

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.
 
+## [1.1.0]
+- add jack terminate
+- refactoring: https://github.com/tongueroo/jack/pull/6
+- autodetect eb_bin and aws_bin
+
 ## [1.0.1]
 - improve jack eb install error message
 

data/README.md

@@ -161,7 +161,7 @@ $ jack config upload hi-web-prod-1 --app customappname
 
 This will save the config to `jack/cfg/hi-web-prod-1.cfg.yml`.
 
-You will notice that the `eb config upload` command prompts you with the diff and asks for confirmation before uploading.  You can bypass the prompt with the force option.
+You will notice that the `eb config upload` command prompts you with the diff and asks for confirmation before uploading.  You can bypass the prompt with the `--sure` option.
 
 #### Diff Config - Comparing your local config to the live environment config
 

data/circle.yml

@@ -0,0 +1,3 @@
+machine:
+  ruby:
+    version: 2.4.1

data/lib/jack.rb

@@ -6,8 +6,10 @@ require File.expand_path("../jack/ext/hash", __FILE__)
 
 module Jack
   autoload :Command, 'jack/command'
+  autoload :Help, 'jack/help'
   autoload :CLI, 'jack/cli'
   autoload :Create, 'jack/create'
+  autoload :Terminate, 'jack/terminate'
   autoload :Settings, 'jack/settings'
   autoload :EbConfig, 'jack/eb_config'
   autoload :Config, 'jack/config'

data/lib/jack/cli.rb

@@ -1,36 +1,35 @@
 require 'thor'
 require 'jack/command'
-require 'jack/cli/help'
 require 'jack/version_checker'
 Jack::VersionChecker.new.run unless ENV['TEST']
 
 module Jack
   class Config < Command
     desc "upload ENV_NAME", "upload and apply jack config changes to EB environment"
-    long_desc Jack::CLI::Help.upload
-    option :force, aliases: :f, type: :boolean, desc: "skip prompt"
+    long_desc Help.upload
+    option :sure, aliases: :f, type: :boolean, desc: "skip prompt"
     def upload(env_name)
-      Jack::Config::Upload.new(options.merge(env_name: env_name)).run
+      Upload.new(options.merge(env_name: env_name)).run
     end
 
     desc "download ENV_NAME", "downloads environment config to jack/cfg folder"
-    long_desc Jack::CLI::Help.download
+    long_desc Help.download
     option :dirty, type: :boolean, desc: "leave the remote eb config and download config behind"
     def download(env_name)
-      Jack::Config::Download.new(options.merge(env_name: env_name)).run
+      Download.new(options.merge(env_name: env_name)).run
     end
 
     desc "diff ENV_NAME", "diff jack config vs environment config"
-    long_desc Jack::CLI::Help.diff
+    long_desc Help.diff
     option :dirty, type: :boolean, desc: "leave the remote eb config and download config behind"
     def diff(env_name)
-      Jack::Config::Diff.new(options.merge(env_name: env_name)).run
+      Diff.new(options.merge(env_name: env_name)).run
     end
 
     desc "sort ENV_NAME", "reformat local jack config file to a sorted yaml file format"
-    long_desc Jack::CLI::Help.sort
+    long_desc Help.sort
     def sort(env_name)
-      Jack::Config::Sort.new(options.merge(env_name: env_name)).run
+      Sort.new(options.merge(env_name: env_name)).run
     end
   end
 
@@ -38,7 +37,7 @@ module Jack
     class_option :verbose, type: :boolean
     class_option :mute, type: :boolean, desc: "mute all output, useful for specs"
     class_option :noop, type: :boolean, desc: "dont run any destructive commands"
-    class_option :force, type: :boolean, desc: "bypass confirmation prompt"
+    class_option :sure, type: :boolean, desc: "bypass confirmation prompt"
     class_option :root, :default => '.', desc: "root of the project, useful for specs"
     class_option :cfg, aliases: :c, desc: "local config name if want to override the convention"
     class_option :app, aliases: :a, desc: "app name if want to override the convention"
@@ -46,12 +45,18 @@ module Jack
     desc "create ENV_NAME", "create EB environment"
     long_desc Help.create
     def create(env_name)
-      Jack::Create.new(options.merge(env_name: env_name)).run
+      Create.new(options.merge(env_name: env_name)).run
+    end
+
+    desc "terminate ENV_NAME", "deletes EB environment"
+    long_desc Help.terminate
+    def terminate(env_name)
+      Terminate.new(options.merge(env_name: env_name)).run
     end
 
     desc "version", "display jack version number"
     def version
-      puts Jack::VERSION
+      puts VERSION
     end
 
     desc "config ACTION ENV_NAME", "manage environment config"

data/lib/jack/config.rb

@@ -3,6 +3,7 @@ require 'thor'
 
 module Jack
   class Config < Command
+    autoload :Help, 'jack/config/help'
     autoload :Base, 'jack/config/base'
     autoload :Diff, 'jack/config/diff'
     autoload :Download, 'jack/config/download'

data/lib/jack/config/diff.rb

@@ -11,19 +11,24 @@ module Jack
 
       def run
         @download.get_current_cfg
-        do_diff(@download.current_path, @download.local_config_path)
+        difference = compute_diff(@download.current_path, @download.local_config_path)
         cleanup_files
+        difference
       end
 
-      def do_diff(current, local)
-        UI.say "Comparing #{current} and #{local}"
+      def compute_diff(current, local)
+        # the diff command returns 0 when there is no difference and returns 1 when there is a difference
+        pretty_current_path = @download.current_path.sub(/.*\.elasticbeanstalk/,'.elasticbeanstalk')
+        command = "#{diff_command} #{pretty_current_path} #{@download.local_config_path}"
+        UI.say("=> #{command}")
+
         return if @options[:noop]
         sorter = YamlFormatter.new
         sorter.process(current)
         sorter.process(local)
-        # need to use system so that the diff shows up properly in the terminal
-        system(diff_command, @download.current_path, @download.local_config_path)
-        puts ""
+
+        no_difference = system(command)
+        !no_difference
       end
 
       def cleanup_files

data/lib/jack/config/download.rb

@@ -34,7 +34,7 @@ module Jack
           ignores = IO.read(path)
           has_ignore = ignores.include?("jack/cfg")
         end
-        do_cmd("echo 'jack/cfg/*.yml' >> #{path}") unless has_ignore
+        sh("echo 'jack/cfg/*.yml' >> #{path}") unless has_ignore
       end
 
       def get_current_cfg
@@ -44,7 +44,7 @@ module Jack
 
       # for specs
       def eb_config_save
-        do_cmd("eb config save --cfg #{current_name} #{@env_name}", @options)
+        sh("#{eb_bin} config save#{eb_base_flags} --cfg #{current_name} #{@env_name}", @options)
       end
 
       def copy_to_local_cfg

data/lib/jack/config/help.rb

@@ -0,0 +1,70 @@
+class Jack::Config::Help
+  class << self
+    def upload
+<<-EOL
+Uploads the specified template configuration in jack/cfg and applies it to the environment immediately.
+
+#{convention}
+
+Example:
+
+$ jack config upload hi-web-stag-1
+
+$ jack config upload myapp -c myconfig hi-web-stag-1
+EOL
+    end
+
+    def download
+<<-EOL
+Downloads the environment's config to jack/cfg/[CONFIG_NAME].cfg.yml
+
+#{convention}
+
+Example:
+
+$ jack config download hi-web-stag-1
+
+$ jack config download myapp -c myconfig hi-web-stag-1
+EOL
+    end
+
+
+    def diff
+<<-EOL
+Diff local jack config vs environment config.  The environment config is generated on the fly.
+
+If you have colordiff installed the diff command will use make use of it.  If you want to have your own custom diff, you can set your JACK_DIFF environment variable to it.
+
+#{convention}
+
+Example:
+
+$ jack config diff hi-web-stag-1
+
+$ jack config diff myapp -c myconfig hi-web-stag-1
+EOL
+    end
+
+    def sort
+<<-EOL
+Reformats local jack config file to a sorted yaml format.
+
+#{convention}
+
+Example:
+
+$ jack config sort hi-web-stag-1
+
+$ jack config sort -c myconfig hi-web-stag-1 # env name doesnt matter here
+EOL
+    end
+
+private
+    # duplicated in jack/help.rb
+    def convention
+<<-EOL
+The configuration name is based on convention.  An environment with the name of hi-web-stag-1 results in the jack/cfg/hi-web-stag.cfg.yml being used.  The convention can be overriden with the --cfg option.
+EOL
+    end
+  end
+end

data/lib/jack/config/upload.rb

@@ -18,13 +18,31 @@ module Jack
           UI.say "#{local_config_path} does not exist, nothing to upload"
           exit 0
         end
-        compare
-        if confirm
-          upload
-          update_env
+        difference = compare
+        if difference
+          if confirm(confirmation_message)
+            upload
+            update_env
+          else
+            UI.say("Whew, that was close. EB Configuration was not updated.")
+          end
+        else
+          UI.say("There was no difference detected from your #{@local_config_path} and what exists on the EB environment")
         end
       end
 
+      def confirmation_message
+        message = "Are you sure you want to update the environment with your the new config #{@local_config_path}?\n".colorize(:yellow)
+        message += <<-EOL
+If the difference is not what you expected, you should say no.
+If you want to download the config from the environment and get #{@local_config_path}
+back in sync, you can use this command:
+  $ jack config download #{@env_name}
+  $ jack config download -h # for more info
+EOL
+        message
+      end
+
       def compare
         Diff.new(@options).run
       end
@@ -37,26 +55,6 @@ module Jack
         clean_up
       end
 
-      def confirm
-        UI.say("Are you sure you want to update the environment with your the new config #{@config_path}?".colorize(:yellow))
-        UI.say(<<-EOL)
-If the difference is not what you expected, you should say no.
-A blank newline indicates that there was no difference.
-If you want to download the config from the environment and
-overwrite your #{@local_config_path} instead, you can use this command:
-$ jack config download #{@env_name}
-$ jack config help download # for more info
-EOL
-        print "yes/no? [no] " unless @options[:mute] || @options[:force]
-        answer = get_answer
-        answer =~ /^y/
-      end
-
-      def get_answer
-        return 'y' if @options[:force]
-        $stdin.gets
-      end
-
       def update_env
         UI.say("Updating environment #{@env_name} with template #{upload_name}")
         eb.update_environment(
@@ -80,7 +78,7 @@ EOL
 
       # for specs
       def eb_config_put
-        do_cmd("eb config put #{upload_name}", @options)
+        sh("#{eb_bin} config put#{eb_base_flags} #{upload_name}", @options)
       end
 
       def clean_up

data/lib/jack/create.rb

@@ -12,6 +12,7 @@ module Jack
     end
 
     def run
+      check_aws_setup
       create_app
       EbConfig::Create.new(@options).sync unless @options[:noop]
       create_env
@@ -31,19 +32,19 @@ module Jack
 
     def create_env
       command = build_command
-      do_cmd(command, @options)
+      sh(command, @options)
     end
 
     def build_command
       @cfg = upload_cfg
       flags = settings.create_flags
-      "eb create --sample --nohang #{flags} #{@cfg}#{cname}#{@env_name}"
+      "#{eb_bin} create#{eb_base_flags} --sample --nohang #{flags} #{@cfg}#{cname}#{@env_name}"
     end
 
     def upload_cfg
       @upload = Config::Upload.new(@options)
       if @upload.local_cfg_exist?
-        @upload.upload 
+        @upload.upload
         cfg = "--cfg #{@upload.upload_name} "
       end
     end

data/lib/jack/eb_config/base.rb

@@ -21,7 +21,7 @@ module Jack
 
       def ensure_eb_init
         unless File.exist?(eb_config_path)
-          do_cmd(%Q|eb init -r us-east-1 -p "#{platform}" "#{app_name}"|, @options)
+          sh(%Q|#{eb_bin} init#{eb_base_flags} -p "#{platform}" "#{app_name}"|, @options)
         end
       end
 

data/lib/jack/eb_config/update.rb

@@ -13,11 +13,15 @@ module Jack
       def app_name
         env.application_name
       end
-   
+
       def env
         return @env if @env
         envs = describe_environments
         @env = envs[:environments].first
+        unless @env
+          abort("ERROR: Environment #{@env_name} not found.  Are you sure it exists?".colorize(:red))
+        end
+        @env
       end
 
       # useful for specs
@@ -26,4 +30,4 @@ module Jack
       end
     end
   end
-end
+end

data/lib/jack/help.rb

@@ -0,0 +1,59 @@
+module Jack
+  class Help
+    class << self
+      def create
+<<-EOL
+Creates a new environment using the configuration in jack/cfg folder.  The AWS sample app is initially used for the newly created environment.  The sample app is used as a starting point to make sure that the environment is working before you introduce your own app code.
+
+#{convention}
+
+Example:
+
+$ jack create hi-web-stag-1
+
+$ jack create -c myconfig hi-web-stag-1
+
+$ jack create -a myapp -c myconfig hi-web-stag-1
+EOL
+      end
+
+      def terminate
+<<-EOL
+Deletes Elastic Beanstalk environment.
+
+Example:
+
+$ jack terminate hi-web-stag-1
+EOL
+      end
+
+      # Thor auto generates the subcommand help menu.
+      # Leaving here in case we figure out a way to override this Thor behavior.
+      def config
+<<-EOL
+Manage the environment's config.  Can use this to download the environment's config to jack/cfg folder or upload config in jack/cfg folder and apply it to the environment.
+
+Example:
+
+$ jack config download hi-web-stag-1
+
+For more info:
+
+$ jack help config
+
+$ jack config help upload
+
+$ jack config help download
+EOL
+      end
+
+private
+      # duplicated in jack/config/help.rb
+      def convention
+  <<-EOL
+  The configuration name is based on convention.  An environment with the name of hi-web-stag-1 results in the jack/cfg/hi-web-stag.cfg.yml being used.  The convention can be overriden with the --cfg option.
+  EOL
+      end
+    end
+  end
+end

data/lib/jack/terminate.rb

@@ -0,0 +1,23 @@
+module Jack
+  class Terminate
+    include Util
+
+    def initialize(options={})
+      @options = options
+      @root = options[:root] || '.'
+      @env_name = options[:env_name]
+      @app_name = options[:app] || app_name_convention(@env_name)
+    end
+
+    def run
+      check_aws_setup
+      message = "Are you sure you want to delete the environment #{@env_name}?".colorize(:yellow)
+      if confirm(message) && !@options[:noop]
+        eb.terminate_environment(environment_name: @env_name)
+        UI.say("Environment #{@env_name} is terminating!")
+      else
+        UI.say("Whew that was close. Environment #{@env_name} was not deleted.")
+      end
+    end
+  end
+end

data/lib/jack/util.rb

@@ -1,32 +1,156 @@
-module Jack
-  # Any class that includes this module should define @root as it is used in
-  # the settings method.
-  module Util
-    def do_cmd(command, options={})
-      UI.say "Running: #{command.colorize(:green)}"
-      return command if options[:noop]
+# Any class that includes this module should define @root as it is used in
+# the settings method.
+module Jack::Util
+  def confirm(message)
+    Jack::UI.say(message)
+    print "yes/no? [no] " unless @options[:mute] || @options[:sure]
+    answer = get_answer
+    answer =~ /^y/
+  end
+
+  def get_answer
+    return 'y' if @options[:sure]
+    $stdin.gets
+  end
+
+  def sh(command, options={})
+    Jack::UI.say "=> #{command.colorize(:green)}"
+    return command if options[:noop]
+
+    if options[:backtick]
       out = `#{command}`
-      UI.say out
+      Jack::UI.say out
+      success = $?.success?
+    else
+      success = system(command)
     end
 
-    def app_name_convention(env_name)
-      pattern = settings.app_name_pattern
-      env_name.match(pattern)[1]
-    end
+    abort "Exiting! Error running command: #{command}".colorize(:red) unless success
+  end
 
-    def settings
-      # do not like the instance @root variable in this module but better
-      # than having to pass settings around
-      @settings ||= Settings.new(@root)
-    end
+  def app_name_convention(env_name)
+    pattern = settings.app_name_pattern
+    env_name.match(pattern)[1]
+  end
 
-    def eb
-      region = ENV['AWS_REGION'] || 'us-east-1'
-      @@eb ||= Aws::ElasticBeanstalk::Client.new(region: region)
-    end
+  def settings
+    # do not like the instance @root variable in this module but better
+    # than having to pass settings around
+    @settings ||= Jack::Settings.new(@root)
+  end
+
+  def eb
+    @@eb ||= Aws::ElasticBeanstalk::Client.new
+  end
+
+  def ensure_folder_exist(folder)
+    FileUtils.mkdir_p(folder) unless File.exist?(folder)
+  end
+
+  # Checks main if the ~/.aws/config has been set up properly. If it has not
+  # print a message to the user and exit the program.
+  def check_aws_setup
+    # abusing `aws configure get region` to check that aws is probably properly configured
+    get_region # method will exits when unable to query for the region
+  end
+
+  # get the region from ~/.aws/config settings
+  # The eb tool reqiures you to specify the region when you run `eb init`. After that
+  # the setting is saved in the ~/.elasticbeanstalk folder.  We will default to what
+  # is set in ~/.aws/config.
+  def get_region
+    return 'us-west-2' if ENV['TEST']
 
-    def ensure_folder_exist(folder)
-      FileUtils.mkdir_p(folder) unless File.exist?(folder)
+    command = "#{aws_bin} configure get region"
+    region = `#{command}`.strip
+    success = $?.success?
+    unless success
+      abort <<~EOS.colorize(:red)
+        ERROR: Unable to infer the region from your ~/.aws/config settings with command: `#{command}`.
+        Maybe it is not properly configured? Please double check ~/.aws/config.
+        If you haven't set your region yet, ou can set your region with `aws configure set region REGION`. Example:
+        aws configure set region us-west-2
+      EOS
     end
+
+    # Defaults to us-east-1:
+    # right now aws configure get region will actually return an error 1 code so we
+    # will never default to us-east-1 here but doing this just in case the return code
+    # changes to 0.
+    region == '' ? 'us-east-1' : region
+  end
+
+  @@aws_bin = nil
+  # Auto detects the aws binary for use, will use an aws binary based on the following precedence:
+  #
+  #   1. JACK_AWS_BIN environmental variable
+  #   2. aws detected using the load path.
+  #      For example: /usr/bin/local/aws if /usr/bin/local/ is earlest in the load path.
+  #   3. /opt/bolts/embedded/bin/aws - This comes packaged with the the bolts toolbelt.
+  #      https://boltops.com/toolbelt
+  #
+  # If an aws installation is not deetcted it'll display a message and exit the program.
+  def aws_bin
+    return @@aws_bin if @@aws_bin
+
+    return @@aws_bin = "aws" if ENV['TEST']
+
+    return @@aws_bin = ENV["JACK_AWS_BIN"] if ENV["JACK_AWS_BIN"]
+
+    which_aws = `which aws`.strip
+    return @@aws_bin = which_aws if which_aws
+
+    embedded_aws = "/opt/bolts/embedded/bin/aws"
+    return @@aws_bin = embedded_aws if File.exist?(embedded_aws)
+
+    # if reach here we did not detect the eb binary
+    message = "ERROR: Unable to auto detect an aws executable. Please make sure you have installed the aws cli tool.\n"
+    message << if RUBY_PLATFORM =~ /darwin/
+        "You can install the aws tool via homebrew:\n\nbrew install awscli"
+      else
+        "Installation instructions: http://docs.aws.amazon.com/cli/latest/userguide/installing.html"
+      end
+    abort(message)
+  end
+
+  @@eb_bin = nil
+  # Auto detects the eb binary for use, will use an eb binary based on the following precedence:
+  #
+  #   1. JACK_EB_BIN environmental variable
+  #   2. eb detected using the load path.
+  #      For example: /usr/bin/local/eb if /usr/bin/local/ is earlest in the load path.
+  #   3. /opt/bolts/embedded/bin/eb - This comes packaged with the the bolts toolbelt.
+  #      https://boltops.com/toolbelt
+  #
+  # If an eb installation is not deetcted it'll display a message and exit the program.
+  def eb_bin
+    return @@eb_bin if @@eb_bin
+
+    return @@eb_bin = "eb" if ENV['TEST']
+
+    return @@eb_bin = ENV["JACK_EB_BIN"] if ENV["JACK_EB_BIN"]
+
+    which_eb = `which eb`.strip
+    return @@eb_bin = which_eb if which_eb
+
+    embedded_eb = "/opt/bolts/embedded/bin/eb"
+    return @@eb_bin = embedded_eb if File.exist?(embedded_aws)
+
+    # if reach here we did not detect the eb binary
+    message = "ERROR: Unable to auto detect an eb executable. Please make sure you have installed the eb cli tool.\n"
+    instructions = VersionChecker.new.install_instructions
+    message << instructions
+    abort(message)
+  end
+
+  def eb_base_flags
+    return @eb_base_flags if @eb_base_flags
+    region = get_region
+    profile = ENV['AWS_PROFILE']
+    flags = {
+      profile: region ? " --profile #{profile}" : "",
+      region: region ? " -r #{region}" : ""
+    }
+    @eb_base_flags = "#{flags[:profile]}#{flags[:region]}"
   end
 end

data/lib/jack/version.rb

@@ -1,3 +1,3 @@
 module Jack
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/lib/jack/version_checker.rb

@@ -1,23 +1,25 @@
 module Jack
   class VersionChecker
     REQUIRED_VERSION = "3.1.2"
+    include Util
 
     def run
-      leave(not_installed) unless system("type eb > /dev/null 2>&1")
+      leave(not_installed) unless system("type #{eb_bin} > /dev/null 2>&1")
       leave(version_too_low) unless check
-      # "SORRY: #{message}, please install at least version #{REQUIRED_VERSION}")
     end
 
     def check
-      major, minor, patch = normalize_version(parsed_version)
-      r_major, r_minor, r_patch = normalize_version(REQUIRED_VERSION)
+      major, minor, patch = version_parts(parsed_version)
+      r_major, r_minor, r_patch = version_parts(REQUIRED_VERSION)
       (major > r_major) ||
       (major == r_major && minor > r_minor) ||
       (major == r_major && minor == r_minor && patch >= r_patch)
     end
 
     def get_version
-      `eb --version`
+      command = "#{eb_bin} --version"
+      puts "command: #{command}"
+      `#{eb_bin} --version`
     end
 
     def parsed_version
@@ -29,7 +31,7 @@ module Jack
     end
 
 
-    def normalize_version(parsed)
+    def version_parts(parsed)
       parsed.split('.').collect(&:to_i)
     end
 

data/spec/lib/cli_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Jack::CLI do
   before(:all) do
-    @args = "hi-web-stag-1 --root spec/fixtures/project --noop --force"
+    @args = "hi-web-stag-1 --root spec/fixtures/project --noop --sure"
     FileUtils.rm_rf("spec/fixtures/project/.elasticbeanstalk")
   end
 
@@ -19,7 +19,7 @@ describe Jack::CLI do
     it "should upload and apply config to environment" do
       out = execute("bin/jack config upload #{@args}")
       # puts out
-      expect(out).to include('eb config put')
+      expect(out).to include('eb config save')
     end
 
     it "should download config from environment" do
@@ -31,7 +31,7 @@ describe Jack::CLI do
     it "should diff local config from eb environment config" do
       out = execute("bin/jack config diff #{@args}")
       # puts out
-      expect(out).to include("Comparing")
+      expect(out).to include("diff")
     end
 
     it "should reformat the local config to a sorted yaml format" do
@@ -39,5 +39,11 @@ describe Jack::CLI do
       # puts out
       expect(out).to include("Reformatted the local config")
     end
+
+    it "should terminate enviornment" do
+      out = execute("bin/jack terminate #{@args}")
+      # puts out
+      expect(out).to include("Whew that was close")
+    end
   end
 end

data/spec/lib/config/diff_spec.rb

@@ -8,8 +8,8 @@ describe Jack::Config do
   let(:diff) { Jack::Config::Diff.new(test_options) }
 
   describe "diff" do
-    it "diff do_diff" do
-      expect(diff).to receive(:do_diff)
+    it "diff compute_diff" do
+      expect(diff).to receive(:compute_diff)
       diff.run
     end
 
@@ -18,4 +18,4 @@ describe Jack::Config do
       expect(command).to match /diff/
     end
   end
-end
+end

data/spec/lib/config/upload_spec.rb

@@ -17,6 +17,8 @@ describe Jack::Config::Upload do
     end
 
     it "upload flow" do
+      allow(upload).to receive(:compare).and_return(true)
+
       expect(upload).to receive(:compare)
       expect(upload).to receive(:upload)
       expect(upload).to receive(:update_env)

data/spec/lib/verison_checker_spec.rb

@@ -26,7 +26,7 @@ describe Jack::VersionChecker do
 
     it "parse version" do
       version = checker.parse_version("EB CLI 3.2.0 (Python 2.7.6)")
-      expect(version).to eq [3,2,0]
+      expect(version).to eq "3.2.0"
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 ENV['TEST'] = '1'
+# Ensures aws api never called. Fixture home folder does not contain ~/.aws/credentails
+ENV['HOME'] = "spec/fixtures/home"
 
 require "pp"
 require 'ostruct'
@@ -10,6 +12,7 @@ require "#{root}/lib/jack"
 require "#{root}/spec/support/fake_project"
 
 module Helpers
+  # TEST=1 DEBUG=1 bin/jack config diff hi-web-stag-1 --root spec/fixtures/project --noop --sure
   def execute(cmd)
     puts "Running: #{cmd}" if ENV['DEBUG']
     out = `#{cmd}`
@@ -21,7 +24,7 @@ module Helpers
     {
       noop: true,
       mute: true,
-      force: true,
+      sure: true,
       root: @root,
       env_name: env_name
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jack-eb
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -118,7 +118,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -126,14 +125,15 @@ files:
 - README.md
 - Rakefile
 - bin/jack
+- circle.yml
 - jack.gemspec
 - lib/jack.rb
 - lib/jack/cli.rb
-- lib/jack/cli/help.rb
 - lib/jack/command.rb
 - lib/jack/config.rb
 - lib/jack/config/diff.rb
 - lib/jack/config/download.rb
+- lib/jack/config/help.rb
 - lib/jack/config/sort.rb
 - lib/jack/config/transmit.rb
 - lib/jack/config/upload.rb
@@ -145,7 +145,9 @@ files:
 - lib/jack/eb_config/create.rb
 - lib/jack/eb_config/update.rb
 - lib/jack/ext/hash.rb
+- lib/jack/help.rb
 - lib/jack/settings.rb
+- lib/jack/terminate.rb
 - lib/jack/ui.rb
 - lib/jack/util.rb
 - lib/jack/version.rb

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.3.3

data/lib/jack/cli/help.rb

@@ -1,107 +0,0 @@
-module Jack
-  class CLI < Command
-    class Help
-      class << self
-        def convention
-<<-EOL
-The configuration name is based on convention.  An environment with the name of hi-web-stag-1 results in the jack/cfg/stag-rails-app.cfg.yml being used.  The convention can be overriden with the --cfg option.
-EOL
-        end
-
-        def create
-<<-EOL
-Creates a new environment using the configuration in jack/cfg folder.  The AWS sample app is initially used for the newly created environment.  The sample app is used as a starting point to make sure that the environment is working before you introduce your own app code.
-
-#{convention}
-
-Example:
-
-$ jack create hi-web-stag-1
-
-$ jack create -c myconfig hi-web-stag-1
-
-$ jack create -a myapp -c myconfig hi-web-stag-1
-EOL
-        end
-
-        def upload
-<<-EOL
-Uploads the specified template configuration in jack/cfg and applies it to the environment immediately.
-
-#{convention}
-
-Example:
-
-$ jack config upload hi-web-stag-1
-
-$ jack config upload myapp -c myconfig hi-web-stag-1
-EOL
-        end
-
-        def download
-<<-EOL
-Downloads the environment's config to jack/cfg/[CONFIG_NAME].cfg.yml
-
-#{convention}
-
-Example:
-
-$ jack config download hi-web-stag-1
-
-$ jack config download myapp -c myconfig hi-web-stag-1
-EOL
-        end
-
-
-        def diff
-<<-EOL
-Diff local jack config vs environment config.  The environment config is generated on the fly.
-
-If you have colordiff installed the diff command will use make use of it.  If you want to have your own custom diff, you can set your JACK_DIFF environment variable to it.
-
-#{convention}
-
-Example:
-
-$ jack config diff hi-web-stag-1
-
-$ jack config diff myapp -c myconfig hi-web-stag-1
-EOL
-        end
-
-        def sort
-<<-EOL
-Reformats local jack config file to a sorted yaml format.
-
-#{convention}
-
-Example:
-
-$ jack config sort hi-web-stag-1
-
-$ jack config sort -c myconfig hi-web-stag-1 # env name doesnt matter here
-EOL
-        end
-
-        # dumb thor bug, so this doesnt even show, leaving here in case Thor is fixed
-        def config
-<<-EOL
-Manage the environment's config.  Can use this to download the environment's config to jack/cfg folder or upload config in jack/cfg folder and apply it to the environment.
-
-Example:
-
-$ jack config download hi-web-stag-1
-
-For more info:
-
-$ jack help config
-
-$ jack config help apply
-
-$ jack config help download
-EOL
-        end
-      end
-    end
-  end
-end