bcome 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a6174a45ea4309da7ce8053c8eef32a601725e4
-  data.tar.gz: a9ee6b5a1181437c27b0e7ac4255e29c1a4d4d71
+  metadata.gz: 92514554431fdc1960b632453544f789e138ef72
+  data.tar.gz: 7b5a1c6dbbcacdd86c210233b1614b613f482f8c
 SHA512:
-  metadata.gz: bec1eeb5d226b4fc6c75e6e3bd37c4ab2d16fb47b7a810898e347e4de009b8df8d74ab307bb67fe10515e6e107c7376155fe48fa7a1b2c249781dbbce511888d
-  data.tar.gz: a7ba04ed80315c990352fadf8484cf5aff31b9bafa7e42214dfdc422dd92c2ff97ec1b3283485e941fcd93385b8efddbf8a37002fec61cb2542f16a2c710ccbd
+  metadata.gz: ec948cd860c212fdfc30e51376e5a3eb85d48073ed1cc06d5fb57cddd24a68d1dceb9d049813c584798763e7e9f14da08c8d0ebc6ea2c082681422751306f8be
+  data.tar.gz: 9a137c66c9afa2e40288eeab9a5955e307766455d35e29727896909b1865bde55946ec2c1afbcb4a2d8c5f14dd4ddf3233a56cac91acf2985da146c8eef9484c

data/lib/bcome.rb

@@ -1,4 +1,4 @@
-require 'colorize'
+require 'rainbow'
 require 'aws-sdk'
 require 'net/scp'
 require 'net/ssh/proxy/command'

data/lib/bcome/version.rb

@@ -1,3 +1,3 @@
 module Bcome
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/become_object.rb

@@ -75,7 +75,8 @@ module ::Bcome::BecomeObject
     if responds_to_list?
       ::RENDER.list_items(collection_key, resources)
     else
-      puts "\nNo list function at this level".headsup
+      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
   alias :ls :list

data/lib/command.rb

@@ -50,11 +50,11 @@ class ::Bcome::Command
   end
 
   def stdout=(data)
-    @stdout = data #data.output
+    @stdout = data 
   end
 
   def stderr=(data)
-    @stderr = data #data.output
+    @stderr = data 
   end
 
   def exit_code=(data)

data/lib/context_functions.rb

@@ -18,11 +18,11 @@ module Bcome::ContextFunctions
 
   def context_commands
     if context_cmd_functions && context_cmd_functions.any?
-      context_cmd_functions.each do |context_function|
-        puts
-        puts context_function[:description].informational
-        puts "Executed command: #{context_function[:executed_command]} bcome_context=\"#{context_breadcrumb}\""
-        puts "Usage: > #{context_function[:command].command}"
+      puts "\n\n\s\s" + "Context Commands".menu_title_green + "\n\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
       end
     else

data/lib/functions.rb

@@ -4,14 +4,14 @@ module Bcome::Functions
 
   def functions
     unless cmd_functions
-      puts "You don't yet have any custom functions defined. Have a read of the docs and define some. They're pretty useful.".informational
+      puts "\n\n" + "You don't yet have any custom functions defined. Have a read of the docs and define some. They're pretty useful.".warning + "\n\n" 
     else
-      puts
+      puts "\n\n\s\s" + "Functions".menu_title_green + "\n\n"
       cmd_functions.each_with_index do |cmd_function, i|          
-        puts "#{cmd_function[:ref].informational}"
-        puts "Description: " + cmd_function[:description]
-        puts "Command: > " + cmd_function[:command]
-        puts "USAGE: > F \"#{cmd_function[:ref]}\""
+        puts "\tShortcut: ".menu_item_cyan + "\s#{cmd_function[:ref].informational}"
+        puts "\tDescription:".menu_item_cyan + "\s#{cmd_function[:description]}"
+        puts "\tCommand:".menu_item_cyan + "\s#{cmd_function[:command]}"
+        puts "\tUsage:".menu_item_cyan + "\sF \"#{cmd_function[:ref]}\""
         puts
       end 
     end
@@ -20,7 +20,7 @@ module Bcome::Functions
 
   def F(reference)
     if self.is_a?(Bcome::Stack::Environment) && no_selections?
-      puts "You are an an Environment level, and have not selected any nodes to workon.".failure
+      puts "\n\n" + "You are an an Environment level, and have not selected any nodes to workon.".warning + "\n\n"
     else
       command = cmd_for_ref(reference)
       if command

data/lib/helpers/selections.rb

@@ -90,15 +90,17 @@ module ::Bcome::Selections
   def add_object(object)
     return if object_in_selections?(object)
     @objects = @objects ? (@objects << object) : [object]
+    puts "\n" + "#{object.identifier} added.".menu_item_cyan + "\sType 'selections' to see currently selections instances.'".menu_item_white
     return
   end  
 
   def remove_object(object)
     return if no_selections?
     unless object_in_selections?(object)
-      print "\n#{object.identifier} is not within selections\n".headsup
+      puts "\n#{object.identifier} is not within selections".headsup
     else
       @objects = @objects - [object]
+      puts "\n" + "#{object.identifier} removed.".menu_item_cyan + "\sType 'selections' to see currently selections instances.'".menu_item_white
     end
     return
   end
@@ -110,9 +112,10 @@ module ::Bcome::Selections
 
   def selections
     if no_selections?
-      print "\nNo added nodes.\n".headsup
+      puts "\n" + "No added nodes.".headsup + "\n"
     else
-      print "\nAdded nodes: #{@objects.collect(&:identifier).join(", ")}\n".headsup
+      puts "\n\s\s" + "Selected nodes:".menu_title_green + "\n\n" 
+      puts @objects.collect {|o| o.do_describe }.join + "\n"
     end
   end  
 

data/lib/nodes/estate.rb

@@ -27,7 +27,7 @@ module ::Bcome::Node
         end
       end
 
-      puts estate_machine_list.colorize(:green)
+      puts estate_machine_list
 
       return ""
     end 

data/lib/orchestrator/recipe.rb

@@ -16,7 +16,7 @@ module ::Bcome::Orchestrator
       end
 
       def as_menu_items(stack_level_instance)
-        stack_level_instance.recipes.collect {|recipe| { :command => recipe.recipe_identifier, :description => "(Command recipe): #{recipe.description}" } }
+        stack_level_instance.recipes.collect {|recipe| { :command => recipe.recipe_identifier, :description => recipe.description } }
       end
 
     end

data/lib/patches/string.rb

@@ -1,47 +1,81 @@
 class String
 
-  def informational
-    self.colorize(:white).on_green
+  # with thanks to http://simianuprising.com/wp-content/uploads/2012/08/solarized-reference-horizontal.png
+  def colour_codes
+    {
+      :yellow => "#b58900",
+      :orange => "#cb4b16",
+      :red => "#dc322f",
+      :magenta => "#d33682",
+      :violet => "#6c71c4",
+      :blue => "#268bd2",
+      :cyan => "#2aa198",
+      :green => "#859900",
+      :white => "#ffffff"
+    }
   end
 
-  def command
-    self.colorize(:black).on_white
+  def highlight_colour_codes
+    {
+      :yellow => "#002b36",
+      :orange => "#073642",
+      :red => "#586e75",
+      :magenta => "#657b83",
+      :violet => "#839496",
+      :blue => "#93a1a1",
+      :cyan => "#eee8d5",
+      :green => "#fdf6e3"
+    }
   end
 
-  def failure
-    self.colorize(:red).on_white
+  def colours
+    {
+      :informational => { :colour => :yellow },
+      :failure => { :colour => :red },
+      :success => { :colour => :green },
+      :title => { :colour => :green },
+      :success => { :colour => :green },
+      :command => {  :colour => :cyan, :highlight => true },
+      :danger => { :colour => :red },
+      :warning => { :colour => :orange },
+      :friendly => { :colour => :green },
+      :menu_item_green => { :colour => :green },
+      :menu_title_orange => { :colour => :orange, :highlight => true },
+      :menu_item_orange => { :colour => :orange },
+      :menu_title_green => { :colour => :green, :highlight => true },
+      :menu_item_white => { :colour => :white },
+      :menu_item_yellow => { :colour => :yellow },
+      :menu_item_cyan => { :colour => :cyan },
+      :selections => { :colour => :cyan },
+      :menu_title_cyan => { :colour => :cyan, :highlight => true },
+      :headsup => { :colour => :orange, :highlight => true },
+      :menu_item_magenta => { :colour => :magenta },
+      :cyan => { :colour => :cyan }
+    }
   end
 
-  def success
-    self.friendly
+  def has_colour?(colour_key)
+    colours.has_key?(colour_key)
   end
 
-  def danger
-    self.colorize(:white).on_red
-  end
-
-  def friendly
-    self.colorize(:black).on_green
-  end 
-
-  def warning
-    self.colorize(:orange).on_black
-  end
+  def method_missing(method_sym, *arguments, &black)
+    super unless has_colour?(method_sym)
+    colour_data = colours[method_sym]
 
