redmine_cli 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc624f0adc7b3abfb235b72185d411a86b58185b
-  data.tar.gz: 00c6f9dbd1619f0ec3b02737e4572a2b4e872121
+  metadata.gz: 32498eec5c1276546c816822dde138b72a826d22
+  data.tar.gz: 50336d81f2a26124ea63d2b2ed48d7fcdd0bb38d
 SHA512:
-  metadata.gz: 365203c3d24ef79f74b270c55e4c2a8be5dd5f66b1f82266de543ed6f2c01d5242331881b19572043b5e1816ed98e7f99bbb7bd0267b084c654f31ba3b76f0e7
-  data.tar.gz: e496799303f3561a3f90152613b113641eb5ded66cea3ea0a95924ef152d624d59c1dfabc15bbfbfb03c3b33cedd9c47e4b0f20b0cd4b752b2dbb8e667039632
+  metadata.gz: 248f44ffd06f6d859a850d2026c94ab4f9bb2b431679e3dbc3c6452f9b7de2a9c08946d33d0bf8cde8e1802c6618840e63d27fe9e009061db94d8b5c3e3f3079
+  data.tar.gz: ae9920568649936d6eeaa43cc448cd61b23f7d1c05064a7867191b60cf124001a4e1c8d1f290c9a345bc84c80c2f9c9b362cb4cffa89871287c205b58520cae2

data/README.md

@@ -22,6 +22,19 @@ Why? 'cause web-browser + mouse sucks
     redmine user find 123
     redmine user find pupkin@yet.another.mail.com
 
+    redmine project list
+    redmine project members 1
+    redmine project members trololo
+
+Don't forget about console aliases!
+I use something like this:
+
+    # alias i='redmine issue'
+    # by the way, Thor can guess your commands so:
+
+    $ i s 123
+    $ i u --assign 'vasya pupkin'
+
 
 ## Contributing
 

data/lib/assets/messages/en.yml

@@ -4,6 +4,7 @@ en:
       issue: 'Works with issues. See "redmine issue help"'
       conf: 'Works with config file. See "redmine conf help"'
       user: 'Works with users. See "redmine user help"'
+      project: 'Works with projects. See "redmine project help"'
     issue:
       list: 'Lists issues of user. By default it is you'
       show: 'More info about issue'
@@ -14,7 +15,7 @@ en:
           limit: 'Amount of comments (last journals).'
         update:
           done: 'Readiness percentage'
-          assign: 'ID of user issue will be assigned to'
+          assign: 'ID of 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.'
@@ -23,7 +24,9 @@ en:
       init: 'Asks you few question to make your config file useful'
     user:
       find: 'Finds users by id|email|name. Without arguments it will show your info'
-
+    project:
+      list: 'Just lists project name with IDs'
+      members: 'Lists members of given project'
   commands:
     conf:
       init:

data/lib/assets/templates/en/id_and_name_list.erb

@@ -0,0 +1,16 @@
+% if list.size.zero?
+Empty list
+% end
+%
+%
+% head_id = '(id)'
+% max_id_len = list.map(&:id).map(&:size).max || 0
+% max_id_len = [max_id_len, head_id.size].max
+%
+% head_name = '(name)'
+%
+<%= head_id.yellow %>  |  <%= head_name.yellow %>
+
+% list.each do |object|
+<%= object.id.rjust(max_id_len) %>  -  <%= object.name %><%= "\n" %>
+% end

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

@@ -32,6 +32,14 @@
   * <%= issue_id == issue.id ? 'this' : issue_id %> <%= relation_type %> <%= issue_to_id == issue.id ? 'this' : issue_to_id %>
 %   end
 
+% end
+%
+% if issue.attachments?
+<%= 'Attachments:'.yellow %>
+
+%   issue.attachments.each do |a|
+  <%= '*'.yellow %> <%= a.filename %>  -  <%= a.content_url %>
+%   end
 % end
 %
 % if issue.description? && !issue.description.empty?

data/lib/redmine_cli/exceptions.rb

@@ -1,4 +1,5 @@
 module RedmineCLI
+  class ProjectNotFound < StandardError; end
   class UserNotFound < StandardError; end
   class BadInputTime < StandardError; end
   class EmptyList < StandardError; end

data/lib/redmine_cli/helpers/input.rb

@@ -12,16 +12,10 @@ module RedmineCLI
       include Helpers::Output
 
       def ask_for_user(message, params = {})
-        params[:limited_to] = proc do |input|
-          begin
-            @ask_for_user_cache = RedmineRest::Models::User.find(input) # save record
-          rescue
-            nil
-          end
-        end
+        params[:limited_to] = ->(input) { @cached_user = RedmineRest::Models::User.find_by_id(input) }
 
         ask(message, params)
-        @ask_for_user_cache
+        @cached_user
       end
 
       def ask_from_text_editor(welcome_message = '')
@@ -58,25 +52,6 @@ module RedmineCLI
         object_list[input.to_i]
       end
 
-      #
-      # Parses time from user's input.
-      # Formats: HH:MM; M; H.h
-      #
-      # @param input [String]
-      #
-      def parse_time(input)
-        fail(BadInputTime) unless input =~ /^\d+[\:\.]?\d*/
-
-        if input.include?(':')
-          h, m = input.split(':').map(&:to_i)
-          (60 * h + m) / 60.0
-        elsif input.include?('.')
-          input.to_f
-        else
-          input.to_i
-        end
-      end
-
       #
       # #ask with :limited_to set to url regexp.
       # TODO: make good regexp

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

@@ -32,12 +32,9 @@ module RedmineCLI
 
         def update_assigned_to(issue)
           return unless options[:assign]
+          issue.assigned_to_id = InputParser.parse_user(options[:assign], project: issue.project).id
 
-          # it can raise exception if there's no such user
-          Models::User.find(options[:assign])
-          issue.assigned_to_id = options[:assign]
-
-        rescue ActiveResource::ResourceNotFound
+        rescue UserNotFound
           @errors.push "Assigned: #{m(:not_found)}"
         end
 
@@ -70,7 +67,7 @@ module RedmineCLI
         def add_time_entry_to_issue(issue)
           return unless options[:time]
 
-          hours = parse_time(options[:time])
+          hours = InputParser.parse_time(options[:time])
           entry = Models::TimeEntry.create issue_id: issue.id,
                                            hours: hours
 

data/lib/redmine_cli/helpers/monkey_patching.rb

@@ -7,4 +7,10 @@ class String
 
     self[0...max_chars - 3] + '...'
   end
+
+  def numeric?
+    Integer(self)
+  rescue
+    false
+  end
 end

data/lib/redmine_cli/input_parser.rb

@@ -0,0 +1,71 @@
+module RedmineCLI
+  #
+  # class with some methods for user input processing
+  #
+  class InputParser
+    extend Helpers::Input
+
+    #
+    # Processes string and tries to find project
+    #
+    def self.parse_project(value)
+      by_id = RedmineRest::Models::Project.find_by_id(value) if value.numeric?
+      return by_id if by_id
+
+      found_projects = RedmineRest::Models::Project.all.filter_by_name_substring(value)
+      case found_projects.size
+      when 0 then fail(ProjectNotFound)
+      when 1 then found_projects.first
+      else ask_for_object(found_projects)
+      end
+
+    rescue ActiveResource::ResourceNotFound, ActiveResource::ForbiddenAccess
+      raise ProjectNotFound
+    end
+
+    #
+    # Processes string and tries to find user
+    #
+    # @return [RedmineRest::Models::User]
+    # @raise [UserNotFound]
+    #
+    def self.parse_user(value, project: nil)
+      return RedmineRest::Models::User.find(value) if value.numeric? || value == 'current'
+      fail UserNotFound unless project
+
+      user_from_project(project, value)
+
+    rescue ActiveResource::ResourceNotFound
+      raise UserNotFound
+    end
+
+    def self.user_from_project(project, name_substring = '')
+      found_members = project.members.filter_by_name_substring(name_substring)
+
+      case found_members.size
+      when 0 then fail(UserNotFound)
+      when 1 then found_members.first
+      else ask_for_object(found_members)
+      end
+    end
+
+    #
+    # Parses time from user's input.
+    # Formats: HH:MM; M; H.h
+    #
+    # @param input [String]
+    #
+    def self.parse_time(input)
+      fail(BadInputTime) unless input =~ /^\d+[\:\.]?\d*/
+
+      if input.include?(':')
+        h, m = input.split(':').map(&:to_i)
+        (60 * h + m) / 60.0
+      elsif input.include?('.')
+        input.to_f
+      else
+        input.to_i
+      end
+    end
+  end
+end

data/lib/redmine_cli/subcommands/issue.rb

@@ -16,7 +16,10 @@ module RedmineCLI
       def list(id = 'current')
         fail('new config') if Config.new?
 
-        puts erb('issue/list', issues: Models::User.find(id).issues)
+        user = InputParser.parse_user(id)
+        puts erb('issue/list', issues: user.issues)
+      rescue UserNotFound
+        puts "User #{m(:not_found)}"
       end
 
       desc 'show <id>', m('desc.issue.show')
@@ -40,7 +43,7 @@ module RedmineCLI
       #
       desc 'update <id>', m('desc.issue.update')
       option :done,          type: :numeric, aliases: '-d', desc: m('desc.issue.options.update.done')
-      option :assign,        type: :numeric, aliases: '-a', desc: m('desc.issue.options.update.assign')
+      option :assign,        type: :string, aliases: '-a', desc: m('desc.issue.options.update.assign')
       option :time,          type: :string, aliases: '-t', desc: m('desc.issue.options.update.time')
       option :status,        type: :string, aliases: '-s', desc: m('desc.issue.options.update.status')
       option :comment,       type: :boolean, aliases: '-c', desc: m('desc.issue.options.update.comment')

data/lib/redmine_cli/subcommands/project.rb

@@ -0,0 +1,36 @@
+require 'thor'
+require 'redmine_rest'
+module RedmineCLI
+  module Subcommands
+    #
+    # Methods for working with projects
+    #
+    class Project < Thor
+      extend Helpers::Output
+
+      include RedmineRest
+      include Helpers::Output
+      include Helpers::Input
+
+      map 'users' => 'members'
+
+      desc 'list', m('desc.project.list')
+      def list
+        puts erb('id_and_name_list', list: Models::Project.all)
+      end
+
+      desc 'members <id | name part>', m('desc.project.members')
+      def members(project)
+        project = InputParser.parse_project(project)
+
+        users = project.members
+                       .map(&:reload)
+                       .sort { |a, b| a.id.to_i <=> b.id.to_i }
+
+        puts erb('user/find', users: users)
+      rescue ProjectNotFound
+        puts "Project #{m(:not_found)}"
+      end
+    end
+  end
+end

data/lib/redmine_cli/version.rb

@@ -1,3 +1,3 @@
 module RedmineCLI
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/redmine_cli.rb

@@ -10,6 +10,7 @@ Dir[File.expand_path('../redmine_cli/helpers/**/*.rb', __FILE__)].each { |f| req
 require 'redmine_cli/version'
 require 'redmine_cli/exceptions'
 require 'redmine_cli/config'
+require 'redmine_cli/input_parser'
 I18n.locale = RedmineCLI::Config['locale']
 
 require 'redmine_cli/template_renderer'
@@ -43,5 +44,8 @@ module RedmineCLI
 
     desc 'user ...', m('desc.client.user')
     subcommand 'user', Subcommands::User
+
+    desc 'project ...', m('desc.client.project')
+    subcommand 'project', Subcommands::Project
   end
 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.6.1'
+  spec.add_dependency 'redmine_rest', '0.7.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.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Dmitriy Non
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-03-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.6.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: non_config
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,7 @@ files:
 - exe/redmine
 - lib/assets/default_config.yml
 - lib/assets/messages/en.yml
+- 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/user/find.erb
@@ -182,8 +183,10 @@ files:
 - lib/redmine_cli/helpers/issue/update.rb
 - lib/redmine_cli/helpers/monkey_patching.rb
 - lib/redmine_cli/helpers/output.rb
+- lib/redmine_cli/input_parser.rb
 - lib/redmine_cli/subcommands/conf.rb
 - lib/redmine_cli/subcommands/issue.rb
+- lib/redmine_cli/subcommands/project.rb
 - lib/redmine_cli/subcommands/user.rb
 - lib/redmine_cli/template_renderer.rb
 - lib/redmine_cli/version.rb