bcome 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d99a4af143d2075b4f499a92601ccc27a94dd96
-  data.tar.gz: 282f22fcfc8fd304bd8f860ee1a727d42e26ab2a
+  metadata.gz: 65790bceb47d5870e33e4879362c00a154a06326
+  data.tar.gz: 2f940a8ee313e71752f66ed852048b3d48c6ad46
 SHA512:
-  metadata.gz: dd94a30b7aa4c68c3735bf3c60e788745bd330723823cb8e62fd9458175a4185dd359835ccaa6e3373ea0f13e20645ddbaa9b081da29e831169a85e0f47b2bac
-  data.tar.gz: 44daa435ece36665e1cc1c9e9e9abe4cdd9412ab6119fb41fa7ba9e5fb31c214c304bb042ad4c52b3a88100d8b37646c93912c737f4f519660bbeb17c84f15c8
+  metadata.gz: eb5e1c75221c5145890bae1c75112e82d8ff6ccdfa2b078bf7a7eb15f01230aeafdb9f8c4fe33458b36fb0f25669a49e2e4a807c84a8db476ea0b0b6783f36ba
+  data.tar.gz: 2c96b8e049ad3b1c18562670a9ed5fb419ce362572a442cc8ec96b4be9ffcaeded6cc9ed0e630afa22dd9e0c4beac041b05d72db8b5d3e44162d2b81f15b66a6

data/bin/bcome

@@ -3,109 +3,14 @@
 # (C) Guillaume Roderick (webzakimbo)
 # MIT licence.
 
+## Load & Boot into namespace
+require 'irb'
+require "irb/completion"
 require 'bcome'
-Dir[Dir.pwd  + "/bcome/patches/**/*.rb"].each {|file| load file }
 
-VERBOSE = true  
-START_PROMPT = "bcome"
-
-# The ssh_mode identifier in platforms.yml signifying that this platform is to be accessed via an SSH bastion machine
-SSH_JUMP_MODE_IDENTIFIER = "jump"
-
-# The ssh mode identifier in platforms.yml signifying that this platform is to be accessed directly
-SSH_DIRECT_MODE_IDENTIFIER = "direct"
-
-# The SSH role in instances.yml signifying that an instance is an SSJ jump host
-SSH_JUMP_HOST_ROLE_IDENTIFIER = "sshjumphost"
-
-## The base resource classes - may be overriden
-PLATFORM_STACK_KLASS = ::Bcome::Stack::Platform
-ENV_STACK_KLASS = ::Bcome::Stack::Environment
-INSTANCE_STACK_KLASS = ::Bcome::Stack::Instance
-
-##################
-## DEPENDENCIES ##
-##################
-
-## Filters are loaded lower down as modules, and hence need to be include first
-Dir[Dir.pwd  + "/bcome/filters/**/*.rb"].each {|file| load file }
-
-quick_contexts = []
-
-BECOME = ::Bcome::WorkspaceContext.new 
-ESTATE = ::Bcome::Stack::Estate.new
-RENDER = ::Bcome::RenderIrb.new
-
-###########################
-## MANAGE QUICK CONTEXTS  #
-###########################
-if ARGV[0] 
-  quick_context = ARGV[0]  
-  quick_context =~ /(.+):(.+)/
-  platform_key = $1
-  context_reference = $2
-
-  unless platform_key && context_reference 
-    puts "Quick context is missing platform key or the context reference".failure
-    exit 1
-  end
-
-  unless platform = ESTATE.resource_for_identifier(platform_key)
-    puts "Cannot find platform named #{platform_key}".failure
-    exit
-  end
-
-  unless platform.has_quick_contexts? && (context = platform.quick_context_for_reference(context_reference))
-    puts "No quick context found on platform #{platform_key} for reference #{context_reference}".failure
-    exit
-  end
-
-  quick_contexts = context[:keys]
-end
-
-####################
-## BASIC IRB SETUP #
-####################
-IRB.setup nil
-IRB.conf[:MAIN_CONTEXT] = IRB::Irb.new.context
-
-#########################
-## QUICK CONTEXT & 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
-    end
-
-    BECOME.set(next_context_resource, context_object, spawn)
-    context_object = next_context_resource
-  end
-else
-  ESTATE.init
-end
-
-##################
-## INIT SESSION ##
-##################
+load Bcome::Boot.boot_path
 
+## Load the shell
 require 'irb/ext/multi-irb'
 IRB.parse_opts_with_ignoring_script
-IRB.irb nil, context_object
+IRB.irb nil, @context_object

data/bin/boot.rb

