aws-ec2 0.9.0 → 1.0.0

data/lib/aws_ec2/template/helper/ssh_key_helper.rb

@@ -0,0 +1,21 @@
+module AwsEc2::Template::Helper::SshKeyHelper
+  def add_ssh_key(user="ec2-user")
+    key_path = "#{ENV['HOME']}/.ssh/id_rsa.pub"
+    if File.exist?(key_path)
+      public_key = IO.read(key_path).strip
+    end
+    if public_key
+      <<-SCRIPT
+# Automatically add user's public key from #{key_path}
+cp /home/#{user}/.ssh/authorized_keys{,.bak}
+echo #{public_key} >> /home/#{user}/.ssh/authorized_keys
+chown #{user}:#{user} /home/#{user}/.ssh/authorized_keys
+SCRIPT
+    else
+      <<-SCRIPT
+# WARN: unable to find a ~/.ssh/id_rsa.pub locally on your machine.  user: #{ENV}['USER']
+# Unable to automatically add the public key
+SCRIPT
+    end
+  end
+end

data/lib/aws_ec2/version.rb

@@ -1,3 +1,3 @@
 module AwsEc2
-  VERSION = "0.9.0"
+  VERSION = "1.0.0"
 end

data/spec/lib/cli_spec.rb

@@ -20,5 +20,19 @@ describe AwsEc2::CLI do
       out = execute("exe/aws-ec2 ami myimage #{@args}")
       expect(out).to include("Creating EC2 instance")
     end
+
+    commands = {
+      "am" => "ami",
+      "compile" => "--profile",
+      "create -" =>  "--profile",
+      "create" => "name",
+      "create name --" => "--profile",
+    }
+    commands.each do |command, expected_word|
+      it "completion #{command}" do
+        out = execute("exe/aws-ec2 completion #{command}")
+        expect(out).to include(expected_word) # only checking for one word for simplicity
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -4,20 +4,30 @@ ENV["AWS_EC2_ROOT"] = "spec/fixtures/demo_project"
 # Ensures aws api never called. Fixture home folder does not contain ~/.aws/credentails
 ENV['HOME'] = "spec/fixtures/home"
 
-require "pp"
+# CodeClimate test coverage: https://docs.codeclimate.com/docs/configuring-test-coverage
+# require 'simplecov'
+# SimpleCov.start
 
-root = File.expand_path("../../", __FILE__)
+require "pp"
+require "byebug"
+root = File.expand_path("../", File.dirname(__FILE__))
 require "#{root}/lib/aws-ec2"
 
-module Helpers
+module Helper
   def execute(cmd)
-    puts "Running: #{cmd}" if ENV["DEBUG"]
+    puts "Running: #{cmd}" if show_command?
     out = `#{cmd}`
-    puts out if ENV["DEBUG"]
+    puts out if show_command?
     out
   end
+
+  # Added SHOW_COMMAND because DEBUG is also used by other libraries like
+  # bundler and it shows its internal debugging logging also.
+  def show_command?
+    ENV['DEBUG'] || ENV['SHOW_COMMAND']
+  end
 end
 
 RSpec.configure do |c|
-  c.include Helpers
+  c.include Helper
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: aws-ec2
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: filesize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-ec2
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,13 +95,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: render_me_pretty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,7 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: thor
+  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
     requirements:
     - - ">="
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -178,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple tool to create AWS ec2 instances consistently with pre-configured
   settings
 email:
@@ -188,6 +216,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitmodules"
 - ".rspec"
 - CHANGELOG.md
 - Gemfile
@@ -212,6 +241,9 @@ files:
 - lib/aws_ec2/base.rb
 - lib/aws_ec2/cli.rb
 - lib/aws_ec2/command.rb
+- lib/aws_ec2/completer.rb
+- lib/aws_ec2/completer/script.rb
+- lib/aws_ec2/completer/script.sh
 - lib/aws_ec2/config.rb
 - lib/aws_ec2/core.rb
 - lib/aws_ec2/create.rb
@@ -221,19 +253,27 @@ files:
 - lib/aws_ec2/help.rb
 - lib/aws_ec2/help/ami.md
 - lib/aws_ec2/help/compile.md
+- lib/aws_ec2/help/completion.md
+- lib/aws_ec2/help/completion_script.md
 - lib/aws_ec2/help/create.md
 - lib/aws_ec2/help/upload.md
 - lib/aws_ec2/hook.rb
 - lib/aws_ec2/profile.rb
 - lib/aws_ec2/script.rb
 - lib/aws_ec2/script/compile.rb
+- lib/aws_ec2/script/compress.rb
 - lib/aws_ec2/script/upload.rb
 - lib/aws_ec2/scripts/ami_creation.sh
 - lib/aws_ec2/scripts/auto_terminate.sh
