pairhost 0.0.5 → 0.0.6

data/README.md

@@ -21,6 +21,9 @@ Manage EC2 instances for remote pairing the style that Relevance prefers.
     # up will resume a down pairhost, but if none will create one
     pairhost up
 
+    # ssh will resume a down pairhost, then SSH to it
+    pairhost ssh
+
     # all future commands will affect the given instance
     pairhost attach instance-id
 

data/config.example.yml

@@ -1,9 +1,18 @@
 provider: 'AWS'
+# optionally specify Region for your AMI
+# FOG gem defaults AWS to 'us-east-1'
+# region: 'us-west-2'
+
 aws_access_key_id: 'YOUR_SECRET_ACCESS_KEY_ID'
 aws_secret_access_key: 'YOUR_SECRET_ACCESS_KEY'
+# specify another config file for your aws credentials
+# in case you want to keep them encrypted. This file
+# will take presedence if access keys are defined in both
+# files
+# aws_credential_file: '~/YOUR_AWS_CREDENTIAL_FILE'
 
 ami_id: 'SOME-AMI'
 flavor_id: 'm1.large'
 
 key_name: 'some-key-pair'
-private_key_path: "~/.ssh/some-private-key.pem"
+private_key_path: "~/.ssh/some-private-key.pem"

data/lib/credential.rb

@@ -0,0 +1,31 @@
+class Credential
+  def initialize(config_file)
+    @config = load_yaml_file(config_file)
+
+    unless aws_credential_file.nil?
+      @config = load_yaml_file(File.expand_path(aws_credential_file))
+    end
+  end
+
+  def secret_access_key
+    @config['aws_secret_access_key']
+  end
+
+  def access_key_id
+    @config['aws_access_key_id']
+  end
+
+  def aws_credential_file
+    @config['aws_credential_file']
+  end
+
+  private
+
+  def load_yaml_file(file)
+    unless File.exists?(file)
+      abort "#{file} not found. First run 'pairhost init' or confirm file exists."
+    else
+      YAML.load_file(file)
+    end
+  end
+end

data/lib/pairhost/version.rb

@@ -1,3 +1,3 @@
 module Pairhost
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/pairhost.rb

@@ -3,6 +3,7 @@ require 'fog'
 require 'thor'
 require 'yaml'
 require 'fileutils'
+require_relative 'credential'
 
 module Pairhost
   def self.config_file
@@ -14,6 +15,7 @@ module Pairhost
       unless File.exists?(config_file)
         abort "pairhost: No config found. First run 'pairhost init'."
       end
+      @credential = Credential.new(config_file)
       YAML.load_file(config_file)
     end
   end
@@ -35,8 +37,9 @@ module Pairhost
 
     @connection = Fog::Compute.new(
       :provider              => config['provider'],
-      :aws_secret_access_key => config['aws_secret_access_key'],
-      :aws_access_key_id     => config['aws_access_key_id'],
+      :region                => config['region'],
+      :aws_secret_access_key => @credential.secret_access_key,
+      :aws_access_key_id     => @credential.access_key_id
     )
   end
 
@@ -99,8 +102,13 @@ module Pairhost
       if File.exists?(Pairhost.config_file)
         STDERR.puts "pairhost: Already initialized."
       else
+        puts "Creating ~/.pairhost directory"
         FileUtils.mkdir_p File.dirname(Pairhost.config_file)
+
+        puts "Copying example.yml file to ~/.pairhost directory"
         FileUtils.cp(File.dirname(__FILE__) + '/../config.example.yml', Pairhost.config_file)
+
+        puts "Edit ~/.pairhost/config.yml to use your real EC2 & AMI settings"
       end
     end
 
@@ -150,13 +158,24 @@ module Pairhost
       server = Pairhost.fetch!
       puts "#{server.id}: #{server.tags['Name']}"
       puts "State: #{server.state}"
-      puts server.dns_name if server.dns_name
+      if server.dns_name
+        puts server.dns_name
+        puts Socket.getaddrinfo(server.dns_name, "http").first[3]
+      end
     end
 
     desc "ssh", "SSH to your pairhost"
     def ssh
       invoke :verify
       server = Pairhost.fetch!
+
+      abort "Server is currently #{server.state}" if ["stopping"].include? server.state
+
+      if ["pending", "stopped"].include? server.state
+        invoke :up
+        server.wait_for { ready? }
+      end
+
       exec "ssh -A -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=QUIET pair@#{server.dns_name}"
     end
 

data/pairhost.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
-  s.add_runtime_dependency "fog", "~> 1.3.1"
+  s.add_runtime_dependency "fog", "~> 1.12.1"
   s.add_runtime_dependency "thor", "~> 0.15.2"
   s.add_runtime_dependency "hirb", "~> 0.6.2"
   s.add_runtime_dependency "launchy", "~> 2.1.1"

data/spec/credential_spec.rb

@@ -0,0 +1,26 @@
+require_relative '../lib/credential'
+
+describe Credential do
+  context "given a config file" do
+    let(:config_file) { File.expand_path('../../config.example.yml', __FILE__) }
+
+    it 'should return a secret access key' do
+      credential = Credential.new(config_file)
+      credential.secret_access_key.should == "YOUR_SECRET_ACCESS_KEY"
+    end
+
+    it 'should return an access key id' do
+      credential = Credential.new(config_file)
+      credential.access_key_id.should == "YOUR_SECRET_ACCESS_KEY_ID"
+    end
+  end
+
+  context "given a config file for credentials within pairhost config file" do
+    let(:config_file) { File.expand_path('../data/config_with_aws_path.yml', __FILE__) }
+
+    it 'should return an access key' do
+      credential = Credential.new(config_file)
+      credential.secret_access_key.should == "YOUR_AWS_SECRET_ACCESS_KEY"
+    end
+  end
+end

data/spec/data/aws_credentials.yml

@@ -0,0 +1,2 @@
+aws_access_key_id: 'YOUR_AWS_SECRET_ACCESS_KEY_ID'
+aws_secret_access_key: 'YOUR_AWS_SECRET_ACCESS_KEY'

data/spec/data/config_with_aws_path.yml

@@ -0,0 +1,14 @@
+provider: 'AWS'
+aws_access_key_id: 'YOUR_SECRET_ACCESS_KEY_ID'
+aws_secret_access_key: 'YOUR_SECRET_ACCESS_KEY'
+# specify another config file for your aws credentials
+# in case you want to keep them encrypted. This file
+# will take presedence if access keys are defined in both
+# files
+aws_credential_file: 'spec/data/aws_credentials.yml'
+
+ami_id: 'SOME-AMI'
+flavor_id: 'm1.large'
+
+key_name: 'some-key-pair'
+private_key_path: "~/.ssh/some-private-key.pem"

data/spec/data/config_with_region.yml

@@ -0,0 +1,18 @@
+provider: 'AWS'
+aws_access_key_id: 'YOUR_SECRET_ACCESS_KEY_ID'
+aws_secret_access_key: 'YOUR_SECRET_ACCESS_KEY'
+# optionally specify Region for your AMI
+# FOG gem defaults AWS to 'us-east-1'
+region: 'us-west-2'
+
+# specify another config file for your aws credentials
+# in case you want to keep them encrypted. This file
+# will take presedence if access keys are defined in both
+# files
+aws_credential_file: 'spec/data/aws_credentials.yml'
+
+ami_id: 'SOME-AMI'
+flavor_id: 'm1.large'
+
+key_name: 'some-key-pair'
+private_key_path: "~/.ssh/some-private-key.pem"

data/spec/pairhost_spec.rb

@@ -81,6 +81,14 @@ describe Pairhost do
       end
     end
 
+    context "using the non default region" do
+      let(:config_file) {File.expand_path('../data/config_with_region.yml', __FILE__)}
+      it 'should return specified region' do
+        Pairhost.stub(:config_file).and_return(config_file)
+        Pairhost.connection.region.should be == 'us-west-2'
+      end
+    end
+
     context "when an instance has been provisioned" do
       # TODO: make sure the instance_id file exists;
       # provision an EC2 instance?

metadata

@@ -1,178 +1,151 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: pairhost
-version: !ruby/object:Gem::Version
-  version: 0.0.5
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.6
 platform: ruby
-authors:
+authors: 
 - Larry Karnowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-07-01 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: fog
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.15.2
+      - !ruby/object:Gem::Version 
+        version: 1.12.1
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: thor
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.15.2
-- !ruby/object:Gem::Dependency
-  name: hirb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.2
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hirb
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.6.2
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.1
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: launchy
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.1.1
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.9.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.9.0
-- !ruby/object:Gem::Dependency
-  name: bahia
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.2
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: bahia
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.7.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2.2
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.9.2.2
-description: A Vagrant-like command line interface for creating, managing, and using
-  EC2 instances for remote pairing like we do at Relevance.
-email:
+  type: :development
+  version_requirements: *id007
+description: A Vagrant-like command line interface for creating, managing, and using EC2 instances for remote pairing like we do at Relevance.
+email: 
 - larry@hickorywind.org
-executables:
+executables: 
 - pairhost
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.md
 - Rakefile
 - bin/pairhost
 - config.example.yml
+- lib/credential.rb
 - lib/pairhost.rb
 - lib/pairhost/version.rb
 - pairhost.gemspec
+- spec/credential_spec.rb
+- spec/data/aws_credentials.yml
+- spec/data/config_with_aws_path.yml
+- spec/data/config_with_region.yml
 - spec/pairhost_spec.rb
 - spec/spec_helper.rb
 homepage: http://www.github.com/karnowski/pairhost
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1667397763441879577
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1667397763441879577
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Automate creation of Relevance-style pairhost EC2 instances.
-test_files:
+test_files: 
+- spec/credential_spec.rb
+- spec/data/aws_credentials.yml
+- spec/data/config_with_aws_path.yml
+- spec/data/config_with_region.yml
 - spec/pairhost_spec.rb
 - spec/spec_helper.rb