bcome 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f21306ed54b699575e5cf11b63eeb0b0652775c
-  data.tar.gz: e70fdd58135f553d8544a2e3dae7fbfaeb2f9b99
+  metadata.gz: 3ac9398e6673878f4324e6127900c8939b1a0cdf
+  data.tar.gz: 102944f7cb3396666308c200715e7e2daa72483c
 SHA512:
-  metadata.gz: ec8d0eaff4dc3240adf07a45e4bea4dc9f67cacc3706b73bf5431749b2c39dcfa4285cc298bb50ee60af068f76ec327633f19025432df9e562f778aa0b2fd790
-  data.tar.gz: 5669e33e6261e4dacf18535f473627581452329b9d04d0f39cc0348faf5c77ae2f624337393f87ce9436a85c628690c3d18205a43e31da4ded6731d904564d76
+  metadata.gz: 7a9ad2aa82e1862b1b4c20a585ce2a193277a95b67ce4e32aff53cbc865a852ea8dd0157fa1bf10e1e0ec6a31a071817489c54da06a6a430bdfd5946bb3106cf
+  data.tar.gz: 0cb412f74956ac92be3477cd8de71807d9cc1fbe25b5b30217bd707bc8d5634b3134991f5bb3fb0a500cb7eb8355a9bad87cb9744cf8b07ae47a495ed7e1dd2d

data/lib/bcome/version.rb

@@ -1,3 +1,3 @@
 module Bcome
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/lib/become_object.rb

@@ -99,6 +99,7 @@ module ::Bcome::BecomeObject
   def list
     if responds_to_list?
       ::RENDER.list_items(collection_key, resources)
+      render_servers_not_returned_by_filtered_lookup if respond_to?(:render_servers_not_returned_by_filtered_lookup)
     else
       puts "\n" + "No list function at this level".warning + "\n\n"
       puts "Enter 'menu' for all available options".menu_item_white + "\n\n"

data/lib/helpers/fog_helper.rb

@@ -9,7 +9,7 @@ module ::Bcome::FogHelper
   end
  
   def ec2_filters
-    network_lookup[:ec2_server_lookup_filters] ? network_lookup[:ec2_server_lookup_filters] : { 'instance-id' => [] }
+    network_lookup[:ec2_server_lookup_filters] ? network_lookup[:ec2_server_lookup_filters] : unfiltered_search_params 
   end  
 
   def reload!
@@ -19,16 +19,58 @@ module ::Bcome::FogHelper
     list
   end
 
-  def unfiltered_servers
+  def unfiltered_search_params
+    { 'instance-id' => [] }
+  end
+
+  ## FOG filter lookups - TODO: misnomers & good intentions ------------
+
+  ## smell
+  def render_servers_not_returned_by_filtered_lookup
+    return unless show_all_unfiltered_status?
+    unfiltered_servers = servers(servers_not_returned_by_filtered_lookup)
+    if unfiltered_servers.any?
+      puts "\n#{network_lookup[:show_all_unfiltered_title]}".informational
+      puts unfiltered_servers.collect{|server| 
+        "#{server.tags["Name"].menu_item_cyan} - #{server.state.send(colour_code_for_server_status[server.state])}"
+      }.join("\n")
+    end
+  end
+
+  def colour_code_for_server_status
+    {
+      "pending" => :headsup,
+      "running" => :friendly,
+      "terminated" => :menu_item_white, #durr
+      "stopping" => :headsup,
+      "stopped" => :danger
+    } 
+  end
+
+  def servers_not_returned_by_filtered_lookup
+    filtered_lookup_names = resources.collect(&:identifier)
+    return unfiltered_fog_lookup.select{|server| !filtered_lookup_names.include?(server.tags["Name"]) }  
+  end
+
+  def unfiltered_fog_lookup
+    fog_client.servers.all(unfiltered_search_params)
+  end
+
+  def show_all_unfiltered_status?
+    self.network_lookup[:show_all_unfiltered]
+  end
+
+  def unfiltered_servers  ### Misnomer - these are filtered
     @unfiltered_servers ||= fog_client.servers.all(ec2_filters)
   end
 
+  ## ---------------------------------------------------------------------
+
   def ec2_tags
     network_lookup[:ec2_tag_filter]
   end
 
-  def servers
-    all = unfiltered_servers
+  def servers(all = unfiltered_servers)
     filtered_by_tags = ec2_tags ? filter_by_tags(all) : all
     
     custom_filter_method = @meta_data[:network_lookup][:custom_post_process_filter_method]

data/lib/render_irb.rb

@@ -2,7 +2,7 @@ class ::Bcome::RenderIrb
 
   def list_items(parent_collection, items)
     if !items || !items.any?
-      print "\n\sNo resources collections found. Maybe you forgot to add any?".headsup
+      print "\nNo active resource collections found.\n".headsup
     else
      print "\n\s"
      puts "#{parent_collection.to_s.menu_title_green}\n".menu_title_green

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcome
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Guillaume Roderick (Webzakimbo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk