cl-magic 0.3.9 → 1.2.0

data/lib/cl/magic/dk/parts_merger.rb

@@ -0,0 +1,67 @@
+require 'tty-command'
+require 'yaml'
+
+class PartsMerger
+
+  def initialize(working_dir, yaml_arg_munger, help_printer, logger)
+    @working_dir = working_dir
+    @yaml_arg_munger = yaml_arg_munger
+    @help_printer = help_printer
+    @logger = logger
+  end
+
+  def merge_parts(compose_hash, dk_parts_hash, args)
+    selected_part_keys = []
+
+    # merge: saved parts
+    saved_part_keys = get_saved_parts(dk_parts_hash)
+    saved_part_keys.each do |potential_part_key|
+      dk_part = dk_parts_hash.fetch(potential_part_key, nil) # yml detail
+      if dk_part
+        compose_hash = print_and_merge_part(potential_part_key, dk_part, compose_hash)
+        selected_part_keys << potential_part_key
+      end
+    end
+
+    # merge: arg parts
+    while true
+      potential_part_key = args.first
+      dk_part = dk_parts_hash.fetch(potential_part_key, nil) # yml detail
+      if dk_part
+        unless selected_part_keys.include?(potential_part_key)
+          compose_hash = print_and_merge_part(potential_part_key, dk_part, compose_hash)
+          selected_part_keys << potential_part_key
+        end
+        args.shift # remove part arg
+      else
+        break
+      end
+    end
+    @logger.puts "" if $stdout.isatty     # tailing line break
+
+    return compose_hash, selected_part_keys, args
+  end
+
+  def get_saved_parts(dk_parts_hash)
+
+    # get saved parts
+    cmd = "cd #{@working_dir} && cl dk parts list"
+    out, err = TTY::Command.new(:printer => :null).run("#{cmd}")
+    return out.split("\n")
+
+  end
+
+  private
+
+  def print_and_merge_part(part_key, dk_part, compose_hash)
+
+    # print
+    if $stdout.isatty
+      help_str = dk_part.fetch('help')
+      @help_printer.print_dk_help_line("#{part_key}", "#{help_str ? '- ' + help_str : ''}") if dk_part.keys.any?
+    end
+    # merge
+    return @yaml_arg_munger.dk_merge_and_remove(compose_hash, dk_part)
+  end
+
+end

data/lib/cl/magic/dk/world_settings.rb

@@ -0,0 +1,52 @@
+require 'tty-command'
+require 'yaml'
+
+class WorldSettings
+
+  def initialize(working_dir)
+    @working_dir = working_dir
+  end
+
+  def get_world_settings_hash()
+    filepath = get_world_settings_filepath()
+    return File.exist?(filepath) ? YAML.load_file(filepath) : {}
+  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
+
+  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
+
+  private
+
+  def get_repo_basename()
+    command = "cd #{@working_dir} && basename $(git remote get-url origin 2> /dev/null) .git"
+    repo_basename = TTY::Command.new(:printer => :null).run(command).out.gsub('.git', '').strip.chomp
+    if repo_basename==".git" or repo_basename==""
+      return File.basename(@working_dir)
+    end
+    return repo_basename
+  end
+
+  def get_world_settings_filepath()
+    return File.join(".cl-dk-world.yml")
+  end
+
+end

data/lib/cl/magic/dk/yaml_arg_munger.rb

@@ -0,0 +1,107 @@
+require 'yaml'
+
+class YamlArgMunger
+
+  def initialize(working_dir, world_settings)
+    @working_dir = working_dir
+    @world_path = world_settings.get_world_path_from_settings()
+    @dk_proj_path = world_settings.get_world_project_path()
+  end
+
+  def get_base_compose_parts_and_make_hashes()
+    compose_hash = get_base_compose_hash()
+    dk_parts_hash = {}
+    dk_make_hash = {}
+    if compose_hash
+      compose_hash = merge_world_files(compose_hash, show_help=ARGV.include?("--help"))
+      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') : {}
+    end
+    return compose_hash, dk_parts_hash, dk_make_hash
+  end
+
+  def dk_merge_and_remove(compose_hash, yml_hash)
+    # remove help & merge
+    clean_yml = yml_hash.clone
+    clean_yml.delete('help')
+    return compose_hash.dk_merge(clean_yml).dk_reject! { |k, v| v=='<dk-remove>' }
+  end
+
+  def save_yaml_and_adjust_args(compose_hash, args)
+
+    # generate final compose file
+    tempfile = File.new(File.join(@working_dir, ".cl-dk.yml"), 'w')
+    tempfile.write(compose_hash.to_yaml)  # write it to the tempfile
+
+    # remove existing '-f' flag, if needed
+    file_flag_index = args.index('-f')
+    if file_flag_index==0
+      args.delete_at(file_flag_index)
+      args.delete_at(file_flag_index)
+    end
+    args.unshift('-f', tempfile.path) # add new '-f' flag
+
+    tempfile.close
+    return args
+  end
+
+  private
+
+  def get_base_compose_hash()
+    cmd = "cd #{@working_dir} && docker compose config 2> /dev/null"
+    return YAML.load(`#{cmd}`)
+  end
+
+  def merge_world_files(compose_hash, show_help=false)
+    if @dk_proj_path
+      print_dk_help_line("dk-project-path", "#{@dk_proj_path}") if show_help and $stdout.isatty
+
+      Dir.glob("#{@dk_proj_path}/*.yml").sort.each do |filepath|
+        print_dk_help_line("dk-world", "#{filepath}") if show_help and $stdout.isatty
+
+        # read file and replace
+        contents = File.read(filepath)
+        contents.gsub!('<dk-world-path>', @world_path)
+        contents.gsub!('<dk-project-path>', @dk_proj_path)
+        contents.gsub!('<dk-working-path>', @working_dir)
+
+        # yml merge
+        yml_hash = YAML.load(contents)
+        compose_hash = dk_merge_and_remove(compose_hash, yml_hash)
+      end
+    end
+    return compose_hash
+  end
+
+  class ::Hash
+    def dk_merge(second)
+      merger = proc { |_, v1, v2|
+        if Hash === v1 && Hash === v2
+          v1.merge(v2, &merger)
+        else
+          if Array === v1 && Array === v2
+            if v2.first=="<dk-replace>"
+              v2[1..-1] # everything but the first item
+            else
+              v1 | v2 # union arrays
+            end
+          else
+            if [:undefined, nil, :nil].include?(v2)
+              v1
+            else
+              v2
+            end
+          end
+        end
+      }
+      merge(second.to_h, &merger)
+    end
+    def dk_reject!(&blk)
+      self.each do |k, v|
+        v.dk_reject!(&blk)  if v.is_a?(Hash)
+        self.delete(k)  if blk.call(k, v)
+      end
+    end
+  end
+
+end

data/lib/cl/magic/version.rb

@@ -2,6 +2,6 @@
 
 module Cl
   module Magic
-    VERSION = "0.3.9"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cl-magic
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Don Najd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-03 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: baran
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -139,15 +195,25 @@ files:
 - cl-magic.gemspec
 - lib/cl/magic.rb
 - lib/cl/magic/cl
+- lib/cl/magic/cl-ai-chat
+- lib/cl/magic/cl-ai-query
+- lib/cl/magic/cl-ai-store-jira
 - lib/cl/magic/cl-auth
 - lib/cl/magic/cl-dk
+- lib/cl/magic/cl-dk-make
+- lib/cl/magic/cl-dk-make-world
+- lib/cl/magic/cl-dk-parts
+- lib/cl/magic/cl-dk-world
 - lib/cl/magic/cl-envkey
 - lib/cl/magic/cl-gc-sql
 - lib/cl/magic/cl-gc-tags
 - lib/cl/magic/cl-glab-commit
 - lib/cl/magic/cl-history
 - lib/cl/magic/cl-jira-fetch
-- lib/cl/magic/cl-jira-stats
+- lib/cl/magic/cl-jira-fetch-by-epics
+- lib/cl/magic/cl-jira-to-elastic
+- lib/cl/magic/cl-jira-to-markdown
+- lib/cl/magic/cl-jira-to-stats
 - lib/cl/magic/cl-kube-cp
 - lib/cl/magic/cl-kube-deployment
 - lib/cl/magic/cl-kube-ktx
@@ -159,12 +225,20 @@ files:
 - lib/cl/magic/cl-poll
 - lib/cl/magic/cl-sandbox
 - lib/cl/magic/cl-vault
+- lib/cl/magic/common/ai_prompt.rb
+- lib/cl/magic/common/ai_text_splitter.rb
 - lib/cl/magic/common/common_options.rb
+- lib/cl/magic/common/elastic.rb
 - lib/cl/magic/common/gcloud.rb
 - lib/cl/magic/common/jira.rb
 - lib/cl/magic/common/kubectl.rb
 - lib/cl/magic/common/logging.rb
+- lib/cl/magic/common/milvus.rb
 - lib/cl/magic/common/parse_and_pick.rb
+- lib/cl/magic/dk/help_printer.rb
+- lib/cl/magic/dk/parts_merger.rb
+- lib/cl/magic/dk/world_settings.rb
+- lib/cl/magic/dk/yaml_arg_munger.rb
 - lib/cl/magic/version.rb
 homepage: https://gitlab.com/beesbot/cl-magic
 licenses:

data/lib/cl/magic/cl-jira-stats

@@ -1,180 +0,0 @@
-#!/usr/bin/env ruby
-# Fetch jira issues print stats
-require 'optparse'
-require 'optparse/subcommand'
-require 'tty-command'
-require 'tty-prompt'
-require 'active_support/all'
-
-require 'cl/magic/common/common_options.rb'
-require 'cl/magic/common/logging.rb'
-require 'cl/magic/common/jira.rb'
-
-require 'net/http'
-require 'json'
-
-require 'byebug'
-
-@logger = get_logger()
-@cl_cmd_name = File.basename(__FILE__).split('-').join(' ')
-
-#
-# Features
-#
-
-def get_issues_from_datafile(options)
-  issues = []
-  filepath = File.join(@working_dir, options[:data_filepath])
-  File.foreach(filepath) do |line|
-    issue = JSON.parse(line)
-    issuetype = issue["fields"]["issuetype"]["name"]
-
-    # filter if needed
-    issues << issue unless options[:exclude_issuetypes].include?(issuetype)
-  end
-  return issues
-end
-
-def oldest_issue_date(issues)
-  return issues.collect {|i| Date.parse(i["fields"]["created"])}.sort.first
-end
-
-def do_work(options)
-  issues = get_issues_from_datafile(options)
-  oldest_date = oldest_issue_date(issues)
-  iter_date_range(oldest_date) do |start_date, end_date|
-    stat_hashes = issues_to_stat_hashes(issues, start_date, end_date, options)
-    counts = print_stats(stat_hashes, start_date, end_date)
-    puts counts # print each time range
-  end
-end
-
-def iter_date_range(start_date)
-  current_date = start_date.beginning_of_week
-  while current_date < 1.week.ago.end_of_week
-    yield current_date, current_date.end_of_week
-    current_date += 2.weeks # increment
-  end
-end
-
-def issues_to_stat_hashes(issues, start_date, end_date, options)
-
-  # parse dates for changelogs
-  issues.each do |issue|
-    issue["status_changelogs"].each do |l|
-      date_string = l["created"]
-      l["created"] = Date.parse(date_string) unless date_string.class == Date
-    end
-  end
-
-  # collect stat hashes
-  return issues.collect do |issue|
-
-    # skip if issue is out of range
-    issue_created = Date.parse(issue["fields"]["created"])
-    if issue_created > end_date
-      nil
-    else
-      # get in-range status change
-      status_changelog = nil
-      status_changelog = issue["status_changelogs"]
-        .select { |l| l["created"] > end_date }
-        .sort_by { |l| l["created"] }.last if start_date && end_date
-
-      # exclude issue types
-      if status_changelog and options[:exclude_issuetypes].include?(status_changelog["toString"])
-        nil
-      else
-        # yield stat hash
-        {
-          issuetype: issue["fields"]["issuetype"]["name"],
-          status: status_changelog ? status_changelog["toString"] : issue["fields"]["status"]["name"]
-        }
-      end
-    end
-  end.compact
-end
-
-def print_stats(stat_hashes, start_date, end_date)
-  counts = {
-    start_date: start_date.strftime("%m-%d-%Y"),
-    end_date: end_date.strftime("%m-%d-%Y"),
-    total_todo: 0,
-    total_done: 0,
-    total: stat_hashes ? stat_hashes.count : 0
-  }
-  return counts unless stat_hashes.any?
-  stat_hashes.each do |stat|
-
-    issuetype = stat[:issuetype]
-    status = stat[:status]
-
-    # count all
-    increment(counts, "status_#{issuetype.downcase.underscore}")
-
-    # count by status
-    case status
-    when "Ready","Rework","In Progress","In QA","Ready For Code Review","In Code Review"
-      increment(counts, :total_todo)
-    when "Ready to Deploy","Closed"
-      increment(counts, :total_done)
-    # else
-    #   raise "invalid ticket status: #{status}"
-    end
-  end
-  return counts
-end
-
-def increment(hash, key)
-  if hash.key? key
-    hash[key] += 1
-  else
-    hash[key] = 1
-  end
-end
-
-#
-# Options
-#
-
-options = {
-  exclude_issuetypes: []
-}
-global_banner = <<DOC
-
-Process jira fetch file an return stats
-
- Usage: #{@cl_cmd_name} [options]
-
-DOC
-
-global = OptionParser.new do |g|
-  g.banner = global_banner
-  add_help_and_verbose(g)
-
-  g.on("-f", "--data-filepath FILEPATH", "relative path to file produced by 'cl jira fetch' command") do |v|
-    options[:data_filepath] = v
-  end
-
-  g.on("-e", "--exclude-issuetypes CSV", "comma separated list of issuetypes you want to exclude") do |v|
-    options[:exclude_issuetypes] = v.split(',')
-    options[:exclude_issuetypes] << "Won't Do"
-  end
-end
-
-#
-# Run
-#
-
-@working_dir = ENV['CL_WORKING_DIR'] # passed through cl-magic to here
-global.parse(ARGV)
-
-# prompt for missing options
-ask_and_store_option(options, :data_filepath, "data_filepath: ")
-
-# display full command
-write_history("""#{@cl_cmd_name} \\
-  --data-filepath=#{options[:data_filepath]}
-""")
-
-do_work(options)