ec2ssh 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2a2ee78001eaabbf39624cff2c27a296e239e77
-  data.tar.gz: e2b72fd81e19145a21d61a67bd10c6feb209c530
+  metadata.gz: 2a75305a65aa96b48c53656fbb89c875afc885ba
+  data.tar.gz: 5885b8f6f11a457a0ccdc3fa52179e6698fc182b
 SHA512:
-  metadata.gz: 96d674315445326d0036e5e3cc535382d9aaa045fc1665df00261c24965a031d675a2cc2d91f655ae151325a4aac8b5deb749f29ff4fe358fb86eff17c027e78
-  data.tar.gz: 427149ba39d20f9b132e241687c4b76e65fb8819ab91f0c075d22fc7be34c920679d9b5113f83fba51ec073e6c7ad3e201f307db36ecfd9f46cbb20b8031de9c
+  metadata.gz: c7c74269f0d19158ad49c49fcfd549a1649f1c416de30e5345d51cbe5fe4da928d761a11103b009d9e93c6f999bffedd7ba365e629b9e03ac21e78c58ea9243d
+  data.tar.gz: 7af6da18131dfbfe3654872587b0d57847a6cfc0959dc986dd76e379060e9afa79abc925c056196da7f1b1e39240ee05d83b3493aa2ef1a9e231baf175888b87

data/ChangeLog.md

@@ -1,4 +1,8 @@
 # Change Log
+## 3.0.1
+* Ignore unnamed instances as default (#22, #24, #25)
+  Thanks to @r7kamura and @kainoku
+
 ## 3.0.0
 * Dotfile (.ec2ssh) format has been changed from YAML to Ruby DSL.
 * Refactored

data/README.md

@@ -35,6 +35,9 @@ aws_keys(
 )
 regions 'us-east-1'
 
+# Ignore unnamed instances
+reject {|instance| !instance.tags['Name'] }
+
 # You can use methods of AWS::EC2::Instance.
 # See http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Instance.html
 host_line <<END

data/lib/ec2ssh/ec2_instances.rb

@@ -31,7 +31,7 @@ module Ec2ssh
         ec2s[key_name][region].instances.
           filter('instance-state-name', 'running').
           to_a.
-          sort_by {|ins| ins.tags['Name'] }
+          sort_by {|ins| ins.tags['Name'].to_s }
       }.flatten
     end
   end

data/lib/ec2ssh/migrator.rb

@@ -47,6 +47,9 @@ module Ec2ssh
 
       out.puts <<-END
 
+# Ignore unnamed instances
+reject {|instance| !instance.tags['Name'] }
+
 # You can use methods of AWS::EC2::Instance.
 # See http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Instance.html
 host_line <<EOS

data/lib/ec2ssh/version.rb

@@ -1,3 +1,3 @@
 module Ec2ssh
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

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

@@ -48,6 +48,9 @@ aws_keys(
   key1: { access_key_id: 'ACCESS_KEY1', secret_access_key: 'SECRET1' }
 )
 
+# Ignore unnamed instances
+reject {|instance| !instance.tags['Name'] }
+
 # You can use methods of AWS::EC2::Instance.
 # See http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Instance.html
 host_line <<EOS

data/spec/lib/ec2ssh/ec2_instances_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+require 'ec2ssh/ec2_instances'
+
+describe Ec2ssh::Ec2Instances do
+  describe '#instances' do
+    let(:key_name) {
+      "dummy_key_name"
+    }
+
+    let(:region) {
+      "ap-northeast-1"
+    }
+
+    let(:mock) do
+      described_class.new(aws_keys='', regions=[region]).tap do |e|
+        allow(e).to receive(:ec2s) { ec2s }
+        allow(e).to receive(:regions) { [region] }
+      end
+    end
+
+    let(:ec2s) {
+      {
+        "#{key_name}" => {
+          "#{region}" => instances.tap do |m|
+            allow(m).to receive(:instances) { m }
+          end
+        }
+      }
+    }
+
+    let(:instances) {
+      mock_instances.tap do |m|
+        allow(m).to receive(:filter) { m }
+      end
+    }
+
+    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' })
+        ]
+      }
+
+      it do
+        result = mock.instances(key_name)
+        expect(result.map {|ins| ins.n}).to match_array([2, 1, 3])
+      end
+    end
+
+    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' })
+        ]
+      }
+
+      it do
+        result = mock.instances(key_name)
+        expect(result.map {|ins| ins.n}).to match_array([2, 1, 3])
+      end
+    end
+
+  end
+end

data/spec/lib/ec2ssh/migrator_spec.rb

@@ -32,6 +32,9 @@ aws_keys(
 )
 regions 'ap-northeast-1', 'us-east-1'
 
+# Ignore unnamed instances
+reject {|instance| !instance.tags['Name'] }
+
 # You can use methods of AWS::EC2::Instance.
 # See http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Instance.html
 host_line <<EOS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2ssh
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Issei Naruta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -92,6 +92,7 @@ files:
 - 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
@@ -125,6 +126,7 @@ test_files:
 - 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