hippo-cli 1.1.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96a621d666288ef2ec40ae5384c0a2ba823f011cd2384db2d0eee53d2dbf6fc1
-  data.tar.gz: 05cf19519259186bd789f02d996b580ba76a7b7e9f598b308c2705c636d25e6c
+  metadata.gz: 7c8e44785f4199b58a0a78270b0b2aa856076b59b86c4ba7411fdbe821a2893e
+  data.tar.gz: 0403d0c48ded78e1fe036964d06ad259a3d64d86a1bcc4ed91b5cff3420e9628
 SHA512:
-  metadata.gz: 911cfb6bdbbcf16ef73a5dc1d36bd53aa06dc7f94e9f53a9cc0aa964400a266cc25583d97651684ebf3394f340f780520bfb7af0e189a656dd48d2338beed7fb
-  data.tar.gz: 466ec97e4b4a4a1dcdd223f18be57fbeddb72aea29aacc1d64fc2b728ca807ec0865619024773b49613ac19aa14dcfea275bcdd9a3cdfa6395ea1dc601b67855
+  metadata.gz: 53c73c8339bc4d98cfa3870e2e9d3593a63885ecda1247357e1f9e9826e5dcfb8b0509aef0dd5999b6af3e859d37952aac6d387bdffff4b382f1a8935547ebb4
+  data.tar.gz: 6f594edae7085e08135d32d9871a1acb0a6e371689338e872ce6772e41545bfd1efd73d13d83e52967b857044ff9ff9a2b61e9e8628a680011a8e2f34cceb396

data/bin/hippo

@@ -8,7 +8,7 @@ require 'hippo/error'
 require 'hippo/version'
 require 'swamp/cli'
 
-COMMANDS_WITHOUT_STAGE = %w[help init version stages].freeze
+COMMANDS_WITHOUT_STAGE = %w[help init version stages update setup].freeze
 
 begin
   cli = Swamp::CLI.new(:hippo, version: Hippo::VERSION)

data/cli/apply_config.rb

@@ -3,10 +3,6 @@
 command :'apply-config' do
   desc 'Apply configuration'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   action do |context|
     require 'hippo/cli'
     cli = Hippo::CLI.setup(context)

data/cli/apply_services.rb

@@ -3,10 +3,6 @@
 command :'apply-services' do
   desc 'Apply service configuration'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   action do |context|
     require 'hippo/cli'
     cli = Hippo::CLI.setup(context)

data/cli/create.rb

@@ -3,10 +3,6 @@
 command :create do
   desc 'Create a new stage'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   option '-n', '--namespace [NAMESPACE]', 'The namespace for the new stage' do |value, options|
     options[:namespace] = value
   end
@@ -21,10 +17,10 @@ command :create do
 
   action do |context|
     require 'hippo/manifest'
-    manifest = Hippo::Manifest.load_from_file(context.options[:hippofile] || './Hippofile')
+    wd = Hippo::WorkingDirectory.new
 
     stage_name = CURRENT_STAGE
-    stage_path = File.join(manifest.root, 'stages', "#{stage_name}.yaml")
+    stage_path = File.join(wd.root, stage_name, 'config.yaml')
 
     if !context.options[:force] && File.file?(stage_path)
       puts "\e[31mA stage named '#{stage_name}' already exists. Use --force to overwrite configuration.\e[0m"
@@ -35,7 +31,7 @@ command :create do
 
     namespace = context.options[:namespace]
     if namespace.nil?
-      namespace = Hippo::Util.ask('Enter a namespace for this stage', default: "#{manifest.name}-#{stage_name}")
+      namespace = Hippo::Util.ask('Enter a namespace for this stage', default: "#{wd.manifest.name}-#{stage_name}")
     end
 
     context_name = context.options[:context]
@@ -49,13 +45,13 @@ command :create do
     yaml['context'] = context_name
 
     require 'hippo/bootstrap_parser'
-    yaml['config'] = Hippo::BootstrapParser.parse(manifest.bootstrap['config'])
+    yaml['config'] = Hippo::BootstrapParser.parse(wd.manifest.bootstrap['config'])
 
     require 'hippo/stage'
-    stage = Hippo::Stage.new(manifest, yaml)
+    stage = Hippo::Stage.new(wd, File.dirname(stage_path), yaml)
 
     require 'hippo/cli'
-    cli = Hippo::CLI.new(manifest, stage)
+    cli = Hippo::CLI.new(wd, stage)
     cli.apply_namespace
 
     if stage.secret_manager.key_available?