-  def menu
-    self.colorize(:yellow).on_black
-  end
-
-  def headsup
-    self.colorize(:yellow).on_black
-  end
+    colour = colour_codes[colour_data[:colour]]
 
-  def output
-    self
+    unless colour_data[:highlight]
+      return Rainbow(self).color(colour)
+    else
+      highlight_colour = highlight_colour_codes[colour_data[:colour]]
+      return Rainbow(self).color(highlight_colour).bg(colour)
+    end
   end
 
-  def bg_gray 
-    "\033[47m#{self}\033[0m"
+  def swatch
+     colours.each { |colour_key, colour_attributes|
+       puts "#{colour_key} : #{send(colour_key)}"
+     }
   end
 
 end

data/lib/render_irb.rb

@@ -2,36 +2,50 @@ class ::Bcome::RenderIrb
 
   def list_items(parent_collection, items)
     if !items || !items.any?
-      print "\nNo resources collections found. Maybe you forgot to add any?".headsup
+      print "\n\sNo resources collections found. Maybe you forgot to add any?".headsup
     else
-     print  "\n #{parent_collection}\n\n".colorize(:green) # are available:\n\n".colorize(:green)
+     print "\n\s"
+     puts "#{parent_collection.to_s.menu_title_green}\n\n".menu_title_green
      items.each do |item|
-        colour = item.highlight? ? :yellow : :green
-        print "* #{item.do_describe}\n".colorize(colour)
+        puts "\t*/added".danger + "\n" if item.highlight?
+        print item.do_describe
       end
+      print "\n\s\sUse cd [node identifier], e.g. cd \"#{items.first.identifier}\" to work on a given node.\n\n"
     end
-    print "\n"
   end
 
   def menu(menu_items, stack_level_instance)
-    recipe_menu_items = ::Bcome::Orchestrator::Recipe.as_menu_items(stack_level_instance)
-    menu_items +=  recipe_menu_items if recipe_menu_items.any? 
-
-    menu_str = "\n** Commands **\n\n"
-    menu_str = "\n\The following commands are available: \n\n"
-    menu_items.each do |item|
-      command = item[:command]
-      description = item[:description]
-      usage = item[:usage]
-
-      menu_str += "> #{command}\n"
-      menu_str += "- #{description}\n"
-      menu_str += "e.g. #{usage}\n" if usage
+    menu_str = "\n\s#{"Standard Menu".menu_title_green}\n\n"
+    menu_items.each_with_index do |item, index|
+      menu_str += construct_menu_item_string(item, index, :menu_item_green)
+    end
 
-      menu_str += "\n"
+    recipe_menu_items = ::Bcome::Orchestrator::Recipe.as_menu_items(stack_level_instance)    
+    if recipe_menu_items.any?  
+      menu_str += "\n\s#{"Orchestration Menu".menu_title_orange}\n\n"   
+      recipe_menu_items.each_with_index do |item, index|
+        menu_str += construct_menu_item_string(item, index, :menu_item_orange)
+      end 
     end
+
     menu_str += "\n\n"
-    print menu_str.menu
+    print menu_str
+    return
+  end
+
+  def construct_menu_item_string(item, index, colour)
+    command = item[:command]
+    description = item[:description]
+    usage = item[:usage]
+    menu_str = "#{tab}#{index+1}. #{description}".send(colour) + "\n"
+    menu_str += "#{tab}" + "Command: ".menu_item_cyan + "#{command}\n".menu_item_white
+    menu_str += "#{tab}" + "Usage: ".menu_item_cyan + "#{usage}\n".menu_item_white if usage
+    menu_str += "\n"
+    return menu_str
+  end
+
+  def tab
+    "\s\s\s"
   end
 
 end

data/lib/ssh.rb

@@ -14,7 +14,7 @@ class ::Bcome::Ssh
       proxy = command.proxy
 
       ::Net::SSH.start(instance.ip_address, ssh_user, :proxy => proxy, :keys => ssh_keys, :paranoid => false) do |ssh|
-        puts "(#{instance.identifier})$ #{command.command}".command
+        puts "(#{instance.identifier})$".cyan + "\s#{command.command}"
         ssh_exec!(ssh, command)
         puts command.output
         print command.pretty_result

data/lib/stack/base.rb

@@ -27,6 +27,7 @@ module ::Bcome::Stack
         puts "Executing Command Recipe #{recipe.recipe_identifier}".informational
         puts "Description: #{recipe.description}".command
         recipe.execute!(machines)
+        return
       else
         super
       end
@@ -70,9 +71,10 @@ module ::Bcome::Stack
       resource = resource_for_identifier(identifier)
  
       unless resource
-        puts "No matching #{collection_key} for identifier '#{identifier}'. #{available_resources_options_string}".failure
+        puts "\nNo matching #{collection_key} for identifier '#{identifier}'.".failure + "\n\n#{available_resources_options_string}" + "\n\n"
       else
-        puts "Working on #{identifier} from #{resource.reference_key}".informational
+        puts "\nFrom #{resource.reference_key}, working on '#{identifier}'.".informational + "\n\n" 
+        puts "Hit 'menu' or 'ls' to see what you can do here.\n\n"
         become(resource)
       end
     end
@@ -87,7 +89,7 @@ module ::Bcome::Stack
       [
         { :command => "list / ls", :description => "List all available resources at the current context." },
         { :command => "describe", :description => "Describe the resource object at the current context." },
-        { :command => "cd / workon / w", :description => "Select a resource object, and switch to its context.", :usage => "cd 'identifier'" },
+        { :command => "cd [Node Name]", :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 => "local", :description => "Execute a shell command on your local machine.", :usage => 'local "command"'},
@@ -101,14 +103,14 @@ module ::Bcome::Stack
     end
 
     def available_resources_options_string
-      "Please select from one of '#{all_items.join(', ')}'"
+      "Please select from one of: #{all_items.join(', ')}'"
     end
 
     def describe
       if self.respond_to?(:do_describe)
-        message = "\nCollection Key: #{reference_key}\n\nResource: #{self.do_describe}".colorize(:green)
+        message = "\n\tCollection Key:".menu_item_cyan + "\s#{reference_key}\n\n#{self.do_describe}"
       else
-        message = "\nNothing to describe. Use 'list' to see namespace options".headsup unless self.respond_to?(:do_describe)
+        message = "\nNothing to describe. Use 'ls' or 'list' to see namespace options".headsup unless self.respond_to?(:do_describe)
       end
       puts message
     end

data/lib/stack/environment.rb

@@ -60,9 +60,10 @@ module ::Bcome::Stack
     end
 
     def do_describe
-      desc = "#{node.identifier}"
-      desc += "\t[ Net lookup: #{node.network_lookup_type}"
-      desc += "\t * SSH Mode: #{node.ssh_mode_type} ]"
+      desc = "\tNode Id:".menu_item_cyan + "\s#{node.identifier}".menu_item_green + "\n"
+      desc += "\tNet Lookup:".menu_item_cyan + "\s#{node.network_lookup_type}".menu_item_white + "\n"
+      desc += "\tSSH Mode:".menu_item_cyan + "\s#{node.ssh_mode_type}".menu_item_white       
+      return desc + "\n\n"
     end
 
     def collection_klass

data/lib/stack/instance.rb

@@ -99,11 +99,12 @@ module ::Bcome::Stack
     end
 
     def do_describe
-      description = "#{node.identifier}#{ is_sudo? ? " MODE: sudo "  : "" }"
-      description += "\n\t* Internal IP #{@meta_data[:external_network_interface_address]}"
-      description += "\n\t* External IP #{node.public_ip_address}" if node.public_ip_address
-      description += "\n\t* #{node.role}" if node.role 
-      description += "\n"
+      description = "\tNode Id:".menu_item_cyan + "\s\s#{node.identifier.menu_item_yellow}"
+      description += "\n\tsudo: ".menu_item_cyan + (is_sudo? ? "on".danger : "off" ) 
+      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" + "Role: ".menu_item_cyan + "#{node.role}".menu_item_white if node.role 
+      description += "\n\n"
       return description    
     end
 
@@ -111,6 +112,5 @@ module ::Bcome::Stack
       ::Bcome::Node::Instance
     end
 
-
   end
 end

data/lib/stack/platform.rb

@@ -27,7 +27,10 @@ module ::Bcome::Stack
     end
 
     def do_describe
-      "#{identifier}\n - #{@meta_data[:description]}\n"
+      description = "\n"
+      description += "\t#{identifier.menu_item_green}\n"
+      description += "\t" + "Description: ".menu_item_cyan + @meta_data[:description].menu_item_white + "\n"
+      return description
     end
 
     def config_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcome
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Guillaume Roderick (Webzakimbo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement