omc 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dd1d6445040ba01d433ef7420ee17e6fbd8947b
-  data.tar.gz: ab68bfcbb40518930199073d3b518513c3aa23d1
+  metadata.gz: b2361d70e5037256d91560c0942293a8131dcb4c
+  data.tar.gz: 313d68f01a3ad87f012a02244635d4f8540ecb9e
 SHA512:
-  metadata.gz: 7b04216dce3e21212fa1728de63dd6af4a8caad9c01021750f361a3fd33f8507ae7e7e10049582e59dfffe7fb240faad188cc4447c9d141ebb22e30ea869e1b2
-  data.tar.gz: a0496b2bd1f001603451759a707ae86098618fee1715c6d59ef5acccdb8e67a69b0a6195dfbb664191971c5d8cd464867a521991cc11d5c29e08d357c1529d96
+  metadata.gz: 6282b605730b8267d82c0c33d440827fd712e3b36e11ea29d325e0feeed8cfa9e3809fc9c4150713b794f81ed9a14228bf8d8e1cb5e4f363d36d2e9420b74ad2
+  data.tar.gz: c734612a25bf5b68f36da62fc30403ec347e05ceab0610ee3138dbddecca0d2d9ec9814ad6489303832e25a84332b4bcec20cbf11e2668017442c845ed0cfd10

data/README.md

@@ -1,4 +1,4 @@
-# Omc - Opsworks Missing Console
+# OMC - Opsworks' Missing Console
 
 Useful commands for dealing with AWS and opsworks across multiple IAM accounts.
 
