Adds the issue develop command, and --dev option to issue create

Author: bougyman

Gemfile

@@ -16,3 +16,4 @@ group :development, :test do
   gem 'rubocop-rake', require: false
   gem 'rubocop-rspec', require: false
 end
+

Gemfile.lock

@@ -5,8 +5,10 @@ PATH
       base64 (~> 0.2)
       dry-cli (~> 1.0)
       dry-cli-completion (~> 1.0)
+      git (~> 1.5)
       gqli (~> 1.2)
       httpx (~> 1.2)
+      octokit (~> 5.0)
       semantic_logger (~> 4.0)
       sequel (~> 5.0)
       sqlite3 (~> 1.7)
@@ -66,11 +68,18 @@ GEM
     dry-cli (1.0.0)
     dry-cli-completion (1.0.0)
       completely (~> 0.5)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
     ffi (1.16.3)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
     gem-release (2.2.2)
+    git (1.19.1)
+      addressable (~> 2.8)
+      rchardet (~> 1.8)
     gqli (1.2.0)
       hashie (> 3.0)
       http (> 0.8, < 6.0)
@@ -102,6 +111,11 @@ GEM
       docopt_ng (~> 0.7, >= 0.7.1)
     multi_json (1.15.0)
     multi_test (1.1.0)
+    net-http (0.4.1)
+      uri
+    octokit (5.6.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     parallel (1.24.0)
     parser (3.3.0.5)
       ast (~> 2.4.1)
@@ -118,6 +132,7 @@ GEM
     racc (1.7.3)
     rainbow (3.1.1)
     rake (13.1.0)
+    rchardet (1.8.0)
     regexp_parser (2.9.0)
     rexml (3.2.6)
     rouge (4.2.0)
@@ -158,6 +173,9 @@ GEM
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
     semantic_logger (4.15.0)
       concurrent-ruby (~> 1.0)
     sequel (5.76.0)
@@ -192,6 +210,7 @@ GEM
     tty-screen (0.8.2)
     unicode-display_width (2.5.0)
     unicode_utils (1.4.0)
+    uri (0.13.0)
     wisper (2.0.1)
 
 PLATFORMS

lib/linear/cli/sub_commands.rb

@@ -30,8 +30,8 @@ def ask_for_team
             logger.info('Only one team found, using it', team: teams.first.name)
             teams.first
           elsif teams.empty?
-            logger.error('No teams found for you. Please join a team or pass an existing team name.')
-            raise SmellsBad, 'No team given and none found for you'
+            logger.error('No teams found for you. Please join a team or pass an existing team ID.')
+            raise SmellsBad, 'No team given and none found for you (try joining a team or use a team id from `lc teams --no-mine`)' # rubocop:disable Layout/LineLength
           else
             choose_a_team! teams
           end
@@ -62,8 +62,53 @@ def title_for(title = nil)
         def labels_for(team, labels = nil)
           return Rubyists::Linear::Label.find_all_by_name(labels.map(&:strip)) if labels
 
+          prompt.on(:keypress) do |event|
+            prompt.trigger(:keydown) if event.value == 'j'
+            prompt.trigger(:keyup) if event.value == 'k'
+          end
           prompt.multi_select('Labels:', team.labels.to_h { |t| [t.name, t] })
         end
+
+        def cut_branch!(branch_name)
+          if current_branch != default_branch
+            prompt.yes?("You are not on the default branch (#{default_branch}). Do you want to checkout #{default_branch} and create a new branch?") && git.checkout(default_branch) # rubocop:disable Layout/LineLength
+          end
+          git.branch(branch_name)
+        end
+
+        def branch_for(branch_name)
+          logger.trace('Looking for branch', branch_name:)
+          existing = git.branches[branch_name]
+          return cut_branch!(branch_name) unless existing
+
+          logger.trace('Branch found', branch: existing&.name)
+          existing
+        end
+
+        def current_branch
+          git.current_branch
+        end
+
+        # Horrible way to do this, but it is working for now
+        def pull_or_push_new_branch!(branch_name)
+          git.pull
+        rescue Git::FailedError
+          prompt.warn("Upstream branch not found, pushing local #{branch_name} to origin")
+          git.push('origin', branch_name)
+          `git branch --set-upstream-to=origin/#{branch_name} #{branch_name}`
+          prompt.ok("Set upstream to origin/#{branch_name}")
+        end
+
+        def git
+          @git ||= Git.open('.')
+        rescue Git::Repository::NoRepositoryError => e
+          logger.error('Your current directory is not a git repository!', error: e)
+          exit 121
+        end
+
+        def default_branch
+          @default_branch ||= Git.default_branch git.repo.path
+        end
       end
     end
   end

lib/linear/commands/issue.rb

@@ -13,8 +13,9 @@ module Issue
         # Aliases for Issue commands
         ALIASES = {
           create: %w[c new add],        # aliases for the create command
+          develop: %w[d dev],           # aliases for the create command
           list: %w[l ls],               # aliases for the list command
-          show: %w[s view v display d], # aliases for the show command
+          show: %w[s view v],           # aliases for the show command
           issue: %w[i issues]           # aliases for the main issue command itself
         }.freeze
 
@@ -28,10 +29,16 @@ def make_da_issue!(**options)
         end
 
         def gimme_da_issue!(issue_id, me) # rubocop:disable Naming/MethodParameterName
+          logger.trace('Looking up issue', issue_id:, me:)
           issue = Rubyists::Linear::Issue.find(issue_id)
-          logger.debug 'Taking issue', issue:, assignee: me
+          if issue.assignee && issue.assignee[:id] == me.id
+            prompt.say("You are already assigned #{issue_id}")
+            return issue
+          end
+
+          prompt.say("Assigning issue #{issue_id} to ya")
           updated = issue.assign! me
-          logger.debug 'Issue taken', issue: updated
+          logger.trace 'Issue taken', issue: updated
           updated
         end
       end

lib/linear/commands/issue/create.rb

@@ -16,18 +16,20 @@ class Create
           include SemanticLogger::Loggable
           include Rubyists::Linear::CLI::CommonOptions
           include Rubyists::Linear::CLI::Issue # for #gimme_da_issue! and other Issue methods
-          desc 'Create a  new issue'
+          desc 'Create a new issue'
           option :title, type: :string, aliases: ['-t'], desc: 'Issue Title'
           option :description, type: :string, aliases: ['-d'], desc: 'Issue Description'
           option :team, type: :string, aliases: ['-T'], desc: 'Team Identifier'
           option :labels, type: :array, aliases: ['-l'], desc: 'Labels for the issue (Comma separated list)'
+          option :develop, type: :boolean, aliases: ['-D', '--dev'], desc: 'Start development after creating the issue'
 
           def call(**options)
             logger.debug('Creating issue', options:)
             issue = make_da_issue!(**options)
             logger.debug('Issue created', issue:)
             prompt.yes?('Do you want to take this issue?') && gimme_da_issue!(issue.id, User.me)
             display issue, options
+            Rubyists::Linear::CLI::Issue::Develop.new.call(issue_id: issue.id, **options) if options[:develop]
           end
         end
       end

lib/linear/commands/issue/develop.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'semantic_logger'
+require 'git'
+require_relative '../issue'
+
+module Rubyists
+  # Namespace for Linear
+  module Linear
+    M :issue, :user, :label
+    # Namespace for CLI
+    module CLI
+      module Issue
+        Develop = Class.new Dry::CLI::Command
+        # The Develop class is a Dry::CLI::Command to start/update development status of an issue
+        class Develop
+          include SemanticLogger::Loggable
+          include Rubyists::Linear::CLI::CommonOptions
+          include Rubyists::Linear::CLI::Issue # for #gimme_da_issue! and other Issue methods
+          desc 'Start or update development status of an issue'
+          argument :issue_id, required: true, desc: 'The Issue (i.e. ISS-1)'
+
+          def call(issue_id:, **options)
+            logger.debug('Developing issue', options:)
+            issue = gimme_da_issue!(issue_id, Rubyists::Linear::User.me)
+            branch_name = issue.branchName
+            branch = branch_for(branch_name)
+            branch.checkout
+            prompt.ok "Checked out branch #{branch_name}"
+            pull_or_push_new_branch!(branch_name)
+            prompt.ok 'Ready to develop!'
+          end
+        end
+      end
+    end
+  end
+end

lib/linear/models/issue.rb

@@ -21,6 +21,7 @@ class Issue
         identifier
         title
         assignee { ___ User::Base }
+        branchName
         description
         createdAt
         updatedAt

lib/linear/models/label.rb

@@ -12,14 +12,29 @@ module Linear
     class Label
       include SemanticLogger::Loggable
 
+      PLURAL = :issueLabels
       Base = fragment('BaseLabel', 'IssueLabel') do
         id
         description
         name
+        isGroup
         createdAt
         updatedAt
       end
 
+      def self.base_fragment # rubocop:disable Metrics/AbcSize
+        define_method(:team) { updated_data[:team] }
+        define_method(:team=) { |val| updated_data[:team] = val }
+        define_method(:parent) { updated_data[:parent] }
+        define_method(:parent=) { |val| updated_data[:parent] = val }
+
+        fragment('LabelWithTeams', 'IssueLabel') do
+          ___ Base
+          parent { ___ Base }
+          team { ___ Team::Base }
+        end
+      end
+
       def self.find_all_by_name(names)
         q = query do
           issueLabels(filter: { name: { in: names } }) do
@@ -46,7 +61,7 @@ def to_s
       end
 
       def full
-        format('%<to_s>-10s %<description>s', description: , to_s:)
+        format('%<to_s>-10s %<description>s', description:, to_s:)
       end
 
       def display(_options)

lib/linear/models/team.rb

@@ -13,7 +13,13 @@ class Team
       include SemanticLogger::Loggable
 
       # TODO: Make this configurable
-      IgnoredLabels = [/-ios$/, /-android$/].freeze # rubocop:disable Naming/ConstantName
+      BaseFilter = { # rubocop:disable Naming/ConstantName
+        and: [
+          { name: { notEndsWith: ' Releases' } },
+          { name: { notEndsWith: '-ios' } },
+          { name: { notEndsWith: '-android' } }
+        ]
+      }.freeze
 
       Base = fragment('BaseTeam', 'Team') do
         description
@@ -51,26 +57,26 @@ def label_query
         team_id = id
         query do
           team(id: team_id) do
-            labels do
-              nodes { ___ Label::Base }
+            labels(first: 100, filter: BaseFilter) do
+              nodes { ___ Label.base_fragment }
             end
           end
         end
       end
 
-      def label_filter(labels = nil)
-        return [] unless labels
-
-        labels.reject { |label| IgnoredLabels.detect { |i| label.name.match? i } }
+      def label_groups
+        @label_groups ||= []
       end
 
-      def labels
-        return @labels if @labels && !@labels.empty?
+      def labels # rubocop:disable Metrics/CyclomaticComplexity
+        return @labels if @labels
+
+        @labels = Api.query(label_query).dig(:team, :labels, :nodes)&.map do |label|
+          label_groups << Label.new(label) if label[:isGroup]
+          next if label[:isGroup] || label[:parent]
 
-        all = Api.query(label_query).dig(:team, :labels, :nodes)&.map do |label|
           Label.new label
-        end
-        @labels = label_filter(all)
+        end&.compact
       end
 
       def members

linear-cli.gemspec

@@ -36,8 +36,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'base64', '~> 0.2'
   spec.add_dependency 'dry-cli', '~> 1.0'
   spec.add_dependency 'dry-cli-completion', '~> 1.0'
+  spec.add_dependency 'git', '~> 1.5'
   spec.add_dependency 'gqli', '~> 1.2'
   spec.add_dependency 'httpx', '~> 1.2'
+  spec.add_dependency 'octokit', '~> 5.0'
   spec.add_dependency 'semantic_logger', '~> 4.0'
   spec.add_dependency 'sequel', '~> 5.0'
   spec.add_dependency 'sqlite3', '~> 1.7'