-- lib/aws_ec2/template_helper.rb
-- lib/aws_ec2/template_helper/ami_helper.rb
-- lib/aws_ec2/template_helper/core_helper.rb
-- lib/aws_ec2/template_helper/partial_helper.rb
+- lib/aws_ec2/setting.rb
+- lib/aws_ec2/template.rb
+- lib/aws_ec2/template/context.rb
+- lib/aws_ec2/template/helper.rb
+- lib/aws_ec2/template/helper/ami_helper.rb
+- lib/aws_ec2/template/helper/core_helper.rb
+- lib/aws_ec2/template/helper/partial_helper.rb
+- lib/aws_ec2/template/helper/script_helper.rb
+- lib/aws_ec2/template/helper/ssh_key_helper.rb
 - lib/aws_ec2/version.rb
 - spec/fixtures/demo_project/config/test.yml
 - spec/fixtures/demo_project/profiles/default.yml

data/lib/aws_ec2/template_helper.rb

@@ -1,18 +0,0 @@
-require "active_support" # for autoload
-require "active_support/core_ext/string"
-
-module AwsEc2
-  module TemplateHelper
-    # auto load all the template_helpers
-    template_helper_path = File.expand_path("../template_helper", __FILE__)
-    Dir.glob("#{template_helper_path}/*").each do |path|
-      next if File.directory?(path)
-      filename = File.basename(path, '.rb')
-      class_name = filename.classify
-      instance_eval do
-        autoload class_name.to_sym, "aws_ec2/template_helper/#{filename}"
-        include const_get(class_name)
-      end
-    end
-  end
-end

data/lib/aws_ec2/template_helper/core_helper.rb

@@ -1,98 +0,0 @@
-require "base64"
-require "erb"
-
-module AwsEc2::TemplateHelper::CoreHelper
-  def user_data(name, base64=true)
-    # allow user to specify the path also
-    if File.exist?(name)
-      name = File.basename(name) # normalize name, change path to name
-    end
-    name = File.basename(name, '.sh')
-    path = "#{AwsEc2.root}/app/user-data/#{name}.sh"
-    result = erb_result(path)
-    result = append_scripts(result)
-
-    # save the unencoded user-data script for easy debugging
-    temp_path = "#{AwsEc2.root}/tmp/user-data.txt"
-    FileUtils.mkdir_p(File.dirname(temp_path))
-    IO.write(temp_path, result)
-
-    base64 ? Base64.encode64(result).strip : result
-  end
-
-  # provides access to config/* settings as variables
-  #   AWS_EC2_ENV=development => config/development.yml
-  #   AWS_EC2_ENV=production => config/production.yml
-  def config
-    AwsEc2.config
-  end
-
-  # pretty timestamp that is useful for ami ids.
-  # the timestamp is generated once and cached.
-  def timestamp
-    @timestamp ||= Time.now.strftime("%Y-%m-%d-%H-%M-%S")
-  end
-
-private
-  def append_scripts(user_data)
-    # assuming user-data script is a bash script for simplicity
-    script = AwsEc2::Script.new(@options)
-    user_data += script.auto_terminate if @options[:auto_terminate]
-    user_data += script.create_ami if @options[:ami_name]
-    user_data
-  end
-
-  # Load custom helper methods from the project repo
-  def load_custom_helpers
-    Dir.glob("#{AwsEc2.root}/app/helpers/**/*_helper.rb").each do |path|
-      filename = path.sub(%r{.*/},'').sub('.rb','')
-      module_name = filename.classify
-
-      require path
-      self.class.send :include, module_name.constantize
-    end
-
-  end
-
-  def erb_result(path)
-    load_custom_helpers
-    template = IO.read(path)
-
-    # Allow a way to bypass the custom ERB error handling in case
-    # the error is in the lambdagem code.
-    if ENV['DEBUG']
-      return ERB.new(template, nil, "-").result(binding)
-    end
-
-    begin
-      ERB.new(template, nil, "-").result(binding)
-    rescue Exception => e
-      puts e
-
-      # how to know where ERB stopped? - https://www.ruby-forum.com/topic/182051
-      # syntax errors have the (erb):xxx info in e.message
-      # undefined variables have (erb):xxx info in e.backtrac
-      error_info = e.message.split("\n").grep(/\(erb\)/)[0]
-      error_info ||= e.backtrace.grep(/\(erb\)/)[0]
-      raise unless error_info # unable to find the (erb):xxx: error line
-      line = error_info.split(':')[1].to_i
-      puts "Error evaluating ERB template on line #{line.to_s.colorize(:red)} of: #{path.sub(/^\.\//, '')}"
-
-      template_lines = template.split("\n")
-      context = 5 # lines of context
-      top, bottom = [line-context-1, 0].max, line+context-1
-      spacing = template_lines.size.to_s.size
-      template_lines[top..bottom].each_with_index do |line_content, index|
-        line_number = top+index+1
-        if line_number == line
-          printf("%#{spacing}d %s\n".colorize(:red), line_number, line_content)
-        else
-          printf("%#{spacing}d %s\n", line_number, line_content)
-        end
-      end
-
-      puts "\nIf the this error does not make sense and the error is not in the ERB template. Run the command again with DEBUG=1 to show the full lambdagem backtrace"
-      exit 1 unless ENV['TEST']
-    end
-  end
-end