ec2ssh 3.1.0.rc1 → 5.0.0

data/spec/lib/ec2ssh/command/update_spec.rb

@@ -3,10 +3,13 @@ require 'ec2ssh/command/update'
 require 'ec2ssh/exceptions'
 
 describe Ec2ssh::Command::Update do
+  include FakeFS::SpecHelpers
+
   describe '#run' do
     let(:command) do
       described_class.new(cli).tap do |cmd|
         allow(cmd).to receive(:options).and_return(options)
+        allow(cmd.builder).to receive(:aws_keys) { aws_keys }
         allow(cmd.builder.ec2s).to receive(:instances) { instances }
       end
     end
@@ -16,10 +19,13 @@ describe Ec2ssh::Command::Update do
     let(:cli) do
       double(:cli, options: options, red: nil, yellow: nil, green: nil)
     end
+    let(:aws_keys) do
+      {'default' => {'us-west-1' => Aws::Credentials.new('access_key_id', 'secret_access_key')}}
+    end
     let(:instances) do
       [
-        double('instance', tags: {'Name' => 'srv1'}, private_ip_address: '10.0.0.1'),
-        double('instance', tags: {'Name' => 'srv2'}, private_ip_address: '10.0.0.2')
+        double('instance', private_ip_address: '10.0.0.1').tap {|m| allow(m).to receive(:tag).with('Name').and_return('srv1') },
+        double('instance', private_ip_address: '10.0.0.2').tap {|m| allow(m).to receive(:tag).with('Name').and_return('srv2') }
       ]
     end
 
@@ -32,11 +38,10 @@ describe Ec2ssh::Command::Update do
       let(:ssh_config_str) { '' }
       let(:dotfile_str) { <<-END }
 path '/dotfile'
-aws_keys(
-  default: { access_key_id: 'ACCESS_KEY1', secret_access_key: 'SECRET1' }
-)
+profiles 'default'
+regions 'us-west-1'
 host_line <<EOS
-Host <%= tags['Name'] %>
+Host <%= tag('Name') %>
   HostName <%= private_ip_address %>
 EOS
       END
@@ -58,11 +63,10 @@ EOS
 
       let(:dotfile_str) { <<-END }
 path '/dotfile'
-aws_keys(
-  default: { access_key_id: 'ACCESS_KEY1', secret_access_key: 'SECRET1' }
-)
+profiles 'default'
+regions 'us-west-1'
 host_line <<EOS
-Host <%= tags['Name'] %>
+Host <%= tag('Name') %>
   HostName <%= private_ip_address %>
 EOS
       END

data/spec/lib/ec2ssh/dsl_spec.rb

@@ -27,10 +27,9 @@ END
     let(:dsl_str) do
 <<-END
 aws_keys(
-  key1: { access_key_id: 'ACCESS_KEY1', secret_access_key: 'SECRET1' },
-  key2: { access_key_id: 'ACCESS_KEY2', secret_access_key: 'SECRET2' }
+  'key1' => { 'ap-northeast-1' => Aws::Credentials.new('ACCESS_KEY1', 'SECRET1') },
+  'key2' => { 'us-east-1' => Aws::Credentials.new('ACCESS_KEY2', 'SECRET2') }
 )
-regions 'ap-northeast-1', 'us-east-1'
 host_line 'host lines'
 reject {|instance| instance }
 path 'path'
@@ -40,13 +39,12 @@ END
     subject(:result) { Ec2ssh::Dsl::Parser.parse dsl_str }
 
     its(:profiles) { should be_nil }
-    its(:aws_keys) do
-      should == {
-        key1: { access_key_id: 'ACCESS_KEY1', secret_access_key: 'SECRET1' },
-        key2: { access_key_id: 'ACCESS_KEY2', secret_access_key: 'SECRET2' }
-      }
+    it do
+      expect(result.aws_keys).to match(
+        'key1' => { 'ap-northeast-1' => be_a(Aws::Credentials).and(have_attributes(access_key_id: 'ACCESS_KEY1', secret_access_key: 'SECRET1')) } ,
+        'key2' => { 'us-east-1' => be_a(Aws::Credentials).and(have_attributes(access_key_id: 'ACCESS_KEY2', secret_access_key: 'SECRET2')) }
+      )
     end
-    its(:regions) { should == ['ap-northeast-1', 'us-east-1'] }
     its(:host_line) { should == 'host lines' }
     it { expect(result.reject.call(123)).to eq(123) }
     its(:path) { should == 'path' }
@@ -56,8 +54,8 @@ END
     let(:dsl_str) do
 <<-END
 aws_keys(
-  key1: { access_key_id: 'ACCESS_KEY1', secret_access_key: 'SECRET1' },
-  key2: { access_key_id: 'ACCESS_KEY2', secret_access_key: 'SECRET2' }
+  'key1' => { 'ap-northeast-1' => Aws::Credentials.new('ACCESS_KEY1', 'SECRET1') },
+  'key2' => { 'us-east-1' => Aws::Credentials.new('ACCESS_KEY2', 'SECRET2') }
 )
 profiles 'default', 'myprofile'
 regions 'ap-northeast-1', 'us-east-1'
