ec2ssh 2.0.8 → 3.0.0.beta1

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
 require 'bundler/setup'
 Bundler.require
 
+require 'fakefs/spec_helpers'
 require 'webmock/rspec'
 require 'pathname'
 require 'stringio'
+require 'fileutils'
 
 RSpec.configure do |config|
   def capture(stream)
@@ -19,19 +21,19 @@ RSpec.configure do |config|
     result
   end
 
-  def base_dir
-    Pathname('../..').expand_path(__FILE__)
+  def silence_stdout(&block)
+    capture(:stdout, &block)
   end
 
   def tmp_dir
-    base_dir.join('tmp')
+    @tmp_dir ||= begin
+      Pathname('/fakefs/ec2ssh').tap do |path|
+        FileUtils.mkdir_p path
+      end
+    end
   end
 
   alias :silence :capture
 
-  config.before(:all) do
-    unless tmp_dir.directory?
-      tmp_dir.mkdir
-    end
-  end
+  config.include FakeFS::SpecHelpers
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2ssh
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Issei Naruta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -68,15 +68,31 @@ files:
 - Guardfile
 - MIT-LICENSE
 - README.md
+- Rakefile
 - bin/ec2ssh
 - ec2ssh.gemspec
+- example/example.ec2ssh
 - lib/ec2ssh.rb
+- lib/ec2ssh/builder.rb
 - lib/ec2ssh/cli.rb
-- lib/ec2ssh/dotfile.rb
-- lib/ec2ssh/hosts.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/lib/ec2ssh/cli_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/migrator_spec.rb
 - spec/lib/ec2ssh/ssh_config_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/mirakui/ec2ssh
@@ -93,9 +109,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: ec2ssh
 rubygems_version: 2.2.2
@@ -103,6 +119,12 @@ signing_key:
 specification_version: 4
 summary: A ssh_config manager for AWS EC2
 test_files:
-- spec/lib/ec2ssh/cli_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/migrator_spec.rb
 - spec/lib/ec2ssh/ssh_config_spec.rb
 - spec/spec_helper.rb

data/lib/ec2ssh/dotfile.rb

@@ -1,49 +0,0 @@
-require 'yaml'
-
-module Ec2ssh
-  class AwsKeyNotFound < StandardError; end
-  class Dotfile
-    def initialize(config={})
-      @config = {
-        'path' => "#{ENV['HOME']}/.ssh/config",
-        'aws_keys' => {
-          'default' => {
-            'access_key_id' => ENV['AMAZON_ACCESS_KEY_ID'],
-            'secret_access_key' => ENV['AMAZON_SECRET_ACCESS_KEY']
-          }
-        },
-        'regions' => %w(ap-northeast-1),
-      }.merge(config)
-    end
-
-    def self.load(path)
-      new YAML.load(open(path).read)
-    end
-
-    def save(path)
-      open(path, 'w') {|f| f.write @config.to_yaml }
-    end
-
-    def self.update_or_create(path, config={})
-      dotfile = if File.exist?(path)
-        Dotfile.load(path)
-      else
-        new
-      end
-      dotfile.update(config)
-      dotfile.save(path)
-    end
-
-    def [](key)
-      @config[key]
-    end
-
-    def aws_key(keyname)
-      self['aws_keys'][keyname] or raise AwsKeyNotFound
-    end
-
-    def update(config)
-      @config = @config.merge config
-    end
-  end
-end

data/lib/ec2ssh/hosts.rb

@@ -1,42 +0,0 @@
-require 'aws-sdk'
-require 'ec2ssh/dotfile'
-
-module Ec2ssh
-  class AwsEnvNotDefined < StandardError; end
-  class Hosts
-    def initialize(dotfile, keyname)
-      @dotfile = dotfile
-      @ec2 = Hash.new do |h,region|
-        key = dotfile.aws_key(keyname)
-        raise AwsEnvNotDefined if key['access_key_id'].nil? || key['secret_access_key'].nil?
-        h[region] = AWS::EC2.new(
-          :region            => region,
-          :access_key_id     => key['access_key_id'],
-          :secret_access_key => key['secret_access_key']
-        )
-      end
-    end
-
-    def all
-      @dotfile['regions'].map {|region|
-        process_region region
-      }.flatten
-    end
-
-    private
-      def process_region(region)
-        instances(region).map {|instance|
-          name_tag = instance[:tag_set].find {|tag| tag[:key] == 'Name' }
-          next nil if name_tag.nil? || name_tag[:value].nil?
-          name = name_tag[:value]
-          dns_name = instance[:dns_name] or next nil
-          {:host => "#{name}.#{region}", :dns_name => dns_name}
-        }.compact.sort {|a,b| a[:host] <=> b[:host] }
-      end
-
-      def instances(region)
-        response = @ec2[region].instances.tagged('Name').filtered_request(:describe_instances)
-        response[:instance_index].values
-      end
-  end
-end

data/spec/lib/ec2ssh/cli_spec.rb

@@ -1,171 +0,0 @@
-require 'spec_helper'
-require 'ec2ssh/cli'
-require 'ec2ssh/dotfile'
-
-describe Ec2ssh::CLI do
-  before(:all) do
-    Ec2ssh::Hosts.tap do |cls|
-      cls.class_eval do
-        def all
-          [
-            {: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
-    end
-  end
-  before do
-    File.delete(dotfile_path) if File.exist?(dotfile_path)
-  end
-  let(:cli) { described_class }
-  let(:ssh_config_path) do
-    path = tmp_dir.join('ssh_config')
-    path.open('w') {|f| f.write <<-END }
-Host foo.bar.com
-  HostName 1.2.3.4
-    END
-    path
-  end
-  let(:ssh_config_string) { ssh_config_path.read }
-  let(:dotfile_path) do
-    tmp_dir.join('dot.ec2ssh')
-  end
-
-  around do |example|
-    tz = ENV['TZ']
-    ENV['TZ'] = 'UTC'
-    Timecop.freeze(Time.local(2013,1,1,0,0,0)) { example.call }
-    ENV['TZ'] = tz
-  end
-
-  subject { ssh_config_string }
-
-  describe '#init' do
-    before do
-      silence(:stdout) { cli.start %W[init --path #{ssh_config_path} --dotfile #{dotfile_path}] }
-    end
-
-    it { should eq(<<-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
-
-### EC2SSH END ###
-END
-  end
-
-  describe '#update' do
-    before do
-      silence(:stdout) do
-        cli.start %W[init --path #{ssh_config_path} --dotfile #{dotfile_path}]
-        cli.start %W[update --path #{ssh_config_path} --dotfile #{dotfile_path}]
-      end
-    end
-
-    it { should eq(<<-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: default
-Host db-01.ap-northeast-1
-  HostName ec2-1-1-1-1.ap-northeast-1.ec2.amazonaws.com
-Host db-02.ap-northeast-1
-  HostName ec2-1-1-1-2.ap-northeast-1.ec2.amazonaws.com
-
-
-### EC2SSH END ###
-END
-  end
-
-  describe '#update with aws-keys option' 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'
-      }
-      @output = capture(:stdout) do
-        cli.start %W[update --path #{ssh_config_path} --dotfile #{dotfile_path} --aws-key #{keyname}]
-      end
-    end
-
-    subject { @output }
-
-    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
-      let(:keyname) { 'key2' }
-      it { should_not =~ /^Updated 2 hosts/ }
-    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
-        cli.start %W[init --path #{ssh_config_path} --dotfile #{dotfile_path}]
-        cli.start %W[update --path #{ssh_config_path} --dotfile #{dotfile_path}]
-        cli.start %W[remove --path #{ssh_config_path} --dotfile #{dotfile_path}]
-      end
-    end
-
-    it { should eq(<<-END) }
-Host foo.bar.com
-  HostName 1.2.3.4
-END
-  end
-end