bcome 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 182bfab8bb82f233dc36d0997b8b04d5c338fdbc
-  data.tar.gz: 05f502b57479254e9f8242105950e11cae9a890b
+  metadata.gz: 6d99a4af143d2075b4f499a92601ccc27a94dd96
+  data.tar.gz: 282f22fcfc8fd304bd8f860ee1a727d42e26ab2a
 SHA512:
-  metadata.gz: 44c5de8e693ea1a1d7ede4eb64ece7ba5d388a6f3de742fbf234c1a4a17a5bd6845467060084ce019f439cef9e3c7b01fd19e343c56c8abb294598f452b162e5
-  data.tar.gz: 7269b4533caae53f815e80ceb40ac6ca3c4f071a3ea537752b9a5ee9850c7efac12c88d38c101a4c28d5e48c1d16bc48d7cadeb326b3e4bd43a7933bec005861
+  metadata.gz: dd94a30b7aa4c68c3735bf3c60e788745bd330723823cb8e62fd9458175a4185dd359835ccaa6e3373ea0f13e20645ddbaa9b081da29e831169a85e0f47b2bac
+  data.tar.gz: 44daa435ece36665e1cc1c9e9e9abe4cdd9412ab6119fb41fa7ba9e5fb31c214c304bb042ad4c52b3a88100d8b37646c93912c737f4f519660bbeb17c84f15c8

data/bin/bcome

@@ -33,7 +33,7 @@ Dir[Dir.pwd  + "/bcome/filters/**/*.rb"].each {|file| load file }
 quick_contexts = []
 
 BECOME = ::Bcome::WorkspaceContext.new 
-BOOT = ::Bcome::Boot.new
+ESTATE = ::Bcome::Stack::Estate.new
 RENDER = ::Bcome::RenderIrb.new
 
 ###########################
@@ -50,7 +50,7 @@ if ARGV[0]
     exit 1
   end
 
-  unless platform = BOOT.resource_for_identifier(platform_key)
+  unless platform = ESTATE.resource_for_identifier(platform_key)
     puts "Cannot find platform named #{platform_key}".failure
     exit
   end
@@ -73,13 +73,23 @@ IRB.conf[:MAIN_CONTEXT] = IRB::Irb.new.context
 ## QUICK CONTEXT & BOOT #
 #########################
 
-context_object = BOOT
+context_object = ESTATE
 
 if quick_contexts.any?
+  
+  is_first_context = true
+
   spawn = false
   quick_contexts.each do |resource_context_key|
     next_context_resource = context_object.resource_for_identifier(resource_context_key)
 
+    # Initialize our object namespace, but only from our lowest level namespace object. This
+    # ensure we don't load more than we need. 
+    if is_first_context
+      next_context_resource.init
+      is_first_context = false
+    end 
+ 
     if next_context_resource.nil?
       puts "Cannot find any resources object named: #{resource_context_key}. Please check your quick contexts and try again".failure
       exit
@@ -88,6 +98,8 @@ if quick_contexts.any?
     BECOME.set(next_context_resource, context_object, spawn)
     context_object = next_context_resource
   end
+else
+  ESTATE.init
 end
 
 ##################

data/lib/bcome/version.rb

@@ -1,3 +1,3 @@
 module Bcome
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/become_object.rb

@@ -12,7 +12,6 @@ module ::Bcome::BecomeObject
     "#{previous_workspace_object.send(:become_identifier)}> #{identifier}"
   end
 
-
   def local_download_path
     "#{Dir.pwd}/downloads#{namespace}" 
   end

data/lib/helpers/environment_ssh.rb

@@ -9,46 +9,97 @@ module ::Bcome::EnvironmentSSH
     return "ssh -W %h:%p #{bastion_ip_address}"
   end
 
-  def execute_command(commands, node)
+  def execute_command(commands, instance)
     begin
-      return execute_cmd(commands, node, proxy)
+      return execute_cmd(commands, instance, proxy)
     rescue Net::SSH::AuthenticationFailed
-      raise "Could not authenticate connection to #{node.identifier}".failure
+      raise "Could not authenticate connection to #{instance.identifier}".failure
     rescue Net::SSH::Disconnect
-      raise "SSH connection to #{node.identifier} was disconnected".failure
+      raise "SSH connection to #{instance.identifier} was disconnected".failure
     end
   end
 
-  def execute_cmd(raw_commands, node, proxy)
+  def execute_cmd(raw_commands, instance, proxy)
     commands = raw_commands.collect{|raw_command|
-      raw_command.is_a?(::Bcome::Command) ? raw_command : ::Bcome::Command.new(raw_command, node)
+      raw_command.is_a?(::Bcome::Command) ? raw_command : ::Bcome::Command.new(raw_command, instance)
     }
 
-    ssh = ::Bcome::Ssh.new(commands, proxy, node)
+    ssh = ::Bcome::Ssh.new(commands, proxy, instance)
     ssh.execute!
     return
   end
 
-  def execute_scp_upload(files, remote_path, node)
+  def execute_scp_upload(files, remote_path, instance)
     begin
-      scp = ::Bcome::Scp.new(proxy, node)
+      scp = ::Bcome::Scp.new(proxy, instance)
       scp.upload!(files, remote_path)
     rescue Net::SSH::AuthenticationFailed
-      raise "Could not authenticate connection to #{node.identifier}".failure
+      raise "Could not authenticate connection to #{instance.identifier}".failure
     rescue Net::SSH::Disconnect 
-      raise "SSH connection to #{node.identifier} was disconnected".failure
+      raise "SSH connection to #{instance.identifier} was disconnected".failure
     end
   end        
 
-  def execute_scp_download(remote_path, local_path, node)
+  def execute_scp_download(remote_path, local_path, instance)
     begin
-      scp = ::Bcome::Scp.new(proxy, node)
+      scp = ::Bcome::Scp.new(proxy, instance)
       scp.download!(remote_path, local_path)
     rescue Net::SSH::AuthenticationFailed
-      raise "Could not authenticate connection to #{node.identifier}".failure
+      raise "Could not authenticate connection to #{instance.identifier}".failure
     rescue Net::SSH::Disconnect
-      raise "SSH connection to #{node.identifier} was disconnected".failure
+      raise "SSH connection to #{instance.identifier} was disconnected".failure
     end
   end   
 
+  def bastion_server
+    instances.select{|instance| instance.identifier == @ssh_mode[:jump_host_identifier] }.first
+  end
+
+  def ssh_mode_type
+    ssh_mode_type = @ssh_mode[:type]
+    raise "Invalid ssh mode type #{ssh_mode_type}. Should be one of #{valid_ssh_modes.join(", ")}".failure unless valid_ssh_modes.include?(ssh_mode_type)
+    return @ssh_mode[:type]
+  end
+
+  def ssh_mode_user
+    return @ssh_mode[:ssh_user]
+  end
+
+  def ssh_nat_user
+    return @ssh_mode[:nat_user]
+  end
+
+  def ssh_key_path
+    return @ssh_mode[:ssh_key_path]
+  end
+
+  def valid_ssh_modes
+    [::SSH_JUMP_MODE_IDENTIFIER, ::SSH_DIRECT_MODE_IDENTIFIER]
+  end
+
+  def bastion_ip_address
+    if dynamic_network_lookup? 
+      return bastion_server.public_ip_address
+    else
+      bastion_ip_address = @ssh_mode[:jump_host_ip_address]
+      raise "No jump_host_ip_address specified in your configuration.".failure unless bastion_ip_address
+      return bastion_ip_address
+    end
+  end
+
+  def network_lookup
+    raise "Missing network lookup in networks_environment configuration".failure unless @network_lookup
+    return @network_lookup
+  end
+
+  def network_lookup_type
+    type = network_lookup[:type]
+    raise "Unknown network lookup type '#{type}" unless ["dynamic", "static"].include?(type)
+    return type
+  end
+
+  def dynamic_network_lookup?
+    return network_lookup_type == "dynamic"
+  end
+
 end

data/lib/helpers/instance_ssh.rb

@@ -31,16 +31,16 @@ module ::Bcome::InstanceSsh
   end
 
   def nat_user
-    return @environment.ssh_nat_user ? @environment.ssh_nat_user : ssh_user
+    return environment.ssh_nat_user ? environment.ssh_nat_user : ssh_user
   end
 
   def ssh_user
     # defined by the environment or we fall back to the local user
-    return @environment.ssh_mode_user ? @environment.ssh_mode_user : `whoami`.gsub("\n","")
+    return environment.ssh_mode_user ? environment.ssh_mode_user : `whoami`.gsub("\n","")
   end
 
   def ssh_key_path
-    return @environment.ssh_key_path ? @environment.ssh_key_path : "~/.ssh/id_rsa" 
+    return environment.ssh_key_path ? environment.ssh_key_path : "~/.ssh/id_rsa" 
   end
 
   def keys
@@ -48,7 +48,7 @@ module ::Bcome::InstanceSsh
   end
 
   def bastion_ip_address
-    return @environment.bastion_ip_address
+    return environment.bastion_ip_address
   end
 
   def is_direct_ssh?
@@ -64,7 +64,7 @@ module ::Bcome::InstanceSsh
   end
 
   def is_ssh_jump_host?
-    @meta_data["role"] == ::SSH_JUMP_HOST_ROLE_IDENTIFIER
+    @role == ::SSH_JUMP_HOST_ROLE_IDENTIFIER
   end
 
 end

data/lib/nodes/base.rb

@@ -0,0 +1,39 @@
+module ::Bcome::Node
+  class Base
+
+    include ::Bcome::CommandHelper
+
+    attr_reader :meta_data
+
+    def machines
+      raise "Should be overriden"
+    end
+  
+    def initialize(meta_data)
+      construct(meta_data)
+    end
+
+    def method_missing(method_sym, *arguments, &block)
+      if instance_variable_defined?("@#{method_sym}")
+        return instance_variable_get("@#{method_sym}")
+      else
+        super
+      end
+    end
+
+    def set_parent_reference(parent, parent_reference_key, collection_key)
+      instance_variable_get("@#{collection_key}").map{|collection_item|
+        collection_item.instance_variable_set("@#{parent_reference_key}", parent)
+      }
+    end
+
+    private
+
+    def construct(meta_data = {})
+      meta_data.each do |key, value|
+        self.instance_variable_set("@#{key}", value)
+      end
+    end
+
+  end
+end

data/lib/nodes/environment.rb

@@ -0,0 +1,19 @@
+module ::Bcome::Node
+  class Environment < ::Bcome::Node::Base
+
+    include ::Bcome::EnvironmentSSH
+
+    def machines
+      instances
+    end
+
+    def identifier
+      @environment
+    end
+ 
+    def namespace
+      "#{platform.namespace}/#{identifier}"
+    end
+
+  end
+end

data/lib/nodes/estate.rb

@@ -0,0 +1,36 @@
+module ::Bcome::Node
+  class Estate < ::Bcome::Node::Base
+
+    include ::Bcome::Selections
+
+    def machines
+      platforms.collect(&:machines).flatten
+    end
+  
+    def namespace
+      ""
+    end  
+
+    def environments
+      @environments ||= platforms.collect(&:environments).flatten
+    end
+
+    def list_all
+      estate_machine_list = "\n"
+      platforms.each do |platform|
+        estate_machine_list += "* #{platform.identifier}\n"
+        platform.environments.each do |environment|
+        estate_machine_list += "\t- #{environment.identifier}\n"
+          environment.instances.each do |instance|
+            estate_machine_list += "\t\t / #{instance.identifier} (#{instance.public_ip_address})\n"
+          end 
+        end
+      end
+
+      puts estate_machine_list.colorize(:green)
+
+      return ""
+    end 
+
+  end
+end

data/lib/nodes/instance.rb

@@ -0,0 +1,37 @@
+module ::Bcome::Node
+  class Instance < ::Bcome::Node::Base
+
+    include ::Bcome::InstanceCommand
+    include ::Bcome::InstanceSsh
+    include ::Bcome::InstanceCommand
+
+    def machines
+      [self]  # for completion
+    end
+
+    def identifier
+      @identifier
+    end
+
+    def ip_address
+      @environment.ssh_mode_type == ::SSH_DIRECT_MODE_IDENTIFIER ? public_ip_address : @external_network_interface_address
+    end
+
+    def public_ip_address
+      @public_ip_address
+    end
+
+    def role
+      @role
+    end
+
+    def namespace
+      "#{environment.namespace}/#{identifier}"
+    end
+
+    def local_download_path
+      "#{Dir.pwd}#{@environment.namespace}/#{identifier}"
+    end
+
+  end
+end

data/lib/nodes/platform.rb

@@ -0,0 +1,17 @@
+module ::Bcome::Node
+  class Platform < ::Bcome::Node::Base
+
+    def machines
+      environments.collect(&:machines).flatten
+    end
+
+    def identifier
+      name
+    end
+
+    def namespace
+      "#{estate.namespace}/#{identifier}"
+    end
+
+  end
+end

data/lib/object.rb

@@ -1,19 +1,4 @@
 class Object
-
-  include ::Bcome::CommandHelper
-
-  def list
-    BOOT.send(:list)  ### Our starting point in the hierarchy... maybe this is all ultimately configurable?
-  end
-  alias :ls :list
-
-  def become_identifier
-    ::START_PROMPT
-  end
-
-  def become(object)
-    BECOME.set(object, self)
-  end
  
   def toggle_sudo
     @sudo = @sudo.nil? ? true : (@sudo ? false : true)
@@ -29,51 +14,6 @@ class Object
     is_sudo? ? "on" : "off"
   end
 
-  def workon(identifier)
-    resource = resource_for_identifier(identifier)
-
-    unless resource
-      puts "No matching #{collection_key} for identifier '#{identifier}'. #{available_resources_options_string}".failure
-    else
-      puts "\\ \nFrom #{resource.reference_key}, working on #{identifier}\n".command
-      become(resource)
-    end
-  end
-  alias :w :workon
-  alias :cd :workon
-
-  def menu_items
-    [
-      { :command => "list / ls", :description => "List all available resources at the current context." },
-      { :command => "describe", :description => "Describe the resource object at the current context." },
-      { :command => "cd / workon / w", :description => "Select a resource object, and switch to its context.", :usage => "cd 'identifier'" },
-      { :command => "exit", :description => "Return to the previous context" }, 
-      { :command => "exit!", :description => "Close all contexts, and exit Become."},
-      { :command => "local", :description => "Execute a shell command on your local machine.", :usage => 'local "command"'}
-    ]
-  end
-
-  def menu
-    ::RENDER.menu(menu_items)
-  end
-
-  def highlight?
-    false  ## override in stack objects that should be highlighted within a list, e.g. instance objects at the environment level that have been selected to workon on
-  end
-
-  def available_resources_options_string
-    "Please select from one of '#{all_items.join(', ')}'"
-  end
-
-  def describe
-    if self.respond_to?(:do_describe)
-      message = "\nCollection Key: #{reference_key}\n\nResource: #{self.do_describe}".colorize(:green)
-    else
-      message = "\nNothing to describe. Use 'list' to see namespace options".headsup unless self.respond_to?(:do_describe)
-    end
-    puts message
-  end
-
   def set_irb_prompt(conf)
     conf[:PROMPT][:CUSTOM] = {
       :PROMPT_N => "\e[1m:\e[m ",

data/lib/ssh.rb

@@ -2,16 +2,16 @@ class ::Bcome::Ssh
 
   attr_reader :commands
 
-  def initialize(commands, proxy, node)
+  def initialize(commands, proxy, instance)
     @commands = commands
     @proxy = proxy
-    @node = node
+    @instance = instance
   end
 
   def execute!
-    ::Net::SSH.start(@node.ip_address, @node.ssh_user, :proxy => @proxy, :keys => @node.keys, :paranoid => false) do |ssh|
+    ::Net::SSH.start(@instance.ip_address, @instance.ssh_user, :proxy => @proxy, :keys => @instance.keys, :paranoid => false) do |ssh|
       @commands.each do |command|
-        puts "(#{@node.identifier}) #{@user}$ #{command.raw_command}".command
+        puts "(#{@instance.identifier}) #{@user}$ #{command.raw_command}".command
         ssh_exec!(ssh, command)
 
         puts command.output

data/lib/stack/base.rb

@@ -0,0 +1,97 @@
+module ::Bcome::Stack
+  class Base 
+
+    def machines
+      node.machines
+    end
+
+    ###
+    ## Construction & Initialisation
+    ##
+
+    def node
+      @node ||= construct_node
+    end
+
+    def construct_node
+      node_attributes = meta_data
+
+      node_attributes.merge!({
+        collection_key => resources.collect(&:node)
+      }) if respond_to?(:collection_key)
+
+      this_node = node_level_klass.new(node_attributes)
+
+      this_node.set_parent_reference(this_node, child_reference_key, collection_key) if respond_to?(:collection_key) && respond_to?(:child_reference_key)
+      return this_node
+    end
+
+    def node_level_klass
+      raise "Should be overidden in derived stack type"
+    end
+
+    def init
+      puts "loading resources ... "
+      node
+    end
+
+    ###
+    ## Core workspace behaviour
+    ##
+
+    def become_identifier
+     ::START_PROMPT
+    end
+
+    def become(object)
+      BECOME.set(object, self)
+    end
+
+    def workon(identifier)
+      resource = resource_for_identifier(identifier)
+ 
+      unless resource
+        puts "No matching #{collection_key} for identifier '#{identifier}'. #{available_resources_options_string}".failure
+      else
+        puts "Working on #{identifier} from #{resource.reference_key}".informational
+        become(resource)
+      end
+    end
+    alias :w :workon
+    alias :cd :workon
+
+    def menu
+      ::RENDER.menu(menu_items)
+    end
+
+    def menu_items
+      [
+        { :command => "list / ls", :description => "List all available resources at the current context." },
+        { :command => "describe", :description => "Describe the resource object at the current context." },
+        { :command => "cd / workon / w", :description => "Select a resource object, and switch to its context.", :usage => "cd 'identifier'" },
+        { :command => "exit", :description => "Return to the previous context" },
+        { :command => "exit!", :description => "Close all contexts, and exit Become."},
+        { :command => "local", :description => "Execute a shell command on your local machine.", :usage => 'local "command"'},
+        { :command => "machines", :description => "Return all servers below the current level to the console. These objects can be manipulated directly" }
+      ]
+    end
+
+    def highlight?
+      false  ## override in stack objects that should be highlighted within a list, e.g. instance objects at the environment level that have been selected to workon on
+    end
+
+    def available_resources_options_string
+      "Please select from one of '#{all_items.join(', ')}'"
+    end
+
+    def describe
+      if self.respond_to?(:do_describe)
+        message = "\nCollection Key: #{reference_key}\n\nResource: #{self.do_describe}".colorize(:green)
+      else
+        message = "\nNothing to describe. Use 'list' to see namespace options".headsup unless self.respond_to?(:do_describe)
+      end
+      puts message
+    end
+
+  end
+end

data/lib/stack/environment.rb

@@ -1,5 +1,5 @@
 module ::Bcome::Stack
-  class Environment
+  class Environment < ::Bcome::Stack::Base
 
     include ::Bcome::BecomeObject
     include ::Bcome::Selections
@@ -39,61 +39,6 @@ module ::Bcome::Stack
         { :command => 'functions', :description => "List all available custom functions" }
       ]
     end
-  
-    def bastion_server
-      resources.select{|resource| resource.identifier == @meta_data[:ssh_mode][:jump_host_identifier] }.first
-    end
-
-    def ssh_mode_type
-      ssh_mode_type = @meta_data[:ssh_mode][:type]
-      raise "Invalid ssh mode type #{ssh_mode_type}. Should be one of #{valid_ssh_modes.join(", ")}".failure unless valid_ssh_modes.include?(ssh_mode_type)
-      return @meta_data[:ssh_mode][:type]
-    end
-
-    def ssh_mode_user
-      return @meta_data[:ssh_mode][:ssh_user]
-    end 
-
-    def ssh_nat_user
-      return @meta_data[:ssh_mode][:nat_user]
-    end
-
-    def ssh_key_path
-      return @meta_data[:ssh_mode][:ssh_key_path]
-    end
-  
-    def sudo 
-      toggle_sudo
-    end
-
-    def valid_ssh_modes
-      [::SSH_JUMP_MODE_IDENTIFIER, ::SSH_DIRECT_MODE_IDENTIFIER]
-    end
- 
-    def bastion_ip_address
-      if dynamic_network_lookup?  
-        return bastion_server.public_ip_address
-      else
-        bastion_ip_address = @meta_data[:ssh_mode][:jump_host_ip_address]
-        raise "No jump_host_ip_address specified in your configuration.".failure unless bastion_ip_address
-        return bastion_ip_address
-      end
-    end
-
-    def network_lookup
-      raise "Missing network lookup in networks_environment configuration".failure unless @meta_data[:network_lookup]
-      return @meta_data[:network_lookup]
-    end
-
-    def network_lookup_type
-      type = network_lookup[:type]
-      raise "Unknown network lookup type '#{type}" unless ["dynamic", "static"].include?(type)
-      return type
-    end
-
-    def dynamic_network_lookup?
-      return network_lookup_type == "dynamic"
-    end
 
     def do_load_resources
      if dynamic_network_lookup? 
