opsicle 0.4.0 → 0.4.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDhlY2I5Nzg3ZjU2OTMyOGZlMjgxMzM3ZjMzOGQ1YWE5MmNjNTZhNg==
+  data.tar.gz: !binary |-
+    ZjEyMTIwODVjOGQyM2E1ZTFlZjg3NzU5OGJkNTlmYThmMjA2NGNhMA==
+SHA512:
+  metadata.gz: !binary |-
+    OWRkNDRiMmUxMzdiMmE4MGUyY2JiNzc0ZDY3YzcyZjdlYmJmM2RlNGZmZDVi
+    MzQ4ZjdjMDFkMjQ4MTY4ODRkNWQ3YTE2NDMzMTQ2MDA2NTY5ZmIwZmQ1YTNj
+    ZWFjYTQxYmY3YTQ0ZjQ3MTA3NWUxYzcxM2Y5ZTQyZTk5OTIxYzQ=
+  data.tar.gz: !binary |-
+    MjAzZjJkYzFlNjEwYjQzMjczM2I0MGY3OGQ1ZjgxZGExN2NiMmFlZGE2NmVj
+    MGM3OWVlMjZlNmJiOTIyNjVhYTUyOWZlOTBkYTU0YjAxZmE0OTYzYjk2OTk2
+    YTIxMTE1ZTQ4ZGY4MGI0MWRkOThiZTY2YzI2MjU0NTFlZDc0MTY=

data/lib/opsicle/instances.rb

@@ -0,0 +1,22 @@
+module Opsicle
+  class Instances
+
+    def initialize(client)
+      @client = client
+    end
+
+    def data
+      instances(reload: true)
+    end
+
+    def instances(options={})
+      # Only call the API again if you need to
+      @instances = nil if options[:reload]
+      @instances ||= @client.api_call('describe_instances',
+                                       :stack_id => @client.config.opsworks_config[:stack_id]
+                                      )[:instances]
+    end
+    private :instances
+
+  end
+end

data/lib/opsicle/monitor.rb

@@ -6,7 +6,9 @@ require "opsicle/monitor/translatable"
 
 require "opsicle/monitor/panels/header"
 require "opsicle/monitor/panels/deployments"
+require "opsicle/monitor/panels/instances"
 require "opsicle/monitor/panels/help"
 
 require "opsicle/monitor/spy/dataspyable"
 require "opsicle/monitor/spy/deployments"
+require "opsicle/monitor/spy/instances"

data/lib/opsicle/monitor/app.rb

@@ -67,7 +67,8 @@ module Opsicle
         command = { 'q' => :stop,
                     'h' => [:set_screen, :help],
                     'b' => :open_opsworks_browser,
-                    'd' => [:set_screen, :deployments] }[key]
+                    'd' => [:set_screen, :deployments],
+                    'i' => [:set_screen, :instances], }[key]
         command ||= :invalid_input
 
         send *command unless command == :invalid_input

data/lib/opsicle/monitor/panels/header.rb

@@ -25,7 +25,7 @@ module Opsicle
             [
               [2, translate[:program], nil],
               [2, -> {
-                [:deployments, :help].map do |e|
+                [:deployments, :instances, :help].map do |e|
                   translate[:menu][(e == @panel_main ? :active : :inactive)][e]
                 end.join("  ")
               }, nil],

data/lib/opsicle/monitor/panels/help.rb

@@ -18,6 +18,9 @@ module Opsicle
             [
               [1, "'d' : Show deployment list on this OpsWorks stack", nil],
             ],
+            [
+              [1, "'i' : Show instance list on this OpsWorks stack", nil],
+            ],
             [
               [1, "'b' : Open OpsWorks screen for this stack in your browser", nil],
             ],

data/lib/opsicle/monitor/panels/instances.rb

@@ -0,0 +1,42 @@
+module Opsicle
+  module Monitor
+    module Panels
+      class Instances < Monitor::Panel
+
+        def initialize(height, width, top, left)
+          super(height, width, top, left, structure(height), :divider_r => " ")
+
+          @spies[:instances] = Monitor::Spy::Instances.new
+        end
+
+        def structure(height)
+          # [
+          #   [relative_column_width, data_left, data_right]
+          # ]
+          s = [
+            [ # table header slots
+              [1, translate[:heading][:ec2_instance_id], nil],
+              [1, translate[:heading][:hostname], nil],
+              [1, translate[:heading][:status], nil],
+              [1, translate[:heading][:zone], nil],
+              [1, translate[:heading][:ip], nil]
+            ],
+          ]
+
+          (0...(height - 1)).each do |i|
+            s << [ # table row slots
+              [1, -> { @spies[:instances][i][:ec2_instance_id] }, nil],
+              [1, -> { @spies[:instances][i][:hostname] }, nil],
+              [1, -> { @spies[:instances][i][:status] }, nil],
+              [1, -> { @spies[:instances][i][:zone] }, nil],
+              [1, -> { @spies[:instances][i][:ip] }, nil]
+            ]
+          end
+
+          s
+        end
+
+      end
+    end
+  end
+end

data/lib/opsicle/monitor/screen.rb

@@ -63,6 +63,8 @@ module Opsicle
         @panels[:main] = case pname
         when :deployments
           Monitor::Panels::Deployments.new((@height - 4), @width, 4, 0)
+        when :instances
+          Monitor::Panels::Instances.new((@height - 4), @width, 4, 0)
         when :help
           Monitor::Panels::Help.new((@height - 4), @width, 4, 0)
         end

data/lib/opsicle/monitor/spy/instances.rb

@@ -0,0 +1,35 @@
+require 'opsicle/instances'
+
+module Opsicle
+  module Monitor
+    module Spy
+      class Instances
+
+        include Spy::Dataspyable
+
+        def initialize
+          @instances = Opsicle::Instances.new(Opsicle::Monitor::App.client)
+          refresh
+        end
+
+        def refresh
+          h = []
+
+          @instances.data.each do |instance|
+            # Massage the API data for our uses
+            h << {
+              :ec2_instance_id => instance[:ec2_instance_id],
+              :hostname => instance[:hostname],
+              :status => instance[:status],
+              :zone => instance[:availability_zone],
+              :ip => instance[:elastic_ip] || instance[:public_ip]
+            }
+          end
+
+          @data = h
+        end
+
+      end
+    end
+  end
+end

data/lib/opsicle/monitor/translatable.rb

@@ -24,7 +24,11 @@ module Opsicle
             created_at: "STARTED",
             completed_at: "COMPLETED",
             user: "USER",
-            command: "COMMAND"
+            command: "COMMAND",
+            hostname: "HOSTNAME",
+            zone: "AZ",
+            ip: "IP ADDRESS",
+            ec2_instance_id: "EC2 INSTANCE ID"
           }
         }
       end

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

data/opsicle.gemspec

@@ -19,14 +19,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "aws-sdk", "~> 1.30"
-  spec.add_dependency "gli"
-  spec.add_dependency "highline"
-  spec.add_dependency "terminal-table"
-  spec.add_dependency "minitar"
+  spec.add_dependency "gli", "~> 2.9"
+  spec.add_dependency "highline", "~> 1.6"
+  spec.add_dependency "terminal-table", "~> 1.4"
+  spec.add_dependency "minitar", "~> 0.5"
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "3.0.0.beta1" # Pinning to beta1 until https://github.com/guard/guard-rspec/pull/250 is closed
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "rake", "~> 10.1"
+  spec.add_development_dependency "rspec", "~> 3.0.0.beta2"
+  spec.add_development_dependency "guard", "~> 2.5"
+  spec.add_development_dependency "guard-rspec", "~> 4.2"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors:
 - Andy Fleener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,71 +27,62 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,67 +97,59 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 description: CLI for the opsworks platform
 email:
 - andrew.fleener@sportngin.com
@@ -201,15 +180,18 @@ files:
 - lib/opsicle/config.rb
 - lib/opsicle/deployment.rb
 - lib/opsicle/deployments.rb
+- lib/opsicle/instances.rb
 - lib/opsicle/monitor.rb
 - lib/opsicle/monitor/app.rb
 - lib/opsicle/monitor/panel.rb
 - lib/opsicle/monitor/panels/deployments.rb
 - lib/opsicle/monitor/panels/header.rb
 - lib/opsicle/monitor/panels/help.rb
+- lib/opsicle/monitor/panels/instances.rb
 - lib/opsicle/monitor/screen.rb
 - lib/opsicle/monitor/spy/dataspyable.rb
 - lib/opsicle/monitor/spy/deployments.rb
+- lib/opsicle/monitor/spy/instances.rb
 - lib/opsicle/monitor/subpanel.rb
 - lib/opsicle/monitor/translatable.rb
 - lib/opsicle/output.rb
@@ -234,33 +216,26 @@ files:
 homepage: https://github.com/sportngin/opsicle
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1300190123240828980
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1300190123240828980
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An opsworks specific abstraction on top of the aws sdk
 test_files:
 - spec/opsicle/client_spec.rb