bcome 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca55cba00e34827423b0c13cb08afb515a45b970
-  data.tar.gz: 0146b318a88f735248b22c88be09c6c5454c8af0
+  metadata.gz: 613edda110e0f6d9a425088ae6d81ea97c085c27
+  data.tar.gz: f589219de99e684a05e8381ec4b4c1955c8f54b8
 SHA512:
-  metadata.gz: ec473e4f8d718b9fe79f8813b8bb2364b0ca2b41af5a98acbb605b44158488358102f12da93b47a48c6d5f574d609c4db5e3585e6c93343d7616145ad39cc9ed
-  data.tar.gz: 124dc53be5a4f3798447b9c2de77f05a218d18fc5b3746238e62757a2871326c3938dfc0c0adf182a2ce740e8dbbe7106d04dd857417148729fa764f982144f8
+  metadata.gz: cfcb9cd3d9bfff842663a09f0e702ce7acf40f31022360727dde257f9f22190fde6a148f28e7976a2acf5ee9bf1b4ec53e39290f902b7cf7ddcd2c61f261af3d
+  data.tar.gz: 38e06ddb8491f634c6fe5472e8f6a5ae30c2169819ea15ea108166ebc946999c20338458bccfed7e583d3cc5184237891aa514e5f14752e75ed467b39a9b7e8b

data/lib/bcome/version.rb

@@ -1,3 +1,3 @@
 module Bcome
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/context_functions.rb

@@ -18,17 +18,15 @@ module Bcome::ContextFunctions
 
   def context_commands
     if context_cmd_functions && context_cmd_functions.any?
-      puts "\n\n\s\s" + "Context Commands".menu_title_green + "\n\n"
+      description = "\n\s\s" + "Context Commands".menu_title_green + "\n"
       context_cmd_functions.each_with_index do |context_function, index|
-        puts "\n\t#{index+1}. #{context_function[:description].menu_item_green}" + "\n"
-        puts "\tExecuted command:".menu_item_cyan + "\s#{context_function[:executed_command]} bcome_context=\"#{context_breadcrumb}\""
-        puts "\tUsage:".menu_item_cyan + "\s#{context_function[:command].command}"
-        puts
+        description += "\n\s\s\s#{index+1}. #{context_function[:description].menu_item_green}"
+        description += "\n\s\s\sExecuted command:".menu_item_cyan + "\s#{context_function[:executed_command]} bcome_context=\"#{context_breadcrumb}\""
+        description += "\n\s\s\sUsage:".menu_item_cyan + "\s#{context_function[:command].command}"
+        description += "\n"
       end
-    else
-      puts "You don't have any context specific functions defined yet."
     end
-    return
+    return description
   end
 
   def context_cmd_functions

data/lib/orchestrator/loader.rb

@@ -1,12 +1,13 @@
 module Bcome::Orchestrator
   class Loader
 
-    def initialize(machines)
+    def initialize(machines, registry_for_context)
       config_path = "#{Dir.pwd}/bcome/config/orchestration"
-      @recipes_path = "#{config_path}/command_recipes.yml"
+      @recipes_path = "#{config_path}/recipes.yml"
       @machine_targets_path = "#{config_path}/node_target_selectors.yml"
       @direct_commands_path = "#{config_path}/direct_command_sets.yml"
       @machines = machines
+      @registry_for_context = registry_for_context
     end
 
     def recipes
@@ -22,7 +23,7 @@ module Bcome::Orchestrator
     end
 
     def do_load_recipes
-      return json_from_file(@recipes_path)
+      return json_from_file(@recipes_path).select{|r| @registry_for_context.include?(r[:recipe_identifier]) }
     end
 
     def do_load_direct_commands

data/lib/orchestrator/registry.rb

@@ -0,0 +1,37 @@
+module Bcome::Orchestrator::Registry
+
+  CONFIGS_PATH = "bcome/config/orchestration"
+
+  def do_load_recipes
+    return [] unless config_for_registry.any?
+    ::Bcome::Orchestrator::Loader.new(machines, config_for_registry).recipes
+  end
+
+  def config_for_registry
+    return [] unless has_registry_config?
+
+    matching_keys = []
+    recipe_registry.keys.each {|registry_key|
+      matching_keys << registry_key if /^#{registry_key}$/.match(context_breadcrumb)
+    }
+
+    return matching_keys.collect{|registry_key| recipe_registry[registry_key] }.flatten
+  end
+
+  def recipe_registry
+    load_recipe_registry
+  end
+
+  def load_recipe_registry
+    return YAML.load_file(registry_configs_path)
+  end
+
+  def registry_configs_path
+    "#{CONFIGS_PATH}/registry.yml"
+  end
+
+  def has_registry_config?
+    File.exist?(registry_configs_path)
+  end
+
+end

data/lib/render_irb.rb

@@ -28,6 +28,8 @@ class ::Bcome::RenderIrb
       end 
     end
 
+    menu_str += stack_level_instance.context_commands if stack_level_instance.context_commands
+
     menu_str += "\n\n"
     print menu_str
     return

data/lib/stack/base.rb

@@ -3,6 +3,7 @@ module ::Bcome::Stack
 
     include ::Bcome::ContextFunctions
     include ::Bcome::CommandHelper
+    include ::Bcome::Orchestrator::Registry
 
     def machines
       node.machines
@@ -12,12 +13,12 @@ module ::Bcome::Stack
     ## Construction & Initialisation
     ##
 
-    def node
-      @node ||= construct_node
+    def recipes
+      @recipes ||= do_load_recipes
     end
 
-    def recipes
-     []
+    def node
+      @node ||= construct_node
     end
 
     def method_missing(method_sym, *arguments, &block)
@@ -93,8 +94,7 @@ module ::Bcome::Stack
         { :command => "exit", :description => "Return to the previous context" },
         { :command => "exit!", :description => "Close all contexts, and exit Become."},
         { :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 => "context_commands", :description => "List all shell commands for invoking non-shell processes, in the current bcome context" },
+        { :command => "machines", :description => "Return all servers below the current level to the console. These objects can be manipulated directly" }
       ]
     end
 

data/lib/stack/environment.rb

@@ -40,10 +40,6 @@ module ::Bcome::Stack
       ]
     end
 
-    def recipes
-      @recipes ||= ::Bcome::Orchestrator::Loader.new(machines).recipes
-    end
-
     def do_load_resources
      if dynamic_network_lookup? 
        return collection_klass.collection_from_fog_data(self, servers)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcome
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Guillaume Roderick (Webzakimbo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -158,6 +158,7 @@ files:
 - lib/orchestrator/node_target/base.rb
 - lib/orchestrator/node_target/single.rb
 - lib/orchestrator/recipe.rb
+- lib/orchestrator/registry.rb
 - lib/orchestrator/validate_and_set.rb
 - lib/patches/string.rb
 - lib/render_irb.rb