ec2ssh 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3ea6bd5f9d58e822861e9bcdb35c18df8da80bbc3273a8645483bac6d1d53cf
-  data.tar.gz: d5326d28bfbc630696d42c692dc90e3eae03a0240bece33f6893ac0584f3763d
+  metadata.gz: 392df01c5d38c8c1dc5589258e885cd348646467303abc15cf346101e4a9d441
+  data.tar.gz: b9eb640b664ef6701e50754ff4cf3b3082c66d3132b94350f8a4eb398b764ace
 SHA512:
-  metadata.gz: d22a8bcdc6c4317c09d2b36aee3aaf0a06b5f7412f7e318f40579fb5d6bdeaa3f24d10eaea0a294e253c31ee1e23f2719c5f66bdf20dc46da8931addf471f69c
-  data.tar.gz: 53d4f48c7a7a3dbbbd48d0f0382dfe0715c7af1750b978b9e14183d16adc4bbfaff8872ab65ed2c5ced36debe570682f34c94cb8824735fa800a29ac349f2cea
+  metadata.gz: 331921d24eace17e5ebdfc94aec1c231e7ebd4e7b9fe1619b7e1c28b8f2fd288109530ea3a54eb3d830141d04f35ef43c777d9d4c2071080aaf745bac3b93dcf
+  data.tar.gz: 224f8d90beb435c656c0d50ae1edff0684ace90f4aa9d7a75c1c62f75bfc3aedee1a590deecb5d93f07d42d4c401775c9a892eee86643b169a13493b5473d46e

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - 2.2
-  - 2.3
-  - 2.4.0
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
   - ruby-head
 script: 'bundle exec rspec spec'
 before_install: gem install bundler -v 1.14.3

data/ChangeLog.md

@@ -1,4 +1,13 @@
 # Change Log
