opsicle 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab993b3d50de8fe63817cfdadf477b2226e7b988
-  data.tar.gz: 627593752949a28787510fcb7808fac626fe2f22
+  metadata.gz: 382eb43575e7839130f2b9aeb764eb073f00eb55
+  data.tar.gz: d2daa070bd8e667242c07655c9c9fe2f615a1a6b
 SHA512:
-  metadata.gz: 27dc029b0626c90206a77eb74f8e14b8a74a3b68c30d4a9d5acdfb059690354036d6fa1e7b66ffa18081f36be65f1f1ded65ddb23b4d1255b047e5a57d45f585
-  data.tar.gz: e573205db262222309adad4b7d30f2a7a897ed302199aa09440fbb4c72b878b0353624fb6b7c5b3541751dea8495cb23a67245754650f3f41527ebfdfe476d0a
+  metadata.gz: 2e3f9d74f4a3e204639c113564faae10f2714f7347a348044de701da4573fb76a915097ea482cc0c81d7b6d9d71365705b0ad11a10e8d16a1f52b10d43a970b4
+  data.tar.gz: eaf95944a7eaa244811546b382e5c1b05ed4cdd9522290e93f353173ad2adf97727dcf46db1c7a7c396e7da154189e39cec13387720c7e39eface42f2e0c57fb

data/lib/opsicle/commands/list_instances.rb

@@ -2,39 +2,33 @@ require 'terminal-table'
 
 module Opsicle
   class ListInstances
-    attr_reader :client, :layers
+    attr_reader :client
 
     def initialize(environment)
       @client = Client.new(environment)
+      @stack = Stack.new(@client)
     end
 
     def execute(options={})
-      get_layers
       print(get_instances)
     end
 
-    def get_layers
-      @layers = client.api_call('describe_layers', stack_id: @client.config.opsworks_config[:stack_id])[:layers]
-    end
-
     def get_instances
       Opsicle::Instances.new(client).data
     end
 
     def print(instances)
-      puts Terminal::Table.new headings: ['Hostname', 'Layers', 'Status', 'Instance ID'], rows: instance_data(instances)
+      puts Terminal::Table.new headings: ['Hostname', 'Layers', 'Status', 'IP', 'Instance ID'], rows: instance_data(instances)
     end
 
     def instance_data(instances)
-      instances.map{|instance| [instance[:hostname], layer_names(instance), instance[:status], instance[:instance_id]] }
+      instances.sort { |a,b| a[:hostname] <=> b[:hostname] }.map { |instance|
+        [instance[:hostname], layer_names(instance), instance[:status], Opsicle::Instances::pretty_ip(instance), instance[:instance_id]]
+      }
     end
 
     def layer_names(instance)
-      instance[:layer_ids].map{ |layer_id| layer_name(layer_id) }.join(" | ")
-    end
-
-    def layer_name(layer_id)
-      layers.detect{ |layer| layer[:layer_id] == layer_id }[:name]
+      instance[:layer_ids].map{ |layer_id| @stack.layer_name(layer_id) }.join(" | ")
     end
 
   end

data/lib/opsicle/commands/ssh.rb

@@ -4,6 +4,7 @@ module Opsicle
 
     def initialize(environment)
       @client = Client.new(environment)
+      @stack = Opsicle::Stack.new(@client)
     end
 
     def execute(options={})
@@ -13,7 +14,7 @@ module Opsicle
       else
         Output.say "Choose an Opsworks instance:"
         instances.each_with_index do |instance, index|
-          Output.say "#{index+1}) #{instance[:hostname]}"
+          Output.say "#{index+1}) #{instance[:hostname]} #{instance_info(instance)}"
         end
         choice = Output.ask("? ", Integer) { |q| q.in = 1..instances.length }
       end
@@ -28,6 +29,7 @@ module Opsicle
       @instances ||= client.api_call(:describe_instances, { stack_id: client.config.opsworks_config[:stack_id] })
                            .data[:instances]
                            .select { |instance| instance[:status].to_s == 'online'}
+                           .sort { |a,b| a[:hostname] <=> b[:hostname] }
     end
 
     def public_ips
@@ -51,5 +53,12 @@ module Opsicle
       "ssh #{ssh_options}#{ssh_string}#{ssh_command}"
     end
 
+    def instance_info(instance)
+      infos = []
+      infos << instance[:layer_ids].map{ |layer_id| @stack.layer_name(layer_id) } if instance[:layer_ids]
+      infos << "EIP" if instance[:elastic_ip]
+      "(#{infos.join(', ')})"
+    end
+
   end
 end

data/lib/opsicle/instances.rb

@@ -14,6 +14,10 @@ module Opsicle
       instances(reload: true)
     end
 
+    def self.pretty_ip(instance)
+      instance[:elastic_ip] ? "#{instance[:elastic_ip]} EIP" : instance[:public_ip]
+    end
+
     def self.find_by_ip(client, ips)
       instances = new(client).data.reject { |instance| instances_matching_ips(instance, ips) }
       instances.empty? ? nil : instances 

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

@@ -19,7 +19,8 @@ module Opsicle
               [1, translate[:heading][:created_at], nil],
               [1, translate[:heading][:completed_at], nil],
               [1, translate[:heading][:user], nil],
-              [1, translate[:heading][:command], nil]
+              [1, translate[:heading][:command], nil],
+              [3, translate[:heading][:command_args], nil]
             ],
           ]
 
