bcome 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd98d90373d60001ec4a21251573bc95c9a0bf87
-  data.tar.gz: 3ef7ba76ffc2efdd1b7825645343c1307d95f55d
+  metadata.gz: 0356068ab732695cc27cf83578703579897e3352
+  data.tar.gz: be45f5cceabe3e3505a2006cf497dde93b49c569
 SHA512:
-  metadata.gz: 54ac7e4ff18b8f8368311ec68c4eaa815414d3d581c67109d7e84315312d567010dd07d7eef54b37a7e39580f00eb5695d7639028c58f0a01559272ae8803aba
-  data.tar.gz: 56eaa6c9572bc6085b4ee2b857d1c35d8f650130a068650079247321f51a02704d42cf829cffdeefbdf591ad0e219b3753b5163552521b83a815fb1047d06ee6
+  metadata.gz: 6cba40a7c1a3dc390b036c6f370196c740e7afa34a0c55d6979028e1b2ff1b3147bcbce1beddf17b76d22383627b8e1befebfd3b4e021552da977772df0c93c2
+  data.tar.gz: 79a7ebe9b9b47c111d416f670fb9dcded28deda2f474a2288d724887a479af169a0c3e5293db4416b500fca2d93ab5ae2092362f682294b5b5222a4603c68b8b

data/bin/boot.rb

@@ -117,6 +117,7 @@ if quick_contexts.any?
     # Initialize our object namespace, but only from our lowest level namespace object. This
     # ensures that we don't load more than we need. 
     if is_first_context
+      next_context_resource = ESTATE if next_context_resource.nil?
       next_context_resource.init
       is_first_context = false
     end

data/lib/bcome/version.rb

@@ -1,3 +1,3 @@
 module Bcome
-  VERSION = "0.5.6"
+  VERSION = "0.6.0"
 end

data/lib/become_object.rb

@@ -106,5 +106,5 @@ module ::Bcome::BecomeObject
     end   
   end
   alias :ls :list
-
+  alias :l :list
 end

data/lib/helpers/environment_ssh.rb

@@ -92,7 +92,7 @@ module ::Bcome::EnvironmentSSH
 
   def bastion_ip_address
     unless bastion_server
-      raise "Unable to fine the jump host. No instance found with identifier '#{@ssh_mode[:jump_host_identifier]}'.  Check your network.yml config for this stack, and ensure that you've got the correct value for key 'jump_host_identifier'"
+      raise "Unable to find the jump host. No instance found with identifier '#{@ssh_mode[:jump_host_identifier]}'.  Check your network.yml config for this stack, and ensure that you've got the correct value for key 'jump_host_identifier'"
     end
 
     if dynamic_network_lookup? 

data/lib/interactive/session_item/transparent_ssh.rb

@@ -67,7 +67,7 @@ module Bcome::Interactive::SessionItem
     end
 
     def machines
-      @machines ||= has_selected_machines? ? selected_machines : @irb_session.machines
+      @machines ||= has_selected_machines? ? selected_machines : @irb_session.resources.collect(&:node)
     end
 
     def has_selected_machines?

data/lib/render_irb.rb

@@ -10,7 +10,7 @@ class ::Bcome::RenderIrb
         puts "\t*/added".danger + "\n" if item.highlight?
         print item.do_describe
       end
-      print "\n\s\sUse cd [node identifier], e.g. cd :#{items.first.identifier} OR cd \"#{items.first.identifier}\" to work on a given node.\n\n"
+      print "\n\s\sTo work on any given node, use the cd command e.g. cd #{items.first.identifier}\n\n"
     end
   end
 

data/lib/stack/environment.rb

@@ -25,6 +25,51 @@ module ::Bcome::Stack
       @platform = parent
     end  
 
+    def views
+      @views ||= do_create_views
+    end
+
+    def has_views?
+      views.any?
+    end
+    
+    def list_views
+      if has_views?
+        ::RENDER.list_items("Sub-views", views)
+      else
+        puts "\n" + "This environment has no configured sub-views".warning + "\n\n"
+      end
+    end
+    alias :lv :list_views
+
+    def resource_identifiers
+      @resource_identifiers ||= resource_identifiers_with_views
+    end
+
+    def resource_identifiers_with_views
+      return has_views? ? (resources.collect(&:identifier) << views.collect(&:identifier)).flatten : resources.collect(&:identifier)
+    end
+
+    def resource_for_identifier(identifier)
+      match = super
+      unless match
+        # Unless we've found a match amongst our server instances, look in our views
+        matches = views.select {|view| view.identifier.to_sym == identifier.to_sym }
+        raise "Retrieved more than one match for #{collection_key} '#{identifier}'. Selection is ambiguous" if matches.size > 1
+        match = matches.first
+      end
+      return match
+    end
+
+    def do_create_views
+      return [] unless meta_data[:sub_views]
+      view_collection = []
+      meta_data[:sub_views].each do |sub_view_data|
+        view_collection << ::Bcome::Stack::View.new(@meta_data, @platform, self, sub_view_data)
+      end
+      return view_collection
+    end
+
     def menu_items
       super + [
         { :command => "add", :description => "Add a resource you wish to work on.", :usage => "add MyServerIdentifier, OR add [array, of, identifiers]" },
@@ -36,7 +81,8 @@ module ::Bcome::Stack
         { :command => "get", :description => "Download from remote from all selected resources (recursive - uses rsync)", :usage => "get 'remote_path'" },
         { :command => "put", :description => "Copy files up to all selected resources (recursive - uses rsync)", :usage => "put 'local_path', 'remote_path'" },
         { :command => "sudo", :description => "Run 'get' and 'put' in sudo mode (assumes you have passwordless sudo setup)" },
-        { :command => 'functions', :description => "List all available custom functions" }
+        { :command => 'functions', :description => "List all available custom functions" },
+        { :command => 'lv', :description => "List all configured sub-views" },
       ]
     end
 
@@ -56,9 +102,18 @@ module ::Bcome::Stack
     end
 
     def do_describe
+      description
+    end
+
+    def description
       desc = "\tNode Id:".menu_item_cyan + "\s#{node.identifier}".menu_item_green + "\n"
       desc += "\tNet Lookup:".menu_item_cyan + "\s#{node.network_lookup_type}".menu_item_white + "\n"
-      desc += "\tSSH Mode:".menu_item_cyan + "\s#{node.ssh_mode_type}".menu_item_white       
+      desc += "\tSSH Mode:".menu_item_cyan + "\s#{node.ssh_mode_type}".menu_item_white
+      if has_views?
+        views.each do |view|
+          desc += "\n\t \\ #{"view".menu_item_cyan}: #{view.identifier.menu_item_green}"
+        end
+      end
       return desc + "\n\n"
     end
 

data/lib/stack/instance.rb

@@ -46,6 +46,10 @@ module ::Bcome::Stack
       return false
     end
 
+    def do_load_resources
+      [self]
+    end
+
     ## Commands
     def ssh
       node.ssh

data/lib/stack/view.rb

@@ -0,0 +1,56 @@
+module ::Bcome::Stack
+  class View < ::Bcome::Stack::Environment
+
+    def initialize(meta_data, parent, encapsulating_environment, sub_view_data)
+      @meta_data = meta_data
+      @identifier = sub_view_data[:id]
+      @platform = parent
+      @sub_view_data = sub_view_data
+      @encapsulating_environment = encapsulating_environment  
+    end
+
+    def views
+      []
+    end
+
+    def has_views?
+      false
+    end 
+
+    def do_load_resources
+      @filtered_resources ||= filter_resources
+    end
+
+    def node
+      @encapsulating_environment.node
+    end
+
+    def pretty_selectors
+      raw = @sub_view_data[:selectors]
+      return raw.collect{|key, values|  
+         values.collect{|value|
+           "\s(node.#{key} == '#{value}')"
+         }  
+      }.join("\sOR".friendly)
+    end    
+
+    def description
+      desc = "\tidentifier:".menu_item_cyan + "\s#{identifier}".menu_item_green + "\n"
+      desc += "\tselectors:".menu_item_cyan + "\s#{pretty_selectors}" + "\n"
+      return desc + "\n"
+    end
+
+    private
+  
+    def filter_resources
+      @encapsulating_environment.resources.select{|resource| resource_belongs_in_filtered_list?(resource) } 
+    end
+
+    def resource_belongs_in_filtered_list?(resource)
+      @sub_view_data[:selectors].select {|selector,values|  
+        values.include?(resource.node.send(selector)) 
+      }.any?  
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcome
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Guillaume Roderick (Webzakimbo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -181,6 +181,7 @@ files:
 - lib/stack/estate.rb
 - lib/stack/instance.rb
 - lib/stack/platform.rb
+- lib/stack/view.rb
 - lib/workspace_context.rb
 - patches/irb.rb
 homepage: https://github.com/webzakimbo/bcome
@@ -204,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Toolkit for managing machines - simplify your workflow.