bcome 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72e854219fe3f3151e3beab00428c300540f1ca6
-  data.tar.gz: 5abe63e971b7994a35a5e45fe07a51f8f4ed657f
+  metadata.gz: d23f3d37841f99b3d8e7998b337353a91590ce91
+  data.tar.gz: 875213a92efe4ee0aa2fb9edbdfb6b43eba13225
 SHA512:
-  metadata.gz: 8031edcc26bff2f693e28fbe65a254569d12be4e8e1ea7c6329775bbfcb800014d35cff7e760f8c2f4bf07f7d4da9b6c57d232ac795bb5e097736ca9c4c1a002
-  data.tar.gz: 443b70d8c51e468f1658756e60e65c02bd7adf673a1aa3872f6a70be2675a02ca3189596bbe6b5464ab0f55db58b548d938741f9b6be3e1c2c07fec062946f09
+  metadata.gz: 68ab4309813702f94e0b151e4a87390072855056b1f2330ece75b0b51891056c0a774d87062d415d122bcb825900df3d7ffec7e8fdbdc9b0cda40c5bc811d6cf
+  data.tar.gz: fd9d48bb19d507724584e2104c951a84ae0e257b354aed8adc5e58d385dfd1ee10381c5e5b3691b02f302b811fd539c0bdd0068c64eba94899adf870f24760dc

data/bin/boot.rb

@@ -90,7 +90,8 @@ if quick_contexts.any?
   quick_contexts.each_with_index do |resource_context_key, index|
 
     if direct_commands.include?(resource_context_key) && (index == (quick_contexts.size - 1)) 
-      unless @context_object.respond_to?(resource_context_key.to_sym) 
+      unless @context_object.node.respond_to?(resource_context_key.to_sym) 
+        
         puts "You cannot invoke '#{resource_context_key}' at this namespace level".danger
         exit!
       end  

data/lib/bcome/version.rb

@@ -1,3 +1,3 @@
 module Bcome
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/become_object.rb

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

data/lib/helpers/environment_ssh.rb

@@ -61,7 +61,7 @@ module ::Bcome::EnvironmentSSH
   end   
 
   def bastion_server
-    instances.select{|instance| instance.identifier == @ssh_mode[:jump_host_identifier] }.first
+    machines.select{|instance| instance.identifier == @ssh_mode[:jump_host_identifier] }.first
   end
 
   def ssh_mode_type

data/lib/helpers/fog_helper.rb

@@ -73,7 +73,6 @@ module ::Bcome::FogHelper
 
   def servers(all = unfiltered_servers)
     filtered_by_tags = ec2_tags ? filter_by_tags(all) : all
-    
     custom_filter_method = @meta_data[:network_lookup][:custom_post_process_filter_method]
 
     if custom_filter_method

data/lib/helpers/instance_command.rb

@@ -7,19 +7,19 @@ module ::Bcome::InstanceCommand
 
   def execute_command(commands, bootstrap = false)
     begin
-      return @environment.execute_command(commands, self, bootstrap)
+      return environment.execute_command(commands, self, bootstrap)
     rescue
       unless bootstrap && bootstrap_settings  ### Try bootstrap fallback
         puts "\n BOOTSTRAP MODE".informational  
         bootstrap = true
-        return @environment.execute_command(commands, self, bootstrap)
+        return environment.execute_command(commands, self, bootstrap)
       end
     end
   end
 
   def put(local_path, remote_path, bootstrap = false)
     puts "rsync> #{self.identifier}".informational
-    if @environment.ssh_mode_type == ::SSH_DIRECT_MODE_IDENTIFIER
+    if environment.ssh_mode_type == ::SSH_DIRECT_MODE_IDENTIFIER
       ## DIRECT MODE
       rsync_command = bootstrap ? direct_rsync_bootstrap(local_path, remote_path) : direct_rsync(local_path, remote_path)
     else
