ec2ssh 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2d501500de8bca04cf4261c8c97725b215c787e2
-  data.tar.gz: cbd4138197443a93a89b53be60f19c5e5263ff4b
+SHA256:
+  metadata.gz: 82094a4ffb0cc7177a3174c0eb775bb77806541076133d515af86172ecb83bf6
+  data.tar.gz: 575e64da09628b5469c974133d2fcde4508498ca07c1a5bc9e55921e4fb9b5ee
 SHA512:
-  metadata.gz: 7b82d0e74f4a9332c6a9d375018e3ba3e54f57032a8abd901b218b91287c2bbc2b712276b6af37586b5162aab534e25b281341775cc2bbe190730be4f7af0028
-  data.tar.gz: 294504a89c81005a6e77958e6d5728dc8cf30bff31f03a054aa57b57f167d96340f314ce38370a00f1e552e8560cd7fb7185c55a28b2462f25642f11c743073b
+  metadata.gz: d14febefd3c85a7b3288fc60bf2836b303d3e5b89874c26bed96b4626c78f37fb1ebde3cd0b68f1f335e7330bb963295bef2174e6a1c3efbd44ef4f0cac26b27
+  data.tar.gz: 1f001fef1061f9e3ce41abea0984a7f36662699ad7290d945701bfd769c056cbd902661e405698673e5d876cb055cfb5535c4d0dee3cae3510fada99ef12d403

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
 rvm:
-  - 2.0
-  - 2.1
   - 2.2
-  - 2.3.0
+  - 2.3
+  - 2.4.0
   - ruby-head
 script: 'bundle exec rspec spec'
-before_install: gem install bundler -v 1.11.2
+before_install: gem install bundler -v 1.14.3
+notifications:
+  slack:
+    secure: CYxJDs0jJkrgXfbOyHuF+gJtxgK5JjS0GAFRNOlkWlDUmpEErtcnPuBOrlzkIBJS4eXaDOuSvpyRJSuJZJjEhmp94GEI98GEcyvByHuaehUWhzhUrhXstX/gg/Ntt6jiFR5dC6NrRWAnmKb7cDsfvagGAVNAuNzAtX0Z9iXWQDo=

data/ChangeLog.md

@@ -1,4 +1,8 @@
 # Change Log
+## 3.1.1
+* Fix a bug in `--verbose` option (#41)
+  Thanks to @adamlazz
+
 ## 3.1.0
 * Use credentials from `~/.aws/credentials` as default. Credential profiles are set as `profiles` in dotfile.
 * Revive path option for changing ssh config path (#34)

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 gemspec
 
+gem 'rake', '>= 12.0.0'
 gem 'rspec', '~> 3.0'
 gem 'rspec-its', '~> 1.0'
 gem 'guard-rspec', '~> 4.3'
@@ -8,3 +9,4 @@ gem 'webmock', '~> 1.9'
 gem 'rb-fsevent', '~> 0.9.1'
 gem 'timecop', '~> 0.5'
 gem 'fakefs', '~> 0.6.0', require: 'fakefs/safe'
+gem 'vcr', '~> 3.0'

data/Rakefile

@@ -1 +1,4 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new("spec")
+task :default => :spec

data/ec2ssh.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/mirakui/ec2ssh"
   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.0.0"
+  s.required_ruby_version = ">= 2.2.0"
 
   s.rubyforge_project = "ec2ssh"
   s.add_dependency "thor", "~> 0.14"

data/fixtures/vcr_cassettes/ec2-instances.yml

@@ -0,0 +1,178 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://ec2.us-west-1.amazonaws.com/
+    body:
+      encoding: UTF-8
+      string: Action=DescribeInstances&Filter.1.Name=instance-state-name&Filter.1.Value.1=running&Timestamp=2017-02-11T09%3A25%3A44Z&Version=2014-10-01
+    headers:
+      Content-Type:
+      - application/x-www-form-urlencoded; charset=utf-8
+      Accept-Encoding:
+      - ''
+      Content-Length:
+      - '137'
+      User-Agent:
+      - aws-sdk-ruby/1.66.0 ruby/2.3.3 x86_64-darwin15 memoizing
+      Host:
+      - ec2.us-west-1.amazonaws.com
+      X-Amz-Date:
+      - 20170211T092544Z
+      X-Amz-Content-Sha256:
+      - b522eeb0f435881e058aaba87cf05aad80856e36205835b070f61e3a2cea2f66
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/xml;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+      Vary:
+      - Accept-Encoding
+      Date:
+      - Sat, 11 Feb 2017 09:25:44 GMT
+      Server:
+      - AmazonEC2
+    body:
+      encoding: UTF-8
+      string: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2014-10-01/">
+            <requestId>9b40910f-51b7-44e2-b75b-96078a730000</requestId>
+            <reservationSet>
+                <item>
+                    <reservationId>r-058c6185fab780000</reservationId>
+                    <ownerId>000000000000</ownerId>
+                    <groupSet/>
+                    <instancesSet>
+                        <item>
+                            <instanceId>i-09e547eca106b0000</instanceId>
+                            <imageId>ami-165a0000</imageId>
+                            <instanceState>
+                                <code>16</code>
+                                <name>running</name>
+                            </instanceState>
+                            <privateDnsName>ip-172-31-9-193.us-west-1.compute.internal</privateDnsName>
+                            <dnsName>ec2-54-215-142-250.us-west-1.compute.amazonaws.com</dnsName>
+                            <reason/>
+                            <keyName>aws.pem</keyName>
+                            <amiLaunchIndex>0</amiLaunchIndex>
+                            <productCodes/>
+                            <instanceType>t2.micro</instanceType>
+                            <launchTime>2017-02-11T09:22:47.000Z</launchTime>
+                            <placement>
+                                <availabilityZone>us-west-1c</availabilityZone>
+                                <groupName/>
+                                <tenancy>default</tenancy>
+                            </placement>
+                            <monitoring>
+                                <state>disabled</state>
+                            </monitoring>
+                            <subnetId>subnet-b02b0000</subnetId>
+                            <vpcId>vpc-f8790000</vpcId>
+                            <privateIpAddress>172.31.9.193</privateIpAddress>
+                            <ipAddress>54.215.142.250</ipAddress>
+                            <sourceDestCheck>true</sourceDestCheck>
+                            <groupSet>
+                                <item>
+                                    <groupId>sg-a83f0000</groupId>
+                                    <groupName>default</groupName>
+                                </item>
+                                <item>
+                                    <groupId>sg-4db20000</groupId>
+                                    <groupName>ssh</groupName>
+                                </item>
+                            </groupSet>
+                            <architecture>x86_64</architecture>
+                            <rootDeviceType>ebs</rootDeviceType>
+                            <rootDeviceName>/dev/xvda</rootDeviceName>
+                            <blockDeviceMapping>
+                                <item>
+                                    <deviceName>/dev/xvda</deviceName>
+                                    <ebs>
+                                        <volumeId>vol-02a0f01045aadbf7f</volumeId>
+                                        <status>attached</status>
+                                        <attachTime>2017-02-11T09:22:48.000Z</attachTime>
+                                        <deleteOnTermination>true</deleteOnTermination>
+                                    </ebs>
+                                </item>
+                            </blockDeviceMapping>
+                            <virtualizationType>hvm</virtualizationType>
+                            <clientToken>XDpiz1486804967277</clientToken>
+                            <tagSet>
+                                <item>
+                                    <key>Role</key>
+                                    <value>ec2ssh-test</value>
+                                </item>
+                                <item>
+                                    <key>Name</key>
+                                    <value>ec2ssh-test-02</value>
+                                </item>
+                            </tagSet>
+                            <hypervisor>xen</hypervisor>
+                            <networkInterfaceSet>
+                                <item>
+                                    <networkInterfaceId>eni-f79a7ff6</networkInterfaceId>
+                                    <subnetId>subnet-b02b2ef6</subnetId>
+                                    <vpcId>vpc-f879939d</vpcId>
+                                    <description/>
+                                    <ownerId>000000000000</ownerId>
+                                    <status>in-use</status>
+                                    <macAddress>06:05:50:b3:b3:d8</macAddress>
+                                    <privateIpAddress>172.31.9.193</privateIpAddress>
+                                    <privateDnsName>ip-172-31-9-193.us-west-1.compute.internal</privateDnsName>
+                                    <sourceDestCheck>true</sourceDestCheck>
+                                    <groupSet>
+                                        <item>
+                                            <groupId>sg-a83f0000</groupId>
+                                            <groupName>default</groupName>
+                                        </item>
+                                        <item>
+                                            <groupId>sg-4db20000</groupId>
+                                            <groupName>ssh</groupName>
+                                        </item>
+                                    </groupSet>
+                                    <attachment>
+                                        <attachmentId>eni-attach-e6ce6187</attachmentId>
+                                        <deviceIndex>0</deviceIndex>
+                                        <status>attached</status>
+                                        <attachTime>2017-02-11T09:22:47.000Z</attachTime>
+                                        <deleteOnTermination>true</deleteOnTermination>
+                                    </attachment>
+                                    <association>
+                                        <publicIp>54.215.142.250</publicIp>
+                                        <publicDnsName>ec2-54-215-142-250.us-west-1.compute.amazonaws.com</publicDnsName>
+                                        <ipOwnerId>amazon</ipOwnerId>
+                                    </association>
+                                    <privateIpAddressesSet>
+                                        <item>
+                                            <privateIpAddress>172.31.9.193</privateIpAddress>
+                                            <privateDnsName>ip-172-31-9-193.us-west-1.compute.internal</privateDnsName>
+                                            <primary>true</primary>
+                                            <association>
+                                            <publicIp>54.215.142.250</publicIp>
+                                            <publicDnsName>ec2-54-215-142-250.us-west-1.compute.amazonaws.com</publicDnsName>
+                                            <ipOwnerId>amazon</ipOwnerId>
+                                            </association>
+                                        </item>
+                                    </privateIpAddressesSet>
+                                </item>
+                            </networkInterfaceSet>
+                            <iamInstanceProfile>
+                                <arn>arn:aws:iam::000000000000:instance-profile/ec2ssh-test-role</arn>
+                                <id>AIPAJF7H4IAXZXXXXXXXX</id>
+                            </iamInstanceProfile>
+                            <ebsOptimized>false</ebsOptimized>
+                        </item>
+                    </instancesSet>
+                </item>
+            </reservationSet>
+        </DescribeInstancesResponse>
+    http_version:
+  recorded_at: Sat, 11 Feb 2017 09:25:45 GMT
+recorded_with: VCR 3.0.3

data/lib/ec2ssh/cli.rb

@@ -8,7 +8,7 @@ module Ec2ssh
   class CLI < Thor
     class_option :path, banner: "/path/to/ssh_config"
     class_option :dotfile, banner: '$HOME/.ec2ssh', default: "#{ENV['HOME']}/.ec2ssh"
-    class_option :verbose, banner: 'enable debug log', default: false
+    class_option :verbose, banner: 'enable debug log', type: 'boolean'
 
     desc 'init', 'Add ec2ssh mark to ssh_config'
     def init

data/lib/ec2ssh/version.rb

@@ -1,3 +1,3 @@
 module Ec2ssh
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

data/spec/aws_sdk_compatibility_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+require 'ec2ssh/ec2_instances'
+
+describe 'aws-sdk compatibility' do
+  let(:region) { 'us-west-1' }
+  let(:root_device) { '/dev/xvda' }
+
+  let!(:ec2_instances) do
+    VCR.use_cassette('ec2-instances') do
+      Ec2ssh::Ec2Instances.new(
+        {'foo' => {access_key_id: '', secret_access_key: ''}},
+        ['us-west-1']
+      ).instances('foo')
+    end
+  end
+
+  let(:ins) { ec2_instances.first }
+
+  it { expect(ec2_instances.count).to be == 1 }
+
+  it { expect(ins.tags['Name']).to match /.+/ }
+  it { expect(ins.tags['Role']).to match /.+/ }
+  it { expect(ins.ami_launch_index).to be == 0 }
+  it { expect(ins.architecture).to be == :x86_64 }
+  it { expect(ins.attachments.to_h).to match( root_device => an_instance_of(AWS::EC2::Attachment) ) }
+  it { expect(ins.availability_zone).to match /\A#{region}[a-c]\z/ }
+  it { expect(ins.block_device_mappings.to_h).to match( root_device => an_instance_of(AWS::EC2::Attachment) ) }
+  it do
+    expect(ins.block_devices.to_a).to match [{
+      device_name: root_device,
+      ebs: {
+        volume_id: /\Avol-\w+\z/,
+        status: 'attached',
+        attach_time: an_instance_of(Time),
+        delete_on_termination: true
+      }
+    }]
+  end
+  it { expect(ins.client_token).to match /\A\w{18}\z/ }
+  it { expect(ins.dedicated_tenancy?).to be_falsy }
+  it { expect(ins.dns_name).to match /\Aec2-[\d\.\-]+\.#{region}\.compute\.amazonaws\.com\z/ }
+  it { expect(ins.ebs_optimized).to be_falsy }
+  it do
+    expect(ins.group_set.to_a).to all match(
+      group_id: /\Asg-\w+\z/,
+      group_name: /\A.+\z/,
+    )
+  end
+  it { expect(ins.groups.to_a).to all match(AWS::EC2::SecurityGroup) }
+  it { expect(ins.hypervisor).to be == :xen }
+  it { expect(ins.iam_instance_profile_arn).to match /\Aarn:aws:iam::\d+:instance-profile\/[\w\-]+\z/ }
+  it { expect(ins.iam_instance_profile_id).to match /\A\w{21}\z/ }
+  it { expect(ins.id).to match /\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/ }
+  it { expect(ins.instance_lifecycle).to be_nil }
+  it { expect(ins.instance_type).to match /\A[trmci][1248]\.\w+\z/ }
+  it { expect(ins.ip_address).to match /\A[\d\.]+\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::KeyPair) }
+  it { expect(ins.launch_time).to be_a(Time) }
+  it { expect(ins.monitoring).to be == :disabled }
+  it { expect(ins.monitoring_enabled?).to be_falsy }
+  it { expect(ins.network_interfaces.to_a).to all match(an_instance_of(AWS::EC2::NetworkInterface)) }
+  # it { expect(ins.owner_id).to match /\A\d{12}\z/ }
+  it { expect(ins.placement.to_h).to match( availability_zone: /\A#{region}[a-c]\z/, group_name: nil, tenancy: 'default' ) }
+  it { expect(ins.platform).to be_nil }
+  it { expect(ins.private_dns_name).to match /\Aip-[\w\-]+\.#{region}\.compute\.internal\z/ }
+  it { expect(ins.private_ip_address).to match /\A[\d\.]+\z/ }
+  it { expect(ins.product_codes).to be == [] }
+  it { expect(ins.public_dns_name).to match /\Aec2-[\w\-]+\.#{region}\.compute\.amazonaws\.com\z/ }
+  it { expect(ins.public_ip_address).to match /\A[\d\.]+\z/ }
+  it { expect(ins.ramdisk_id).to be_nil }
+  it { expect(ins.requester_id).to be_nil }
+  # it { expect(ins.reservation_id).to match /\Ar-\w+\z/ }
+  it { expect(ins.root_device_name).to eq root_device }
+  it { expect(ins.root_device_type).to be == :ebs }
+  it { expect(ins.security_groups.to_a).to all match(an_instance_of(AWS::EC2::SecurityGroup)) }
+  it { expect(ins.spot_instance?).to be_falsy }
+  it { expect(ins.state_transition_reason).to be_nil }
+  it { expect(ins.status).to be == :running }
+  it { expect(ins.status_code).to be == 16 }
+  it { expect(ins.subnet).to be_a(AWS::EC2::Subnet) }
+  it { expect(ins.subnet_id).to match /\Asubnet-\w+\z/ }
+  it { expect(ins.virtualization_type).to be == :hvm }
+  it { expect(ins.vpc).to be_a(AWS::EC2::VPC) }
+  it { expect(ins.vpc?).to be_truthy }
+  it { expect(ins.vpc_id).to match /\Avpc-\w+\z/ }
+end

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

@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'ec2ssh/command/migrate'
 
 describe Ec2ssh::Command::Migrate do
+  include FakeFS::SpecHelpers
+
   describe '#run' do
     let(:cli) do
       double(:cli,

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

@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'ec2ssh/command/remove'
 
 describe Ec2ssh::Command::Remove do
+  include FakeFS::SpecHelpers
+
   describe '#run' do
     let(:command) do
       described_class.new(cli).tap do |cmd|

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

@@ -3,6 +3,8 @@ 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|

data/spec/lib/ec2ssh/migrator_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'ec2ssh/migrator'
 
 describe Ec2ssh::Migrator do
+  include FakeFS::SpecHelpers
+
   subject(:migrator) { described_class.new '/dotfile' }
 
   before do

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2ssh
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Issei Naruta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2018-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -62,7 +62,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".tachikoma.yml"
 - ".travis.yml"
 - ChangeLog.md
 - Gemfile
@@ -74,6 +73,7 @@ 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
@@ -88,6 +88,7 @@ files:
 - 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
@@ -110,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -118,11 +119,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ec2ssh
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 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

data/.tachikoma.yml

@@ -1 +0,0 @@
-strategy: 'bundler'