awslanes 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61d5264586ea12544f5ed60a050b9eaf9dfa705a
-  data.tar.gz: 189ad401623c0eef45500dc7f8814cac4dfc2f9b
+  metadata.gz: d5e7cd275d0ee3cf3974b73263d8e2bb2bfe9cb9
+  data.tar.gz: 259d5af166ef23ad00f78b74cc04a93daffa3362
 SHA512:
-  metadata.gz: 5f5d102680808adae95e99e0d9d1b315d7a65427cbb44899677616a69dc6a8cdfc66c13998151943b1126d2d6eef5b6965028f2442ab146db428228afa9e3b1c
-  data.tar.gz: b9a03db047585f27df74ece747c68b2c264d2d327e3b1af8f742b6a1b65ce857b7f7b97b8416c48c33c4c8eba45e157ddf1e26a305b5ff119ddb351b06e0993b
+  metadata.gz: b13474d8c6ed5ed8a0938162d6193444c2052aa8c7693044b974478efe4746f6027d804be9b2ce40f3042f573345ad087b822200530be5cee6a4f63238b39c88
+  data.tar.gz: 894555cb37894dc7734c93de432cbc52eaafbaa26ce3073ca09048de868c7962f2a39e292a8c390eb1446c2044696bf254db1dc27a90ef7e7e32bba73f92515a

data/lib/lanes.rb

@@ -26,7 +26,6 @@ module LanesCli
     desc "list [LANE]", "Lists all servers name + ip + Instance ID, optionally filtered by lane 2"
     def list(lane=nil)
       servers = AWS.instance.fetchServers(lane)
-      servers.sort_by!{ |s| [s[:lane], s[:name]] }
       display_server_table(servers)
       
     end
@@ -143,7 +142,6 @@ module LanesCli
     no_commands{
       def chooseServer(lane=nil)
         servers = AWS.instance.fetchServers(lane)
-        servers.sort_by!{ |s| [s[:lane], s[:name]] }
         display_server_table(servers, title: "Available Servers:", display_index: true)
 
         choice = ask "Which server: "
@@ -155,6 +153,7 @@ module LanesCli
         table border: true do
           row header: true, color: 'white'  do
             column 'INDEX', width: 5, align: 'center' if ops[:display_index]
+            column 'LANE', width: 15
             column 'SERVER', width: 30
             column 'IP ADDRESS', width: 20
             column 'ID', width: 15
@@ -163,7 +162,8 @@ module LanesCli
           servers.each_with_index do |server, index|  
             row :color => 'green', :bold => true do
               column (index+1).to_s if ops[:display_index]
-              column "#{server[:name]} (#{server[:lane]})"
+              column server[:lane]
+              column server[:name]
               column server[:ip]
               column server[:id]
             end

data/lib/lanes/aws.rb

@@ -19,12 +19,14 @@ class AWS
           :id => server.id
       }
       if s[:ip]
-        if s[:lane] != nil and (lane == nil or lane == s[:lane])
+        if lane == nil or lane == s[:lane]
           servers.push s
         end
       end
     };
 
+    servers.sort_by!{ |s| [s[:lane] ? s[:lane] : "zzz", s[:name]] }
+
     return servers
   end
 end

data/lib/lanes/version.rb

@@ -1,3 +1,3 @@
 module AwsLanes
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awslanes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dave Welch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler