jro_apps/redmine Commit - r810:5f10cc867327

Added the ability to set the "done ratio" of issues fixed by commit (original path by Nikolay Solakov, slightly edited)....

Jean-Philippe Lang -

r810:5f10cc867327

parent child

Context file:

r810:5f10cc867327

Collapse all files

app/models/changeset.rb +3 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Changeset < ActiveRecord::Base
               belongs_to :repository
               has_many :changes, :dependent => :delete_all
               has_and_belongs_to_many :issues
               acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.comments.blank? ? '' : (': ' + o.comments))},
                             :description => :comments,
                             :datetime => :committed_on,
                             :author => :committer,
                             :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project_id, :rev => o.revision}}
               acts_as_searchable :columns => 'comments',
                                  :include => :repository,
                                  :project_key => "#{Repository.table_name}.project_id",
                                  :date_column => 'committed_on'
               validates_presence_of :repository_id, :revision, :committed_on, :commit_date
               validates_numericality_of :revision, :only_integer => true
               validates_uniqueness_of :revision, :scope => :repository_id
               validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
               def comments=(comment)
                 write_attribute(:comments, comment.strip)
               end
               def committed_on=(date)
                 self.commit_date = date
                 super
               end
               def after_create
                 scan_comment_for_issue_ids
               end
               def scan_comment_for_issue_ids
                 return if comments.blank?
                 # keywords used to reference issues
                 ref_keywords = Setting.commit_ref_keywords.downcase.split(",")
                 # keywords used to fix issues
                 fix_keywords = Setting.commit_fix_keywords.downcase.split(",")
-                # status applied
+                # status and optional done ratio applied
                 fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
+                done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i
                 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw.strip)}.join("|")
                 return if kw_regexp.blank?
                 # remove any associated issues
                 self.issues.clear
                 comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
                   action = match[0]
                   target_issue_ids = match[1].scan(/\d+/)
                   target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
                   if fix_status && fix_keywords.include?(action.downcase)
                     # update status of issues
                     logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
                     target_issues.each do |issue|
                       # don't change the status is the issue is already closed
                       next if issue.status.is_closed?
                       issue.status = fix_status
+                      issue.done_ratio = done_ratio if done_ratio
                       issue.save
                     end
                   end
                   self.issues << target_issues
                 end
               end
             end

