commit for current worktime

Author: tf

lib/redmine_cli/tasks/commit.rb

@@ -14,7 +14,7 @@ class Commit < Base
       class_option :assigned_to_me, :type => :boolean, :aliases => "-I", :desc => "Only show issues that are assigned to me."
 
       ['fixes', 'closes', 'refs'].each do |method|
-        desc "#{method} <search> [-a] [-m <msg>] [-A | -C] [-I]", "Search for issue and commit with #{method}."
+        desc "#{method} [<search>] [-a] [-m <msg>] [-A | -C] [-I]", "Search for issue and commit with #{method}."
         define_method method do |*args|
           commit(args.first, options.merge(:prefix => method))
         end
@@ -23,13 +23,28 @@ class Commit < Base
       private
 
       def commit(term, options)
-        matching = fetch_issues(term, options)
-
-        if issue = RedmineCLI.ui.choose_issue(matching)
-          exec %`git commit -m "#{options[:prefix]} ##{issue['id']}: #{options[:msg]}" #{options[:msg] ? '' : '-e'} #{options[:all] ? '-a' : ''}`
+        if term.nil?
+          worktime = Worktime.current
+
+          if worktime && worktime.issue?
+            issue = {
+              'id' => worktime.issue_id
+            }
+          else
+            puts "Cannot determine issue from worktime. Not signed in for any issue."
+            return
+          end
         else
-          puts "Bye."
+          matching = fetch_issues(term, options)
+          issue = RedmineCLI.ui.choose_issue(matching)
+
+          unless issue
+            puts "Bye."
+            return
+          end
         end
+
+        exec %`git commit -m "#{options[:prefix]} ##{issue['id']}: #{options[:msg]}" #{options[:msg] ? '' : '-e'} #{options[:all] ? '-a' : ''}`
       end
 
       def fetch_issues(term, options)
@@ -42,7 +57,6 @@ def fetch_issues(term, options)
 
         query.all
       end
-
     end
   end
 end

lib/redmine_cli/version.rb

@@ -1,3 +1,3 @@
 module RedmineCLI
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end