cl-magic 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42235afcff8b801982ca721b3217756dad15a401063e59310900dd595c05a4e2
-  data.tar.gz: a49e3798271b7cef9f8e82d9b0a6e9846e9a56a1de1d4d75d91ed81e2291d237
+  metadata.gz: '08b4655abcd92a0d5e3a779fdc7e0e09231c7cb15d073e06878c085227ef3f9d'
+  data.tar.gz: 63999d535d6ad18d22b8cff1e259b9b054bbf7faf75939e54c9819885ca24feb
 SHA512:
-  metadata.gz: 5319a3c52cc59b51c2a6a0e8469cc7085e6485765c335ba44bf6709937c8eb7d12b4b410c78ebb71b283faabd466d647b9109399b20ea9e72ffc4d5fdfa6b252
-  data.tar.gz: 5f016f4f25736f492b0985fe4ebe5cfb0f33597cf8a365d240743f7635c8142db1726c6c17ffac9a4f6a34946e6864e8a0eabda6b8ef89dd5068f6f14161dc06
+  metadata.gz: 4157d207e824e2d0a309790187873d3b6b02c41bd892fc3436e359cc1f4639044576129d1a8d36ac9a0faee8afa6dc2366db506f93401bf4165e93766435f3d7
+  data.tar.gz: 0bce3b21105e81dd1bc1d5656e941ceec30814bb01e19c16a7a5ee57eba98403093d7359eb9e113bd60b0850a87764b1241a08febe1881dcde74c303fb9d35be

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cl-magic (0.3.9)
+    cl-magic (0.4.0)
       activesupport
       optparse-subcommand
       pastel

data/lib/cl/magic/cl-auth

@@ -61,6 +61,18 @@ def aws_okta(options)
   # cmd = "aws-okta add" # old
   # do work
   if is_tty
+
+    # ensure we are logged in
+    begin
+      TTY::Command.new(:printer => :null).run("aws-okta exec #{options[:aws_profile]} -- env")
+    rescue TTY::Command::ExitError => e
+      if e.message.include? "Failed to authenticate"
+        @logger.info "authenticate first with: aws-okta add"
+      else
+        raise
+      end
+    end
+
     puts
     @logger.info "now export into your environment with"
     puts

data/lib/cl/magic/cl-dk

@@ -41,7 +41,11 @@ end
 
 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
+  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()
@@ -106,37 +110,35 @@ def print_dk_help(dk_parts_hash, dk_make_hash, args)
   has_dk_commands = dk_parts_hash.keys.any?
 
   if no_args or asked_for_help
-    if has_dk_commands
-      puts ""
-      puts "Usage: dk [DK_PARTS] [COMPOSE_OPTIONS] COMPOSE_COMMAND"
-      puts ""
-      puts "Run docker compose while munging yamls in sophisticated ways."
-      puts ""
-      if get_repo_basename
-        puts "PROJ INFO"
-        puts " - Repo basename:       #{get_repo_basename}"
-        puts " - World filepath:      #{get_world_project_path()}"
-        puts ""
-      end
-      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>         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 set-world         sets the location of the world directory"
-      puts " - dk make              turnkey commands for a project"
-      puts " - dk set-parts        save parts so they are automatically applied to commands"
+    puts ""
+    puts "Usage: dk [DK_PARTS] [COMPOSE_OPTIONS] COMPOSE_COMMAND"
+    puts ""
+    puts "Run docker compose while munging yamls in sophisticated ways."
+    puts ""
+    if get_repo_basename
+      puts "PROJ INFO"
+      puts " - Repo basename:       #{get_repo_basename}"
+      puts " - World filepath:      #{get_world_project_path()}"
       puts ""
-      puts "-------------------------"
     end
+    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>         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 set-world         sets the location of the world directory"
+    puts " - dk make              turnkey commands for a project"
+    puts " - dk set-parts        save parts so they are automatically applied to commands"
+    puts ""
+    puts "-------------------------"
   end
 end
 

data/lib/cl/magic/cl-jira-fetch

@@ -12,8 +12,6 @@ require 'cl/magic/common/jira.rb'
 require 'net/http'
 require 'json'
 
-require 'byebug'
-
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')
 
@@ -27,7 +25,7 @@ def do_work(options)
 
   puts ""
   @logger.wait "fetch epics"
-  epic_ids = jira.get_epic_ids(options[:project], options[:epic_wildcard])
+  epic_ids, epics = jira.get_epic_ids(options[:project], options[:epic_wildcard])
   @logger.success "#{epic_ids.count} epics"
 
   puts ""
@@ -44,8 +42,8 @@ def do_work(options)
   @logger.wait "saving file"
   output_filepath = File.join(@working_dir, options[:output_filename])
   File.open(output_filepath, 'w') do |file|
-    issues.each do |issue|
-      file.puts(issue.to_json)
+    issues.each do |o|
+      file.puts(o.to_json)
     end
   end
 
@@ -122,7 +120,8 @@ write_history("""#{@cl_cmd_name} \\
   --base-uri=#{options[:base_uri]} \\
   --username=#{options[:username]} \\
   --project=#{options[:project]} \\
-  --epic-wildcard=#{options[:epic_wildcard]}
+  --epic-wildcard=#{options[:epic_wildcard]} \\
+  --token
 """)
 
 do_work(options)

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

@@ -13,8 +13,6 @@ require 'cl/magic/common/jira.rb'
 require 'net/http'
 require 'json'
 
-require 'byebug'
-
 @logger = get_logger()
 @cl_cmd_name = File.basename(__FILE__).split('-').join(' ')
 
@@ -28,70 +26,50 @@ def get_issues_from_datafile(options)
   File.foreach(filepath) do |line|
     issue = JSON.parse(line)
     issuetype = issue["fields"]["issuetype"]["name"]
+    labels = issue["fields"]["labels"]
 
-    # filter if needed
-    issues << issue unless options[:exclude_issuetypes].include?(issuetype)
+    has_excluded_labels = (labels & options[:exclude_labels]).any?
+    is_excluded_issuetype = options[:exclude_issuetypes].include?(issuetype.downcase)
+    issues << issue unless has_excluded_labels or is_excluded_issuetype
   end
   return issues
 end
 
-def oldest_issue_date(issues)
-  return issues.collect {|i| Date.parse(i["fields"]["created"])}.sort.first
-end
+def in_range_issue_stats(issues, start_date, end_date, options)
 
-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
+  def in_range_logs(start_date, end_date, issue)
+    return issue["status_changelogs"].select do |log|
+      (start_date..end_date).cover?(Date.parse(log["created"]))
+    end
   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
+  # in-range
+  in_range_issues = issues.select do |issue|
 
-def issues_to_stat_hashes(issues, start_date, end_date, options)
+    # issue created date?
+    issue_in_range = Date.parse(issue["fields"]["created"]) < end_date
 
-  # 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
+    # logs created date?
+    logs_in_range = in_range_logs(start_date, end_date, issue).any?
+
+    # select if
+    (logs_in_range or issue_in_range)
   end
 
-  # collect stat hashes
-  return issues.collect do |issue|
+  # stat hashes
+  return in_range_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
+    # most recent in-range log?
+    changelog = in_range_logs(start_date, end_date, issue)
+      .sort_by { |l| Date.parse(l["created"]) }.last
+
+    # yield stat hash
+    status = changelog ? changelog["toString"] : issue["fields"]["status"]["name"]
+    {
+      key: issue["key"],
+      issuetype: issue["fields"]["issuetype"]["name"],
+      status: status
+    }
   end.compact
 end
 
@@ -99,37 +77,70 @@ 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: 0,
     total_todo: 0,
     total_done: 0,
-    total: stat_hashes ? stat_hashes.count : 0
+    by_type: {}
   }
-  return counts unless stat_hashes.any?
-  stat_hashes.each do |stat|
 
+  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"
+    when "To Do","Ready","Rework","In Progress","In QA","Ready For Code Review","In Code Review"
+      increment_type(counts, issuetype, :to_do)
       increment(counts, :total_todo)
     when "Ready to Deploy","Closed"
+      increment_type(counts, issuetype, :done)
       increment(counts, :total_done)
-    # else
-    #   raise "invalid ticket status: #{status}"
+    else
+      # if status != "Won't Do"
+      #   debugger
+      # end
     end
+
+    # count totals
+    unless status=="Won't Do"
+      increment(counts, :total)
+      increment_type(counts, issuetype, :total)
+    end
+
   end
   return counts
 end
 
+def oldest_issue_date(issues)
+  return issues.collect {|i| Date.parse(i["fields"]["created"])}.sort.first.beginning_of_day
+end
+
+def increment_type(hash, type, status_category)
+  type = type.downcase.underscore
+  hash[:by_type][type] = {} unless hash[:by_type].key?(type)
+  hash[:by_type][type][status_category] ||= 0
+  hash[:by_type][type][status_category] += 1
+end
+
 def increment(hash, key)
-  if hash.key? key
-    hash[key] += 1
-  else
-    hash[key] = 1
+  hash[key] ||= 0
+  hash[key] += 1
+end
+
+def iter_date_range(start_date)
+  while start_date < Date.today.end_of_week
+    yield start_date.beginning_of_week.beginning_of_day, start_date.end_of_week.end_of_day
+    start_date += 1.weeks # increment
+  end
+end
+
+def do_work(options)
+  issues = get_issues_from_datafile(options)
+  oldest_date = oldest_issue_date(issues).beginning_of_week
+  iter_date_range(oldest_date) do |start_date, end_date|
+    stat_hashes = in_range_issue_stats(issues, start_date, end_date, options)
+    counts = print_stats(stat_hashes, start_date, end_date)
+    puts counts # print each time range
   end
 end
 
@@ -160,6 +171,10 @@ global = OptionParser.new do |g|
     options[:exclude_issuetypes] = v.split(',')
     options[:exclude_issuetypes] << "Won't Do"
   end
+
+  g.on("-l", "--exclude-labels CSV", "comma separated list of labels that will cause a ticket to be excluded") do |v|
+    options[:exclude_labels] = v.split(',')
+  end
 end
 
 #
@@ -171,10 +186,14 @@ global.parse(ARGV)
 
 # prompt for missing options
 ask_and_store_option(options, :data_filepath, "data_filepath: ")
+options[:exclude_issuetypes] = [] if options[:exclude_issuetypes].nil?
+options[:exclude_labels] = [] if options[:exclude_labels].nil?
 
 # display full command
 write_history("""#{@cl_cmd_name} \\
-  --data-filepath=#{options[:data_filepath]}
+  --data-filepath=#{options[:data_filepath]} \\
+  --exclude-issuetypes=#{options[:exclude_issuetypes].join(',')} \\
+  --exclude-labels=#{options[:exclude_labels].join(',')}
 """)
 
 do_work(options)

data/lib/cl/magic/cl-poll

@@ -17,10 +17,10 @@ require 'cl/magic/common/kubectl.rb'
 # Features
 #
 
-def do_work(options)
+def do_work(options, remaining_options)
   while true
-    tty_command = TTY::Command.new(printer: :null)
-    out, err = tty_command.run(ARGV.join(' '))
+    tty_command = TTY::Command.new(printer: :null, pty: options[:pty])
+    out, err = tty_command.run("cd #{@working_dir} && #{remaining_options.join(' ')}")
     puts out
     puts
     sleep(1)
@@ -31,7 +31,9 @@ end
 # Options
 #
 
-options = {}
+options = {
+  pty: true
+}
 global_banner = <<DOC
 
  A sandbox to try things
@@ -43,10 +45,23 @@ DOC
 global = OptionParser.new do |g|
   g.banner = global_banner
   add_help_and_verbose(g)
+
+  g.on("--no-pty", "disable pseudo terminal") do |v|
+    options[:pty] = v
+  end
 end
 
 #
 # Run
 #
 
-do_work(options)
+remaining_options = []
+global.order! do |option|
+  remaining_options << option
+end
+
+global.parse(ARGV)
+
+@working_dir = ENV['CL_WORKING_DIR'] # passed through cl-magic to here
+
+do_work(options, remaining_options)

data/lib/cl/magic/common/jira.rb

@@ -1,4 +1,3 @@
-require 'byebug'
 
 class Jira
 
@@ -16,7 +15,9 @@ class Jira
   def get_epic_ids(project, epic_wildcard)
     jql_query = "project = \"#{project}\" AND issuetype = Epic AND text ~ \"#{epic_wildcard}\""
     results = run_jql_query(jql_query)
-    return results.select{|h| h['fields']['summary'].start_with? epic_wildcard}.map {|h| h['id']}
+    epics = results.select{|h| h['fields']['summary'].start_with? epic_wildcard}
+    epic_ids = epics.map {|h| h['id']}
+    return epic_ids, epics
   end
 
   def get_issues(project, epic_ids)
@@ -153,7 +154,7 @@ def collect_status_changelogs(jira, issues, options)
       # append them to issue
       status_logs.each do |status_log|
         issue["status_changelogs"] << status_log
-      end if status_logs.count > 0
+      end
     end
 
     final_issue_hashes << issue # save

data/lib/cl/magic/version.rb

@@ -2,6 +2,6 @@
 
 module Cl
   module Magic
-    VERSION = "0.3.9"
+    VERSION = "0.4.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: 0.4.0
 platform: ruby
 authors:
 - Don Najd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-03 00:00:00.000000000 Z
+date: 2023-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake