bcome 0.6.12 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 944d45bdbdb931774593cd25875da20e5437719e
-  data.tar.gz: 2d04f718547a179ce80bfbaa2638be566d689344
+  metadata.gz: 75e06da0e2c27915d8ca0a306ef24c0ce217c0f7
+  data.tar.gz: ec8e78f0956c494335ea297d32f86917b827ce43
 SHA512:
-  metadata.gz: e0d5623b15e93ffdce2df7af152c2fab1ec3691faf8348bd751cafa3e0951ccf162979afbe4c0d8c735f95af1785d470adfaa731f74db96b81ab6817c5e2f0b3
-  data.tar.gz: 43824b5427fc7484c79f0e83db34a76e46442f41cbaaf055d4f50ec4948355a03971df52f244e76b1f6cc2d4de6127d50df7dff071595861f0e94176d6ec8cf9
+  metadata.gz: da2ca953c5f9d2c6d3778e68311f61b0e7e74f6cc512819c231d89595349f76e5beb25900888db306d4ea3f51cb3003ae83de1737547973d0e83cb94b3feea9e
+  data.tar.gz: 7a7587be892d152d337f81b112926ed5c075391c27b80e92fa74571f2b2605c44f53af0c2a93532a2ae7b0f9a98dbbf8bf2c0ce46fa476526ac81f45ce435fa4

data/bin/bcome-bash-setup

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+# (C) Guillaume Roderick (webzakimbo)
+# MIT licence.
+
+require 'fileutils'
+
+gem_install_path = File.dirname(__FILE__)
+
+FileUtils::mkdir_p("#{ENV["HOME"]}/.bcome")
+FileUtils::mkdir_p("#{ENV["HOME"]}/.bcome/bin")
+
+cp_bcome_bash = "cp #{gem_install_path}/../bash/experimental_shortcuts.sh ~/.bcome/bin"
+system(cp_bcome_bash)
+
+puts "\nExperimental bash shortcuts installed. Please ensure you add the bcome bash files to $PATH in your .bashrc"
+puts "\ne.g. export PATH=\"$PATH:$HOME/.bcome/bin\""
+exit 0

data/lib/bcome/version.rb

@@ -1,3 +1,3 @@
 module Bcome
-  VERSION = "0.6.12"
+  VERSION = "0.7.0"
 end

data/lib/become_object.rb

@@ -104,7 +104,7 @@ module ::Bcome::BecomeObject
       puts "\n" + "No list function at this level".warning + "\n\n"
       puts "Enter 'menu' for all available options".menu_item_white + "\n\n"
     end  
-    return  
+    return 
   end
   alias :ls :list
   alias :l :list

data/lib/command.rb

@@ -20,22 +20,10 @@ class ::Bcome::Command
     return is_success? ? "success".success : "failure".failure
   end
 
-  def ssh_user
-    @bootstrap ? instance.bootstrap_settings[:ssh_user] : instance.ssh_user
-  end
-
   def bootstrap=(bootstrap_value)
     @bootstrap = bootstrap_value
   end
 
-  def ssh_keys
-    @bootstrap ? [instance.bootstrap_settings[:key]] : instance.keys
-  end
-
-  def proxy
-    @bootstrap ? instance.proxy(true) : instance.proxy
-  end
-
   def output
     command_output = is_success? ? @stdout : "Exit code: #{@exit_code}\n\nSTDERR: #{@stderr}"
     return "\n#{command_output}"

data/lib/helpers/environment_ssh.rb

@@ -92,7 +92,7 @@ module ::Bcome::EnvironmentSSH
 
   def bastion_ip_address
     unless bastion_server
-      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'"
+      raise "Unable to find jump host for #{self.namespace}. 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/helpers/instance_command.rb

@@ -8,7 +8,10 @@ module ::Bcome::InstanceCommand
   def execute_command(commands, bootstrap = false)
     begin
       return environment.execute_command(commands, self, bootstrap)
-    rescue
+    rescue Exception => e
+       puts e.message
+       puts e.backtrace.join(", ")
+
       if bootstrap_settings  ### Try bootstrap fallback
         puts "\n failed to connect. Attempting bootstrap connection".informational  
         bootstrap = true

data/lib/helpers/instance_ssh.rb

@@ -35,9 +35,8 @@ module ::Bcome::InstanceSsh
     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","")
+  def ssh_user(bootstrap = false)
+    bootstrap ? bootstrap_settings[:ssh_user] : (environment.ssh_mode_user ? environment.ssh_mode_user : `whoami`.gsub("\n",""))
   end
 
   def ssh_key_path

data/lib/helpers/selections.rb

@@ -16,11 +16,9 @@ module Bcome::Selections
   ## Runs commands over *every* object in the selection
   def run(raw_commands, bootstrap = false)
     return unless @objects
- 
     @objects.pmap {|object|
       object.run(raw_commands, bootstrap)
     }
-
     return
   end
 

data/lib/interactive/session.rb

@@ -10,7 +10,7 @@ module Bcome::Interactive
           irb_session.conf.return_format = ""
           system("clear")
           session.prompt
-        rescue ::Bcome::Interactive::SessionHalt
+        rescue ::Bcome::Interactive::SessionHalt => e
           irb_session.conf.return_format = irb_pre_session_return_format
           puts session_end_message
         end
@@ -33,7 +33,9 @@ module Bcome::Interactive
     def process_item(item)
       begin
         item.do
-      rescue 
+      rescue Exception => e
+        puts "Exception: #{e.message}"
+        puts e.backtrace.join("\n")
         raise ::Bcome::Interactive::SessionHalt.new
       end
     end

data/lib/interactive/session_item/transparent_ssh.rb

@@ -6,9 +6,19 @@ module Bcome::Interactive::SessionItem
     LIST_KEY = "\\l"
     
     DANGER_CMD = "rm\s+-r|rm\s+-f|rm\s+-fr|rm\s+-rf|rm"
+
     def do
+      show_menu
+      puts ""
+      open_ssh_connections!
+      puts ""
+      list_machines
+      action 
+    end
+
+    def action
       input = get_input
-      raise ::Bcome::Interactive::SessionHalt.new if exit?(input)
+      return if exit?(input)
       if show_menu?(input)
         show_menu
       elsif list_machines?(input)
@@ -18,7 +28,7 @@ module Bcome::Interactive::SessionItem
       else
         execute_on_machines(input)
       end
-      send(:do)
+      action
     end
 
     def show_menu
@@ -70,6 +80,24 @@ module Bcome::Interactive::SessionItem
     def list_machines?(input)
       input == LIST_KEY 
     end
+
+    def open_ssh_connections!
+      ProgressBar.instance.reset!
+      machines.pmap {|machine|
+        ProgressBar.instance.indicate_and_increment!("init ssh: ","~~~", "connections")
+        machine.ssh_connect!
+      }
+      ProgressBar.instance.reset!
+    end
+
+    def list_machines
+      puts "\n"
+      machines.each do |machine|
+        env = machine.environment
+        platform = env.platform
+        puts "#{platform.identifier.cyan}:#{env.identifier.orange}:#{machine.identifier.yellow}"
+      end
+    end
  
     def get_input(message = terminal_prompt)
       return ::Readline.readline("\n#{message}", true).squeeze(" " ).to_s
@@ -81,16 +109,8 @@ module Bcome::Interactive::SessionItem
       }
     end
 
-    def list_machines
-      puts "\n" + machines.collect {|m| 
-        env = m.environment
-        platform = env.platform
-       "* #{platform.identifier.cyan}:#{env.identifier.orange}:#{m.identifier.yellow}"  
-      }.join("\n")
-    end
-
     def machines
-      @machines ||= has_selected_machines? ? selected_machines : flat_list_of_machines
+      @machines ||= has_selected_machines? ? selected_machines.collect(&:node) : flat_list_of_machines
     end
 
     def flat_list_of_machines

data/lib/nodes/instance.rb

@@ -17,6 +17,32 @@ module ::Bcome::Node
       stack_peer.override_instance_identifier_for_wbz_stacks? ? wbz_overriden_identifier : @identifier
     end
 
+    ## START SSH CONNECTION STUFF --
+    def ssh_connect!(bootstrap = false)
+
+      net_ssh_params = { :keys => ssh_keys(bootstrap), :paranoid => false }
+      net_ssh_params[:proxy] = proxy(bootstrap) if proxy(bootstrap)
+      begin
+        @ssh_con = ::Net::SSH.start(ip_address, ssh_user(bootstrap), net_ssh_params)
+      rescue Net::SSH::ConnectionTimeout
+        raise "Could not initiate connection to #{self.namespace}"
+      end
+      return @ssh_con
+    end
+
+    def ssh_connection(bootstrap = false)
+      return has_open_ssh_con? ? @ssh_con : ssh_connect!(bootstrap)
+    end
+  
+    def has_open_ssh_con?
+      @ssh_con && !@ssh_con.closed?
+    end 
+
+    def ssh_keys(bootstrap = false)
+      bootstrap ? [bootstrap_settings[:key]] : keys
+    end
+    ######## END SSH CONNECTION STUFF --
+
     def wbz_overriden_identifier
       prefix = stack_peer.overriden_identifier_prefix
       @identifier =~ /#{prefix}(.+)/
@@ -35,8 +61,13 @@ module ::Bcome::Node
       environment.proxy(bootstrap)
     end
 
+    def display_ip_address
+      return "xxx.xxx.xxx.xx" if @identifier == "bastionserver"
+      return @public_ip_address
+    end
+
     def public_ip_address
-      @public_ip_address
+      return @public_ip_address
     end
 
     def hostname_map

data/lib/nodes/view.rb

@@ -0,0 +1,31 @@
+module ::Bcome::Node
+  class View < ::Bcome::Node::Base
+
+    include ::Bcome::EnvironmentSSH
+
+    def machines
+      if instances.empty?
+        stack_peer.do_load_resources
+      end
+      instances
+    end
+
+    def identifier
+      @environment
+    end
+
+    def bootstrap_settings
+      @bootstrap_settings
+    end
+
+    def namespace
+      "#{platform.namespace}/#{@environment.identifier}/#{identifier}"
+    end
+
+    def set_instances(loaded_resources)
+      @instances = loaded_resources.collect(&:node)
+    end
+
+  end
+end
+

data/lib/progress_bar.rb

@@ -0,0 +1,31 @@
+require 'singleton'
+
+class ProgressBar
+
+  include Singleton
+
+  attr_reader :count
+
+  def initialize
+    @count = 0
+  end
+
+  def increment!
+    @count += 1
+  end
+
+  def reset!
+    @count = 0
+  end
+
+  def indicate(bar_prefix, bar_indice, indice_descriptor)
+    bar = "#{bar_prefix}" + "#{bar_indice * @count}>".cyan + " (#{@count} #{indice_descriptor})" + "\r"    
+    print bar
+  end
+
+  def indicate_and_increment!(bar_prefix, bar_indice, indice_descriptor)
+    increment!
+    indicate(bar_prefix, bar_indice, indice_descriptor)
+  end
+
+end

data/lib/ssh.rb

@@ -17,19 +17,10 @@ class ::Bcome::Ssh
   def execute!
     @commands.each do |command|
       instance = command.instance
