bcome 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e37ef36e32729d99fc0d22377dd1f8e3a105f654
-  data.tar.gz: f2d3d80620f317a74aa17fe3ac0f61c56751f0ab
+  metadata.gz: f4b9ed597a273b6b2583fdbbe47fcf39e5f364d7
+  data.tar.gz: c1435dd0a9b8c642b5f685bd5d0ca691843ae4ad
 SHA512:
-  metadata.gz: cddabfe2eb7b2cc275b0b16891cd2865016cfa5a2eb34942f1038f2606f379030257af83cf68a1675c74a39794c94c6aac3c1e0a0c5982e836e25ce733ee8281
-  data.tar.gz: 5fe5bbb97ead4ea73ea29fe6f0b074ea0d928fe0863fc7b9af1b8ab9a045fd96575c2a6f3ffff510f590868d5e70513562d84130fce3545eae2516aec975383e
+  metadata.gz: 77f31f5fe23d0a3379658c8344f6ff267509d245d83130ea5a21074d6a9a4af66318bc365f37c8325472ccd216459789859a595cae4e32b73765bfe43657c990
+  data.tar.gz: dc8b03b7f322159c2e082df45ebbbbde4dec3f21a813d2af1953317066b974d07dea0ef1096be5753618cfef85ac6130e1eb9dce626f03f2e8faa2469600ef19

data/lib/bcome/version.rb

@@ -1,3 +1,3 @@
 module Bcome
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

data/lib/helpers/fog_helper.rb

@@ -14,7 +14,8 @@ module ::Bcome::FogHelper
 
   def reload!
     @unfiltered_servers = fog_client.servers.all(ec2_filters)
-    @resources = do_load_resources
+    restock_inventory = true 
+    @resources = do_load_resources(restock_inventory)
     @node = construct_node
     system("clear")
     list

data/lib/stack/environment.rb

@@ -96,21 +96,75 @@ module ::Bcome::Stack
       ]
     end
 
-    def do_load_resources
-      if dynamic_network_lookup? 
-        loaded_resources = collection_klass.collection_from_fog_data(self, servers)
-      else
-        path = config_path
-        raise "Missing instances.yml configuration for your environment. You've selected a static network lookup, and yet I cannot find #{config_path}".failure unless File.exist?(config_path)
-        config = YAML.load_file(path)
-        loaded_resources = collection_klass.collection_from_config(self, config)
-      end
+    def load_from_static_inventory
+      path = config_path
+      raise "Missing instances.yml configuration for your environment. You've selected a static network lookup, and yet I cannot find #{config_path}".failure unless File.exist?(config_path)
+      config = YAML.load_file(path)
+      return collection_klass.collection_from_config(self, config)
+    end
+
+    def refresh_dynamic_inventory
+      loaded_resources = collection_klass.collection_from_fog_data(self, servers)
+      loaded_resources
+    end
+
+
+    def restock
+      puts "\n/ Refreshing server inventory".menu_item_green
+      take_stock!(collection_klass.collection_from_fog_data(self, servers))
+      puts " Done. Inventory written to: #{config_path}\n".menu_item_green
+    end
+ 
+    def use_inventory_cache?
+      (dynamic_network_lookup? && self.meta_data[:inventory_cache])
+    end
+
+    def static_inventory_is_set?
+      File.exist?(config_path)
+    end
+
+    def load_and_take_stock
+      loaded_resources = refresh_dynamic_inventory
+      take_stock!(loaded_resources)
+      loaded_resources
+    end
+
+    def do_load_resources(restock_inventory = false)
+      loaded_resources = manage_inventory(restock_inventory)
       node.set_instances(loaded_resources)
       return loaded_resources
     end
 
+    def manage_inventory(restock_inventory = false)
+      return load_from_static_inventory unless dynamic_network_lookup? # No dynamic lookup, load from static
+      return refresh_dynamic_inventory unless use_inventory_cache?   # Dynamic lookup, with no cache, just load from dynamic
+      return load_and_take_stock if !static_inventory_is_set? || restock_inventory # Dynamic lookup and stock, if stock not set or we're explicitly re-stocking
+      return load_from_static_inventory # otherwise just load from static.
+    end
+
+
+    def config_dir
+      "#{CONFIGS_PATH}/static_instances/"
+    end
+
     def config_path
-      "#{CONFIGS_PATH}/static_instances/#{platform.identifier}_#{identifier}-instances.yml"
+      "#{config_dir}#{platform.identifier}_#{identifier}-instances.yml"
+    end
+
+    def take_stock!(resources)
+      `mkdir -p #{config_dir}`
+      inventory = { :instances => [] }  
+      resources.each do |resource|
+        inventory[:instances] << {
+          :identifier => resource.identifier,
+          :external_network_interface_address => resource.external_network_interface_address,
+          :public_ip_address => resource.public_ip_address,
+          :role => resource.role
+        }
+      end
+      File.open(config_path, "w") do |file|
+        file.write inventory.to_yaml
+      end
     end
 
     def do_describe

data/lib/stack/instance.rb

@@ -31,11 +31,14 @@ module ::Bcome::Stack
       end
     end
 
-    attr_reader :environment, :meta_data
- 
+    attr_reader :environment, :meta_data, :external_network_interface_address, :public_ip_address, :role
+
     def initialize(meta_data, parent)
       @meta_data = meta_data
       @environment = parent
+      @external_network_interface_address = meta_data[:external_network_interface_address]
+      @public_ip_address = meta_data[:public_ip_address]
+      @role = meta_data[:role]
     end
 
     def identifier

metadata

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