@@ -34,7 +34,7 @@ module ::Bcome::InstanceCommand
   end
 
   def jump_host_rsync(local_path, remote_path)
-    "rsync -av -e \"ssh -A #{self.nat_user}@#{@environment.bastion_ip_address} ssh -o StrictHostKeyChecking=no\" #{rsync_is_sudo}#{local_path} #{self.ssh_user}@#{self.ip_address}:#{remote_path}"
+    "rsync -av -e \"ssh -A #{self.nat_user}@#{environment.bastion_ip_address} ssh -o StrictHostKeyChecking=no\" #{rsync_is_sudo}#{local_path} #{self.ssh_user}@#{self.ip_address}:#{remote_path}"
   end
 
   def direct_rsync_bootstrap(local_path, remote_path)   
@@ -42,17 +42,17 @@ module ::Bcome::InstanceCommand
   end
 
   def jump_host_rsync_bootstrap(local_path, remote_path) 
-    "rsync -av -e \"ssh -i #{bootstrap_settings[:key]} -A #{bootstrap_settings[:ssh_user]}@#{@environment.bastion_ip_address} ssh -o StrictHostKeyChecking=no\" #{rsync_is_sudo}#{local_path} #{bootstrap_settings[:ssh_user]}@#{self.ip_address}:#{remote_path}"  
+    "rsync -av -e \"ssh -i #{bootstrap_settings[:key]} -A #{bootstrap_settings[:ssh_user]}@#{environment.bastion_ip_address} ssh -o StrictHostKeyChecking=no\" #{rsync_is_sudo}#{local_path} #{bootstrap_settings[:ssh_user]}@#{self.ip_address}:#{remote_path}"  
   end
 
   def get(remote_path, local_path = local_download_path)
     raise "No local path specified" unless local_path
     raise "No remote_path specified" unless remote_path
 
-    if @environment.ssh_mode_type == ::SSH_DIRECT_MODE_IDENTIFIER
+    if environment.ssh_mode_type == ::SSH_DIRECT_MODE_IDENTIFIER
       rsync_command = "rsync #{rsync_is_sudo} -chavzP #{self.ssh_user}@#{self.ip_address}:#{remote_path} #{local_path}"
     else
-      rsync_command = "rsync -chavzP -av -e \"ssh -A #{self.nat_user}@#{@environment.bastion_ip_address} ssh -o StrictHostKeyChecking=no\" #{rsync_is_sudo}#{self.ssh_user}@#{self.ip_address}:#{remote_path} #{local_path}"
+      rsync_command = "rsync -chavzP -av -e \"ssh -A #{self.nat_user}@#{environment.bastion_ip_address} ssh -o StrictHostKeyChecking=no\" #{rsync_is_sudo}#{self.ssh_user}@#{self.ip_address}:#{remote_path} #{local_path}"
     end
 
     silent = true

data/lib/nodes/base.rb

@@ -3,7 +3,7 @@ module ::Bcome::Node
 
     include ::Bcome::CommandHelper
 
-    attr_reader :meta_data
+    attr_reader :meta_data, :stack_peer
 
     def machines
       raise "Should be overriden"
@@ -13,6 +13,14 @@ module ::Bcome::Node
       construct(meta_data)
     end
 
+    def set_stack_peer(stack_instance)
+      @stack_peer = stack_instance
+    end
+
+    def interactive
+      stack_peer.interactive
+    end
+
     ## Runs a command over *every* machine in this node
     def run(raw_command, bootstrap = false)
       return unless machines

data/lib/nodes/environment.rb

@@ -4,6 +4,9 @@ module ::Bcome::Node
     include ::Bcome::EnvironmentSSH
 
     def machines
+      if instances.empty?
+        stack_peer.do_load_resources
+      end
       instances
     end
 
@@ -19,5 +22,9 @@ module ::Bcome::Node
       "#{platform.namespace}/#{identifier}"
     end
 