@@ -71,4 +69,39 @@ END
       expect { Ec2ssh::Dsl::Parser.parse dsl_str }.to raise_error Ec2ssh::DotfileValidationError
     end
   end
+
+  context 'with old structure aws_keys' do
+    let(:dsl_str) do
+<<-END
+aws_keys(
+  key1: { access_key_id: 'ACCESS_KEY1', secret_access_key: 'SECRET1' },
+  key2: { access_key_id: 'ACCESS_KEY2', secret_access_key: 'SECRET2' }
+)
+regions 'ap-northeast-1', 'us-east-1'
+host_line 'host lines'
+reject {|instance| instance }
+path 'path'
+END
+    end
+
+    it { expect { Ec2ssh::Dsl::Parser.parse dsl_str }.to raise_error Ec2ssh::DotfileValidationError }
+  end
+
+  context 'with filters' do
+    let(:dsl_str) do
+<<-END
+regions 'ap-northeast-1', 'us-east-1'
+filters [{
+  name: 'instance-state-name',
+  values: ['running', 'stopped']
+}]
+END
+    end
+
+    subject(:result) { Ec2ssh::Dsl::Parser.parse dsl_str }
+
+    it do
+      expect(result.filters).to eq([{name:'instance-state-name', values:['running', 'stopped']}])
+    end
+  end
 end

data/spec/lib/ec2ssh/ec2_instances_spec.rb

@@ -12,9 +12,11 @@ describe Ec2ssh::Ec2Instances do
     }
 
     let(:mock) do
-      described_class.new(profiles='', regions=[region]).tap do |e|
+      described_class.new(
+        {key_name => {region => ''}},
+        [{ name: 'instance-state-name', values: ['running'] }]
+      ).tap do |e|
         allow(e).to receive(:ec2s) { ec2s }
-        allow(e).to receive(:regions) { [region] }
       end
     end
 
@@ -37,9 +39,9 @@ describe Ec2ssh::Ec2Instances do
     context 'with non-empty names' do
       let(:mock_instances) {
         [
-          double('instance', n: 1, tags: {'Name' => 'srvB' }),
-          double('instance', n: 2, tags: {'Name' => 'srvA' }),
-          double('instance', n: 3, tags: {'Name' => 'srvC' })
+          double('instance', n: 1, tags: [double('tag', key: 'Name', value: 'srvB')]),
+          double('instance', n: 2, tags: [double('tag', key: 'Name', value: 'srvA')]),
+          double('instance', n: 3, tags: [double('tag', key: 'Name', value: 'srvC')])
         ]
       }
 
@@ -52,9 +54,9 @@ describe Ec2ssh::Ec2Instances do
     context 'with names including empty one' do
       let(:mock_instances) {
         [
-          double('instance', n: 1, tags: {'Name' => 'srvA'}),
-          double('instance', n: 2, tags: {}),
-          double('instance', n: 3, tags: {'Name' => 'srvC' })
+          double('instance', n: 1, tags: [double('tag', key: 'Name', value: 'srvA')]),
+          double('instance', n: 2, tags: []),
+          double('instance', n: 3, tags: [double('tag', key: 'Name', value: 'srvC')])
         ]
       }
 
@@ -63,6 +65,22 @@ describe Ec2ssh::Ec2Instances do
         expect(result.map {|ins| ins.n}).to match_array([2, 1, 3])
       end
     end
+  end
+
+  describe Ec2ssh::Ec2Instances::InstanceWrapper do
+    let(:mock_instance) {
+      double('instance', n: 1, tags: [double('tag', key: 'Name', value: 'srvA')])
+    }
+    let(:instance) { described_class.new(mock_instance) }
 
+    describe '#tag' do
+      it { expect(instance.tag('Name')).to eq 'srvA' }
+    end
+
+    describe '#tags' do
+      it { expect(instance.tags).to match_array(have_attributes(key: 'Name', value: 'srvA')) }
+      it { expect(instance.tags[0]).to have_attributes(key: 'Name', value: 'srvA') }
+      it { expect { instance.tags['Name'] }.to raise_error Ec2ssh::DotfileValidationError }
+    end
   end
 end

data/spec/lib/ec2ssh/ssh_config_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'ec2ssh/ssh_config'
 
 describe Ec2ssh::SshConfig do
+  include FakeFS::SpecHelpers
+
   let(:path) { Pathname('/ssh_config') }
 
   subject(:ssh_config) do

data/spec/spec_helper.rb

@@ -34,6 +34,10 @@ RSpec.configure do |config|
   end
 
   alias :silence :capture
+end
 
-  config.include FakeFS::SpecHelpers
+require 'vcr'
+VCR.configure do |config|
+  config.cassette_library_dir = "fixtures/vcr_cassettes"
+  config.hook_into :webmock
 end

data/zsh/_ec2ssh

@@ -3,82 +3,40 @@
 # main completion function
 _ec2ssh-init() {
     local ret
-    _call_function ret __ec2ssh_noarg_cmd
-    return $ret
-}
-
-_ec2ssh-migrate() {
-    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:__ec2ssh_aws_keys' \
-               '--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
 }
 
-_ec2ssh-help() {
-    local curcontext context state line
-    declare -A opt_args
-
-    integer ret=1
-    _arguments -C -S \
-               '(-): :->commands' && return
-
-    case $state in
-        (commands)
-            _ec2ssh_commands && ret=0
-            ;;
-    esac
-
-    return $ret
-}
-
-
-__ec2ssh_aws_keys() {
-    local keys dotfile
-
-    if (( ind = ${words[(I)--dotfile]} )) && [ -f "${~words[ind+1]}" ]; then
-        dotfile=${~words[ind+1]}
-    else
-        dotfile="$HOME/.ec2ssh"
-    fi
-
-    keys=$(echo "$dotfile" | ruby -r ec2ssh/dsl -e 'puts Ec2ssh::Dsl::Parser.parse_file(STDIN.read.strip).aws_keys.keys' 2> /dev/null)
-    _values 'aws key name' $(echo $keys)
-}
-
 _ec2ssh() {
     local curcontext context state line
     declare -A opt_args
@@ -86,6 +44,7 @@ _ec2ssh() {
     integer ret=1
 
     _arguments -C -S \
+        '--path:ssh_config file:_files' \
         '--dotfile:ec2ssh dotfile:_files' \
         '--verbose' \
         '(-): :->commands' \
@@ -111,7 +70,6 @@ _ec2ssh_commands() {
     _values 'command' \
         'help[Describe available commands or one specific command]' \
         'init[Add ec2ssh mark to ssh_config]' \
-        'migrate[Migrate dotfile from old versions]' \
         'remove[Remove ec2ssh mark from ssh_config]' \
         'update[Update ec2 hosts list in ssh_config]' \
         'version[Show version]'

metadata

@@ -1,57 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: ec2ssh
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc1
+  version: 5.0.0
 platform: ruby
 authors:
 - Issei Naruta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-08 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: '1.8'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1'
 description: ec2ssh is a ssh_config manager for AWS EC2
 email:
 - mimitako@gmail.com
@@ -73,33 +99,32 @@ files:
 - bin/ec2ssh
 - ec2ssh.gemspec
 - example/example.ec2ssh
+- fixtures/vcr_cassettes/ec2-instances.yml
 - lib/ec2ssh.rb
 - lib/ec2ssh/builder.rb
 - lib/ec2ssh/cli.rb
 - lib/ec2ssh/command.rb
 - lib/ec2ssh/command/init.rb
-- lib/ec2ssh/command/migrate.rb
 - lib/ec2ssh/command/remove.rb
 - lib/ec2ssh/command/update.rb
 - lib/ec2ssh/dsl.rb
 - lib/ec2ssh/ec2_instances.rb
 - lib/ec2ssh/exceptions.rb
-- lib/ec2ssh/migrator.rb
 - lib/ec2ssh/ssh_config.rb
 - lib/ec2ssh/version.rb
+- spec/aws_sdk_compatibility_spec.rb
 - spec/lib/ec2ssh/builder_spec.rb
 - spec/lib/ec2ssh/command/init_spec.rb
-- spec/lib/ec2ssh/command/migrate_spec.rb
 - spec/lib/ec2ssh/command/remove_spec.rb
 - spec/lib/ec2ssh/command/update_spec.rb
 - spec/lib/ec2ssh/dsl_spec.rb
 - spec/lib/ec2ssh/ec2_instances_spec.rb
-- spec/lib/ec2ssh/migrator_spec.rb
 - spec/lib/ec2ssh/ssh_config_spec.rb
 - spec/spec_helper.rb
 - zsh/_ec2ssh
 homepage: http://github.com/mirakui/ec2ssh
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -109,26 +134,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: ec2ssh
-rubygems_version: 2.4.5
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A ssh_config manager for AWS EC2
 test_files:
+- spec/aws_sdk_compatibility_spec.rb
 - spec/lib/ec2ssh/builder_spec.rb
 - spec/lib/ec2ssh/command/init_spec.rb
-- spec/lib/ec2ssh/command/migrate_spec.rb
 - spec/lib/ec2ssh/command/remove_spec.rb
 - spec/lib/ec2ssh/command/update_spec.rb
 - spec/lib/ec2ssh/dsl_spec.rb
 - spec/lib/ec2ssh/ec2_instances_spec.rb
-- spec/lib/ec2ssh/migrator_spec.rb
 - spec/lib/ec2ssh/ssh_config_spec.rb
 - spec/spec_helper.rb