ec2ssh 2.0.8 → 3.0.0.beta1

data/lib/ec2ssh/command.rb

@@ -0,0 +1,25 @@
+require 'ec2ssh/dsl'
+
+module Ec2ssh
+  module Command
+    class Base
+      attr_reader :cli
+
+      def initialize(cli)
+        @cli = cli
+      end
+
+      def dotfile
+        @dotfile ||= Ec2ssh::Dsl::Parser.parse_file(dotfile_path)
+      end
+
+      def ssh_config_path
+        cli.options.path || dotfile.path || "#{$ENV['HOME']}/.ssh/config"
+      end
+
+      def dotfile_path
+        cli.options.dotfile
+      end
+    end
+  end
+end

data/lib/ec2ssh/command/init.rb

@@ -0,0 +1,72 @@
+require 'ec2ssh/command'
+require 'ec2ssh/ssh_config'
+require 'ec2ssh/exceptions'
+
+module Ec2ssh
+  module Command
+    class Init < Base
+      def initialize(cli)
+        super
+      end
+
+      def run
+        begin
+          init_ssh_config
+        rescue DotfileNotFound
+          init_dotfile
+          retry
+        end
+      end
+
+      def init_dotfile
+        if File.exist?(dotfile_path)
+          cli.yellow "Warning: #{dotfile_path} already exists."
+          return
+        end
+
+        write_dotfile_example
+
+        cli.green "Generated #{dotfile_path}"
+        cli.yellow "Please check and edit #{dotfile_path} before run `ec2ssh update`"
+      end
+
+      def write_dotfile_example
+        example = <<-DOTFILE
+path '#{ENV['HOME']}/.ssh/config'
+aws_keys(
+  default: {
+    access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+    secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+  },
+  # my_key1: { access_key_id: '...', secret_access_key: '...' }, ...
+)
+regions ENV['AWS_REGION'] || ENV['AMAZON_REGION'] || ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
+# Enable regions as you like
+# regions *%w(ap-northeast-1 ap-southeast-1 ap-southeast-2 eu-west-1 sa-east-1 us-east-1 us-west-1 us-west-2)
+
+# You can use methods of AWS::EC2::Instance.
+# See http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Instance.html
+host_line <<END
+Host <%= tags['Name'] %>.<%= availability_zone %>
+  HostName <%= dns_name || private_ip_address %>
+END
+        DOTFILE
+
+        File.open(dotfile_path, 'w') {|f| f.write example }
+      end
+
+      def init_ssh_config
+        if ssh_config.mark_exist?
+          raise MarkAlreadyExists
+        else
+          ssh_config.append_mark!
+          cli.green "Added mark to #{ssh_config_path}"
+        end
+      end
+
+      def ssh_config
+        @ssh_config ||= SshConfig.new(ssh_config_path)
+      end
+    end
+  end
+end

data/lib/ec2ssh/command/migrate.rb

@@ -0,0 +1,34 @@
+require 'ec2ssh/exceptions'
+require 'ec2ssh/command'
+require 'ec2ssh/migrator'
+
+module Ec2ssh
+  module Command
+    class Migrate < Base
+      def initialize(cli)
+        super
+      end
+
+      def run
+        migrator = Migrator.new dotfile_path
+        version = migrator.check_version
+        case version
+        when '2'
+          cli.red "Current dotfile version is #{version} (#{dotfile_path})"
+          new_dotfile_str = migrator.migrate_from_2
+          cli.red "Ec2ssh is migrating your dotfile to version 3 style as follows:"
+          cli.yellow new_dotfile_str
+          if cli.yes? "Are you sure to migrate #{dotfile_path} to version 3 style? (y/n)"
+            backup_path = migrator.backup!
+            puts "Creating backup as #{backup_path}"
+            migrator.replace! new_dotfile_str
+            cli.green 'Migrated successfully.'
+          end
+        when '3'
+          cli.green "Current dotfile version is #{version} (#{dotfile_path})"
+          cli.green 'Your dotfile is up-to-date.'
+        end
+      end
+    end
+  end
+end

data/lib/ec2ssh/command/remove.rb

@@ -0,0 +1,20 @@
+require 'ec2ssh/exceptions'
+require 'ec2ssh/command'
+require 'ec2ssh/ssh_config'
+
+module Ec2ssh
+  module Command
+    class Remove < Base
+      def initialize(cli)
+        super
+      end
+
+      def run
+        ssh_config = SshConfig.new(ssh_config_path)
+        raise MarkNotFound unless ssh_config.mark_exist?
+
+        ssh_config.replace! ""
+      end
+    end
+  end
+end

data/lib/ec2ssh/command/update.rb

@@ -0,0 +1,39 @@
+require 'ec2ssh/exceptions'
+require 'ec2ssh/command'
+require 'ec2ssh/ssh_config'
+require 'ec2ssh/builder'
+require 'ec2ssh/dsl'
+require 'ec2ssh/migrator'
+
+module Ec2ssh
+  module Command
+    class Update < Base
+      def initialize(cli)
+        super
+      end
+
+      def run
+        ssh_config = SshConfig.new(ssh_config_path)
+        raise MarkNotFound unless ssh_config.mark_exist?
+
+        ssh_config.parse!
+        lines = builder.build_host_lines
+        ssh_config_str = ssh_config.wrap lines
+        ssh_config.replace! ssh_config_str
+        cli.yellow ssh_config_str
+      end
+
+      def builder
+        @builder ||= Builder.new dsl
+      end
+
+      def dsl
+        @dsl ||= Ec2ssh::Dsl::Parser.parse File.read(dotfile_path)
+      end
+
+      def migrator
+        @migrator ||= Migrator.new dotfile_path
+      end
+    end
+  end
+end

data/lib/ec2ssh/dsl.rb

@@ -0,0 +1,55 @@
+require 'ec2ssh/exceptions'
+
+module Ec2ssh
+  class Dsl
+    attr_reader :_result
+
+    def initialize
+      @_result = Container.new
+    end
+
+    def aws_keys(keys)
+      @_result.aws_keys = keys
+    end
+
+    def regions(*regions)
+      @_result.regions = regions
+    end
+
+    def host_line(erb)
+      @_result.host_line = erb
+    end
+
+    def reject(&block)
+      @_result.reject = block
+    end
+
+    def path(str)
+      @_result.path = str
+    end
+
+    class Container < Struct.new(*%i[
+      aws_keys
+      regions
+      host_line
+      reject
+      path
+    ])
+    end
+
+    module Parser
+      def self.parse(dsl_str)
+        dsl = Dsl.new
+        dsl.instance_eval dsl_str
+        dsl._result
+      rescue SyntaxError => e
+        raise DotfileSyntaxError, e.to_s
+      end
+
+      def self.parse_file(path)
+        raise DotfileNotFound, path.to_s unless File.exist?(path)
+        parse File.read(path)
+      end
+    end
+  end
+end

data/lib/ec2ssh/ec2_instances.rb

@@ -0,0 +1,38 @@
+require 'aws-sdk'
+
+module Ec2ssh
+  class Ec2Instances
+    attr_reader :ec2s, :aws_keys
+
+    def initialize(aws_keys, regions)
+      @aws_keys = aws_keys
+      @regions = regions
+    end
+
+    def make_ec2s
+      AWS.start_memoizing
+      _ec2s = {}
+      aws_keys.each do |name, key|
+        _ec2s[name] = {}
+        @regions.each do |region|
+          options = key.merge ec2_region: region
+          _ec2s[name][region] = AWS::EC2.new options
+        end
+      end
+      _ec2s
+    end
+
+    def ec2s
+      @ec2s ||= make_ec2s
+    end
+
+    def instances(key_name)
+      @regions.map {|region|
+        ec2s[key_name][region].instances.
+          filter('instance-state-name', 'running').
+          to_a.
+          sort_by {|ins| ins.tags['Name'] }
+      }.flatten
+    end
+  end
+end

data/lib/ec2ssh/exceptions.rb

@@ -0,0 +1,9 @@
+module Ec2ssh
+  class DotfileNotFound < StandardError; end
+  class DotfileSyntaxError < StandardError; end
+  class ObsoleteDotfile < StandardError; end
+  class InvalidDotfile < StandardError; end
+  class MarkNotFound < StandardError; end
+  class MarkAlreadyExists < StandardError; end
+  class AwsKeyNotFound < StandardError; end
+end

data/lib/ec2ssh/migrator.rb

@@ -0,0 +1,74 @@
+require 'yaml'
+require 'stringio'
+require 'ec2ssh/dsl'
+
+module Ec2ssh
+  class Migrator
+    def initialize(dotfile_path)
+      @dotfile_path = dotfile_path
+    end
+
+    def dotfile_str
+      @dotfile_str ||= File.read(@dotfile_path)
+    end
+
+    def check_version
+      begin
+        hash = YAML.load dotfile_str
+        return '2' if hash.is_a?(Hash) && hash.keys.include?('aws_keys')
+      rescue Psych::SyntaxError
+      end
+
+      begin
+        Dsl::Parser.parse dotfile_str
+        return '3'
+      rescue DotfileSyntaxError
+      end
+
+      raise InvalidDotfile
+    end
+
+    def migrate_from_2
+      hash = YAML.load dotfile_str
+      out = StringIO.new
+
+      out.puts "path '#{hash['path']}'" if hash['path']
+
+      out.puts 'aws_keys('
+      out.puts hash['aws_keys'].map {|name, key|
+        "  #{name}: { access_key_id: '#{key['access_key_id']}', secret_access_key: '#{key['secret_access_key']}' }"
+      }.join(",\n")
+      out.puts ')'
+
+      if hash['regions']
+        regions = hash['regions'].map{|r| "'#{r}'" }.join(', ')
+        out.puts "regions #{regions}"
+      end
+
+      out.puts <<-END
+
+# You can use methods of AWS::EC2::Instance.
+# See http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Instance.html
+host_line <<EOS
+Host <%= tags['Name'] %>.<%= availability_zone %>
+  HostName <%= dns_name || private_ip_address %>
+EOS
+      END
+
+      out.puts
+      out.puts dotfile_str.gsub(/^/m, '# ')
+
+      out.string
+    end
+
+    def replace!(new_dotfile_str)
+      File.open(@dotfile_path, 'w') {|f| f.write new_dotfile_str }
+    end
+
+    def backup!
+      backup_path = "#{@dotfile_path}.#{Time.now.strftime("%Y%m%d%H%M%S")}"
+      File.open(backup_path, 'w') {|f| f.write dotfile_str }
+      backup_path
+    end
+  end
+end

data/lib/ec2ssh/ssh_config.rb

@@ -8,9 +8,8 @@ module Ec2ssh
 
     attr_reader :path, :sections
 
-    def initialize(path=nil, aws_key='default')
-      @path     = Pathname(path || "#{ENV['HOME']}/.ssh/config")
-      @aws_key  = aws_key
+    def initialize(path=nil)
+      @path     = path || "#{ENV['HOME']}/.ssh/config"
       @sections = {}
     end
 
@@ -35,7 +34,7 @@ module Ec2ssh
 
     def append_mark!
       replace! ""
-      open(@path, "a") do |f|
+      File.open(@path, "a") do |f|
         f.puts wrap("")
       end
     end
@@ -49,13 +48,13 @@ module Ec2ssh
     end
 
     def config_src
-      @config_src ||= open(@path, "r") do |f|
+      @config_src ||= File.open(@path, "r") do |f|
         f.read
       end
     end
 
     def save!(str)
-      open(@path, "w") do |f|
+      File.open(@path, "w") do |f|
         f.puts str
       end
     end

data/lib/ec2ssh/version.rb

@@ -1,3 +1,3 @@
 module Ec2ssh
-  VERSION = '2.0.8'
+  VERSION = '3.0.0.beta1'
 end

data/spec/lib/ec2ssh/builder_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+require 'ec2ssh/dsl'
+require 'ec2ssh/builder'
+
+describe Ec2ssh::Builder do
+  describe '#build_host_lines' do
+    let(:container) do
+      Ec2ssh::Dsl::Container.new.tap do |c|
+        c.aws_keys = {
+          key1: { access_key_id: 'KEY1', secret_access_key: 'SEC1' },
+          key2: { access_key_id: 'KEY2', secret_access_key: 'SEC2' }
+        }
+        c.host_line = "Host <%= tags['Name'] %>"
+      end
+    end
+
+    let(:builder) do
+      Ec2ssh::Builder.new(container).tap do |bldr|
+        allow(bldr).to receive(:ec2s) { ec2s }
+      end
+    end
+
+    let(:ec2s) do
+      double('ec2s', aws_keys: container.aws_keys).tap do |dbl|
+        allow(dbl).to receive(:instances) {|name| instances[name] }
+      end
+    end
+
+    let(:instances) do
+      {
+        key1: [
+          double('instance', tags: {'Name' => 'srv1'}),
+          double('instance', tags: {'Name' => 'srv2'})],
+        key2: [
+          double('instance', tags: {'Name' => 'srv3'}),
+          double('instance', tags: {'Name' => 'srv4'})]
+      }
+    end
+
+    it do
+      expect(builder.build_host_lines).to eq <<-END
+# section: key1
+Host srv1
+Host srv2
+# section: key2
+Host srv3
+Host srv4
+      END
+    end
+
+    context 'with #reject' do
+      before do
+        container.reject = lambda {|ins| ins.tags['Name'] == 'srv1' }
+      end
+
+      it do
+        expect(builder.build_host_lines).to eq <<-END
+# section: key1
+Host srv2
+# section: key2
+Host srv3
+Host srv4
+        END
+      end
+    end
+  end
+end