@@ -0,0 +1,108 @@
+
+### Boot up bcome - used by the shell & exterior bcome processes
+
+unless @no_shell
+  Dir[Dir.pwd  + "/bcome/patches/**/*.rb"].each {|file| load file }
+end
+
+VERBOSE = true
+START_PROMPT = "bcome"
+
+# The ssh_mode identifier in platforms.yml signifying that this platform is to be accessed via an SSH bastion machine
+SSH_JUMP_MODE_IDENTIFIER = "jump"
+
+# The ssh mode identifier in platforms.yml signifying that this platform is to be accessed directly
+SSH_DIRECT_MODE_IDENTIFIER = "direct"
+
+# The SSH role in instances.yml signifying that an instance is an SSJ jump host
+SSH_JUMP_HOST_ROLE_IDENTIFIER = "sshjumphost"
+
+## The base resource classes - may be overriden
+PLATFORM_STACK_KLASS = ::Bcome::Stack::Platform
+ENV_STACK_KLASS = ::Bcome::Stack::Environment
+INSTANCE_STACK_KLASS = ::Bcome::Stack::Instance
+
+##################
+## DEPENDENCIES ##
+##################
+
+## Filters are loaded lower down as modules, and hence need to be include first
+Dir[Dir.pwd  + "/bcome/filters/**/*.rb"].each {|file| load file }
+
+quick_contexts = []
+
+BECOME = ::Bcome::WorkspaceContext.new
+ESTATE = ::Bcome::Stack::Estate.new
+RENDER = ::Bcome::RenderIrb.new
+
+###########################
+## MANAGE QUICK CONTEXTS  #
+###########################
+
+quick_context = @bcome_context ? @bcome_context : ARGV[0]
+
+if quick_context
+  quick_context =~ /(.+):(.+)/
+  platform_key = $1
+  context_reference = $2
+
+  unless platform_key && context_reference
+    puts "Quick context is missing platform key or the context reference".failure
+    exit 1
+  end
+
+  unless platform = ESTATE.resource_for_identifier(platform_key)
+    puts "Cannot find platform named #{platform_key}".failure
+    exit
+  end
+
+  unless platform.has_quick_contexts? && (context = platform.quick_context_for_reference(context_reference))
+    puts "No quick context found on platform #{platform_key} for reference #{context_reference}".failure
+    exit
+  end
+
+  quick_contexts = context[:keys]
+end
+
+#########################
+## QUICK CONTEXT & BOOT #
+#########################
+
+@context_object = ESTATE
+
+unless @no_shell
+  IRB.setup nil
+  IRB.conf[:MAIN_CONTEXT] = IRB::Irb.new.context
+end
+
+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
+    # ensures that 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
+    end
+     
+    unless @no_shell
+      BECOME.set(next_context_resource, @context_object, spawn)
+    end
+
+    @context_object = next_context_resource
+  end
+
+  B_PIN = @context_object
+  B_PIN.init
+else
+  ESTATE.init
+end

data/lib/bcome.rb

@@ -1,5 +1,3 @@
-require 'irb'
-require "irb/completion"
 require 'colorize'
 require 'aws-sdk'
 require 'net/scp'

data/lib/bcome/version.rb

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

data/lib/boot.rb

@@ -0,0 +1,9 @@
+module Bcome
+  class Boot
+
+    def self.boot_path
+      return "#{File.dirname(__FILE__)}/../bin/boot.rb"
+    end
+
+  end
+end

data/lib/helpers/environment_ssh.rb

@@ -65,6 +65,10 @@ module ::Bcome::EnvironmentSSH
     return @ssh_mode[:ssh_user]
   end
 
+  def ssh_user
+    (@ssh_mode && ssh_mode_user) ? ssh_mode_user : `whoami`.gsub("\n","")
+  end
+
   def ssh_nat_user
     return @ssh_mode[:nat_user]
   end

data/lib/nodes/instance.rb

@@ -3,7 +3,6 @@ module ::Bcome::Node
 
     include ::Bcome::InstanceCommand
     include ::Bcome::InstanceSsh
-    include ::Bcome::InstanceCommand
 
     def machines
       [self]  # for completion

data/lib/stack/base.rb

@@ -31,7 +31,7 @@ module ::Bcome::Stack
     end
 
     def init
-      puts "loading resources ... "
+      puts "loading resources #{self.class} "
       node
     end
 

data/lib/stack/instance.rb

@@ -3,6 +3,7 @@ module ::Bcome::Stack
 
     include ::Bcome::BecomeObject
     include ::Bcome::Functions
+    include ::Bcome::InstanceCommand
 
     class << self
       def collection_from_fog_data(parent, fog_instances)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcome
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Guillaume Roderick (Webzakimbo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -114,6 +114,7 @@ extra_rdoc_files: []
 files:
 - bin/bcome
 - bin/bcome-setup
+- bin/boot.rb
 - documentation/configuration.md
 - documentation/examples/functions.yml-example
 - documentation/examples/network.yml-example
@@ -125,6 +126,7 @@ 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