jirify 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07d9648da98d02b0aea77481668a386b9182bdf777ca242ad61c6e5c7e793602
-  data.tar.gz: 494f816f3e49f388343949ea025fd615065e895f0f8036801b85f120206197d0
+  metadata.gz: 0620a5caff8ce1ff95efd9542e4e16e9d8a44e934292cb46bfc8cea1aeb2b1c1
+  data.tar.gz: db06a83b292bd626f059265e8ae24a070a3ef12da70f6a296950c97a946e562c
 SHA512:
-  metadata.gz: 6bff2d97e9fe24848423aa4b3f4108e53bba6953603a04b3fe703c9aeba4ccec242a0f3d5308d3889b7efae71cecc2a119ba3003c186d78b663ec55a6ec4738a
-  data.tar.gz: 71c8810f34cd135794a64a492b0510d8a220e7ef9868e3abde4c1a601129c43e66182fbb17a0ad899baabae186a450d3cc11fdb2c43e69fbe91c35de5c2933c9
+  metadata.gz: 16578ee5a6a2594cd1ad04bb4ff5fa70197324dd0e30db842705913ba74385188d59e5b5a902769387943648acbe5930028e2894144216575c8c510dea9d47f1
+  data.tar.gz: d7c03119e00de00ac4899b11249dadc2dce0662babba1d5de7f053a965f3b4beec222fd3c31fad26eb668281ee49ad9caef0e50270e7a97259db3917690d162c

data/README.md

@@ -27,7 +27,8 @@ options:
   username: <atlassian username (email)>
   token: <token generated from https://id.atlassian.com>
   site: <JIRA url>
-  project: <JIRA project key>
+  projects:
+    - <JIRA project key>
   filter_by_labels:
     - <label to filter by when displaying sprint>
   verbose: <force jirify to always be verbose>

data/jirify.bash_completion.sh

@@ -28,7 +28,8 @@ _jirify_completions() {
 
   top_level_commands="help issues projects setup sprint version"
   projects_commands="help list"
-  setup_commands="help init bash_completion verbose"
+  setup_commands="help init bash_completion projects verbose"
+  sprint_commands="help show"
   issues_commands="help assignee block close describe mine open review start status take todo transition transitions unassign unblock"
 
   _compgen_issue_keys() {
@@ -49,6 +50,10 @@ _jirify_completions() {
     COMPREPLY=($(compgen -W "${setup_commands}" -- ${current}))
   }
 
+  _compgen_sprint() {
+    COMPREPLY=($(compgen -W "${sprint_commands}" -- ${current}))
+  }
+
   _compgen_issues() {
     COMPREPLY=($(compgen -W "${issues_commands}" -- ${current}))
   }
@@ -74,6 +79,10 @@ _jirify_completions() {
         _compgen_setup
         return 0
         ;;
+      s|sprint)
+        _compgen_sprint
+        return 0
+        ;;
       i|issues)
         _compgen_issues
         return 0
@@ -95,6 +104,10 @@ _jirify_completions() {
           _compgen_setup
           return 0
           ;;
+        s|sprint)
+          _compgen_sprint
+          return 0
+          ;;
         i|issues)
           _compgen_issues
           return 0

data/lib/jirify.rb

@@ -38,6 +38,12 @@ module Jirify
     desc 'setup [SUBCOMMAND]', 'Jirify setup tools'
     subcommand 'setup', Subcommands::Setup
 
+    desc 's [SUBCOMMAND]', 'Alias for <jira sprint>'
+    subcommand 's', Subcommands::Sprint
+
+    desc 'sprint [SUBCOMMAND]', 'Work with JIRA Sprints'
+    subcommand 'sprint', Subcommands::Sprint
+
     desc 'i [SUBCOMMAND]', 'Alias for <jira issues>'
     subcommand 'i', Subcommands::Issues
 

data/lib/jirify/cli/setup.rb

@@ -15,17 +15,23 @@ module Jirify
         username      = ask 'Enter username:'
         token         = ask 'Enter token (generate from https://id.atlassian.com):'
         site          = ask 'Enter JIRA url:'
-        project       = ask 'Enter JIRA Project key:'
+        project       = ask 'Enter a comma-separated list of JIRA Project keys to filter by every time (1 required):'
         filter_labels = ask 'Enter a comma-separated list of labels to filter by every time (optional):'
 
         labels = filter_labels.split ', ' if filter_labels
+        projects = project.split ', ' if project
+
+        if projects.nil? or projects.empty?
+          say "You must enter at least one project key!".red
+          exit(0)
+        end
 
         options = {
           'options' => {
             'username' => username,
             'token'    => token,
             'site'     => site,
-            'project'  => project
+            'projects'  => projects
           }
         }
 
@@ -50,6 +56,25 @@ module Jirify
 
         say 'Done! You have to source the file again or open a new shell! :)'.green
       end
+
+      desc 'projects', 'Set projects to query'
+      method_option :set, type: :array, aliases: '-s', desc: 'List of projects'
+      def projects
+        if options[:set].nil? || options[:set].empty?
+          say 'Pass a list of projects to set with -s. Run "jira setup help projects" for more information.'.red
+          exit(0)
+        end
+
+        Config.projects = options[:set]
+      end
+
+      desc 'bash_completion', 'Update your bash_completion file when a new version comes out'
+      def bash_completion
+        say "Updating #{Config.config_folder}/jirify.bash_completion.sh ...".blue
+        Config.copy_bash_completion!
+
+        say 'Done! You have to source the file again or open a new shell! :)'.green
+      end
     end
   end
 end

data/lib/jirify/cli/sprint.rb

@@ -1,26 +1,30 @@
 module Jirify
-  class CLI < Thor
-    desc 'sprint', 'Show the current sprint table'
-    method_option :mine, type: :boolean, aliases: '-m', desc: 'Show only issues assigned to me'
-    method_option :all_columns, type: :boolean, aliases: '-c', default: true, desc: 'Show all columns'
-    method_option :assignee, type: :boolean, aliases: '-a', desc: 'Show issue assignee'
-    method_option :summary, type: :boolean, aliases: '-s', desc: 'Show issue summary'
-    method_option :url, type: :boolean, aliases: '-u', desc: 'Show issue url'
-    def sprint
-      verbose = Config.always_verbose || options[:verbose]
-      issues  = Models::Sprint.issues_in_current_sprint(options[:mine])
+  module Subcommands
+    class Sprint < Thor
+      default_task :show
 
-      modified_options = options.dup
-      if verbose
-        modified_options[:assignee] = true
-        modified_options[:url]      = true
-        modified_options[:summary]  = true
-      end
+      desc 'show', 'Show the current sprint table'
+      method_option :mine, type: :boolean, aliases: '-m', desc: 'Show only issues assigned to me'
+      method_option :all_columns, type: :boolean, aliases: '-c', default: true, desc: 'Show all columns'
+      method_option :assignee, type: :boolean, aliases: '-a', desc: 'Show issue assignee'
+      method_option :summary, type: :boolean, aliases: '-s', desc: 'Show issue summary'
+      method_option :url, type: :boolean, aliases: '-u', desc: 'Show issue url'
+      def show
+        verbose = Config.always_verbose || options[:verbose]
+        issues  = Models::Sprint.issues_in_current_sprint(options[:mine])
+
+        modified_options = options.dup
+        if verbose
+          modified_options[:assignee] = true
+          modified_options[:url]      = true
+          modified_options[:summary]  = true
+        end
 
-      say UI::SprintTable.new(issues).to_table(modified_options)
-    rescue UI::WindowTooNarrow
-      say ColorizedString['ERROR: Your terminal window is too narrow to print the sprint table!']
-        .white.on_red.bold
+        say UI::SprintTable.new(issues).to_table(modified_options)
+      rescue UI::WindowTooNarrow
+        say ColorizedString['ERROR: Your terminal window is too narrow to print the sprint table!']
+          .white.on_red.bold
+      end
     end
   end
 end

data/lib/jirify/config.rb

@@ -38,6 +38,17 @@ module Jirify
         File.write(config_file, config.to_yaml)
       end
 
+      def projects=(value)
+        unless initialized?
+          puts ColorizedString['ERROR: You must initialize Jirify first!'].white.on_red.bold
+          exit(0)
+        end
+
+        config = YAML.load_file(config_file)
+        config['options']['projects'] = value
+        write(config)
+      end
+
       def verbose=(value)
         unless initialized?
           puts ColorizedString['ERROR: You must initialize Jirify first!'].white.on_red.bold
@@ -70,6 +81,10 @@ module Jirify
         options['username']
       end
 
+      def projects
+        options['projects']
+      end
+
       def issue_browse_url
         "#{atlassian_url}/browse/"
       end

data/lib/jirify/models/base.rb

@@ -21,10 +21,6 @@ module Jirify
         def client
           @client ||= JIRA::Client.new(Config.client_options)
         end
-
-        def project
-          @project ||= Config.options['project']
-        end
       end
     end
   end

data/lib/jirify/models/issue.rb

@@ -86,8 +86,9 @@ module Jirify
         protected
 
         def my_issues_jql(all_issues)
+          project_clause = "project in (#{Config.projects.join(', ')})"
           all_clause = 'AND sprint in openSprints()' unless all_issues
-          "project='#{project}' #{all_clause} AND assignee='#{Config.username}'"
+          "#{project_clause} #{all_clause} AND assignee='#{Config.username}'"
         end
       end
     end

data/lib/jirify/models/sprint.rb

@@ -12,12 +12,14 @@ module Jirify
         def current_sprint_jql(only_mine)
           labels = Config.options['filter_by_labels']
           labels = labels.join(', ') if labels
+          projects = Config.projects.join(', ')
 
+          projects_clause = "project in (#{projects})"
           labels_clause = "AND labels in (#{labels})" if labels
           mine_clause   = "AND assignee='#{Config.username}'" if only_mine
           sprint_clause = 'AND sprint in openSprints()'
 
-          "project='#{project}' #{sprint_clause} #{labels_clause} #{mine_clause}"
+          "#{projects_clause} #{sprint_clause} #{labels_clause} #{mine_clause}"
         end
       end
     end

data/lib/jirify/version.rb

@@ -1,3 +1,3 @@
 module Jirify
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jirify
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Georgi Gardev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.0.beta1
 signing_key: 
 specification_version: 4
 summary: JIRA CLI