@@ -29,7 +30,8 @@ module Opsicle
               [1, -> { @spies[:deployments][i][:created_at] },  nil],
               [1, -> { @spies[:deployments][i][:completed_at] },  nil],
               [1, -> { @spies[:deployments][i][:user] }, nil],
-              [1, -> { @spies[:deployments][i][:command] }, nil]
+              [1, -> { @spies[:deployments][i][:command] }, nil],
+              [3, -> { @spies[:deployments][i][:command_args] }, nil]
             ]
           end
 

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

@@ -27,6 +27,7 @@ module Opsicle
               :user          => user_from_arn(deployment[:iam_user_arn]),
               :comment       => deployment[:comment],
               :command       => deployment[:command][:name],
+              :command_args  => deployment[:command][:args],
               :name          => deployment[:name],
               :args          => deployment[:args],
               :value         => deployment[:value],

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

@@ -22,10 +22,11 @@ module Opsicle
               :hostname => instance[:hostname],
               :status => instance[:status],
               :zone => instance[:availability_zone],
-              :ip => instance[:elastic_ip] || instance[:public_ip]
+              :ip => Opsicle::Instances::pretty_ip(instance)
             }
           end
 
+          h.sort! { |a,b| a[:hostname] <=> b[:hostname] }
           @data = h
         end
 

data/lib/opsicle/monitor/translatable.rb

@@ -25,6 +25,7 @@ module Opsicle
             completed_at: "COMPLETED",
             user: "USER",
             command: "COMMAND",
+            command_args: "ARGS",
             hostname: "HOSTNAME",
             zone: "AZ",
             ip: "IP ADDRESS",

data/lib/opsicle/stack.rb

@@ -18,5 +18,13 @@ module Opsicle
       stack_summary[:name]
     end
 
+    def layers
+      @layers ||= @client.api_call('describe_layers', stack_id: @client.config.opsworks_config[:stack_id])[:layers]
+    end
+
+    def layer_name(layer_id)
+      layers.detect{ |layer| layer[:layer_id] == layer_id }[:name]
+    end
+
   end
 end

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/spec/opsicle/commands/list_instances_spec.rb

@@ -17,7 +17,6 @@ module Opsicle
       end
 
       it "shows a table with all of the instances for the stack from OpsWorks" do
-        expect(subject).to receive(:get_layers).and_return(layers)
         expect(subject).to receive(:get_instances).and_return(instances)
         expect(subject).to receive(:print).with(instances)
         subject.execute

data/spec/opsicle/commands/ssh_spec.rb

@@ -5,9 +5,11 @@ module Opsicle
   describe SSH do
     subject { SSH.new('derp') }
     let(:client) { double(config: double(opsworks_config: {stack_id: "1234"})) }
+    let(:stack) { double(client: client) }
     let(:api_call) { double }
     before do
       allow(Client).to receive(:new).with('derp').and_return(client)
+      allow(Stack).to receive(:new).with(client).and_return(stack)
     end
 
     context "#execute" do
@@ -92,6 +94,12 @@ module Opsicle
         expect(api_call).to receive(:data).and_return(instances: [{:name => :foo, :status => "online"},{:name => :bar, :status => "stopped"}])
         expect(subject.instances).to eq([{:name => :foo, :status=>"online"}])
       end
+      it "sorts instances by hostname" do
+        expect(client).to receive(:api_call).with(:describe_instances, {stack_id: "1234"})
+          .and_return(api_call)
+        expect(api_call).to receive(:data).and_return(instances: [{:hostname => "taco", :status => "online"},{:hostname => "bar", :status => "online"}])
+        expect(subject.instances).to eq([{:hostname => "bar", :status=>"online"}, {:hostname => "taco", :status=>"online"}])
+      end
     end
 
     context "#ssh_username" do
@@ -134,5 +142,32 @@ module Opsicle
         expect(subject.ssh_command({private_ip: "789.789.789.789"}, { :"ssh-opts" => "-c"} )).to eq("ssh -c -A -t mrderpyman2014@123.123.123.123 ssh 789.789.789.789")
       end
     end
+
+    context "#instance_info" do
+      before do
+        allow(stack).to receive(:layer_name).with("1").and_return("one")
+        allow(stack).to receive(:layer_name).with("2").and_return("two")
+        allow(subject).to receive(:instances) {[
+                    { hostname: "host1", public_ip: "123.123.123.123", layer_ids: [1] },
+                    { hostname: "host2", private_ip: "789.789.789.789", layer_ids: [1,2] },
+                    { hostname: "host3", private_ip: "789.789.789.789", layer_ids: nil }
+                  ]}
+        it "should handle no layers or EIP" do
+          expect(subject.instance_info({})).to eq("()")
+        end
+        it "should list a layer" do
+          expect(subject.instance_info(layer_ids: [1])).to eq("(one)")
+        end
+        it "should list layers" do
+          expect(subject.instance_info(layer_ids: [1, 2])).to eq("(one, two)")
+        end
+        it "should list a EIP" do
+          expect(subject.instance_info(elastic_ip: "1.1.1.1")).to eq("(EIP)")
+        end
+        it "should list all info" do
+          expect(subject.instance_info(layer_ids: [1], elastic_ip: "1.1.1.1")).to eq("(one, EIP)")
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk