redmine_cli 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f495b25e5f3bcf3c39572f4217c898c2d6d31664
-  data.tar.gz: 8677006b2a6184346b9554d0f73b1c9037824716
+  metadata.gz: 2479d08810ffc54eb4bbdfb57148a88da022f257
+  data.tar.gz: deded6244bc061858921682443d02a95ed089298
 SHA512:
-  metadata.gz: 92f258a59b5f0a66b3579b5ff299528ce06a0bd4d8cdd5e97132251e4b1660346c084f2b19b1910ef26ea314d6565c16ede635b1de75258508e444b4a2defcad
-  data.tar.gz: 7b549586215ad72aa4b06242b9fe703b3b54d4ce0c45edd1bf0a21db43c8430168a68f132a8f5a61a2424c8e5f0fe3d4cd4c5713e2a9bdd0b23c56c3d7f10ece
+  metadata.gz: 5ef74fd825bd0db651b61b17f4b949d482d4476feebaf42ec62d7c4675de5316a3882b30320896556f1601f2d333e61f763881c28fe118d7e7edb8b41e24cd9c
+  data.tar.gz: 9b83f76f4ee0f9c852bd1b98393a387d250c99fdfdded638c080e9c5abde7c8baddda0ad19ed970ffd1826f9dfc1c69a52838b8e38df330de0d9314f8feea51b

data/.rvmrc

@@ -1,9 +1,11 @@
+echo 'rvm use 2.2.1@redmine_cli --create'
 rvm use 2.2.1@redmine_cli --create
+
 if [ -z "$(gem list | grep '^bundler\s')" ]; then
     echo
     echo '--- WARNING ---'
     echo 'I cannot find "bundler" gem.'
-    echo 'Looks like you use gemset "profit-gis" at first time.'
+    echo 'Looks like you use gemset "redmine_cli" at first time.'
     echo 'Please, execute:  gem install bundler; bundle install'
     echo
 fi

data/README.md

@@ -3,7 +3,12 @@
 
 Command-Line Interface for Redmine.
 
-Why? 'cause web-browser + mouse sucks
+Why? Because web-browser + mouse sucks
+
+I hate using Redmine web-interface. All these mouse moves and clicks...
+This CLI allows me to do some tasks much faster: I read issue descriptions and last comments right in the console.
+
+It doesnt provide much functional so I need to open my browser sometimes, but for most of my tasks it fits well.
 
 ## Installation
 
@@ -29,6 +34,8 @@ Why? 'cause web-browser + mouse sucks
 Don't forget about console aliases!
 I use something like this:
 
+    # ~/.bashrc
+    #
     # alias i='redmine issue'
     # by the way, Thor can guess your commands so:
 

data/lib/assets/messages/en.yml

@@ -10,18 +10,23 @@ en:
       show: 'More info about issue'
       update: 'Change some issue params, add time entry, comment'
       create: 'Create issue'
+      complete: 'Sets readiness to 100, changes assignee, changes status'
       options:
         show:
           limit: 'Amount of comments (last journals).'
+          comments: 'Show only journals with comments'
         update:
           done: 'Readiness percentage'
-          assign: 'ID of name part of user issue will be assigned to'
+          assign: 'ID or name part of user issue will be assigned to'
           time: 'Add time entry. Formats: HH:MM; M (minutes); H.h (hours in float)'
           status: 'Change status of issue. Search by status name substring'
           comment: 'Leave comment. It will open your text editor.'
           description: 'Change description with your text editor.'
+        complete:
+          assign: 'ID or name part of user issue will be assigned to. If not defined, issue will be assigned to its author.'
     conf:
       init: 'Asks you few question to make your config file useful'
+      status_complete: 'Sets default status for completed issues'
     user:
       find: 'Finds users by id|email|name. Without arguments it will show your info'
     project:
@@ -33,6 +38,8 @@ en:
         enter_user: 'Enter your login to Redmine: '
         enter_password: 'Enter your password: '
         enter_site: 'Enter URL to your Redmine: '
+      status_complete:
+        select_status: 'Please, select status for completed issues.'
     issue:
       update:
         type_comment_here: 'Type your comment here, save file and close'
@@ -52,4 +59,5 @@ en:
   select_item_from_list: 'Select item from list: '
   trackers: 'trackers'
   projects: 'projects'
