omc 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47f530e21b36ef261bc1c5312c37eea8d3e43d0a
-  data.tar.gz: 312737de277a4d458e1a65341f48e3501e9cb7ce
+  metadata.gz: 46021d8d49c5f6627c59c726ab9d46ca780cae4e
+  data.tar.gz: 399407808e128c45549e0473a85f3f749ba86b30
 SHA512:
-  metadata.gz: 0fe52e6a12531b42c63dc1229928f889841b3897cbbc1c8e1ab725a6b6c89db2e6aaa633db9e3ff7c1da256cdea05ce8e0605a050bff34c78dec4ba758b2d27c
-  data.tar.gz: 4ccee6e1bc5a0b55eacdc3894d2bf7eafbcfcf4351abd22f9a6fd8f6c8d84159a227e922b3d2dcbe6db5049b6c62fed85fc94c09e3493a31247ab5d223c594bb
+  metadata.gz: 1f4f9dcbff7fa1a3199aaadd08473f1ad7afcb94dd1a7f6f32275c630e2b1c9ad89f7a13aa0d07309813acbffc2d573f3b700f11eb48fbee516e9f2561bc420f
+  data.tar.gz: 8bb6dbb519b9f98230bce973ea1658debc63bf00d3ec5362c9a26322f0b4bf56d75fc7159e958e12dd0551f10005c4793e6625d960093cc75a75f575d1121353

data/lib/omc/cli.rb

@@ -7,30 +7,38 @@ require "omc/config"
 module Omc
   class Cli < Thor
     class_option :account, aliases: '-a', optional: true
+    class_option :layer, aliases: '-l', optional: true
 
     desc 'ssh STACK', 'Connect to an instance on a stack on an account'
     def ssh(stack)
-      command = StackCommand.new(user, stack)
+      command = StackCommand.new(user, stack, layer: options[:layer])
       command.ssh
     end
 
     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 = StackCommand.new(user, stack, app: options[:app], layer: options[:layer])
       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 = StackCommand.new(user, stack, app: options[:app], layer: options[:layer])
       command.db
     end
 
+    desc 'unicorn ACTION STACK', 'Connect and run the given action on the unicorns'
+    method_option :app
+    def unicorn(action, stack)
+      command = StackCommand.new(user, stack, app: options[:app])
+      command.unicorn(action)
+    end
+
     desc 'status STACK', 'Show the instance status for the given stack'
     def status(stack)
-      command = StackCommand.new(user, stack, options[:app])
+      command = StackCommand.new(user, stack, app: options[:app], layer: options[:layer])
       command.status(self)
     end
 

data/lib/omc/layer.rb

@@ -0,0 +1,22 @@
+require 'forwardable'
+
+module Omc
+  class Layer
+    attr_reader :stack, :attributes
+
+    extend Forwardable
+    def_delegators :@attributes, :[]
+    def_delegators :stack, :account, :client
+
+    def initialize stack, attributes
+      @stack = stack
+      @attributes = attributes
+    end
+
+    def instances
+      @instances ||= @stack.instances.select do |i|
+        i[:layer_ids].include? self[:layer_id]
+      end
+    end
+  end
+end

data/lib/omc/stack.rb

@@ -1,5 +1,6 @@
 require 'omc/instances'
 require 'omc/app'
+require 'omc/layer'
 require 'forwardable'
 
 module Omc
@@ -26,5 +27,24 @@ module Omc
         ::Omc::App.new(self, app)
       end
     end
+
+    def layers
+      @layers ||= client.describe_layers(stack_id: self[:stack_id])[:layers].map do |layer|
+        ::Omc::Layer.new(self, layer)
+      end
+    end
+
+    def execute_recipes(app, recipes: [], name: "execute_recipes")
+      client.create_deployment(
+        stack_id: self[:stack_id],
+        app_id: app[:app_id],
+        command: {
+          name: name,
+          args: {
+            "recipes" => recipes
+          }
+        }
+      )
+    end
   end
 end

data/lib/omc/stack_command.rb

@@ -3,10 +3,11 @@ require 'omc/account'
 
 module Omc
   class StackCommand
-    def initialize user, stack_name, app_name=nil
+    def initialize user, stack_name, app: nil, layer: nil
       @user = user
       @stack_name = stack_name
-      @app_name = app_name
+      @app_name = app
+      @layer_name = layer
     end
 
     def ssh
@@ -21,6 +22,15 @@ module Omc
       ssh_and_execute "cd /srv/www/#{app[:name]}/current && RAILS_ENV=#{app[:attributes]['RailsEnv']} bundle exec rails db -p"
     end
 
+    def unicorn(action)
+      case action
+      when "restart"
+        stack.execute_recipes(app, recipes: ["deploy::rails-restart"], name: "restart")
+      else
+        abort("Unicorn action should be one of [restart]")
+      end
+    end
+
     def status(thor)
       details = stack.instances.map do |i|
         [
@@ -48,8 +58,15 @@ module Omc
       end
     end
 
+    def layer
+      if @layer_name
+        get_by_name(stack.layers, @layer_name, key: :shortname)
+      end
+    end
+
     def instance
-      stack.instances.detect(&:online?) || abort("No running instances")
+      instances = layer ? layer.instances : stack.instances
+      instances.detect(&:online?) || abort("No running instances")
     end
 
     def ssh_host
@@ -64,10 +81,10 @@ module Omc
       @stack ||= get_by_name(account.stacks, @stack_name)
     end
 
-    def get_by_name collection, name
+    def get_by_name collection, name, key: :name
       collection.detect do |x|
-        x[:name] == name
-      end || abort("Can't find #{name.inspect} among #{collection.map{|x| x[:name] }.inspect}")
+        x[key] == name
+      end || abort("Can't find #{name.inspect} among #{collection.map{|x| x[key] }.inspect}")
     end
   end
 end

data/lib/omc/version.rb

@@ -1,3 +1,3 @@
 module Omc
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/omc.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omc
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Clarke Brunsdon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - clarke@freerunningtechnologies.com
@@ -100,6 +114,7 @@ files:
 - lib/omc/cli.rb
 - lib/omc/config.rb
 - lib/omc/instances.rb
+- lib/omc/layer.rb
 - lib/omc/stack.rb
 - lib/omc/stack_command.rb
 - lib/omc/version.rb