ec2ssh 2.0.3 → 2.0.4

data/ChangeLog.md

@@ -1,4 +1,8 @@
 # Change Log
+## 2.0.4
+
+* Store multiple hosts info per `--aws_key` (#8)
+
 ## 2.0.3
 
 * Fix bug: Fix undefined method `empty?` when aws keys not set

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ec2ssh (2.0.0)
+    ec2ssh (2.0.3)
       aws-sdk (~> 1.8)
       highline (~> 1.6)
       thor (~> 0.14.6)
@@ -10,7 +10,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.2)
-    aws-sdk (1.8.1.3)
+    aws-sdk (1.8.5)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
@@ -26,12 +26,12 @@ GEM
     guard-rspec (2.4.0)
       guard (>= 1.1)
       rspec (~> 2.11)
-    highline (1.6.15)
+    highline (1.6.17)
     json (1.7.7)
     listen (0.7.2)
     lumberjack (1.0.2)
     method_source (0.8.1)
-    nokogiri (1.5.6)
+    nokogiri (1.5.9)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)

data/lib/ec2ssh/cli.rb

@@ -25,16 +25,16 @@ module Ec2ssh
     desc "update", "Update ec2 hosts list in ssh_config"
     method_option :aws_key, :banner => 'aws key name', :default => 'default'
     def update
-      config = SshConfig.new(config_path)
+      config = SshConfig.new(config_path, options.aws_key)
       unless config.mark_exist?
         red "Marker not found on #{config_path}"
         red "Execute '#{$0} init --path=/path/to/ssh_config' first!"
         return
       end
-      config_str = config.wrap(hosts.map{|h|<<-END}.join)
-Host #{h[:host]}
-  HostName #{h[:dns_name]}
-      END
+
+      config.parse!
+      sections = merge_sections(config)
+      config_str = config.wrap(sections.join("\n"))
       config.replace! config_str
       yellow config_str
       green "Updated #{hosts.size} hosts on #{config_path}"
@@ -81,6 +81,32 @@ Host #{h[:host]}
           puts hl.color(str, col)
         end
       end
+
+      def merge_sections(config)
+        section_str = hosts.map { |h| <<-END }.join
+Host #{h[:host]}
+  HostName #{h[:dns_name]}
+        END
+        config.sections[options.aws_key] ||= SshConfig::Section.new(
+          options.aws_key,
+          section_str
+        )
+
+        sections = config.sections.values.map do |section|
+          if (
+              # section is matched
+              (section.name == options.aws_key) ||
+
+              # for backward compatibility
+              (config.sections.size == 1 && options.aws_key != 'default')
+          )
+            section.name = options.aws_key
+            section.replace!(section_str)
+          end
+
+          section.to_s
+        end
+      end
     end
   end
 end

data/lib/ec2ssh/ssh_config.rb

@@ -6,10 +6,31 @@ module Ec2ssh
     HEADER = "### EC2SSH BEGIN ###"
     FOOTER = "### EC2SSH END ###"
 
-    attr_reader :path
+    attr_reader :path, :sections
 
-    def initialize(path=nil)
-      @path = Pathname(path || "#{ENV['HOME']}/.ssh/config")
+    def initialize(path=nil, aws_key='default')
+      @path     = Pathname(path || "#{ENV['HOME']}/.ssh/config")
+      @aws_key  = aws_key
+      @sections = {}
+    end
+
+    def parse!
+      return unless mark_exist?
+      ec2_config = config_src.match(/#{HEADER}\n(.*)#{FOOTER}/m).to_s
+
+      current_section = 'default'
+      @sections[current_section] = Section.new('default')
+
+      ec2_config.split(/\n+/).each do |line|
+        if line =~ /#{Section::HEADER} (.+)/
+          current_section = $1
+          @sections[current_section] ||= Section.new(current_section)
+        elsif line =~ /^#/ # ignore
+        elsif line =~ /^$/ # ignore
+        else
+          @sections[current_section].append("#{line}\n")
+        end
+      end
     end
 
     def append_mark!
@@ -49,5 +70,36 @@ module Ec2ssh
 #{FOOTER}
       END
     end
+
+    class Section
+      HEADER = "# section:"
+
+      attr_accessor :name
+      attr_reader   :text
+
+      def initialize(name, text = '')
+        @name = name
+        @text = text
+      end
+
+      def append(text)
+        @text << text
+      end
+
+      def replace!(text)
+        @text = text
+      end
+
+      def to_s
+        if text.empty?
+          ""
+        else
+          <<-EOS
+#{HEADER} #{@name}
+#{@text}
+          EOS
+        end
+      end
+    end
   end
 end

data/lib/ec2ssh/version.rb

@@ -1,3 +1,3 @@
 module Ec2ssh
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

data/spec/lib/ec2ssh/cli_spec.rb

@@ -8,8 +8,8 @@ describe Ec2ssh::CLI do
       cls.class_eval do
         def all
           [
-            {:host => 'db-01', :dns_name => 'ec2-1-1-1-1.ap-northeast-1.ec2.amazonaws.com'},
-            {:host => 'db-02', :dns_name => 'ec2-1-1-1-2.ap-northeast-1.ec2.amazonaws.com'},
+            {:host => 'db-01.ap-northeast-1', :dns_name => 'ec2-1-1-1-1.ap-northeast-1.ec2.amazonaws.com'},
+            {:host => 'db-02.ap-northeast-1', :dns_name => 'ec2-1-1-1-2.ap-northeast-1.ec2.amazonaws.com'},
           ]
         end
       end
@@ -73,11 +73,13 @@ Host foo.bar.com
 # Generated by ec2ssh http://github.com/mirakui/ec2ssh
 # DO NOT edit this block!
 # Updated 2013-01-01T00:00:00+00:00
-Host db-01
+# section: default
+Host db-01.ap-northeast-1
   HostName ec2-1-1-1-1.ap-northeast-1.ec2.amazonaws.com
-Host db-02
+Host db-02.ap-northeast-1
   HostName ec2-1-1-1-2.ap-northeast-1.ec2.amazonaws.com
 
+
 ### EC2SSH END ###
 END
   end
@@ -102,11 +104,13 @@ END
     context do
       let(:keyname) { 'default' }
       it { should =~ /Updated 2 hosts/ }
+      it { should =~ /# section: default/ }
     end
 
     context do
       let(:keyname) { 'key1' }
       it { should =~ /Updated 2 hosts/ }
+      it { should =~ /# section: key1/ }
     end
 
     context do
@@ -115,6 +119,41 @@ END
     end
   end
 
+  describe '#update with aws-keys option in multiple times' do
+    before do
+      silence(:stdout) do
+        cli.start %W[init --path #{ssh_config_path} --dotfile #{dotfile_path}]
+      end
+      dotfile = Ec2ssh::Dotfile.load(dotfile_path)
+      dotfile['aws_keys']['key1'] = {
+        'access_key_id' => 'ACCESS_KEY_ID',
+        'secret_access_key' => 'SECRET_ACCESS_KEY'
+      }
+      dotfile['aws_keys']['key2'] = {
+        'access_key_id' => 'ACCESS_KEY_ID',
+        'secret_access_key' => 'SECRET_ACCESS_KEY'
+      }
+      @output = capture(:stdout) do
+        cli.start %W[update --path #{ssh_config_path} --dotfile #{dotfile_path} --aws-key key1]
+        cli.start %W[update --path #{ssh_config_path} --dotfile #{dotfile_path} --aws-key #{keyname}]
+      end
+    end
+
+    subject { @output }
+
+    context 'when updated by the same key' do
+      let(:keyname) { 'key1' }
+      it { subject.should     =~ /# section: key1/ }
+      it { subject.should_not =~ /# section: key2/ }
+    end
+
+    context 'when updated by different key' do
+      let(:keyname) { 'key2' }
+      it { subject.should =~ /# section: key1/ }
+      it { subject.should =~ /# section: key2/ }
+    end
+  end
+
   describe '#remove' do
     before do
       silence(:stdout) do

data/spec/lib/ec2ssh/ssh_config_spec.rb

@@ -0,0 +1,125 @@
+require 'spec_helper'
+require 'ec2ssh/ssh_config'
+
+describe Ec2ssh::SshConfig do
+  describe '#parse!' do
+    context 'when no section exists' do
+      let(:path) { path = tmp_dir.join('ssh_config') }
+      subject    { described_class.new(path)         }
+
+      before do
+        path.open('w') {|f| f.write <<-END }
+### EC2SSH BEGIN ###
+# Generated by ec2ssh http://github.com/mirakui/ec2ssh
+# DO NOT edit this block!
+# Updated 2013-01-01T00:00:00+00:00
+Host db-01.ap-northeast-1
+  HostName ec2-1-1-1-1.ap-northeast-1.ec2.amazonaws.com
+
+### EC2SSH END ###
+END
+        subject.parse!
+      end
+
+      it { expect(subject.sections.size).to be == 1 }
+      it { expect(subject.sections['default']).to be_an_instance_of Ec2ssh::SshConfig::Section }
+    end
+
+    context 'when a section exists' do
+      let(:path) { path = tmp_dir.join('ssh_config') }
+      subject    { described_class.new(path)         }
+
+      before do
+        path = tmp_dir.join('ssh_config')
+        path.open('w') {|f| f.write <<-END }
+Host foo.bar.com
+  HostName 1.2.3.4
+### EC2SSH BEGIN ###
+# Generated by ec2ssh http://github.com/mirakui/ec2ssh
+# DO NOT edit this block!
+# Updated 2013-01-01T00:00:00+00:00
+# section: foo
+Host db-01.ap-northeast-1
+  HostName ec2-1-1-1-1.ap-northeast-1.ec2.amazonaws.com
+
+### EC2SSH END ###
+END
+        subject.parse!
+      end
+
+      it { expect(subject.sections.size).to be == 2 }
+      it { expect(subject.sections['foo']).to be_an_instance_of Ec2ssh::SshConfig::Section }
+    end
+
+    context 'when multiple sections exist' do
+      let(:path) { path = tmp_dir.join('ssh_config') }
+      subject    { described_class.new(path)         }
+
+      before do
+        path = tmp_dir.join('ssh_config')
+        path.open('w') {|f| f.write <<-END }
+Host foo.bar.com
+  HostName 1.2.3.4
+### EC2SSH BEGIN ###
+# Generated by ec2ssh http://github.com/mirakui/ec2ssh
+# DO NOT edit this block!
+# Updated 2013-01-01T00:00:00+00:00
+# section: foo
+Host db-01.ap-northeast-1
+  HostName ec2-1-1-1-1.ap-northeast-1.ec2.amazonaws.com
+# section: bar
+Host db-02.ap-northeast-1
+  HostName ec2-1-1-1-2.ap-northeast-1.ec2.amazonaws.com
+
+### EC2SSH END ###
+END
+        subject.parse!
+      end
+
+      it { expect(subject.sections.size).to be == 3 }
+      it { expect(subject.sections['foo']).to be_an_instance_of Ec2ssh::SshConfig::Section }
+      it { expect(subject.sections['bar']).to be_an_instance_of Ec2ssh::SshConfig::Section }
+    end
+  end
+
+  describe Ec2ssh::SshConfig::Section do
+    describe '#append' do
+      let(:section) { Ec2ssh::SshConfig::Section.new('test') }
+      before { section.append('foo') }
+
+      it { expect(section.text).to eq 'foo' }
+    end
+
+    describe '#replace' do
+      let(:section) { Ec2ssh::SshConfig::Section.new('test', 'foo') }
+      before { section.replace!('bar') }
+
+      it { expect(section.text).to eq 'bar' }
+    end
+
+    describe '#to_s' do
+      context 'when no text given' do
+        let(:section) { Ec2ssh::SshConfig::Section.new('test') }
+
+        it { expect(section.to_s).to eq '' }
+      end
+
+      context 'when empty text given' do
+        let(:section) { Ec2ssh::SshConfig::Section.new('test', '') }
+
+        it { expect(section.to_s).to eq '' }
+      end
+
+      context 'when some text given' do
+        let(:section) { Ec2ssh::SshConfig::Section.new('test', 'foo') }
+
+        it {
+          expect(section.to_s).to eq <<EOS
+# section: test
+foo
+EOS
+        }
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2ssh
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -86,6 +86,7 @@ files:
 - lib/ec2ssh/ssh_config.rb
 - lib/ec2ssh/version.rb
 - spec/lib/ec2ssh/cli_spec.rb
+- spec/lib/ec2ssh/ssh_config_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/mirakui/ec2ssh
 licenses: []
@@ -113,5 +114,6 @@ specification_version: 3
 summary: A ssh_config manager for AWS EC2
 test_files:
 - spec/lib/ec2ssh/cli_spec.rb
+- spec/lib/ec2ssh/ssh_config_spec.rb
 - spec/spec_helper.rb
 has_rdoc: