hippo-cli 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f83aed53c34504783dbbddbcdd77dfa3b7a612b3963538744b7c7fd67dfd700
-  data.tar.gz: 55a178de59ec1f5d2cea029e4ab1183cfeb458248d1239e725193dff49a26d50
+  metadata.gz: 5b0705ed92b4a87716b435a10107d472adb75e391404c981e359a258318ed106
+  data.tar.gz: 385e2ec641b638bbdc9bd650174249bdd12a5c1304f76bd183402f99bf44b1c3
 SHA512:
-  metadata.gz: 695c51c84ca1f193a58263e0d362cd7d3d3bf16f1c7a2d649306c2c8d36ad8ae4e8b6e0408d71a6e0c069073602e8d1b3d9708c9070e461d5784852a460ad790
-  data.tar.gz: f949d4bcfc454b6178322f5e63d380452a89f31b928d2632ef498f61c3c89f7f8b1001c0aff0e7ea2c83c53844356de16a4b087ae1809b5353dbc8dd100d176b
+  metadata.gz: f868b57d54be99ac4a00a7dc47581a1ffe37f5b33c41536d4b0dd326b32377a7a7cb4eaa8740ebda0b363cba30d0a71d4f9c22e0700c9836cb98468f1e40d67c
+  data.tar.gz: c2d27be5d0cb74d54499ebfd3b4bc4d0d9cd047a4e5675d5433aa6ccef24bab3e4d156b57bc1ea6c2ae8b04c6f90dc0eacf71b4b73469d60fd821c0e3edeac34

data.tar.gz.sig

@@ -1 +1 @@
->��}�:1��V�DX��	�$,�����	��x��$�B���xl�-mMp�݋�޷�#1�1
��`E~Y�w������0���H߮��*%�Y!�Pu�/���I�&�OTG;ծO8m���W	2�YW��+ۺ�i�T��V�w7���(�"��o�=@�1�?�1÷�y�Ry{e���RL��R�<�.�����E@�8^��;��ԛ�f�$���F�y�,p���������5~�zu;��D�
+T��Aӝ����Bd�xͮe�Y��Q�ԮeOe��2=�P��҄y�����
�`�X����'�u�Y�IQ6����g)X� �fe{�QmLI��?���-�������V�&g4�����M6F�B?��wZPI�<��˷{ÐGw�J�f<�G�ky8�?�QHl��ü���,H������^��ձ�1��%"�'S�W�q��%�|�W#j�x�F�C�����1����v�9�

data/cli/exec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+command :exec do
+  desc 'Exec a command on a given pod'
+
+  action do |context|
+    require 'hippo/cli'
+    cli = Hippo::CLI.setup(context)
+    cli.preflight
+
+    command = context.args[2]
+    if command.nil?
+      raise Error, 'Must specify command alias as first argument after `exec`'
+    end
+
+    command = cli.stage.command(command)
+    raise Error, "Invalid command alias `#{context.args[2]}`" if command.nil?
+
+    command_to_run = ([command[:command]] + context.args[3..-1]).join(' ')
+
+    exec cli.stage.kubectl("exec -it #{command[:target]} -- #{command_to_run}").join(' ')
+  end
+end

data/cli/run.rb

@@ -12,7 +12,7 @@ command :run do
     cli = Hippo::CLI.setup(context)
     cli.preflight
 
-    image = cli.stage.images.values.first
+    image = cli.stage.images[context.options[:image]] || cli.stage.images.values.first
     raise Error, "No image exists at #{image.image_url}" unless image.exists?
 
     command = context.options[:command] || '/bin/bash'

data/lib/hippo/manifest.rb

@@ -36,6 +36,10 @@ module Hippo
       @options['console']
     end
 
+    def commands
+      @options['commands'] || {}
+    end
+
     def config
       @options['config'] || {}
     end

data/lib/hippo/stage.rb

@@ -45,6 +45,16 @@ module Hippo
       @options['config']
     end
 
+    def command(name)
+      base = manifest.commands[name]
+      return nil if base.nil?
+
+      {
+        target: base['target'],
+        command: decorator.call(base['command'])
+      }
+    end
+
     def images
       @images ||= manifest.images.deep_merge(@options['images'] || {}).each_with_object({}) do |(key, image), hash|
         hash[key] = Image.new(key, image)

data/lib/hippo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hippo
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hippo-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Adam Cooke
@@ -30,7 +30,7 @@ cert_chain:
   3wUJNGnT5XYq+qvTqmjkTSTfdGvZCM63C6bGdN5CAyMokGOOatGqyCMAONolWnfC
   gm3t2GWWrxY=
   -----END CERTIFICATE-----
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: encryptor
@@ -143,9 +143,9 @@ files:
 - bin/hippo
 - cli/apply_config.rb
 - cli/apply_services.rb
-- cli/console.rb
 - cli/create.rb
 - cli/deploy.rb
+- cli/exec.rb
 - cli/help.rb
 - cli/init.rb
 - cli/install.rb

data/cli/console.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-command :console do
-  desc 'Open a console based on the configuration'
-
-  option '-d', '--deployment [NAME]', 'The name of the deployment to use' do |value, options|
-    options[:deployment] = value.to_s
-  end
-
-  option '-c', '--command [NAME]', 'The command to run' do |value, options|
-    options[:command] = value.to_s
-  end
-
-  action do |context|
-    require 'hippo/cli'
-    cli = Hippo::CLI.setup(context)
-
-    if cli.manifest.console.nil?
-      raise Error, 'No console configuration has been provided in Hippofile'
-    end
-
-    cli.preflight
-
-    time = Time.now.to_i
-    deployment_name = context.options[:deployment] || cli.manifest.console['deployment']
-    command = context.options[:command] || cli.manifest.console['command'] || 'bash'
-    exec cli.stage.kubectl("exec -it deployment/#{deployment_name} -- #{command}").join(' ')
-  end
-end