bcome 1.3.4 → 2.0.1

data/lib/objects/workspace.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ::Bcome::Workspace
   include ::Singleton
 
@@ -20,11 +22,20 @@ class ::Bcome::Workspace
 
     @context.irb_workspace = main_context.workspace if main_context
     @context.previous_irb_workspace = params[:current_context] if params[:current_context]
-    set_irb_prompt
+
+    show_welcome if params[:show_welcome]
+
     spawn_into_console_for_context
     nil
   end
 
+  def show_welcome
+    puts "\n\n"
+    puts "Welcome to bcome v#{::Bcome::Version.release}".bc_yellow
+    puts "\nType\s" + 'menu'.underline + "\sfor a command list, or\s" + 'registry'.underline + "\sfor your custom tasks."
+    puts "\n\n"
+  end
+
   def console_set!
     @console_set = true
   end
@@ -38,9 +49,7 @@ class ::Bcome::Workspace
   end
 
   def spawn_into_console_for_context
-    require 'irb/ext/multi-irb'
-    IRB.parse_opts_with_ignoring_script
-    IRB.irb nil, @context
+    ::IRB.start_session(self, @context)
   end
 
   def has_context?
@@ -62,14 +71,4 @@ class ::Bcome::Workspace
     IRB.conf[:MAIN_CONTEXT] = IRB::Irb.new.context
     console_set!
   end
-
-  def set_irb_prompt
-    IRB.conf[:PROMPT][:CUSTOM] = {
-      PROMPT_N: "\e[1m:\e[m ",
-      PROMPT_I: "\e[1m#{irb_prompt} >\e[m ",
-      PROMPT_C: "\e[1m#{irb_prompt} >\e[m ",
-      RETURN: "%s \n"
-    }
-    IRB.conf[:PROMPT_MODE] = :CUSTOM
-  end
 end

data/patches/irb.rb

@@ -1,25 +1,82 @@
-require 'irb'
+# frozen_string_literal: true
 
+require 'irb'
 module IRB
   class << self
     # with thanks: http://stackoverflow.com/questions/4749476/how-can-i-pass-arguments-to-irb-if-i-dont-specify-programfile
-    def parse_opts_with_ignoring_script(*params)
+    def parse_opts_with_ignoring_script(*_params)
       arg = ARGV.first
       script = $PROGRAM_NAME
       parse_opts_without_ignoring_script
       @CONF[:SCRIPT] = nil
+
+      @CONF[:IGNORE_SIGINT] = true
+
       $0 = script
       ARGV.unshift arg
     end
-
     alias parse_opts_without_ignoring_script parse_opts
     alias parse_opts parse_opts_with_ignoring_script
+
+    def start_session(bc_workspace, binding)
+      workspace = WorkSpace.new(binding)
+
+      IRB.conf[:PROMPT][:CUSTOM] = {
+        PROMPT_N: "\e[1m:\e[m ",
+        PROMPT_I: "\e[1m#{bc_workspace.irb_prompt} >\e[m ",
+        PROMPT_C: "\e[1m#{bc_workspace.irb_prompt} >\e[m ",
+        RETURN: "%s \n"
+      }
+      IRB.conf[:PROMPT_MODE] = :CUSTOM
+
+      irb = Irb.new(workspace)
+
+      @CONF[:IRB_RC]&.call(irb.context)
+      @CONF[:MAIN_CONTEXT] = irb.context
+
+      catch(:IRB_EXIT) do
+        irb.eval_input
+      end
+    end
+  end
+
+  module ExtendCommandBundle
+    class << self
+      # Allow us to redefine 'quit' by preventing it getting aliased in the first place.
+      def overriden_extend_object(*params)
+        # Remove 'quit', as we want to write our own
+        @ALIASES.delete([:quit, :irb_exit, 1])
+
+        original_extend_object(*params)
+      end
+      alias original_extend_object extend_object
+      alias extend_object overriden_extend_object
+    end
+
+    def quit(*_params)
+      ::Bcome::Bootup.instance.close_ssh_connections
+      ::Bcome::Ssh::TunnelKeeper.instance.close_tunnels
+      ::Bcome::LoadingBar::PidBucket.instance.stop_all
+      exit!
+    end
+
+    def back
+      # Allow navigation back up a namespace tree, or 'exit' if at the highest level, or at the point of entry
+      irb_exit(0)
+    end
   end
 
   class Context
-    def overriden_evaluate(line, line_no)
-      @line_no = line_no
-      set_last_value(@workspace.evaluate(self, line, irb_path, line_no))
+    def overriden_evaluate(*_params)
+      if _params.last.is_a?(Hash)
+        # Ruby 2.7.0 compatibility: "Using the last argument as keyword parameters is deprecated" ; hence splat the last argument
+        last = _params.pop
+        without_last = _params - [last]
+        evaluate_without_overriden(*without_last, **last)
+      else
+        # previous rubies...
+        evaluate_without_overriden(*_params)
+      end
     rescue ::Bcome::Exception::Base => e
       puts e.pretty_display
     end

data/patches/string-encrypt.rb

@@ -1,40 +1,37 @@
+# frozen_string_literal: true
+
 require 'openssl'
 
 # Adapted from https://stackoverflow.com/questions/39033577/opensslcipherciphererror-wrong-final-block-length
 
 class String
-
   ALGORITHM = 'AES-256-ECB'
 
   def encrypt(key)
-    begin
-      cipher = OpenSSL::Cipher.new(ALGORITHM)
-      cipher.encrypt()
-      cipher.key = key.as_256_bit_key
-      crypt = cipher.update(self) + cipher.final()
-      crypt_string = (Base64.encode64(crypt))
-      return crypt_string
-    rescue Exception => e
-      puts "Failed to encrypt: #{e.message}"
-    end
+    cipher = OpenSSL::Cipher.new(ALGORITHM)
+    cipher.encrypt
+    cipher.key = key.as_256_bit_key
+    crypt = cipher.update(self) + cipher.final
+    crypt_string = Base64.encode64(crypt)
+    crypt_string
+  rescue Exception => e
+    puts "Failed to encrypt: #{e.message}"
   end
 
   def decrypt(key)
-    begin
-      cipher = OpenSSL::Cipher.new(ALGORITHM)
-      cipher.decrypt()
-      cipher.key = key.as_256_bit_key
-      tempkey = Base64.decode64(self)
-      crypt = cipher.update(tempkey)
-      crypt << cipher.final()
-      return crypt
-    rescue Exception => e
-      raise ::Bcome::Exception::InvalidMetaDataEncryptionKey.new
-    end
+    cipher = OpenSSL::Cipher.new(ALGORITHM)
+    cipher.decrypt
+    cipher.key = key.as_256_bit_key
+    tempkey = Base64.decode64(self)
+    crypt = cipher.update(tempkey)
+    crypt << cipher.final
+    crypt
+  rescue Exception
+    ::Bcome::Node::MetaDataLoader.instance.decryption_key = nil
+    raise ::Bcome::Exception::InvalidMetaDataEncryptionKey
   end
 
   def as_256_bit_key
     ::Digest::SHA256.digest self
   end
-
 end

data/patches/string.rb

@@ -1,6 +1,23 @@
+# frozen_string_literal: true
+
+require 'rainbow'
+require 'fileutils'
+
 class String
   include StringColourStylesheet
 
+  def ansi?
+    Strings::ANSI.ansi?(self)
+  end
+
+  def sanitize
+    ansi? ? Strings::ANSI.sanitize(self) : self
+  end
+
+  def is_file_or_directory?
+    File.directory?(self) || File.exist?(self)
+  end
+
   # with thanks to http://simianuprising.com/wp-content/uploads/2012/08/solarized-reference-horizontal.png
   def colour_codes
     {
@@ -13,7 +30,7 @@ class String
       bc_cyan: '#2aa198',
       bc_green: '#859900',
       bc_white: '#ffffff',
-      bc_grey: '#1c1c1c'
+      bc_grey: '#808080'
     }
   end
 

data/patches/string_stylesheet.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module StringColourStylesheet
   def error
     bc_red.bold

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcome
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 2.0.1
 platform: ruby
 authors:
-- Guillaume Roderick (Webzakimbo)
-autorequire: 
+- Webzakimbo
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.2.4.3
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: google-api-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.29.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.29.1
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +128,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -129,22 +171,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
-  name: rsync
+  name: strings-ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
-description: An orchestration framework for AWS EC2
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: tty-cursor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+description: Generate custom management interfaces from simple configuration and Ruby
+  code. On-premise, cloud, hybrid & multi-cloud. Amazon AWS (EC2) & Google Cloud (GCP)
+  integration with more cloud providers coming. Fully extensible. Free for commercial
+  and non-commercial use.
 email:
-- guillaume@webzakimbo.com
+- info@webzakimbo.com
 executables:
 - bcome
 extensions: []
@@ -159,12 +218,22 @@ files:
 - lib/objects/driver/base.rb
 - lib/objects/driver/bucket.rb
 - lib/objects/driver/ec2.rb
