hippo-cli 1.2.0 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8b14eb5652ec29878ff1d7ccf48685ed7ea0d6c345587e16cd237ebcdf42609
-  data.tar.gz: f180aef6e85fc1cb857dfef0578e2a3a14c3c5e6cc89b3808b07c7e150d8f35d
+  metadata.gz: '004641278dbfd92f58567a1f92eaa75b11c1c9eeac15665c199e3df28e22367e'
+  data.tar.gz: 47109ddab7e7fb850c7cc303351647246b1a8c1fffa6b950007a33f4967df810
 SHA512:
-  metadata.gz: 26f0e6b8e35bcf6bdb751b00faff8be463d28c36dcff91640e67c90f2c99f9cafccd3c37ceb354170e8f654e1841d9915a06597abc48ad3477de83ada8453942
-  data.tar.gz: be4e0bc1f4180726bee41aece0f947882f9c37006a776107b073dcc6bab0be9525a86c5750e92d119b48622e7a55e91c7713422c4f0def824f9dd8424396025c
+  metadata.gz: 16734fb7e2bfbc8757c15f6b99675506efe9f64810cfc31a676d694a6206e0ed89a4bde0dc3d8ee93417bb9bfc706225371ef2785fe4f0f25d97e4d3bf15d422
+  data.tar.gz: feffdb308806ec55694a0ede2ff980f674d73daa0ee9c2ebba55e87b6c2c34ff54815e82019c8defbeac15e9e4dc1ab945cb927118d6f23289e96c192db7363b

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/cli/setup.rb

@@ -52,7 +52,7 @@ command :setup do
 
     require 'yaml'
     config = { 'source' => source }
-    File.open(File.join(path, 'hippo.yaml'), 'w') { |f| f.write(config.to_yaml) }
+    File.open(File.join(path, 'manifest.yaml'), 'w') { |f| f.write(config.to_yaml) }
     puts "Created configuration directory at #{path}"
 
     require 'hippo/working_directory'

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/package.rb

@@ -26,6 +26,13 @@ module Hippo
       @options['package']
     end
 
+    # Return the version of the chart to be used
+    #
+    # @return [String]
+    def chart_version
+      @options['chart_version']
+    end
+
     # return values defined in the package's manifest file
     #
     # @return [Hash]
@@ -89,6 +96,9 @@ module Hippo
     private
 
     def install_command(verb, *additional)
+      if chart_version
+        additional = ['--version', chart_version] + additional
+      end
       helm(verb, name, package, '-f', '-', *additional)
     end
 
@@ -98,6 +108,7 @@ module Hippo
     end
 
     def run(command, stdin: nil)
+      puts command
       stdout, stderr, status = Open3.capture3(*command, stdin_data: stdin)
       raise Error, "[helm] #{stderr}" unless status.success?
 

data/lib/hippo/secret_manager.rb

@@ -25,7 +25,7 @@ module Hippo
     def download_key
       return if @key
 
-      Util.action 'Downloading secret encryiption key...' do |state|
+      Util.action 'Downloading secret encryption key...' do |state|
         begin
           value = @stage.get('secret', 'hippo-secret-key').first
 

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)
@@ -238,7 +248,6 @@ module Hippo
         Util.parse_kubectl_apply_lines(stdout)
         true
       else
-        stderr = stderr.read
         if stderr =~ /\" not found$/
           false
         else

data/lib/hippo/version.rb

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

data/lib/hippo/working_directory.rb

@@ -168,7 +168,7 @@ module Hippo
     #
     # @return [Hash<Symbol, Hippo::Stage>]
     def stages
-      objects = Util.load_objects_from_path(File.join(@root, '**', 'config.{yml,yaml}'))
+      objects = Util.load_objects_from_path(File.join(@root, '*', 'config.{yml,yaml}'))
       objects.each_with_object({}) do |(path, objects), hash|
         objects.each do |obj|
           stage = Stage.new(self, File.dirname(path), obj)

metadata

@@ -1,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hippo-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.4
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDZDCCAkygAwIBAgIBATANBgkqhkiG9w0BAQUFADA8MQswCQYDVQQDDAJtZTEZ
-  MBcGCgmSJomT8ixkARkWCWFkYW1jb29rZTESMBAGCgmSJomT8ixkARkWAmlvMB4X
-  DTE5MDUxNDEzNTIxM1oXDTIwMDUxMzEzNTIxM1owPDELMAkGA1UEAwwCbWUxGTAX
-  BgoJkiaJk/IsZAEZFglhZGFtY29va2UxEjAQBgoJkiaJk/IsZAEZFgJpbzCCASIw
-  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMUohRlPw3iIOhWZq+qf5N1ATm1H
-  7gBO4TpsUrw/FL/+urFExzt1+4MPfiKjILge48vKpjoTfuZusRsOQebaFidOfmhk
-  sEqa941CvN3OeUYARA53ORlmoLDLmdcrxq430+woFp4uuSYwim/2YQgIMdgiOTqs
-  cHaM9yh/xUGMnH4lB9bBDNfggMmkSFb6P8Ax4rvdX3EVv5P58RHwHszd+UI4fyy9
-  0W143m6ntNmqena4ZOc7HtWtRyDHHXXzlGgmghKEZgOA+/LO53VHp+cM0JqB7lq5
-  ZxN43fQrIT5yY9Dy7dRBeiDo53WNJPspa5soEivCBVYstMqfd+LGk/BnsyMCAwEA
-  AaNxMG8wCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFGlRGerNfr6J
-  Dprgl6DQ3kLvgVvPMBoGA1UdEQQTMBGBD21lQGFkYW1jb29rZS5pbzAaBgNVHRIE
-  EzARgQ9tZUBhZGFtY29va2UuaW8wDQYJKoZIhvcNAQEFBQADggEBAK2TQPMeW9qh
-  NDNoVbbplfSc8/uscSP2DfssCbhXQqeDfF2z+kQpxv8iAc++KTlotqOaX5A6RvLb
-  NvuwMHPJRQJ2e8rbuN8Sh3tUjbkAEv3SFw4hqbKmtp0j2oKBU0dxHWNfp+5ulh2l
-  UXnQAt4zg3v1hTD1VrwLqG/hyk9xAaWB38lEDBuPhLrDIdDJklg9bD1E2TUvoMrg
-  L6TIbdP1TRrxINO1D9GzboR+OuWos7qMLBEEbjat/fQchYrW1KLcHIUCyrGkZTLm
-  3wUJNGnT5XYq+qvTqmjkTSTfdGvZCM63C6bGdN5CAyMokGOOatGqyCMAONolWnfC
-  gm3t2GWWrxY=
-  -----END CERTIFICATE-----
-date: 2020-02-17 00:00:00.000000000 Z
+cert_chain: []
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: encryptor
@@ -143,9 +121,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.tar.gz.sig

@@ -1,3 +0,0 @@
-F�I~|�}�����r�pc#��[ټ������s#��쒹���F�N�8��E��W$�<-���yZ����ò�}�s>"�H�V°�(R����(��� r��B{�$��:y
-��b��B�?��9�W��/�;���1s���t��A���[���[��eq���N��<2�XxVP!w?0o0#K�6K�/ܾ�ڊ�E@�&�C����8��Η�\��T��m��	�5<�&P��Ad�p
-t���,

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