-      ssh_user = command.ssh_user
-      ssh_keys = command.ssh_keys
-      proxy = command.proxy
-
-      net_ssh_params = { :keys => ssh_keys, :paranoid => false }
-      net_ssh_params[:proxy] = proxy if proxy
-
-      ::Net::SSH.start(instance.ip_address, ssh_user, net_ssh_params) do |ssh|
-        ssh_exec!(ssh, command)
-          output_append("\n(#{instance.identifier})$".cyan + ">\s#{command.command} (#{command.pretty_result})\n")  
-          output_append("#{command.output}")
-        ssh.close
-      end
+      ssh = instance.ssh_connection(command.bootstrap)
+      ssh_exec!(ssh, command)
+      output_append("\n(#{instance.identifier})$".cyan + ">\s#{command.command} (#{command.pretty_result})\n")
+      output_append("#{command.output}")
       print_output
     end
   end

data/lib/stack/base.rb

@@ -120,7 +120,7 @@ module ::Bcome::Stack
         { :command => "describe", :description => "Describe the resource object at the current context." },
         { :command => "cd NodeName", :description => "Select a resource object, and switch to its context.", :usage => "cd YourServerName" },
         { :command => "exit", :description => "Return to the previous context" },
-        { :command => "exit!", :description => "Close all contexts, and exit Become."},
+        { :command => "exit!", :description => "Close all contexts, and exit bcome."},
         { :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" },
         { :command => "interactive", :description => "Enter an interactive where you may transparently interact with all the machines in your selection at once" },

data/lib/stack/environment.rb

@@ -30,7 +30,7 @@ module ::Bcome::Stack
       do_load_resources unless node_machines.any?
       return node.machines
     end
- 
+
     def should_eager_load_children?
       false
     end

data/lib/stack/instance.rb

@@ -116,7 +116,7 @@ module ::Bcome::Stack
     def do_describe
       description = "\tNode Id:".menu_item_cyan + "\s\s#{node.identifier.menu_item_yellow}"
       description += "\n\t" + "Internal IP: ".menu_item_cyan + "#{@meta_data[:external_network_interface_address]}".menu_item_white
-      description += "\n\t" + "External IP: ".menu_item_cyan + "#{node.public_ip_address}".menu_item_white if node.public_ip_address
+      description += "\n\t" + "External IP: ".menu_item_cyan + "#{node.display_ip_address}".menu_item_white if node.public_ip_address
       description += "\n\t" + "Role: ".menu_item_cyan + "#{node.role}".menu_item_white if node.role 
       description += "\n\n"
       return description    

data/lib/stack/view.rb

@@ -22,7 +22,7 @@ module ::Bcome::Stack
     end
 
     def node
-      @encapsulating_environment.node
+      @node ||= n = ::Bcome::Node::View.new({ :instances => resources.collect(&:node) })  
     end
 
     def pretty_selectors

data/lib/workspace_context.rb

@@ -30,7 +30,7 @@ class ::Bcome::WorkspaceContext
   end
 
   def irb_prompt
-    @object ? @object.send(:become_identifier) : start_prompt
+    return @object ? @object.send(:become_identifier) : start_prompt
   end
 
   def is_sudo?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcome
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.7.0
 platform: ruby
 authors:
 - Guillaume Roderick (Webzakimbo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -124,10 +124,12 @@ email:
 executables:
 - bcome
 - bcome-setup
+- bcome-bash-setup
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/bcome
+- bin/bcome-bash-setup
 - bin/bcome-setup
 - bin/boot.rb
 - bin/boot_no_shell.rb
@@ -156,6 +158,7 @@ files:
 - lib/nodes/estate.rb
 - lib/nodes/instance.rb
 - lib/nodes/platform.rb
+- lib/nodes/view.rb
 - lib/object.rb
 - lib/orchestrator/command_group/base.rb
 - lib/orchestrator/command_group/custom.rb
@@ -173,6 +176,7 @@ files:
 - lib/orchestrator/registry.rb
 - lib/orchestrator/validate_and_set.rb
 - lib/patches/string.rb
+- lib/progress_bar.rb
 - lib/render_irb.rb
 - lib/scp.rb
 - lib/ssh.rb