linear-cli 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb92c9146c83ed3475e22b56f91f6a9c99fe3728a1c93578e63cccaa901b874d
-  data.tar.gz: 6fb9075b1306defe1282f011a788ae88542b3684c466afb40367bc2a25eb3a61
+  metadata.gz: 4d1133e666c4896922694d8dd9a8f3c9eeb99de63da400ae14ba6c06eaea6df1
+  data.tar.gz: a73559f2a87113d05cc089cac0b8ddb48b124da991b9e2fac8bed68d11537501
 SHA512:
-  metadata.gz: 7f3c6a39b2e046aa35a16790715ab34dfd79ac08c7696b25b634d9a2a8e6068b477d50baabd91000f51c713eda3eb8b36311d55a649e9e15d76448bcc1128e7d
-  data.tar.gz: 22ac8fa5fa283eaa2f22a7f8c22a3e7dcad62031a3421062511afef00148e8c7307d7a249700e14d966ec2964f279de97475ea1afdad98ce996da1a49b48cff8
+  metadata.gz: 3df7cfa7fccf9cefc7a2a9bf3204f22c55265612380baadf01df2115305bf5737c5a777259a2ad154cb60890f4078ab67a85aac84f9e2dcf185f2d0d2cf6d529
+  data.tar.gz: 41ddafcb546b3760a93b7880ebc877d4d6813d9f93545e1052063f97042df62d5d5427f96151d2e374f934ec266c283b862072181486a51b6112d751ad61a72b

data/Readme.adoc

@@ -1,6 +1,6 @@
 = Linear Command line interface
 :toc: right
-:toclevels: 2
+:toclevels: 3
 :sectanchors:
 :icons: font
 :experimental:

data/lib/linear/cli/sub_commands.rb

@@ -15,21 +15,25 @@ module Rubyists
           end
         end
 
-        def ask_for_team # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        def choose_a_team!(teams)
+          prompt.on(:keypress) do |event|
+            prompt.trigger(:keydown) if event.value == 'j'
+            prompt.trigger(:keyup) if event.value == 'k'
+          end
+          key = prompt.select('Choose a team', teams.to_h { |t| [t.name, t.key] })
+          Rubyists::Linear::Team.find key
+        end
+
+        def ask_for_team
           teams = Rubyists::Linear::Team.mine
           if teams.size == 1
             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
-            prompt.on(:keypress) do |event|
-              prompt.trigger(:keydown) if event.value == 'j'
-              prompt.trigger(:keyup) if event.value == 'k'
-            end
-            key = prompt.select('Choose a team', teams.to_h { |t| [t.name, t.key] })
-            Rubyists::Linear::Team.find key
+            choose_a_team! teams
           end
         end
 
@@ -58,8 +62,53 @@ module Rubyists
         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

data/lib/linear/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Rubyists
   module Linear
-    VERSION = '0.4.5'
+    VERSION = '0.5.0'
   end
 end

data/lib/linear/commands/issue/create.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'semantic_logger'
+require_relative '../issue'
 
 module Rubyists
   # Namespace for Linear
@@ -14,12 +15,13 @@ module Rubyists
         class Create
           include SemanticLogger::Loggable
           include Rubyists::Linear::CLI::CommonOptions
-          include Rubyists::Linear::CLI::Issue # for #gimme_da_issue and other methods
-          desc 'Create a  new issue'
+          include Rubyists::Linear::CLI::Issue # for #gimme_da_issue! and other Issue methods
+          desc 'Create a new issue'
           option :title, type: :string, aliases: ['-t'], desc: 'Issue Title'
-          option :team, type: :string, aliases: ['-T'], desc: 'Team Identifier'
           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:)
@@ -27,6 +29,7 @@ module Rubyists
             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

data/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

data/lib/linear/commands/issue.rb

@@ -13,8 +13,9 @@ module Rubyists
         # 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 @@ module Rubyists
         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

data/lib/linear/models/issue.rb

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

data/lib/linear/models/label.rb

@@ -12,14 +12,29 @@ module Rubyists
     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 @@ module Rubyists
       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)

data/lib/linear/models/team.rb

@@ -13,7 +13,13 @@ module Rubyists
       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 @@ module Rubyists
         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

data/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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linear-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Tj (bougyman) Vanderpoel
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-02 00:00:00.000000000 Z
+date: 2024-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: gqli
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: semantic_logger
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +205,7 @@ files:
 - lib/linear/cli/watcher.rb
 - lib/linear/commands/issue.rb
 - lib/linear/commands/issue/create.rb
+- lib/linear/commands/issue/develop.rb
 - lib/linear/commands/issue/list.rb
 - lib/linear/commands/issue/take.rb
 - lib/linear/commands/team.rb