bcome 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94df7cdb98d0ba0912450f1a90ca59fae3e5f489
-  data.tar.gz: ea051925146882cb957a6c6f58ea56028bb1869b
+  metadata.gz: 1f21306ed54b699575e5cf11b63eeb0b0652775c
+  data.tar.gz: e70fdd58135f553d8544a2e3dae7fbfaeb2f9b99
 SHA512:
-  metadata.gz: c15c4470d3608edc82b7f0d27b06991107e76e50d7bb2a713e1053c6349cc46ca131315be49aef158c5bef6648dda5cc6d49939295ef62da39fa0cfe0c5901ed
-  data.tar.gz: 48b05070fb93de1fbb74e090024a4fb61000478f0848f3ac5db7b6763294b087e0f926c273a176decdca0b2a07b2694b057d7fb3bdcbd51e9cfa499a868f8d08
+  metadata.gz: ec8d0eaff4dc3240adf07a45e4bea4dc9f67cacc3706b73bf5431749b2c39dcfa4285cc298bb50ee60af068f76ec327633f19025432df9e562f778aa0b2fd790
+  data.tar.gz: 5669e33e6261e4dacf18535f473627581452329b9d04d0f39cc0348faf5c77ae2f624337393f87ce9436a85c628690c3d18205a43e31da4ded6731d904564d76

data/bin/bcome

@@ -14,22 +14,27 @@ load Bcome::Boot.boot_path
 unless @no_shell
   require 'irb/ext/multi-irb'
   IRB.parse_opts_with_ignoring_script
-  IRB.irb nil, @context_object
+  irb_method = (@direct_command && @direct_shell_commands.include?(@direct_command)) ? @direct_command.to_sym : nil
+  IRB.irb irb_method, @context_object
 end
 
-## We're SSH'ing directly to a node, indicated by an 'ssh' key at the end of our context breadcrumb
-# called with, e.g. bcome platform:environment:node_name:ssh
-@ssh_to.node.ssh if @ssh_in && @ssh_to
-
-## We're directly excuting a command on a n node indicated by a 'run' key at the end of our context breadrumb
-# called with, e.g. bcome platform:environment:node_name:run "command to execute"
-if @run_cmd && @run_on
-  params = ARGV[(1..(ARGV.size))].join("\s")
-  @run_on.node.run(params)
+if @direct_command && @direct_command_on
+  if @direct_command == "ssh"
+    ## We're SSH'ing directly to a node, indicated by an 'ssh' key at the end of our context breadcrumb
+    # called with, e.g. bcome platform:environment:node_name:ssh
+    @direct_command_on.node.ssh
+  elsif @direct_command == "run"
+    ## We're directly excuting a command on a n node indicated by a 'run' key at the end of our context breadrumb
+    # called with, e.g. bcome platform:environment:node_name:run "command to execute"
+    params = ARGV[(1..(ARGV.size))].join("\s")
+    @direct_command_on.node.run(params)
+  else 
+    @direct_command_on.send(@direct_command)
+  end
 end
 
 ## We're going to directly execute a command on a node, indicated by the method name  at the end of our context breadcrumb.
 ## This works for commands specified in the users own personal framework installation, either from a context command or from an orchestration hook
 ## e,g, bcome platform:environment:node_name:bootstrap
-@context_object.send(@direct_execute_method) if @direct_execute_method
+@context_object.send(@direct_execute_method) if @context_object && @direct_execute_method
 

data/bin/boot.rb

@@ -4,7 +4,6 @@ extensions_init_path = "#{Dir.pwd}/bcome/extensions_initializer.rb"
 load extensions_init_path if File.exist?(extensions_init_path)
 
 ### Boot up bcome - used by the shell & exterior bcome processes
-
 unless @no_shell
   Dir[Dir.pwd  + "/bcome/patches/**/*.rb"].each {|file| load file }
 end
@@ -67,9 +66,9 @@ if quick_context
   end
 end
 
-direct_commands = ["run", "ssh"]
-
-@no_shell = true if direct_commands.include?(quick_contexts.last)
+direct_commands = ["run", "ssh", "interactive"] # direct command executions that do not require an irb shell
+@direct_shell_commands = ["interactive"]  # where we need to jump into a context method directly, but require an irb shell
+@no_shell = true if (direct_commands - @direct_shell_commands).include?(quick_contexts.last)
 
 #########################
 ## QUICK CONTEXT & BOOT #
@@ -90,15 +89,13 @@ if quick_contexts.any?
   spawn = false
   quick_contexts.each_with_index do |resource_context_key, index|
 
-    if resource_context_key == "ssh" && index == (quick_contexts.size - 1)  ## If last shortcut is SSH, we'll skip so we can execute it
-      @ssh_in = true
-      @ssh_to = @context_object
-      break
-    end
-
-    if resource_context_key == "run" && index == (quick_contexts.size - 1)
-      @run_cmd = true
-      @run_on = @context_object
+    if direct_commands.include?(resource_context_key) && (index == (quick_contexts.size - 1)) 
+      unless @context_object.respond_to?(resource_context_key.to_sym) 
+        puts "You cannot invoke '#{resource_context_key}' at this namespace level".danger
+        exit!
+      end  
+      @direct_command = resource_context_key
+      @direct_command_on = @context_object
       break
     end
 
@@ -109,10 +106,9 @@ if quick_contexts.any?
     # orchestration on it).
     # e.g. you have a context command called 'deploy'. You may want to do the following:
     # bcome platform:environment:deploy
-
     unless next_context_resource && index <= (quick_contexts.size - 1)
      if @context_object.respond_to_bcome_context_method?(resource_context_key.to_sym)
-        @no_shell = true
+        @no_shell = true 
         @direct_execute_method = resource_context_key.to_sym
         break
       end
@@ -126,19 +122,25 @@ if quick_contexts.any?
     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
-    end
-     
-    unless @no_shell
-      BECOME.set(next_context_resource, @context_object, spawn)
+      if @context_object.respond_to?(resource_context_key)
+        @context_object.send(resource_context_key)
+        exit!
+      else
+        puts "Cannot find any resource object named: #{resource_context_key}. Please check your breadcrumb and try again".failure
+        if @context_object.responds_to_list?
+          puts "\nYou may have been attempting to key into one of the following: ".failure
+          puts @context_object.mini_list + "\n"
+        end
+        exit!
+      end
     end
 
+    BECOME.set(next_context_resource, @context_object, spawn) unless @no_shell
     @context_object = next_context_resource
   end
-
+ 
   B_PIN = @context_object
-  B_PIN.init
+  B_PIN.init 
 else
   B_PIN = ESTATE
   ESTATE.init

data/lib/bcome/version.rb

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

data/lib/become_object.rb

@@ -91,6 +91,11 @@ module ::Bcome::BecomeObject
     true
   end  
 
+  def mini_list
+    raise "Namespace does not respond to list" unless responds_to_list?
+    return resources.collect(&:identifier).join(", ").friendly
+  end
+
   def list
     if responds_to_list?
       ::RENDER.list_items(collection_key, resources)

data/lib/helpers/fog_helper.rb

@@ -7,9 +7,20 @@ module ::Bcome::FogHelper
   def fog_client
     @fog_client ||= get_fog_client
   end
+ 
+  def ec2_filters
+    network_lookup[:ec2_server_lookup_filters] ? network_lookup[:ec2_server_lookup_filters] : { 'instance-id' => [] }
+  end  
+
+  def reload!
+    @unfiltered_servers = fog_client.servers.all(ec2_filters)
+    @resources = do_load_resources
+    system("clear")
+    list
+  end
 
   def unfiltered_servers
-    @unfiltered_servers ||= fog_client.servers.all(network_lookup[:ec2_server_lookup_filters])
+    @unfiltered_servers ||= fog_client.servers.all(ec2_filters)
   end
 
   def ec2_tags
@@ -24,7 +35,7 @@ module ::Bcome::FogHelper
 
     if custom_filter_method
       filter = ::Bcome::Filter::Ec2Filter.new(filtered_by_tags, self)
-      raise "Custome filter method #{custom_filter_method} is missing. Make sure you've added it".failure unless filter.respond_to?(custom_filter_method.to_sym)
+      raise "Custom filter method #{custom_filter_method} is missing. Make sure you've added it".failure unless filter.respond_to?(custom_filter_method.to_sym)
       return filter.send(custom_filter_method.to_sym) 
     else
       return filtered_by_tags

data/lib/workspace_context.rb

@@ -5,6 +5,7 @@ class ::Bcome::WorkspaceContext
   def set(object, current_object, spawn = true)
     @object = object
     main_context = IRB.conf[:MAIN_CONTEXT]
+
     @object.main_context = main_context.workspace if main_context
     @object.previous_workspace_object = current_object if current_object
 

metadata

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