@@ -67,11 +63,11 @@ command :create do
 
     FileUtils.mkdir_p(File.dirname(stage_path))
     File.open(stage_path, 'w') { |f| f.write(yaml.to_yaml.sub(/\A---\n/m, '')) }
-    puts "Written new stage file to stages/#{stage.name}.yaml"
+    puts "Written new stage file to #{stage.name}/config.yaml"
 
-    secrets = Hippo::BootstrapParser.parse(manifest.bootstrap['secrets'])
+    secrets = Hippo::BootstrapParser.parse(wd.manifest.bootstrap['secrets'])
     stage.secret_manager.write_file(secrets.to_yaml)
-    puts "Written encrypted secrets into secrets/#{stage.name}.yaml"
+    puts "Written encrypted secrets into #{stage.name}/secrets.yaml"
 
     puts
     puts "\e[32mStage '#{stage.name}' has been created successfully.\e[0m"

data/cli/deploy.rb

@@ -3,10 +3,6 @@
 command :deploy do
   desc 'Deploy the application to Kubernetes (including image build/push)'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   option '--no-jobs', 'Do not run the deploy jobs' do |_value, options|
     options[:jobs] = false
   end

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

@@ -3,10 +3,6 @@
 command :install do
   desc 'Run installation jobs for the application'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   option '--no-deploy', 'Do not deploy after install' do |_value, options|
     options[:deploy] = false
   end

data/cli/key.rb

@@ -3,13 +3,10 @@
 command :key do
   desc 'Display/generate details about the secret encryption key'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   option '-g', '--generate', 'Generate a new key' do |_value, options|
     options[:generate] = true
   end
+
   action do |context|
     require 'hippo/cli'
     cli = Hippo::CLI.setup(context)

data/cli/kubectl.rb

@@ -3,10 +3,6 @@
 command :kubectl do
   desc 'Execute kubectl commands with the correct namespace for the stage'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   action do |context|
     require 'hippo/cli'
     cli = Hippo::CLI.setup(context)

data/cli/logs.rb

@@ -3,10 +3,6 @@
 command :logs do
   desc 'Display logs for a particular pod'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   option '-p', '--pod [POD]', 'The name of the pod' do |value, options|
     options[:pod] = value
   end

data/cli/objects.rb

@@ -3,10 +3,6 @@
 command :objects do
   desc 'Display all objects that will be exported'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   option '-t', '--type [TYPE]', 'Limit which type of object to return (one of config, deployments or services)' do |value, options|
     options[:type] = value
   end

data/cli/package_install.rb

@@ -3,10 +3,6 @@
 command :'package:install' do
   desc 'Install a named helm package'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   option '-p', '--package [NAME]', 'The name of the package to install' do |value, options|
     options[:package] = value
   end

data/cli/package_list.rb

@@ -3,10 +3,6 @@
 command :'package:list' do
   desc 'List all available packages with status'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   action do |context|
     require 'hippo/cli'
     cli = Hippo::CLI.setup(context)

data/cli/package_notes.rb

@@ -3,10 +3,6 @@
 command :'package:notes' do
   desc 'Show notes about an installed Helm package'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   option '-p', '--package [NAME]', 'The name of the package to install' do |value, options|
     options[:package] = value
   end

data/cli/package_test.rb

@@ -3,10 +3,6 @@
 command :'package:test' do
   desc 'Test a package installation'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   option '-p', '--package [NAME]', 'The name of the package' do |value, options|
     options[:package] = value
   end

data/cli/package_uninstall.rb

@@ -3,10 +3,6 @@
 command :'package:uninstall' do
   desc 'Uninstall a package'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   option '-p', '--package [NAME]', 'The name of the package' do |value, options|
     options[:package] = value
   end

data/cli/package_upgrade.rb

@@ -3,10 +3,6 @@
 command :'package:upgrade' do
   desc 'Upgrade a package'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   option '-p', '--package [NAME]', 'The name of the package' do |value, options|
     options[:package] = value
   end

data/cli/package_values.rb

@@ -3,10 +3,6 @@
 command :'package:values' do
   desc 'Display the values file that will be used for all packages'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   action do |context|
     require 'hippo/cli'
     cli = Hippo::CLI.setup(context)
@@ -16,7 +12,7 @@ command :'package:values' do
       puts "\e[33m#{'=' * 80}"
       puts package.name
       puts "#{'=' * 80}\e[0m"
-      puts package.final_values.to_yaml.sub(/\A---\n/, '')
+      puts package.final_values.to_yaml(line_width: -1).sub(/\A---\n/, '')
     end
   end
 end

data/cli/prepare.rb

@@ -3,10 +3,6 @@
 command :prepare do
   desc 'Prepare Kubernetes namespace (including installing all packages)'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   action do |context|
     require 'hippo/cli'
     cli = Hippo::CLI.setup(context)

data/cli/readme.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+command :readme do
+  desc 'Display the README'
+
+  action do |context|
+    require 'hippo/cli'
+    cli = Hippo::CLI.setup(context)
+    cli.preflight
+
+    readme = cli.stage.readme
+    raise Error, 'No README is configured for this application' if readme.nil?
+
+    puts '=' * 80
+    puts readme
+    puts '=' * 80
+  end
+end

data/cli/run.rb

@@ -3,10 +3,6 @@
 command :run do
   desc 'Create and run a pod using the given image'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   option '--command [COMMAND]', 'The command to run (defaults to /bin/bash)' do |value, options|
     options[:command] = value.to_s
   end
@@ -16,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/secrets.rb

@@ -3,10 +3,6 @@
 command :secrets do
   desc 'Create/edit an encrypted secrets file'
 
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
-
   action do |context|
     require 'hippo/cli'
     cli = Hippo::CLI.setup(context)

data/cli/setup.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+command :setup do
+  desc 'Create a new configuration directory'
+
+  option '--local [PATH]', 'Use a local manifest from the given path' do |value, options|
+    options[:local] = value
+  end
+
+  option '--remote [REPO]', 'Use a repo manifest from the given repository' do |value, options|
+    options[:remote] = value
+  end
+
+  option '-p [PATH]', '--path [PATH]', 'Path within the remote repository' do |value, options|
+    options[:path] = value
+  end
+
+  option '-b [BRANCH]', '--branch [BRANCH]', 'Branch on remote repository' do |value, options|
+    options[:branch] = value
+  end
+
+  action do |context|
+    path = context.args[0]
+    raise Error, 'Provide path as first argument' if path.nil?
+
+    path = File.expand_path(path)
+
+    raise Error, "Directory already exists at #{path}" if File.exist?(path)
+
+    if context.options[:local] && context.options[:remote]
+      raise Error, 'Only specify --local OR --remote'
+    end
+
+    require 'fileutils'
+    FileUtils.mkdir_p(path)
+    source = {}
+    if local_path = context.options[:local]
+      source['type'] = 'local'
+      source['localOptions'] = {
+        'path' => File.expand_path(local_path)
+      }
+    elsif repo = context.options[:remote]
+      source['type'] = 'remote'
+      source['remoteOptions'] = { 'repository' => repo }
+      if context.options[:path]
+        source['remoteOptions']['path'] = context.options[:path]
+      end
+      if context.options[:branch]
+        source['remoteOptions']['branch'] = context.options[:branch]
+      end
+    end
+
+    require 'yaml'
+    config = { 'source' => source }
+    File.open(File.join(path, 'manifest.yaml'), 'w') { |f| f.write(config.to_yaml) }
+    puts "Created configuration directory at #{path}"
+
+    require 'hippo/working_directory'
+    wd = Hippo::WorkingDirectory.new(path)
+    if wd.can_update?
+      puts 'Updating local copy of remote repository...'
+      wd.update_from_remote
+      puts "\e[32mUpdate completed successfully.\e[0m"
+      puts
+      puts "  Repository....: \e[33m#{wd.remote_repository}\e[0m"
+      puts "  Branch........: \e[33m#{wd.remote_branch}\e[0m"
+      puts "  Path..........: \e[33m#{wd.remote_path}\e[0m"
+      puts
+    end
+  end
+end

data/cli/stages.rb

@@ -2,15 +2,12 @@
 
 command :stages do
   desc 'List all stages that are available'
-  option '-h', '--hippofile [RECIPE]', 'The path to the Hippofile (defaults: ./Hippofile)' do |value, options|
-    options[:hippofile] = value.to_s
-  end
 
-  action do |context|
+  action do |_context|
     require 'hippo/manifest'
-    manifest = Hippo::Manifest.load_from_file(context.options[:hippofile] || './Hippofile')
+    wd = Hippo::WorkingDirectory.new
 
-    if manifest.stages.empty?
+    if wd.stages.empty?
       puts 'There are no stages configured yet.'
       puts 'Use the following command to create one:'
       puts
@@ -19,7 +16,7 @@ command :stages do
       exit 0
     end
 
-    manifest.stages.each do |_, stage|
+    wd.stages.each do |_, stage|
       puts "- #{stage.name}"
     end
   end