cl-magic 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 504fca48eea3cb6eca83e8025a98e4f3187f19286b81134b42b53a0a639f2b9b
-  data.tar.gz: 1269ba9642497c4e7541598d3ba180a09b2e5c033627ae9e60cbd545ba3f4e91
+  metadata.gz: a9f83478d5c0be3f555396d8274a2c4ed7e275130f8068236d8bc9a2775bc30e
+  data.tar.gz: d48e33ed2be7ccc8e83c36edf86ef622e0668cc911b9d50cc5e8c5fb6c039614
 SHA512:
-  metadata.gz: b56850adb7d7182d6a72777236902b7b961493f3780c209675c268381c4ccfc78a339ea740f38ed9dd16c2a96f8c102efa24ea3527435699830219b7a5b9e8c9
-  data.tar.gz: a83324b6a355286f9ad2cfaf7b034ca93b710f2706da1fb4e1b61722575a6477e42763d669b082bc72dc308fa5c78195cedaa64c755f9ef4d250f98b36e443b0
+  metadata.gz: 7849ce794132e7111a17091b51b27e1b991e74f5ab2666f831152199da79baa8c683d005ceb9018a8fb48d9d7c5530e8e4c603b38272f7df32316dfc744c19b7
+  data.tar.gz: faab04d8e3c91b302d35b5e89f558326eabf1aabd6648d22d08bc9c38d66bba3aab2b01cb7a50b13c7f20a8719cb48b894078147b6b0dd7c09eeab5ac5cb1378

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cl-magic (0.3.0)
+    cl-magic (0.3.2)
       optparse-subcommand
       pastel
       tty-command

data/lib/cl/magic/cl-auth

@@ -62,14 +62,6 @@ github_cli_banner = <<DOC
 
 DOC
 
-aws_okta_banner = <<DOC
-
- Authenticate with https://github.com/segmentio/aws-okta
-
- Usage: #{@cl_cmd_name} aws-okta [options]
-
-DOC
-
 global = OptionParser.new do |g|
   g.banner = global_banner
   add_help_and_verbose(g)
@@ -84,11 +76,6 @@ global = OptionParser.new do |g|
     options[:action] = :github_cli
   end
 
-  g.subcommand 'aws-okta' do |s|
-    s.banner = aws_okta_banner
-    options[:action] = :aws_okta
-  end
-
 end
 
 #

data/lib/cl/magic/cl-dk

@@ -2,10 +2,12 @@
 require 'yaml'
 require 'json'
 require 'tty-command'
+require 'tty-prompt'
 require 'tempfile'
 
 require 'cl/magic/common/common_options.rb'
 require 'cl/magic/common/logging.rb'
+require 'cl/magic/common/parse_and_pick.rb'
 
 @logger = get_logger()
 
@@ -18,23 +20,50 @@ def get_base_compose_hash()
   return YAML.load(`#{cmd}`)
 end
 
+def get_save_parts_filepath()
+  return File.join(@working_dir, ".cl-dk-parts.yml")
+end
+
+# world
+
 def get_repo_basename()
   command = "cd #{@working_dir} && basename $(git remote get-url origin 2> /dev/null) .git"
   return TTY::Command.new(:printer => :null).run(command).out.gsub('.git', '').strip.chomp
 end
 
-def get_dk_world_project_path()
-  repo_basename = get_repo_basename()
-  return "dk-world/#{repo_basename}" if repo_basename
-  return nil
+def get_world_settings_filepath()
+  return File.join(".cl-dk-world.yml")
 end
 
-def get_save_parts_filepath()
-  return File.join(@working_dir, ".cl-dk-parts.yml")
+def get_world_settings_hash()
+  filepath = get_world_settings_filepath()
+  return File.exist?(filepath) ? YAML.load_file(filepath) : {}
+end
+
+def get_world_path_from_settings()
+  world_settings = get_world_settings_hash()
+  if world_settings.key?(:world_path) and world_settings.key?(:context)
+    return File.join(world_settings[:world_path], world_settings[:context])
+  end
+  return ""
+end
+
+def save_world_settings(world_settings_hash)
+  filepath = get_world_settings_filepath()
+  tempfile = File.new(filepath, 'w')
+  tempfile.write(world_settings_hash.to_yaml)
+  tempfile.close
+end
+
+def get_world_project_path()
+  repo_basename = get_repo_basename()
+  world_path = get_world_path_from_settings()
+  return File.join(world_path, repo_basename) if world_path and repo_basename
+  return nil
 end
 
 #