-- lib/objects/driver/static.rb
+- lib/objects/driver/gcp.rb
+- lib/objects/driver/gcp/authentication/api_key.rb
+- lib/objects/driver/gcp/authentication/base.rb
+- lib/objects/driver/gcp/authentication/oauth.rb
+- lib/objects/driver/gcp/authentication/oauth_client_config.rb
+- lib/objects/driver/gcp/authentication/oauth_session_store.rb
+- lib/objects/driver/gcp/authentication/service_account.rb
+- lib/objects/driver/gcp/authentication/signet/service_account.rb
+- lib/objects/driver/gcp/authentication/utilities.rb
 - lib/objects/encryptor.rb
 - lib/objects/exception/argument_error_invoking_method_from_command_line.rb
 - lib/objects/exception/base.rb
 - lib/objects/exception/can_only_subselect_on_inventory.rb
+- lib/objects/exception/cannot_authenticate_to_gcp.rb
 - lib/objects/exception/cannot_find_internal_registry_klass.rb
+- lib/objects/exception/cannot_find_inventory.rb
 - lib/objects/exception/cannot_find_subselection_parent.rb
 - lib/objects/exception/cant_find_key_in_cloud_tags.rb
 - lib/objects/exception/cant_find_key_in_metadata.rb
@@ -172,14 +241,20 @@ files:
 - lib/objects/exception/cant_find_proxy_host_by_namespace.rb
 - lib/objects/exception/could_not_initiate_ssh_connection.rb
 - lib/objects/exception/could_not_initiate_ssh_connection_through_backend_proxy.rb
+- lib/objects/exception/could_not_retrieve_terraform_output.rb
 - lib/objects/exception/deprecation_warning.rb
 - lib/objects/exception/duplicate_command_line_argument_key.rb
+- lib/objects/exception/ec2_driver_missing_authorization_keys.rb
 - lib/objects/exception/ec2_driver_missing_provisioning_region.rb
+- lib/objects/exception/empty_namespace_tree.rb
 - lib/objects/exception/failed_to_run_local_command.rb
+- lib/objects/exception/gcp_auth_service_account_missing_credentials.rb
+- lib/objects/exception/generic.rb
 - lib/objects/exception/interactive_session_halt.rb
 - lib/objects/exception/invalid_bcome_breadcrumb.rb
 - lib/objects/exception/invalid_breadcrumb.rb
 - lib/objects/exception/invalid_context_command.rb
+- lib/objects/exception/invalid_gcp_authentication_scheme.rb
 - lib/objects/exception/invalid_identifier.rb
 - lib/objects/exception/invalid_machines_cache_config.rb
 - lib/objects/exception/invalid_matcher_query.rb
@@ -187,6 +262,7 @@ files:
 - lib/objects/exception/invalid_metadata_encryption_key.rb
 - lib/objects/exception/invalid_network_config.rb
 - lib/objects/exception/invalid_network_driver_type.rb
+- lib/objects/exception/invalid_port_forward_request.rb
 - lib/objects/exception/invalid_proxy_config.rb
 - lib/objects/exception/invalid_regexp_matcher_in_registry.rb
 - lib/objects/exception/invalid_registry_arguments_type.rb
@@ -201,9 +277,14 @@ files:
 - lib/objects/exception/missing_argument_for_registry_command.rb
 - lib/objects/exception/missing_description_on_view.rb
 - lib/objects/exception/missing_execute_on_registry_object.rb
+- lib/objects/exception/missing_gcp_authentication_scheme.rb
+- lib/objects/exception/missing_gcp_service_account_credentials_filename.rb
+- lib/objects/exception/missing_gcp_service_scopes.rb
 - lib/objects/exception/missing_identifier_on_view.rb
+- lib/objects/exception/missing_inventory_contributors.rb
 - lib/objects/exception/missing_ip_address_on_server.rb
 - lib/objects/exception/missing_network_config.rb
+- lib/objects/exception/missing_or_invalid_client_secrets.rb
 - lib/objects/exception/missing_params_for_rsync.rb
 - lib/objects/exception/missing_params_for_scp.rb
 - lib/objects/exception/missing_subselection_key.rb
@@ -213,13 +294,25 @@ files:
 - lib/objects/exception/node_identifiers_must_be_unique.rb
 - lib/objects/exception/orchestration_script_does_not_exist.rb
 - lib/objects/exception/proxy_host_node_does_not_have_public_ip_address.rb
+- lib/objects/exception/unknown_dynamic_server_type.rb
 - lib/objects/exception/unknown_method_for_namespace.rb
+- lib/objects/exception/user_orchestration_error.rb
+- lib/objects/initialization/factory.rb
+- lib/objects/initialization/structure.rb
+- lib/objects/initialization/utils.rb
 - lib/objects/interactive/session.rb
 - lib/objects/interactive/session_item/base.rb
 - lib/objects/interactive/session_item/capture_input.rb
 - lib/objects/interactive/session_item/transparent_ssh.rb
+- lib/objects/loading_bar/handler.rb
+- lib/objects/loading_bar/indicator/base.rb
+- lib/objects/loading_bar/indicator/basic.rb
+- lib/objects/loading_bar/indicator/progress.rb
+- lib/objects/loading_bar/pid_bucket.rb
 - lib/objects/modules/context.rb
+- lib/objects/modules/draw.rb
 - lib/objects/modules/registry_management.rb
+- lib/objects/modules/tree.rb
 - lib/objects/modules/ui_output.rb
 - lib/objects/modules/workspace_commands.rb
 - lib/objects/modules/workspace_menu.rb
@@ -230,7 +323,14 @@ files:
 - lib/objects/node/factory.rb
 - lib/objects/node/inventory/base.rb
 - lib/objects/node/inventory/defined.rb
+- lib/objects/node/inventory/merge.rb
 - lib/objects/node/inventory/subselect.rb
+- lib/objects/node/kube/base.rb
+- lib/objects/node/kube/container.rb
+- lib/objects/node/kube/estate.rb
+- lib/objects/node/kube/namespace.rb
+- lib/objects/node/kube/pod.rb
+- lib/objects/node/kube_wrap.rb
 - lib/objects/node/meta/base.rb
 - lib/objects/node/meta/cloud.rb
 - lib/objects/node/meta/local.rb
@@ -238,15 +338,17 @@ files:
 - lib/objects/node/meta_data_loader.rb
 - lib/objects/node/resources/base.rb
 - lib/objects/node/resources/inventory.rb
+- lib/objects/node/resources/merged.rb
 - lib/objects/node/resources/sub_inventory.rb
 - lib/objects/node/server/base.rb
-- lib/objects/node/server/dynamic.rb
+- lib/objects/node/server/dynamic/base.rb
+- lib/objects/node/server/dynamic/ec2.rb
+- lib/objects/node/server/dynamic/gcp.rb
 - lib/objects/node/server/static.rb
 - lib/objects/orchestration/base.rb
 - lib/objects/orchestration/interactive_terraform.rb
 - lib/objects/orchestrator.rb
 - lib/objects/parser/bread_crumb.rb
-- lib/objects/progress_bar.rb
 - lib/objects/registry/arguments/base.rb
 - lib/objects/registry/arguments/command_line.rb
 - lib/objects/registry/arguments/console.rb
@@ -260,24 +362,47 @@ files:
 - lib/objects/ssh/bootstrap.rb
 - lib/objects/ssh/command.rb
 - lib/objects/ssh/command_exec.rb
-- lib/objects/ssh/connection_handler.rb
+- lib/objects/ssh/connection_wrangler.rb
+- lib/objects/ssh/connector.rb
 - lib/objects/ssh/driver.rb
-- lib/objects/ssh/proxy_data.rb
+- lib/objects/ssh/driver_concerns/command_strings.rb
+- lib/objects/ssh/driver_concerns/connection.rb
+- lib/objects/ssh/driver_concerns/functions.rb
+- lib/objects/ssh/driver_concerns/user.rb
+- lib/objects/ssh/proxy_chain.rb
+- lib/objects/ssh/proxy_chain_link.rb
+- lib/objects/ssh/proxy_hop.rb
 - lib/objects/ssh/script_exec.rb
 - lib/objects/ssh/tunnel/local_port_forward.rb
+- lib/objects/ssh/tunnel_keeper.rb
+- lib/objects/ssh/window.rb
+- lib/objects/startup.rb
 - lib/objects/system/local.rb
-- lib/objects/terraform/parser.rb
-- lib/objects/terraform/state.rb
+- lib/objects/terraform/output.rb
 - lib/objects/workspace.rb
 - patches/irb.rb
 - patches/string-encrypt.rb
 - patches/string.rb
 - patches/string_stylesheet.rb
-homepage: https://bcome-kontrol.readthedocs.io/en/latest/
+homepage: https://bcome.com
 licenses:
-- GPL-3.0
-metadata: {}
-post_install_message: 
+- Nonstandard
+metadata:
+  documentation_uri: https://docs.bcome.com/en/2.0.0
+  homepage_uri: https://bcome.com
+  source_code_uri: https://github.com/webzakimbo/bcome
+post_install_message: |2+
+
+    Welcome to Bcome, the DevOps Control Panel Framework
+
+    2.0.0 introduces a wealth of new features (including GCP integration), and some breaking changes.
+
+    Visit our new documentation site here: https://docs.bcome.com/en/2.0.0
+
+    See implementation demos at our guides site: https://guides.bcome.com/en/2.0.0
+
+    For full release notes see: https://github.com/webzakimbo/bcome/releases/tag/2.0.0
+
 rdoc_options: []
 require_paths:
 - lib
@@ -285,17 +410,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
-summary: Organise your world, then integrate absolutely whatever you want in pure
-  Ruby.
+summary: The DevOps Control Panel Framework
 test_files: []
+...