-
+  versions: 'versions'
+  without_version: '<without version>'

data/lib/assets/templates/en/issue/show.erb

@@ -1,13 +1,12 @@
-
 % ljust_value = 15
 % info =  { 'ID' => issue.id,
 %           'Subject' => issue.subject,
 %           'Status' => issue.status.name,
 %           'Priority' => issue.priority.name,
 %           'Readiness' => issue.done_ratio + '%',
-%           'Author' => "#{issue.author.name} (#{issue.author.id})" }
+%           'Author' => TemplateRenderer.render('issue/show/user', user: issue.author) }
 %
-% info['Assigned to'] = "#{issue.assigned_to.name} (#{issue.assigned_to.id})" if issue.assigned_to?
+% info['Assigned to'] = TemplateRenderer.render('issue/show/user', user: issue.assigned_to) if issue.assigned_to?
 % info['Project'] = issue.project.name if issue.project?
 % info['Version'] = issue.fixed_version.name if issue.fixed_version?
 % info['Parent'] = "#{issue.parent.id} - #{issue.parent.reload.subject.cut(80)}" if issue.parent?
@@ -34,7 +33,7 @@
 
 % end
 %
-% if issue.attachments?
+% if issue.attachments.size > 0
 <%= 'Attachments:'.yellow %>
 
 %   issue.attachments.each do |a|
@@ -53,25 +52,8 @@
 %   journals = []
 %   issue.journals.reverse.each do |j|
 %     break if journals.size > journals_limit
-%     next unless j.notes?
+%     next if comments_only && !j.notes
 %     journals.push j
 %   end
-
-%   journals.reverse.each do |j|
-
-<%= "----------\n".yellow %>
-%     journal_info = { 'From' => "#{j.user.name} (#{j.user.id})",
-%                      'Created' => j.created_on }
-%
-%     journal_info.each do |k, v|
-<%= "#{k}:".ljust(ljust_value).yellow %> <%= v %>
-
-%     end
-
-
-<%= j.notes %>
-
-
-%   end
-
+<%= TemplateRenderer.render 'issue/show/journals', journals: journals, ljust_value: ljust_value %>
 % end

data/lib/assets/templates/en/issue/show/detail.erb

@@ -0,0 +1,45 @@
+% name = detail.name
+% old_value = detail.old_value
+% new_value = detail.new_value
+%
+% if detail.attribute?
+%   case name
+%   when 'subject', 'description'
+%     attribute = name.capitalize
+%     old = old_value.nil? ? '0' : old_value.size.to_s
+%     new = new_value.nil? ? '0' : new_value.size.to_s
+%
+%     changes = "#{old_value ? old_value.size : 0} chars" + '  ->  '.white + "#{new_value ? new_value.size : 0} chars"
+%   when 'assigned_to_id'
+%     attribute = 'Assigned'
+%     changes = TemplateRenderer.render('issue/show/detail/user', new_value: new_value, old_value: old_value)
+%   when 'done_ratio'
+%     attribute = 'Readiness'
+%     changes = "#{old_value}%" + '  ->  '.white + "#{new_value}%"
+%   when 'estimated_hours'
+%     attribute = 'Estimated'
+%     changes = "#{old_value || 'nil'}" + '  ->  '.white + "#{new_value || 'nil'}"
+%   when 'fixed_version_id'
+%     attribute = 'Version'
+%     changes = TemplateRenderer.render 'issue/show/detail/some_object',
+%                                       new_value: new_value,
+%                                       old_value: old_value,
+%                                       object_class: RedmineRest::Models::Version
+%   when 'status_id'
+%     attribute = 'Status'
+%     changes = TemplateRenderer.render 'issue/show/detail/status',
+%                                       new_value: new_value,
+%                                       old_value: old_value
+%   else
+%     attribute = name.capitalize
+%     changes = "#{old_value || 'nil'}" + '  ->  '.white + "#{new_value || 'nil'}"
+%   end
+%
+%  output = "#{attribute}:".ljust(ljust_value).white + changes
+%
+% elsif detail.relation?
+%    output = new_value.nil? ? "not #{name} #{old_value}" : "#{name} #{new_value}"
+% else
+%   output = detail.inspect
+% end
+<%= output %>

data/lib/assets/templates/en/issue/show/detail/some_object.erb

@@ -0,0 +1,16 @@
+% old_obj = object_class.find_by_id(old_value)
+% old = if old_obj
+%         old_obj.name.to_s + "[#{old_obj.id}]".red
+%       else
+%         'nil'
+%       end
+%
+% new_obj = object_class.find_by_id(new_value)
+% new = if new_obj
+%         new_obj.name.to_s + "[#{new_obj.id}]".red
+%       else
+%         'nil'
+%       end
+%
+% output = old + '  ->  '.white + new
+<%= output %>

data/lib/assets/templates/en/issue/show/detail/status.erb

@@ -0,0 +1,18 @@
+% list = RedmineRest::Models::IssueStatus.all
+%
+% old_status = list.find { |i| i.id == old_value }
+% old = if old_status
+%         old_status.name.to_s + "[#{old_status.id}]".red
+%       else
+%         'nil'
+%       end
+%
+% new_status = list.find { |i| i.id == new_value }
+% new = if new_status
+%         new_status.name.to_s + "[#{new_status.id}]".red
+%       else
+%         'nil'
+%       end
+%
+% output = old + '  ->  '.white + new
+<%= output %>

data/lib/assets/templates/en/issue/show/detail/user.erb

@@ -0,0 +1,6 @@
+% old = TemplateRenderer.render 'issue/show/user', user: old_value
+% new = TemplateRenderer.render 'issue/show/user', user: new_value
+%
+% output = old + '  ->  '.white + new
+%
+<%= output %>

data/lib/assets/templates/en/issue/show/journals.erb

@@ -0,0 +1,21 @@
+% journals.reverse.each do |j|
+
+<%= "----------\n".yellow %>
+%   journal_info = { 'From' => TemplateRenderer.render('issue/show/user', user: j.user),
+%                    'Created' => j.created_on }
+%
+%   journal_info.each do |k, v|
+<%= "#{k}:".ljust(ljust_value).yellow %> <%= v %>
+
+%   end
+
+%   if j.details
+%     j.details.each do |d|
+* <%= TemplateRenderer.render 'issue/show/detail', detail: d, ljust_value: ljust_value %>
+%     end
+
+%   end
+<%= j.notes %>
+
+
+%   end

data/lib/assets/templates/en/issue/show/user.erb

@@ -0,0 +1,13 @@
+% record = case user
+%          when String, Fixnum then RedmineRest::Models::User.find_by_id(user)
+%          when RedmineRest::Models::User then user
+%          else nil
+%          end
+%
+% output = if record
+%            (record.name? ? record.name : "#{record.firstname} #{record.lastname}") + "[#{record.id}]".red
+%          else
+%            'nil'
+%          end
+%
+<%= output %>

data/lib/redmine_cli/helpers/issue/create.rb

@@ -14,6 +14,7 @@ module RedmineCLI
 
         def set_attributes
           set_project
+          set_version
           set_tracker
           set_subject
           set_description
@@ -26,10 +27,18 @@ module RedmineCLI
           @issue.project_id = @project.id
         end
 
+        def set_version
+          list = [dummy_object_with_name(m(:without_version))] + @project.versions.to_a
+          return if list.size == 1
+
+          puts Unicode.upcase(m(:versions)) + ':'
+          @version = ask_for_object(list)
+          @issue.fixed_version_id = @version.is_a?(Models::Version) ? @version.id : nil
+        end
+
         def set_tracker
           puts Unicode.upcase(m(:trackers)) + ':'
-          # @issue.tracker_id = ask_for_object(@project.trackers).id
-          @issue.tracker_id = ask_for_object(Models::Tracker.all)
+          @issue.tracker_id = ask_for_object(Models::Tracker.all).id
         end
 
         def set_subject
@@ -48,6 +57,13 @@ module RedmineCLI
           @assignee = ask_for_object(@project.members)
           @issue.assigned_to_id = @assignee.id
         end
+
+        def dummy_object_with_name(name)
+          dummy = Object.new
+          dummy.define_singleton_method(:name) { name }
+
+          dummy
+        end
       end
     end
   end

data/lib/redmine_cli/helpers/issue/update.rb

@@ -39,9 +39,16 @@ module RedmineCLI
         end
 
         def update_status(issue)
-          return unless options[:status]
+          opt = options[:status]
+          return unless opt
 
-          found_statuses = Models::IssueStatus.all.filter_by_name_substring(options[:status])
+          list = Models::IssueStatus.all
+          if opt.numeric?
+            status = list.find { |s| s.id == opt }
+            return issue.status_id = status.id if status
+          end
+
+          found_statuses = list.filter_by_name_substring(opt)
           case found_statuses.size
           when 0 then @errors.push "Status: #{m(:not_found)}"
           when 1 then issue.status_id = found_statuses.first.id

data/lib/redmine_cli/subcommands/conf.rb

@@ -22,6 +22,15 @@ module RedmineCLI
 
         puts m(:thank_you)
       end
+
+      desc 'status-complete', m('desc.conf.status_complete')
+      def status_complete
+        puts m('commands.conf.status_complete.select_status')
+        Config['statuses'] ||= {}
+        Config['statuses']['complete'] = ask_for_object(RedmineRest::Models::IssueStatus.all).id
+        Config.save
+        puts m(:thank_you)
+      end
     end
   end
 end

data/lib/redmine_cli/subcommands/issue.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'redmine_rest'
+require_relative 'conf'
 
 module RedmineCLI
   module Subcommands
@@ -24,13 +25,33 @@ module RedmineCLI
 
       desc 'show <id>', m('desc.issue.show')
       option :limit, aliases: ['-l'], type: :numeric, default: 5, desc: m('desc.issue.options.show.limit')
+      option :comments_only, aliases: ['-c'], type: :boolean, desc: m('desc.issue.options.show.comments')
       def show(id)
-        puts erb('issue/show', issue: Models::Issue.find(id), journals_limit: options[:limit])
+        puts erb 'issue/show',
+                 issue: Models::Issue.find(id),
+                 journals_limit: options[:limit],
+                 comments_only: options[:comments_only]
 
       rescue ActiveResource::ResourceNotFound # WARNING: it can be raised by associations in template
         puts m(:not_found)
       end
 
+      desc 'complete <id>', m('desc.issue.complete')
+      option :assign, aliases: ['-a'], type: :string, desc: m('desc.issue.options.complete.assign')
+      def complete(id)
+        issue = Models::Issue.find(id)
+        invoke(Conf, 'status_complete', []) unless Config['statuses'] && Config['statuses']['complete']
+        assign_to = if options[:assign]
+                      InputParser.parse_user(options[:assign], project: issue.project).id
+                    else
+                      issue.author.id
+                    end
+
+        invoke(:update, [id], ['-d', '100', '-s', Config['statuses']['complete'], '-c', '-a', assign_to])
+      rescue ActiveResource::ResourceNotFound
+        puts m(:not_found)
+      end
+
       #
       # TODO:
       # * estimated time
@@ -69,7 +90,6 @@ module RedmineCLI
 
         @issue = Models::Issue.new
         set_attributes
-
         @issue.save
         puts 'Done.'
       end

data/lib/redmine_cli/template_renderer.rb

@@ -34,7 +34,7 @@ module RedmineCLI
       end
 
       def method_missing(m, *args)
-        return @vars[m] if args.empty? && @vars[m]
+        return @vars[m] if args.empty? && @vars.key?(m)
 
         super
       end

data/lib/redmine_cli/version.rb

@@ -1,3 +1,3 @@
 module RedmineCLI
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/redmine_cli.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'i18n', '~> 0.7'
-  spec.add_dependency 'redmine_rest', '0.7.0'
+  spec.add_dependency 'redmine_rest', '0.8.0'
   spec.add_dependency 'non_config', '0.1.2'
   spec.add_dependency 'colorize', '~> 0.7'
   spec.add_dependency 'unicode', '~> 0.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_cli
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Dmitriy Non
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: non_config
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,12 @@ files:
 - lib/assets/templates/en/id_and_name_list.erb
 - lib/assets/templates/en/issue/list.erb
 - lib/assets/templates/en/issue/show.erb
+- lib/assets/templates/en/issue/show/detail.erb
+- lib/assets/templates/en/issue/show/detail/some_object.erb
+- lib/assets/templates/en/issue/show/detail/status.erb
+- lib/assets/templates/en/issue/show/detail/user.erb
+- lib/assets/templates/en/issue/show/journals.erb
+- lib/assets/templates/en/issue/show/user.erb
 - lib/assets/templates/en/user/find.erb
 - lib/redmine_cli.rb
 - lib/redmine_cli/config.rb
@@ -211,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CLI for Redmine