app/views/settings/edit.rhtml +1 0

             <h2><%= l(:label_settings) %></h2>
             <div id="settings">
             <% form_tag({:action => 'edit'}) do %>
             <div class="box tabular">
             <p><label><%= l(:setting_app_title) %></label>
             <%= text_field_tag 'settings[app_title]', Setting.app_title, :size => 30 %></p>
             <p><label><%= l(:setting_app_subtitle) %></label>
             <%= text_field_tag 'settings[app_subtitle]', Setting.app_subtitle, :size => 60 %></p>
             <p><label><%= l(:setting_welcome_text) %></label>
             <%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
             <%= wikitoolbar_for 'settings[welcome_text]' %>
             <p><label><%= l(:label_theme) %></label>
             <%= select_tag 'settings[ui_theme]', options_for_select( ([[l(:label_default), '']] + Redmine::Themes.themes.collect {|t| [t.name, t.id]}), Setting.ui_theme) %></p>
             <p><label><%= l(:setting_default_language) %></label>
             <%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
             <p><label><%= l(:setting_date_format) %></label>
             <%= select_tag 'settings[date_format]', options_for_select( [[l(:label_language_based), '0'], ['ISO 8601 (YYYY-MM-DD)', '1']], Setting.date_format) %></p>
             <p><label><%= l(:setting_attachment_max_size) %></label>
             <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
             <p><label><%= l(:setting_issues_export_limit) %></label>
             <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>
             <p><label><%= l(:setting_cross_project_issue_relations) %></label>
             <%= check_box_tag 'settings[cross_project_issue_relations]', 1, Setting.cross_project_issue_relations? %><%= hidden_field_tag 'settings[cross_project_issue_relations]', 0 %></p>
             <p><label><%= l(:setting_mail_from) %></label>
             <%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p>
             <p><label><%= l(:setting_host_name) %></label>
             <%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %></p>
             <p><label><%= l(:setting_text_formatting) %></label>
             <%= select_tag 'settings[text_formatting]', options_for_select([[l(:label_none), "0"], ["textile", "textile"]], Setting.text_formatting) %></p>
             <p><label><%= l(:setting_wiki_compression) %></label>
             <%= select_tag 'settings[wiki_compression]', options_for_select( [[l(:label_none), 0], ["gzip", "gzip"]], Setting.wiki_compression) %></p>
             <p><label><%= l(:setting_feeds_limit) %></label>
             <%= text_field_tag 'settings[feeds_limit]', Setting.feeds_limit, :size => 6 %></p>
             <p><label><%= l(:setting_autofetch_changesets) %></label>
             <%= check_box_tag 'settings[autofetch_changesets]', 1, Setting.autofetch_changesets? %><%= hidden_field_tag 'settings[autofetch_changesets]', 0 %></p>
             <p><label><%= l(:setting_sys_api_enabled) %></label>
             <%= check_box_tag 'settings[sys_api_enabled]', 1, Setting.sys_api_enabled? %><%= hidden_field_tag 'settings[sys_api_enabled]', 0 %></p>
             <p><label><%= l(:setting_repositories_encodings) %></label>
             <%= text_field_tag 'settings[repositories_encodings]', Setting.repositories_encodings, :size => 60 %><br /><em><%= l(:text_comma_separated) %></em></p>
             </div>
             <fieldset class="box"><legend><%= l(:setting_issue_list_default_columns) %></legend>
             <%= hidden_field_tag 'settings[issue_list_default_columns][]', '' %>
             <p><% Query.available_columns.each do |column| %>
               <label><%= check_box_tag 'settings[issue_list_default_columns][]', column.name, Setting.issue_list_default_columns.include?(column.name.to_s) %>
               <%= l("field_#{column.name}") %></label>
             <% end %></p>
             </fieldset>
             <fieldset class="box tabular"><legend><%= l(:label_authentication) %></legend>
             <p><label><%= l(:setting_login_required) %></label>
             <%= check_box_tag 'settings[login_required]', 1, Setting.login_required? %><%= hidden_field_tag 'settings[login_required]', 0 %></p>
             <p><label><%= l(:setting_autologin) %></label>
             <%= select_tag 'settings[autologin]', options_for_select( [[l(:label_disabled), "0"]] + [1, 7, 30, 365].collect{|days| [lwr(:actionview_datehelper_time_in_words_day, days), days.to_s]}, Setting.autologin) %></p>
             <p><label><%= l(:setting_self_registration) %></label>
             <%= check_box_tag 'settings[self_registration]', 1, Setting.self_registration? %><%= hidden_field_tag 'settings[self_registration]', 0 %></p>
             <p><label><%= l(:label_password_lost) %></label>
             <%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>
             </fieldset>
             <fieldset class="box tabular"><legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
             <p><label><%= l(:setting_commit_ref_keywords) %></label>
             <%= text_field_tag 'settings[commit_ref_keywords]', Setting.commit_ref_keywords, :size => 30 %><br /><em><%= l(:text_comma_separated) %></em></p>
             <p><label><%= l(:setting_commit_fix_keywords) %></label>
             <%= text_field_tag 'settings[commit_fix_keywords]', Setting.commit_fix_keywords, :size => 30 %>
             &nbsp;<%= l(:label_applied_status) %>: <%= select_tag 'settings[commit_fix_status_id]', options_for_select( [["", 0]] + IssueStatus.find(:all).collect{|status| [status.name, status.id.to_s]}, Setting.commit_fix_status_id) %>
+            &nbsp;<%= l(:field_done_ratio) %>: <%= select_tag 'settings[commit_fix_done_ratio]', options_for_select( [[l(:label_no_change_option), '']] + ((0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }), Setting.commit_fix_done_ratio) %>
             <br /><em><%= l(:text_comma_separated) %></em></p>
             </fieldset>
             <%= submit_tag l(:button_save) %>
             </div>
             <% end %>

config/settings.yml +3 0

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             # DO NOT MODIFY THIS FILE !!!
             # Settings can be defined through the application in Admin -> Settings
             app_title:
               default: Redmine
             app_subtitle:
               default: Project management
             welcome_text:
               default:
             login_required:
               default: 0
             self_registration:
               default: 1
             lost_password:
               default: 1
             attachment_max_size:
               format: int
               default: 5120
             issues_export_limit:
               format: int
               default: 500
             mail_from:
               default: redmine@somenet.foo
             text_formatting:
               default: textile
             wiki_compression:
               default: ""
             default_language:
               default: en
             host_name:
               default: localhost:3000
             feeds_limit:
               format: int
               default: 15
             autofetch_changesets:
               default: 1
             sys_api_enabled:
               default: 0
             commit_ref_keywords:
               default: 'refs,references,IssueID'
             commit_fix_keywords:
               default: 'fixes,closes'
             commit_fix_status_id:
               format: int
               default: 0
+            commit_fix_done_ratio:
+              format: int
+              default: 100
             # autologin duration in days
             # 0 means autologin is disabled
             autologin:
               format: int
               default: 0
             # date format
             # 0: language based
             # 1: ISO format
             date_format:
               format: int
               default: 0
             cross_project_issue_relations:
               default: 0
             notified_events:
               serialized: true
               default: --
               - issue_added
               - issue_updated
             issue_list_default_columns:
               serialized: true
               default: --
               - tracker
               - status
               - priority
               - subject
               - assigned_to
               - updated_on
             # encodings used to convert repository files content to UTF-8
             # multiple values accepted, comma separated
             repositories_encodings:
               default: ''
             ui_theme:
               default: ''
   No newline at end of file

test/unit/repository_test.rb +6 -3

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             class RepositoryTest < Test::Unit::TestCase
               fixtures :projects, :repositories, :issues, :issue_statuses, :changesets, :changes
               def setup
                 @repository = Project.find(1).repository
               end
               def test_create
                 repository = Repository::Subversion.new(:project => Project.find(2))
                 assert !repository.save
                 repository.url = "svn://localhost"
                 assert repository.save
                 repository.reload
                 project = Project.find(2)
                 assert_equal repository, project.repository
               end
               def test_scan_changesets_for_issue_ids
                 # choosing a status to apply to fix issues
                 Setting.commit_fix_status_id = IssueStatus.find(:first, :conditions => ["is_closed = ?", true]).id
+                Setting.commit_fix_done_ratio = "90"
                 # make sure issue 1 is not already closed
                 assert !Issue.find(1).status.is_closed?
                 Repository.scan_changesets_for_issue_ids
                 assert_equal [101, 102], Issue.find(3).changeset_ids
                 # fixed issues
-                assert Issue.find(1).status.is_closed?
+                fixed_issue = Issue.find(1)
-                assert_equal [101], Issue.find(1).changeset_ids
+                assert fixed_issue.status.is_closed?
+                assert_equal 90, fixed_issue.done_ratio
+                assert_equal [101], fixed_issue.changeset_ids
                 # ignoring commits referencing an issue of another project
                 assert_equal [], Issue.find(4).changesets
               end
               def test_for_changeset_comments_strip
                 repository = Repository::Mercurial.create( :project => Project.find( 4 ), :url => '/foo/bar/baz' )
                 comment = <<-COMMENT
                 This is a loooooooooooooooooooooooooooong comment
                 COMMENT
                 changeset = Changeset.new(
                   :comments => comment, :commit_date => Time.now, :revision => 0, :scmid => 'f39b7922fb3c',
                   :committer => 'foo <foo@example.com>', :committed_on => Time.now, :repository_id => repository )
                 assert( changeset.save )
                 assert_not_equal( comment, changeset.comments )
                 assert_equal( 'This is a loooooooooooooooooooooooooooong comment', changeset.comments )
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages