pairhost 0.0.1 → 0.0.2

data/bin/pairhost

@@ -1,172 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'fog'
-require 'thor'
-require 'yaml'
+require 'pairhost'
 
-class Pairhost
-  def initialize
-    @config = YAML.load(File.open("./config.yml"))
-    @instance_id = File.read(File.expand_path('~/.pairhost/instance')).chomp
-
-    Fog.credentials = Fog.credentials.merge(
-      :private_key_path => @config['private_key_path'], 
-    )
-
-    @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'],
-    )
-  end
-
-  def create
-    server_options = {
-      "tags" => {"Name" => "DevOps Dev (LK FTW)"},
-      "image_id" => @config['ami_id'],
-      "flavor_id" => @config['flavor_id'],
-      "key_name" => @config['key_name'],
-    }
-
-    puts "Provisioning..."
-    server = @connection.servers.create(server_options)
-    server.wait_for { ready? }
-    puts "provisioned!"
-    server
-  end
-
-  def start(server)
-    puts "Starting..."
-    server.start
-    server.wait_for { ready? }
-    puts "Started!"
-  end
-
-  def check_ssh(server)
-    # Try to ssh in every 3 seconds until 
-    # we get a response or one minute passes
-    server.wait_for(60, 3) do
-      begin
-        puts "Trying to ssh..."
-        output = ssh('/bin/pwd')
-        puts output.inspect
-        output
-      rescue => e
-        puts "ssh failed... exception was #{e}"
-        false
-      end
-    end
-  end
-
-  def fetch_server
-    @connection.servers.get(@instance_id) if @instance_id
-  end
-
-  def display_status(server)
-    puts "#{server.id}: #{server.tags['Name']}"
-    puts server.state
-    puts server.dns_name if server.dns_name
-  end
-end
-
-class PairhostCLI < Thor
-  desc "ssh", "SSH to your pairhost"
-  def ssh
-    server = Pairhost.new.fetch_server
-    exec "ssh -A -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=QUIET pair@#{server.reload.dns_name}"
-  end
-
-  desc "status", "Print the status of your pairhost"
-  def status
-    ph = Pairhost.new
-    server = ph.fetch_server
-    ph.display_status(server)
-  end
-
-  map "stop" => :shutdown
-  map "halt" => :shutdown
-
-  desc "shutdown", "Stop your pairhost"
-  def shutdown
-    ph = Pairhost.new
-    server = ph.fetch_server
-    puts "Shutting down..."
-    server.stop
-    server.wait_for { state == "stopped" }
-    puts "shutdown!"
-  end
-
-  desc "attach", "Start using an existing pairhost given its EC2 instance ID"
-  def attach
-    puts "coming soon..."
-  end
-
-  # TODO: replace with "up" (which does a "create" or a "start" as appropriate)
-  # create asks for a name, but gives you a default based on the $CWD and git initials, if any
-  desc "up", "Create a new pairhost or start your stopped pairhost"
-  def up
-    ph = Pairhost.new
-    server = ph.fetch_server
-
-    if server 
-      ph.start(server)
-    else
-      server = ph.create
-    end
-
-    ph.display_status(server)
-  end
-
-  desc "destroy", "Terminate your pairhost"
-  def destroy
-    server = fetch_server
-    puts "Destroying..."
-    server.destroy
-    server.wait_for { state == "terminated" }
-    puts "destroyed!"
-  end
-
-  desc "list", "List all instances on your EC2 account"
-  def list
-    @config[:pairhost].connection.servers.each do |server|
-      puts server.tags['Name']
-      puts server.inspect
-      puts 
-      puts
-    end
-  end
-
-  desc "initials", "DEBUG: just a test task for getting the current git initials"
-  def initials
-    initials = `git config user.initials`.chomp.split("/").map(&:upcase).join(" ")
-    puts initials.inspect
-  end
-
-  desc "init", "Setup your ~/.pairhost directory with default config"
-  def init
-    
-  end
-
-
-=begin
-  vagrant commands:
-    box --> ignore?
-    destroy
-    gem --> ignore
-    halt
-    init --> ignore
-    package --> ignore
-    provision
-    reload
-    resume
-    ssh
-    ssh-config --> ignore?
-    status
-    suspend
-    up
-=end
-
-end
-
-PairhostCLI.start
+Pairhost::CLI.start

data/lib/pairhost/version.rb

@@ -1,3 +1,3 @@
 module Pairhost
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/pairhost.rb

@@ -1,5 +1,182 @@
 require "pairhost/version"
+require 'fog'
+require 'thor'
+require 'yaml'
+require 'fileutils'
 
 module Pairhost
-  # Your code goes here...
+  def self.config_file
+    @config_file ||= File.expand_path('~/.pairhost/config.yml')
+  end
+
+  def self.config
+    @config ||= begin
+      unless File.exists?(config_file)
+        abort "No pairhost config found. First run 'pairhost init'."
+      end
+      YAML.load_file(config_file)
+    end
+  end
+
+  def self.instance_id
+    @instance_id ||= File.read(File.expand_path('~/.pairhost/instance')).chomp
+  end
+
+  def self.connection
+    return @connection if @connection
+
+    Fog.credentials = Fog.credentials.merge(
+      :private_key_path => config['private_key_path'],
+    )
+
+    @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'],
+    )
+  end
+
+  def self.create(name)
+    server_options = {
+      "tags" => {"Name" => name, 
+                 "Created-By-Pairhost-Gem" => VERSION},
+      "image_id" => config['ami_id'],
+      "flavor_id" => config['flavor_id'],
+      "key_name" => config['key_name'],
+    }
+
+    server = connection.servers.create(server_options)
+    server.wait_for { ready? }
+
+    @instance_id = server.id
+    write_instance_id(@instance_id)
+
+    server
+  end
+
+  def self.write_instance_id(instance_id)
+    File.open(File.expand_path('~/.pairhost/instance'), "w") do |f|
+      f.write(instance_id)
+    end
+  end
+
+  def self.start(server)
+    server.start
+    server.wait_for { ready? }
+  end
+
+  def self.stop(server)
+    server.stop
+    server.wait_for { state == "stopped" }
+  end
+
+  def self.fetch
+    connection.servers.get(instance_id) if instance_id
+  end
+
+  class CLI < Thor
+    include Thor::Actions
+
+    desc "ssh", "SSH to your pairhost"
+    def ssh
+      server = Pairhost.fetch
+      exec "ssh -A -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=QUIET pair@#{server.dns_name}"
+    end
+
+    desc "status", "Print the status of your pairhost"
+    def status
+      server = Pairhost.fetch
+      puts "#{server.id}: #{server.tags['Name']}"
+      puts "State: #{server.state}"
+      puts server.dns_name if server.dns_name
+    end
+
+    map "start" => :resume
+
+    desc "resume", "Start a stopped pairhost"
+    def resume
+      server = Pairhost.fetch
+      puts "Starting..."
+      Pairhost.start(server.reload)
+      puts "started!"
+
+      invoke :status
+    end
+
+    desc "create", "Provision a new pairhost; all future commands affect this pairhost"
+    def create
+      initials = `git config user.initials`.chomp.split("/").map(&:upcase).join(" ")
+      default_name = "something1 #{initials}"
+      name = ask_with_default("What to name your pairhost? [#{default_name}]", default_name)
+      puts "Name will be: #{name}"
+      puts "Provisioning..."
+      # server = Pairhost.create(name)
+      # puts "provisioning!"
+      # invoke :status
+    end
+
+    desc "up", "Create a new pairhost or start your stopped pairhost"
+    def up
+      server = Pairhost.fetch
+
+      if server
+        invoke :resume
+      else
+        invoke :create
+      end
+    end
+
+    map "halt" => :stop
+    map "shutdown" => :stop
+    map "suspend" => :stop
+
+    desc "stop", "Stop your pairhost"
+    def stop
+      server = Pairhost.fetch
+      puts "Shutting down..."
+      Pairhost.stop(server)
+      puts "shutdown!"
+    end
+
+    desc "attach", "All future commands affect this pairhost"
+    def attach
+      instance_id = ask("EC2 Instance?")
+      Pairhost.write_instance_id(instance_id)
+      invoke :status
+    end
+
+    map "terminate" => :destroy
+
+    desc "destroy", "Terminate your pairhost"
+    def destroy
+      server = Pairhost.fetch
+      confirm = ask("Type 'yes' to confirm deleting '#{server.tags['Name']}'.\n>")
+
+      return unless confirm == "yes"
+
+      puts "Destroying..."
+      server.destroy
+      server.wait_for { state == "terminated" }
+      puts "destroyed!"
+    end
+
+    desc "init", "Setup your ~/.pairhost directory with default config"
+    def init
+      FileUtils.mkdir_p File.dirname(Pairhost.config_file)
+      FileUtils.cp(File.dirname(__FILE__) + '/../config.example.yml', Pairhost.config_file)
+    end
+
+    desc "provision", "Freshen the Chef recipes"
+    def provision
+      puts "coming soon..."
+    end
+
+    private
+
+    def ask_with_default(question, default)
+      answer = ask(question)
+      answer = answer.strip.empty? ? default : answer
+      answer
+    end
+  end
 end

data/pairhost.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = ["larry@hickorywind.org"]
   s.homepage    = "http://www.github.com/karnowski/pairhost"
   s.summary     = %q{Automate creation of Relevance pairhost EC2 instances.}
-  s.description = %q{A Vagrant-like command line interface for creating, managing, and using EC2 pairhosts.}
+  s.description = %q{A Vagrant-like command line interface for creating, managing, and using EC2 instances for remote pairing.}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pairhost
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.14.6
 description: A Vagrant-like command line interface for creating, managing, and using
-  EC2 pairhosts.
+  EC2 instances for remote pairing.
 email:
 - larry@hickorywind.org
 executables:
@@ -54,12 +54,10 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/pairhost
 - config.example.yml
-- config.yml
 - lib/pairhost.rb
 - lib/pairhost/version.rb
 - pairhost.gemspec

data/Gemfile.lock

@@ -1,31 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    builder (3.0.0)
-    excon (0.9.6)
-    fog (1.1.2)
-      builder
-      excon (~> 0.9.0)
-      formatador (~> 0.2.0)
-      mime-types
-      multi_json (~> 1.0.3)
-      net-scp (~> 1.0.4)
-      net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5.0)
-      ruby-hmac
-    formatador (0.2.1)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.3.0)
-    nokogiri (1.5.1)
-    ruby-hmac (0.4.0)
-    thor (0.14.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fog (= 1.1.2)
-  thor (= 0.14.6)

data/config.yml

@@ -1,10 +0,0 @@
-provider: 'AWS'
-aws_secret_access_key: 'aOWCyMXgpFd452aBh4BRyPGkR/RtQ9G0qQX/5aQV'
-aws_access_key_id: 'AKIAIQZWXGD2S56W2MMQ'
-
-# 608860329496/Ubuntu 11.04 64-bit Pairhost (2011-10-26)
-ami_id: 'ami-9360affa'
-flavor_id: 'm1.large'
-
-key_name: 'relevance_aws'
-private_key_path: '~/.ssh/relevance_aws/relevance_aws.pem'