@@ -111,9 +56,9 @@ module ::Bcome::Stack
     end
 
     def do_describe
-      desc = "#{identifier}"
-      desc += "\t[ Net lookup: #{network_lookup_type}"
-      desc += "\t * SSH Mode: #{ssh_mode_type} ]"
+      desc = "#{node.identifier}"
+      desc += "\t[ Net lookup: #{node.network_lookup_type}"
+      desc += "\t * SSH Mode: #{node.ssh_mode_type} ]"
     end
 
     def collection_klass
@@ -124,9 +69,36 @@ module ::Bcome::Stack
       :environments
     end
 
+    def child_reference_key
+      :environment 
+    end
+
     def collection_key
       :instances
     end 
 
+    def node_level_klass
+      ::Bcome::Node::Environment
+    end
+
+    def network_lookup
+      raise "Missing network lookup in networks_environment configuration".failure unless @meta_data[:network_lookup]
+      return @meta_data[:network_lookup]
+    end
+
+    def network_lookup_type
+      type = network_lookup[:type]
+      raise "Unknown network lookup type '#{type}" unless ["dynamic", "static"].include?(type)
+      return type
+    end
+
+    def dynamic_network_lookup?
+      return network_lookup_type == "dynamic"
+    end
+
+    def sudo
+      toggle_sudo
+    end
+
   end
 end

data/lib/stack/estate.rb

@@ -0,0 +1,51 @@
+module ::Bcome::Stack
+  class Estate < ::Bcome::Stack::Base
+
+    include ::Bcome::BecomeObject
+    include ::Bcome::CommandHelper
+
+    def config_path
+      "#{CONFIGS_PATH}/platform.yml"
+    end
+
+    def collection_klass 
+      ::PLATFORM_STACK_KLASS
+    end  
+
+    def collection_key
+      :platforms
+    end
+
+    def to_s
+      "Estate"
+    end
+
+    def become_identifier
+      ::START_PROMPT
+    end
+
+    def namespace
+      starting_namespace
+    end
+
+    def starting_namespace
+      ""  # Used to determine where to store downloaded file - this is the start point directory, relative to the bcome install directory
+    end
+
+    def init
+      puts "loading resources ... "
+      n = ::Bcome::Node::Estate.new({ :platforms => resources.collect(&:node) })
+      n.set_parent_reference(n, :estate, :platforms)
+      return n
+    end
+
+    def node
+      @node ||= init
+    end
+
+    def menu_items
+      super
+    end
+
+  end
+end

data/lib/stack/instance.rb

@@ -1,9 +1,7 @@
 module ::Bcome::Stack
-  class Instance
+  class Instance < ::Bcome::Stack::Base
 
     include ::Bcome::BecomeObject
-    include ::Bcome::InstanceSsh
-    include ::Bcome::InstanceCommand
     include ::Bcome::Functions
 
     class << self
@@ -32,13 +30,34 @@ module ::Bcome::Stack
       end
     end
 
-    attr_reader :environment
-
+    attr_reader :environment, :meta_data
+ 
     def initialize(meta_data, parent)
       @meta_data = meta_data
       @environment = parent
     end
 
+    def identifier
+      node.identifier
+    end
+
+    ## Commands
+    def ssh
+      node.ssh
+    end
+
+    def put(*params)
+      node.put(*params)
+    end 
+
+    def run(*params)
+      node.run(*params)
+    end
+
+    def get(*params)
+      node.get(*params)
+    end
+
     def menu_items
       super + [
         { :command => "run", :description => "Execute a command.", :usage => "run 'command'" },
@@ -58,10 +77,6 @@ module ::Bcome::Stack
       toggle_sudo
     end
 
-    def namespace
-      "#{@environment.namespace}/#{identifier}"
-    end
-
     def is_sudo?
       super || @environment.is_sudo?
     end
@@ -70,38 +85,31 @@ module ::Bcome::Stack
       false
     end
  
-    def identifier
-      @meta_data[:identifier] 
-    end
-
-    def ip_address
-     @environment.ssh_mode_type == ::SSH_DIRECT_MODE_IDENTIFIER ? public_ip_address : @meta_data[:external_network_interface_address]
-    end
-
-    def public_ip_address
-      @meta_data[:public_ip_address]
-    end
-
-    def role
-      @meta_data[:role]
-    end
-
     def reference_key
       :instances
     end
 
+    def child_reference_key
+      :instance
+    end 
+
     def highlight?
       @environment.object_in_selections?(self)
     end
 
     def do_describe
-      description = "#{identifier}#{ is_sudo? ? " MODE: sudo "  : "" }"
+      description = "#{node.identifier}#{ is_sudo? ? " MODE: sudo "  : "" }"
       description += "\n\t* Internal IP #{@meta_data[:external_network_interface_address]}"
-      description += "\n\t* External IP #{public_ip_address}" if public_ip_address
-      description += "\n\t* #{role}" if role 
+      description += "\n\t* External IP #{node.public_ip_address}" if node.public_ip_address
+      description += "\n\t* #{node.role}" if node.role 
       description += "\n"
       return description    
     end
 
+    def node_level_klass
+      ::Bcome::Node::Instance
+    end
+
+
   end
 end

data/lib/stack/platform.rb

@@ -1,5 +1,5 @@
 module ::Bcome::Stack
-  class Platform
+  class Platform < ::Bcome::Stack::Base
 
     include ::Bcome::BecomeObject
 
@@ -14,8 +14,7 @@ module ::Bcome::Stack
       end
     end
 
-    attr_reader :identifier
-    attr_reader :quick_contexts
+    attr_reader :identifier, :meta_data, :quick_contexts
 
     def initialize(identifier, meta_data)
       @identifier = identifier
@@ -43,6 +42,10 @@ module ::Bcome::Stack
       :platforms
     end 
 
+    def child_reference_key
+      :platform
+    end
+
     def collection_key
       :environments
     end
@@ -57,6 +60,10 @@ module ::Bcome::Stack
       raise "Multiple quick context matches found on platform #{@identifier} for context key #{context_reference}. Cannot load quick context - selection is ambiguous." if matches.size > 1
       return matches.first 
     end
+
+    def node_level_klass
+      ::Bcome::Node::Platform
+    end
  
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcome
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Guillaume Roderick (Webzakimbo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -125,7 +125,6 @@ files:
 - lib/bcome.rb
 - lib/bcome/version.rb
 - lib/become_object.rb
-- lib/boot.rb
 - lib/command.rb
 - lib/filters/base.rb
 - lib/filters/ec2_filter.rb
@@ -136,12 +135,19 @@ files:
 - lib/helpers/instance_command.rb
 - lib/helpers/instance_ssh.rb
 - lib/helpers/selections.rb
+- lib/nodes/base.rb
+- lib/nodes/environment.rb
+- lib/nodes/estate.rb
+- lib/nodes/instance.rb
+- lib/nodes/platform.rb
 - lib/object.rb
 - lib/patches/string.rb
 - lib/render_irb.rb
 - lib/scp.rb
 - lib/ssh.rb
+- lib/stack/base.rb
 - lib/stack/environment.rb
+- lib/stack/estate.rb
 - lib/stack/instance.rb
 - lib/stack/platform.rb
 - lib/workspace_context.rb

data/lib/boot.rb

@@ -1,33 +0,0 @@
-class ::Bcome::Boot
-
-  include ::Bcome::BecomeObject
-
-  def config_path
-    "#{CONFIGS_PATH}/platform.yml"
-  end
-
-  def collection_klass 
-    ::PLATFORM_STACK_KLASS
-  end  
-
-  def collection_key
-    :platforms
-  end
-
-  def to_s
-    "Bootup"
-  end
-
-  def become_identifier
-    ::START_PROMPT
-  end
-
-  def namespace
-    starting_namespace
-  end
-
-  def starting_namespace
-    ""  # Used to determine where to store downloaded file - this is the start point directory, relative to the bcome install directory
-  end
-
-end