bcome 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e0ef34cf4079f32b9f5a8472f55f8e7fe3186cf
-  data.tar.gz: 3e14c57b673789e26c1f3553ab478351ffc21cb3
+  metadata.gz: 72e854219fe3f3151e3beab00428c300540f1ca6
+  data.tar.gz: 5abe63e971b7994a35a5e45fe07a51f8f4ed657f
 SHA512:
-  metadata.gz: 91e0a4100fa35de6558e854509ff45303ec6c86f15190b8f5feddc47440e732c778c6663a735de45426880671e03bde0a5b67405406e6a5590513d20563016e3
-  data.tar.gz: ea5ee12c471a79b03252598e92d0160da2426625ce065a31600f971f8c298fb37433a76ab10d8acbfecb667eb4d28b6783e0da2cd5d2924de9ea1eb282c9e884
+  metadata.gz: 8031edcc26bff2f693e28fbe65a254569d12be4e8e1ea7c6329775bbfcb800014d35cff7e760f8c2f4bf07f7d4da9b6c57d232ac795bb5e097736ca9c4c1a002
+  data.tar.gz: 443b70d8c51e468f1658756e60e65c02bd7adf673a1aa3872f6a70be2675a02ca3189596bbe6b5464ab0f55db58b548d938741f9b6be3e1c2c07fec062946f09

data/lib/bcome.rb

@@ -2,7 +2,7 @@ require 'rainbow'
 require 'aws-sdk'
 require 'net/scp'
 require 'net/ssh/proxy/command'
-require 'fog'
+require 'fog/aws'
 require 'require_all'
 require 'pmap'
 

data/lib/bcome/version.rb

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

data/lib/interactive/session_item/transparent_ssh.rb

@@ -4,7 +4,8 @@ module Bcome::Interactive::SessionItem
     END_SESSION_KEY = "\\q"
     HELP_KEY = "\\?"   
     LIST_KEY = "\\l"
-
+    
+    DANGER_CMD = "rm\s+-r|rm\s+-f|rm\s+-fr|rm\s+-rf|rm"
     def do
       input = get_input
       raise ::Bcome::Interactive::SessionHalt.new if exit?(input)
@@ -12,6 +13,8 @@ module Bcome::Interactive::SessionItem
         show_menu
       elsif list_machines?(input)
         list_machines
+      elsif command_may_be_unwise?(input)
+        handle_the_unwise(input)   
       else
         execute_on_machines(input)
       end
@@ -22,11 +25,28 @@ module Bcome::Interactive::SessionItem
       system("clear") ; print start_message
     end
 
+    def handle_the_unwise(input)
+      if prompt_for_confirmation("Command may be dangerous to run on all machines. Are you sure you want to proceed? [Y|N] > ".danger)
+        execute_on_machines(input)
+      end
+    end
+
+    def command_may_be_unwise?(input)
+      input =~ /#{DANGER_CMD}/
+    end
+
+    def prompt_for_confirmation(message)
+      answer = get_input(message)
+      unless ["Y", "N"].include?(answer)
+        prompt_for_confirmation(message)
+      end 
+      return answer == "Y" ? true : false 
+    end
+
     def start_message
-      warning = "\nCommands entered here will be executed on every machine in your selection.".danger
-      second_warning = "\nUse with CAUTION.".danger
+      warning = "\nCommands entered here will be executed on EVERY machine in your selection.".danger
+      second_warning = "\n\nUse with CAUTION.".danger
       info = "\n\n\\l list machines\n\\q to quit\n\\? this message".informational                                                             
-    
       return "#{warning}#{second_warning}#{info}\n"
     end
 
@@ -51,8 +71,8 @@ module Bcome::Interactive::SessionItem
       input == LIST_KEY 
     end
  
-    def get_input
-      return ::Readline.readline("\n#{terminal_prompt}", true).squeeze(" " ).to_s
+    def get_input(message = terminal_prompt)
+      return ::Readline.readline("\n#{message}", true).squeeze(" " ).to_s
     end
 
     def execute_on_machines(user_input)
@@ -62,12 +82,23 @@ module Bcome::Interactive::SessionItem
     end
 
     def list_machines
-      listed = "\n#{machines.collect(&:identifier).join(", ")}\n"
-      print listed.friendly
+      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 : @irb_session.resources.collect(&:node)
+      @machines ||= has_selected_machines? ? selected_machines : flat_list_of_machines
+    end
+
+    def flat_list_of_machines
+      resources.collect{|resource| resource.node.machines }.flatten
+    end
+
+    def resources
+      @irb_session.resources  
     end
 
     def has_selected_machines?

data/lib/patches/string.rb

@@ -49,7 +49,9 @@ class String
       :menu_title_cyan => { :colour => :cyan, :highlight => true },
       :headsup => { :colour => :orange, :highlight => true },
       :menu_item_magenta => { :colour => :magenta },
-      :cyan => { :colour => :cyan }
+      :cyan => { :colour => :cyan },
+      :yellow => { :colour => :yellow },
+      :orange => { :colour => :orange }
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcome
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Guillaume Roderick (Webzakimbo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -73,19 +73,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Toolkit for managing machines - simplify your workflow.