+
+## 5.0.0
+* Remove `--aws-key` option and add `--path` option in shellcomp (#56)
+* Use aws-sdk v3 and stop using v2 (#54)
+* Delete `rubyforge_project=` in gemspec (#51)
+* Relax thor and highline versions (#49)
+* CI against Ruby 2.5, 2.6 and 2.7 (#45, #55)
+* Drop support outdated Ruby 2.2 and 2.3 (#59)
+
 ## 4.0.0
 * Use aws-sdk v2 and stop using v1 (#44)
 * Support AssumeRole with `~/.aws/credentials` (#44)

data/Gemfile

@@ -6,7 +6,9 @@ gem 'rspec', '~> 3.0'
 gem 'rspec-its', '~> 1.0'
 gem 'guard-rspec', '~> 4.3'
 gem 'webmock', '~> 1.9'
-gem 'rb-fsevent', '~> 0.9.1'
+gem 'rb-fsevent', '~> 0.10'
 gem 'timecop', '~> 0.5'
-gem 'fakefs', '~> 0.6.0', require: 'fakefs/safe'
+gem 'fakefs', '~> 1.2', require: 'fakefs/safe'
 gem 'vcr', '~> 3.0'
+
+gem 'rexml' if RUBY_VERSION >= '2.8.0'

data/README.md

@@ -1,4 +1,5 @@
-[![Build Status](https://travis-ci.org/mirakui/ec2ssh.png?branch=master)](https://travis-ci.org/mirakui/ec2ssh)
+[![Gem Version](https://badge.fury.io/rb/ec2ssh.svg)](https://badge.fury.io/rb/ec2ssh)
+[![Build Status](https://travis-ci.org/mirakui/ec2ssh.svg?branch=master)](https://travis-ci.org/mirakui/ec2ssh)
 
 # Introduction
 ec2ssh is a ssh_config manager for Amazon EC2.
@@ -53,7 +54,7 @@ filters([
 ])
 
 # You can use methods of AWS::EC2::Instance and tag(key) method.
-# See https://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Instance.html
+# See https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/EC2/Instance.html
 host_line <<END
 Host <%= tag('Name') %>.<%= placement.availability_zone %>
   HostName <%= public_dns_name || private_ip_address %>
@@ -124,8 +125,8 @@ Host db-server-1.ap-southeast-1
 Dotfile (`.ec2ssh`) format has been changed from 3.x.
 
 * A instance tag access I/F has been changed from `tags['Name']` to `tag('Name')`
-* `Aws::EC2::Instance` methods have been changed to AWS SDK v2
-* The `aws_keys` structure have benn changed
+* `Aws::EC2::Instance` methods have been changed to AWS SDK v3
+* The `aws_keys` structure has been changed
   * `aws_keys[profile_name][region] # => Aws::Credentials`
   * For example:
 
@@ -144,4 +145,4 @@ aws_keys(
 Use `zsh/_ec2ssh`.
 
 # License
-Copyright (c) 2019 Issei Naruta. ec2ssh is released under the MIT license.
+Copyright (c) 2020 Issei Naruta. ec2ssh is released under the MIT license.

data/bash/ec2ssh.bash

@@ -7,7 +7,7 @@ _ec2ssh() {
     prev=$3
 
     subcmds="help init remove update version"
-    common_opts="--dotfile --verbose"
+    common_opts="--path --dotfile --verbose"
 
     # contextual completion
     case $prev in
@@ -21,11 +21,7 @@ _ec2ssh() {
             esac
             return 0
             ;;
-        --aws-key)
-            COMPREPLY=()
-            return 0;
-            ;;
-        --dotfile)
+        --path | --dotfile)
             COMPREPLY=( $(compgen -o default -- "$cur"))
             return 0;
             ;;
@@ -35,9 +31,6 @@ _ec2ssh() {
     subcmd=${COMP_WORDS[1]}
 
     case $subcmd in
-        update)
-            COMPREPLY=( $(compgen -W "--aws-key $common_opts" -- "$cur") )
-            ;;
         help)
             COMPREPLY=( $(compgen -W "$subcmds" $cur) )
             ;;

data/ec2ssh.gemspec

@@ -9,14 +9,15 @@ Gem::Specification.new do |s|
   s.authors     = ["Issei Naruta"]
   s.email       = ["mimitako@gmail.com"]
   s.homepage    = "http://github.com/mirakui/ec2ssh"
+  s.license     = "MIT"
   s.summary     = %q{A ssh_config manager for AWS EC2}
   s.description = %q{ec2ssh is a ssh_config manager for AWS EC2}
-  s.required_ruby_version = ">= 2.2.0"
+  s.required_ruby_version = ">= 2.4.0"
 
-  s.rubyforge_project = "ec2ssh"
-  s.add_dependency "thor", "~> 0.14"
-  s.add_dependency "highline", "~> 1.6"
-  s.add_dependency "aws-sdk", "~> 2"
+  s.add_dependency "thor", ">= 0.14", "< 2.0"
+  s.add_dependency "highline", ">= 1.6", "< 3.0"
+  s.add_dependency "aws-sdk-core", "~> 3"
+  s.add_dependency "aws-sdk-ec2", "~> 1"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/ec2ssh/cli.rb

@@ -97,7 +97,7 @@ EOS
       def set_aws_logging
         if options.verbose
           require 'logger'
-          require 'aws-sdk'
+          require 'aws-sdk-core'
           logger = ::Logger.new($stdout)
           logger.level = ::Logger::DEBUG
           ::Aws.config.update logger: logger

data/lib/ec2ssh/dsl.rb

@@ -1,5 +1,5 @@
 require 'ec2ssh/exceptions'
-require 'aws-sdk'
+require 'aws-sdk-core'
 
 module Ec2ssh
   class Dsl

data/lib/ec2ssh/ec2_instances.rb

@@ -1,4 +1,6 @@
-require 'aws-sdk'
+require 'aws-sdk-core'
+require 'aws-sdk-ec2'
+require 'ec2ssh/exceptions'
 
 module Ec2ssh
   class Ec2Instances

data/lib/ec2ssh/version.rb

@@ -1,3 +1,3 @@
 module Ec2ssh
-  VERSION = '4.0.0'
+  VERSION = '5.0.0'
 end

data/spec/aws_sdk_compatibility_spec.rb

@@ -42,14 +42,13 @@ describe 'aws-sdk compatibility' do
   it { expect(ins.client_token).to match /\A\w{18}\z/ }
   # it { expect(ins.cpu_options).to be_nil }
   it { expect(ins.ebs_optimized).to be_falsy }
-  # it { expect(ins.elastic_gpu_associations).to be_nil }
+  it { expect(ins.elastic_gpu_associations).to be_nil }
   # it { expect(ins.elastic_inference_accelerator_associations).to be_nil }
-  # it { expect(ins.ena_support).to be_falsy }
+  it { expect(ins.ena_support).to be_falsy }
   # it { expect(ins.hibernation_options).to be_nil}
   it { expect(ins.hypervisor).to be == 'xen' }
   it { expect(ins.iam_instance_profile).to have_attributes(arn: /\Aarn:aws:iam::\d+:instance-profile\/[\w\-]+\z/, id: /\A\w{21}\z/) }
   it { expect(ins.id).to match /\Ai-\w+\z/ }
-  it { expect(ins.identifiers).to match(id: /\Ai-\w+\z/) }
   it { expect(ins.image).to be_a(Aws::EC2::Image) }
   it { expect(ins.image_id).to match /\Aami-\w+\z/ }
   it { expect(ins.instance_id).to match /\Ai-\w+\z/ }
@@ -57,7 +56,7 @@ describe 'aws-sdk compatibility' do
   it { expect(ins.instance_type).to match /\A[trmci][1248]\.\w+\z/ }
   it { expect(ins.kernel_id).to be_nil }
   it { expect(ins.key_name).to match /\A.+\.pem\z/ }
-  # it { expect(ins.key_pair).to be_a(Aws::EC2::KeyPairInfo) }
+  it { expect(ins.key_pair).to be_a(Aws::EC2::KeyPairInfo) }
   it { expect(ins.launch_time).to be_a(Time) }
   # it { expect(ins.licenses).to all have_attributes(license_configuration_arn: '') }
   it { expect(ins.monitoring).to have_attributes(state: 'disabled') }

data/zsh/_ec2ssh

@@ -3,40 +3,35 @@
 # main completion function
 _ec2ssh-init() {
     local ret
-    _call_function ret __ec2ssh_noarg_cmd
+    _call_function ret __ec2ssh_common_cmd
     return $ret
 }
 
 _ec2ssh-remove() {
     local ret
-    _call_function ret __ec2ssh_noarg_cmd
+    _call_function ret __ec2ssh_common_cmd
     return $ret
 }
 
 _ec2ssh-update() {
-    local curcontext context state line
-    declare -A opt_args
-
-    integer ret=1
-    _arguments -C -S \
-               '--aws-key:aws key name' \
-               '--dotfile:ec2ssh dotfile:_files' \
-               '--verbose' && return
+    local ret
+    _call_function ret __ec2ssh_common_cmd
     return $ret
 }
 
 _ec2ssh-version() {
     local ret
-    _call_function ret __ec2ssh_noarg_cmd
+    _call_function ret __ec2ssh_common_cmd
     return $ret
 }
 
-__ec2ssh_noarg_cmd() {
+__ec2ssh_common_cmd() {
     local curcontext context state line
     declare -A opt_args
 
     integer ret=1
     _arguments -C -S \
+        '--path:ssh_config file:_files' \
         '--dotfile:ec2ssh dotfile:_files' \
         '--verbose' && return
     return $ret
@@ -49,6 +44,7 @@ _ec2ssh() {
     integer ret=1
 
     _arguments -C -S \
+        '--path:ssh_config file:_files' \
         '--dotfile:ec2ssh dotfile:_files' \
         '--verbose' \
         '(-): :->commands' \

metadata

@@ -1,57 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: ec2ssh
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Issei Naruta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
 description: ec2ssh is a ssh_config manager for AWS EC2
 email:
 - mimitako@gmail.com
@@ -97,7 +123,8 @@ files:
 - spec/spec_helper.rb
 - zsh/_ec2ssh
 homepage: http://github.com/mirakui/ec2ssh
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -107,14 +134,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A ssh_config manager for AWS EC2