+    def set_instances(loaded_resources)
+      @instances = loaded_resources.collect(&:node)
+    end
+
   end
 end

data/lib/nodes/instance.rb

@@ -4,6 +4,11 @@ module ::Bcome::Node
     include ::Bcome::InstanceCommand
     include ::Bcome::InstanceSsh
 
+    def environment
+      @environment = (@environment ? @environment : stack_peer.environment.node)
+      @environment
+    end
+
     def machines
       [self]  # for completion
     end
@@ -13,15 +18,15 @@ module ::Bcome::Node
     end
 
     def ip_address
-      @environment.ssh_mode_type == ::SSH_DIRECT_MODE_IDENTIFIER ? public_ip_address : @external_network_interface_address
+      environment.ssh_mode_type == ::SSH_DIRECT_MODE_IDENTIFIER ? public_ip_address : @external_network_interface_address
     end
 
     def bootstrap_settings
-      @environment.bootstrap_settings
+      environment.bootstrap_settings
     end
 
     def proxy(bootstrap = false)
-      @environment.proxy(bootstrap)
+      environment.proxy(bootstrap)
     end
 
     def public_ip_address
@@ -45,7 +50,7 @@ module ::Bcome::Node
     end
 
     def local_download_path
-      "#{Dir.pwd}#{@environment.namespace}/#{identifier}"
+      "#{Dir.pwd}#{environment.namespace}/#{identifier}"
     end
 
   end

data/lib/stack/base.rb

@@ -57,14 +57,21 @@ module ::Bcome::Stack
       return (command_for_context(method_sym) || ::Bcome::Orchestrator::Recipe.by_identifier(method_sym.to_s, self)) ? true : false
     end
 
+    def should_eager_load_children?
+      return true
+    end
+  
     def construct_node
       node_attributes = meta_data
-
-      node_attributes.merge!({
-        collection_key => resources.collect(&:node)
-      }) if respond_to?(:collection_key)
+      if respond_to?(:collection_key)
+        collection = should_eager_load_children? ? (resources.collect(&:node)) : []
+        node_attributes.merge!({
+          collection_key => collection
+        }) 
+      end
  
       this_node = node_level_klass.new(node_attributes)
+      this_node.set_stack_peer(self)
       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
@@ -104,6 +111,7 @@ module ::Bcome::Stack
     alias :cd :workon
 
     def menu
+      puts "Rendering menu for #{self.class}"
       ::RENDER.menu(menu_items, self)
     end
 

data/lib/stack/environment.rb

@@ -25,6 +25,16 @@ module ::Bcome::Stack
       @platform = parent
     end  
 
+    def machines
+      node_machines = node.machines
+      do_load_resources unless node_machines.any?
+      return node.machines
+    end
+ 
+    def should_eager_load_children?
+      false
+    end
+
     def views
       @views ||= do_create_views
     end
@@ -87,14 +97,16 @@ module ::Bcome::Stack
     end
 
     def do_load_resources
-     if dynamic_network_lookup? 
-       return collection_klass.collection_from_fog_data(self, servers)
-     else
-       path = config_path
-       raise "Missing instances.yml configuration for your environment. You've selected a static network lookup, and yet I cannot find #{config_path}".failure unless File.exist?(config_path)
-       config = YAML.load_file(path)
-       return collection_klass.collection_from_config(self, config)
-     end
+      if dynamic_network_lookup? 
+        loaded_resources = collection_klass.collection_from_fog_data(self, servers)
+      else
+        path = config_path
+        raise "Missing instances.yml configuration for your environment. You've selected a static network lookup, and yet I cannot find #{config_path}".failure unless File.exist?(config_path)
+        config = YAML.load_file(path)
+        loaded_resources = collection_klass.collection_from_config(self, config)
+      end
+      node.set_instances(loaded_resources)
+      return loaded_resources
     end
 
     def config_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcome
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Guillaume Roderick (Webzakimbo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Toolkit for managing machines - simplify your workflow.