@@ -9,9 +9,9 @@ Useful commands for dealing with AWS and opsworks across multiple IAM accounts.
 gem install omc
 ```
 
-### Aws Cred Vault
+### AWS Cred Vault
 
-omc works off of [aws_cred_vault](www.github.com/cbrunsdon/aws_cred_vault) and requires a ~/.aws_cred_vault file to exist. This file should be populated with your different IAM accounts and users.
+omc works off of [aws_cred_vault](http://www.github.com/cbrunsdon/aws_cred_vault) and requires an ~/.aws_cred_vault file to exist. This file should be populated with your different IAM accounts and users.
 
 Below is an example of a valid ~/.aws_cred_vault
 

data/Rakefile

@@ -1 +1,13 @@
 require "bundler/gem_tasks"
+
+desc 'Open an pry (or irb) session'
+task :console do
+  begin
+    require 'pry'
+    sh 'pry -Ilib -romc'
+  rescue LoadError => _
+    sh 'irb -rubygems -Ilib -romc'
+  end
+end
+
+task c: :console

data/lib/omc.rb

@@ -1,4 +1,5 @@
 require "omc/version"
+require "omc/account"
 require "omc/cli"
 
 module Omc

data/lib/omc/account.rb

@@ -0,0 +1,17 @@
+require 'omc/stack'
+
+module Omc
+  class Account
+    attr_accessor :client
+
+    def initialize(credentials)
+      @client = ::AWS::OpsWorks::Client.new(credentials)
+    end
+
+    def stacks
+      @stacks ||= client.describe_stacks[:stacks].map do |stack|
+        ::Omc::Stack.new(self, stack)
+      end
+    end
+  end
+end

data/lib/omc/app.rb

@@ -0,0 +1,14 @@
+module Omc
+  class App
+    attr_reader :stack, :attributes
+
+    extend Forwardable
+    def_delegators :@attributes, :[]
+    def_delegators :stack, :account, :client
+
+    def initialize stack, attributes
+      @stack = stack
+      @attributes = attributes
+    end
+  end
+end

data/lib/omc/cli.rb

@@ -2,27 +2,52 @@ require 'thor'
 require 'aws_cred_vault'
 require 'aws-sdk'
 require "omc/stack_command"
+require "omc/config"
 
 module Omc
   class Cli < Thor
-    desc 'ssh', 'Connect to an instance on a stack on an account'
-    def ssh(account, stack)
-      command = StackCommand.new(user(account), stack)
+    class_option :account, aliases: '-a', optional: true
+
+    desc 'ssh STACK', 'Connect to an instance on a stack on an account'
+    def ssh(stack)
+      command = StackCommand.new(user, stack)
       command.ssh
     end
 
-    desc 'console', 'Run a rails console on the given stack'
-    def console(account, stack)
-      command = StackCommand.new(user(account), stack)
+    desc 'console STACK', 'Run a rails console on the given stack'
+    method_option :app
+    def console(stack)
+      command = StackCommand.new(user, stack, options[:app])
       command.console
     end
 
+    desc 'db STACK', 'Connect and run the database client on the given stack'
+    method_option :app
+    def db(stack)
+      command = StackCommand.new(user, stack, options[:app])
+      command.db
+    end
+
+    desc 'status STACK', 'Show the instance status for the given stack'
+    def status(stack)
+      command = StackCommand.new(user, stack, options[:app])
+      command.status(self)
+    end
+
     private
-    def user(account)
+    def user
       iam_account = vault.account(account) || abort("Account #{account.inspect} not configured")
       iam_account.users.first || abort("No users configured under #{account.inspect}")
     end
 
+    def account
+      options[:account] || config.account || abort("Must specify account")
+    end
+
+    def config
+      @config ||= Omc::Config.load
+    end
+
     def vault
       AwsCredVault::Toml.new File.join(ENV['HOME'], '.aws_cred_vault')
     end

data/lib/omc/config.rb

@@ -0,0 +1,31 @@
+require 'toml'
+
+module Omc
+  class Config
+    PATHS = [
+      File.join(ENV['HOME'], '.config', 'omcrc'),
+      File.join(ENV['HOME'], '.omcrc'),
+      '.omcrc'
+    ]
+    def self.load
+      config = new
+      PATHS.each do |path|
+        config.load_file(path)
+      end
+      config
+    end
+
+    def load_file path
+      return unless File.exists?(path)
+      @config.update TOML.load_file(path)
+    end
+
+    def initialize(config={})
+      @config = config
+    end
+
+    def account
+      @config['account']
+    end
+  end
+end

data/lib/omc/instances.rb

@@ -0,0 +1,23 @@
+module Omc
+  class Instance
+    attr_reader :stack, :attributes
+
+    extend Forwardable
+    def_delegators :@attributes, :[]
+    def_delegators :stack, :account
+    def_delegators :account, :client
+
+    def initialize stack, attributes
+      @stack = stack
+      @attributes = attributes
+    end
+
+    def online?
+      attributes[:status] == "online"
+    end
+
+    def offline?
+      !online?
+    end
+  end
+end

data/lib/omc/stack.rb

@@ -0,0 +1,29 @@
+require 'omc/instances'
+require 'omc/app'
+
+module Omc
+  class Stack
+    attr_reader :account, :attributes
+
+    extend Forwardable
+    def_delegators :@attributes, :[]
+    def_delegators :account, :client
+
+    def initialize account, attributes
+      @account = account
+      @attributes = attributes
+    end
+
+    def instances
+      @instances ||= client.describe_instances(stack_id: self[:stack_id])[:instances].map do |instance|
+        ::Omc::Instance.new(self, instance)
+      end
+    end
+
+    def apps
+      @apps ||= client.describe_apps(stack_id: self[:stack_id])[:apps].map do |app|
+        ::Omc::App.new(self, app)
+      end
+    end
+  end
+end

data/lib/omc/stack_command.rb

@@ -1,10 +1,12 @@
 require 'aws-sdk'
+require 'omc/account'
 
 module Omc
   class StackCommand
-    def initialize user, stack_name
+    def initialize user, stack_name, app_name=nil
       @user = user
       @stack_name = stack_name
+      @app_name = app_name
     end
 
     def ssh
@@ -12,31 +14,54 @@ module Omc
     end
 
     def console
-      app = applications.first
-      exec 'ssh', '-t', ssh_host, "sudo su deploy -c 'cd /srv/www/#{app[:name]}/current && RAILS_ENV=#{app[:attributes]['RailsEnv']} bundle exec rails c'"
+      ssh_and_execute "cd /srv/www/#{app[:name]}/current && RAILS_ENV=#{app[:attributes]['RailsEnv']} bundle exec rails c"
+    end
+
+    def db
+      ssh_and_execute "cd /srv/www/#{app[:name]}/current && RAILS_ENV=#{app[:attributes]['RailsEnv']} bundle exec rails db -p"
+    end
+
+    def status(thor)
+      details = stack.instances.map do |i|
+        [
+          i[:hostname],
+          i[:instance_type],
+          i[:status],
+          i[:availability_zone],
+          i[:ec2_instance_id],
+          i[:public_ip],
+        ]
+      end
+      thor.print_table(details)
     end
 
     private
-    def applications
-      ops.describe_apps(stack_id: stack[:stack_id])[:apps]
+    def ssh_and_execute(command)
+      exec 'ssh', '-t', ssh_host, "sudo su deploy -c '#{command}'"
+    end
+
+    def app
+      if @app_name
+        get_by_name(stack.apps, @app_name)
+      else
+        stack.apps.first
+      end
     end
 
     def instance
-      instances = ops.describe_instances(stack_id: stack[:stack_id])[:instances]
-      instances.reject!{|i| i[:status] != "online" }
-      instance = instances.first || abort("No running instances")
+      stack.instances.detect(&:online?) || abort("No running instances")
     end
 
     def ssh_host
       "#{@user.name}@#{instance[:public_ip]}"
     end
 
-    def ops
-      @ops ||= ::AWS::OpsWorks::Client.new @user.credentials
+    def account
+      @account ||= Omc::Account.new(@user.credentials)
     end
 
     def stack
-      @stack ||= get_by_name ops.describe_stacks[:stacks], @stack_name
+      @stack ||= get_by_name(account.stacks, @stack_name)
     end
 
     def get_by_name collection, name

data/lib/omc/version.rb

@@ -1,3 +1,3 @@
 module Omc
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omc
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Clarke Brunsdon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -95,7 +95,12 @@ files:
 - Rakefile
 - bin/omc
 - lib/omc.rb
+- lib/omc/account.rb
+- lib/omc/app.rb
 - lib/omc/cli.rb
+- lib/omc/config.rb
+- lib/omc/instances.rb
+- lib/omc/stack.rb
 - lib/omc/stack_command.rb
 - lib/omc/version.rb
 - omc.gemspec