-# Print Help Methods
+# Help Methods
 #
 
 def print_dk_help_line(key, help)
@@ -69,26 +98,27 @@ def print_dk_help(dk_parts_hash, dk_make_hash, args)
       puts "Run docker compose while munging yamls in sophisticated ways."
       puts ""
       if get_repo_basename
-        puts "PROJ INFO:"
+        puts "PROJ INFO"
         puts " - Repo basename:       #{get_repo_basename}"
-        puts " - World filepath:      #{File.join(@working_dir, get_dk_world_project_path())}"
+        puts " - World filepath:      #{get_world_project_path()}"
         puts ""
       end
-      puts "PROJ PARTS:"
+      puts "PROJ PARTS"
       dk_parts_hash.keys.each do |key|
         print_dk_help_line(key, dk_parts_hash[key].fetch('help'))
       end
       puts ""
       puts "YML TOKENS"
-      puts "  - <dk-remove>"
-      puts "  - <dk-replace>"
-      puts "  - <dk-project-path>"
-      puts "  - <dk-world-path>"
-      puts "  - <dk-working-path>"
+      puts "  - <dk-remove>         removes section of yaml"
+      puts "  - <dk-replace>        replaces values in a yaml array"
+      puts "  - <dk-world-path>     absolute filepath to world directory"
+      puts "  - <dk-project-path>   absolute filepath to world/project directory"
+      puts "  - <dk-working-path>   absolute filepath to location dk command was run from"
       puts ""
-      puts "ADDITIONAL TURNKEY COMMANDS:"
-      puts " - dk make"
-      puts " - dk save-parts"
+      puts "ADDITIONAL TURNKEY COMMANDS"
+      puts " - dk set-world         sets the location of the world directory"
+      puts " - dk make              turnkey commands for a project"
+      puts " - dk save-parts        save parts so they are automatically applied to commands"
       puts ""
       puts "-------------------------"
     end
@@ -113,16 +143,19 @@ def print_make_help(dk_parts_hash, dk_make_hash)
   puts ""
 end
 
-def print_save_parts_help(dk_parts_hash)
+def print_set_world_help()
   puts ""
-  puts "Usage: dk [DK_PARTS] save-parts"
+  puts "Usage: dk set-world PATH"
   puts ""
-  puts "Save parts in project and apply every time"
+  puts "Set the folder that contains dk-world configuration"
   puts ""
-  puts "Parts:"
-  dk_parts_hash.keys.each do |key|
-    print_dk_help_line(key, dk_parts_hash[key].fetch('help'))
-  end
+end
+
+def print_set_parts_help()
+  puts ""
+  puts "Usage: dk [DK_PARTS] set-parts"
+  puts ""
+  puts "Set parts for a project and apply to every 'dk' command"
   puts ""
 end
 
@@ -169,7 +202,7 @@ def dk_merge_and_remove(compose_hash, yml_hash)
 end
 
 def merge_world_files(compose_hash, show_help=false)
-  dk_proj_path = get_dk_world_project_path()
+  dk_proj_path = get_world_project_path()
   if dk_proj_path
     print_dk_help_line("dk-project-path", "#{dk_proj_path}") if show_help
 
@@ -178,8 +211,8 @@ def merge_world_files(compose_hash, show_help=false)
 
       # read file and replace
       contents = File.read(filepath)
-      contents.gsub!('<dk-world-path>', File.join(Dir.pwd, "dk-world"))
-      contents.gsub!('<dk-project-path>', File.join(Dir.pwd, dk_proj_path))
+      contents.gsub!('<dk-world-path>', get_world_path_from_settings())
+      contents.gsub!('<dk-project-path>', dk_proj_path)
       contents.gsub!('<dk-working-path>', @working_dir)
 
       # yml merge
@@ -277,22 +310,70 @@ def run_dk(compose_args)
 end
 
 #
-# Run: SAVE PARTS
+# Run: SET WORLD
 #
 
-def run_dk_save_parts(compose_args, dk_parts_hash, selected_part_keys)
+def run_dk_set_world()
+  world_settings = get_world_settings_hash()
+
+  # world path
+  world_path = ARGV[1]
+  if world_path.nil?
+    print_set_world_help
+    exit
+  else
+    world_path = File.expand_path(File.join(@working_dir, world_path))
+  end
+
+  if TTY::Prompt.new.yes?("Set world to: #{world_path}?")
+    world_settings[:world_path] = world_path
+    save_world_settings(world_settings)
+    run_dk_set_context()
+  else
+    exit
+  end
+
+end
+
+def run_dk_set_context()
+  world_settings = get_world_settings_hash()
+  unless world_settings[:world_path] and File.directory?(world_settings[:world_path])
+    @logger.error "no world path set."
+    exit 1
+  end
+
+  # read folder from world path (aka. context)
+  all_dir = Dir.chdir(world_settings[:world_path]) do
+    Dir.glob('*').select { |f| File.directory? f and f != "common" }
+  end
+  selected_dir = pick_single_result(all_dir.collect {|f| [f]}, "select context").first
+  world_settings[:context] = selected_dir
+  save_world_settings(world_settings)
+
+  @logger.puts "world set!"
+  exit
+end
+
+#
+# Run: SET PARTS
+#
+
+def run_dk_set_parts()
+  parts = ARGV[1..]
   filepath = get_save_parts_filepath()
-  if selected_part_keys.any?
+  if parts.any?
     tempfile = File.new(filepath, 'w')
-    tempfile.write(selected_part_keys.to_yaml) # write it to the tempfile
+    tempfile.write(ARGV[1..].to_yaml) # write it to the tempfile
+    tempfile.close
   else
     if File.exist?(filepath)
       File.delete(filepath)
       @logger.info "parts cleared"
     else
-      print_save_parts_help(dk_parts_hash)
+      print_set_parts_help()
     end
   end
+  exit
 end
 
 #
@@ -374,29 +455,38 @@ end
 
 @working_dir = ENV['CL_WORKING_DIR'] # passed through cl-magic to here
 
-# get compose settings
-compose_hash = get_base_compose_hash()
-if compose_hash
-
-  # world
-  compose_hash = merge_world_files(compose_hash, show_help=ARGV.include?("--help"))
-
-  # x-dk fragments
-  dk_parts_hash = compose_hash['x-dk-parts'] ? compose_hash.delete('x-dk-parts') : {}
-  dk_make_hash = compose_hash['x-dk-make'] ? compose_hash.delete('x-dk-make') : {}
-
-  # parts
-  saved_part_keys = get_saved_parts(dk_parts_hash)
-  compose_args, selected_part_keys = merge_parts_save_and_prep_args(compose_hash, dk_parts_hash, dk_make_hash, saved_part_keys)
-
-  # sub-command
-  case compose_args[2]
-  when "make"
-    all_part_keys = selected_part_keys + saved_part_keys
-    run_dk_make(compose_args, dk_make_hash, dk_parts_hash, all_part_keys)
-  when "save-parts"
-    run_dk_save_parts(compose_args, dk_parts_hash, selected_part_keys)
-  else
-    run_dk(compose_args)
+# SET commands first
+case ARGV.first
+when "set-world"
+  run_dk_set_world()
+when "set-context"
+  run_dk_set_context()
+when "set-parts"
+  run_dk_set_parts()
+else
+
+  # get compose settings
+  compose_hash = get_base_compose_hash()
+  if compose_hash
+
+    # world
+    compose_hash = merge_world_files(compose_hash, show_help=ARGV.include?("--help"))
+
+    # x-dk fragments
+    dk_parts_hash = compose_hash['x-dk-parts'] ? compose_hash.delete('x-dk-parts') : {}
+    dk_make_hash = compose_hash['x-dk-make'] ? compose_hash.delete('x-dk-make') : {}
+
+    # parts
+    saved_part_keys = get_saved_parts(dk_parts_hash)
+    compose_args, selected_part_keys = merge_parts_save_and_prep_args(compose_hash, dk_parts_hash, dk_make_hash, saved_part_keys)
+
+    # sub-command
+    case compose_args[2]
+    when "make"
+      all_part_keys = selected_part_keys + saved_part_keys
+      run_dk_make(compose_args, dk_make_hash, dk_parts_hash, all_part_keys)
+    else
+      run_dk(compose_args)
+    end
   end
 end

data/lib/cl/magic/version.rb

@@ -2,6 +2,6 @@
 
 module Cl
   module Magic
-    VERSION = "0.3.0"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cl-magic
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Don Najd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake