redpomo 0.0.5 → 0.0.6

data/README.md

@@ -5,7 +5,8 @@
 
 Redpomo is the classic "scratch your own itch" project:
 
-* It makes it really easy to manage Redmine issues from the command-line;
+* It makes it really easy to manage (create, close, browse) Redmine issues
+  from the command-line;
 * It is able to sync Redmine issues with your local Todo.txt tasks;
 * It can start Pomodoro.app timer on a specific Todo.txt task, and is
   able to "push" the logged pomodoros as Redmine timetracks.
@@ -14,26 +15,28 @@ Redpomo is the classic "scratch your own itch" project:
 
     › redpomo help
     Tasks:
-      redpomo close TASK    # Marks a todo.txt task as complete, and closes the related Redmine issue
+      redpomo add           # creates a new task on Todo.txt, forwarding it to the remote tracker
+      redpomo close TASK    # marks a todo.txt task as complete, and closes the related Redmine issue
       redpomo help [TASK]   # Describe available tasks or one specific task
-      redpomo open TASK     # Opens up the Redmine issue page of the selected task
-      redpomo pull          # Imports Redmine open issues into local todo.txt
-      redpomo push LOGFILE  # Parses Pomodoro export file and imports to Redmine clients
-      redpomo start TASK    # Starts a Pomodoro session for the selected task
+      redpomo init          # generates a .redpomo configuration file on your home directory
+      redpomo open TASK     # opens up the Redmine issue page of the selected task
+      redpomo pull          # imports Redmine open issues into local todo.txt
+      redpomo push LOGFILE  # parses Pomodoro export file and imports to Redmine clients
+      redpomo start TASK    # starts a Pomodoro session for the selected task
 
-## Installation
-
-Add this line to your application's Gemfile:
+    Options:
+      -c, [--config=CONFIG] # Default: ~/.redpomo
+          [--no-color]
 
-    gem 'redpomo'
+## Installation
 
-And then execute:
+Install it yourself as:
 
-    $ bundle
+    $ gem install redpomo
 
-Or install it yourself as:
+And then configure it:
 
-    $ gem install redpomo
+    $ redpomo init
 
 ## Contributing
 

data/lib/redpomo/cli.rb

@@ -1,81 +1,133 @@
 require 'thor'
+require 'tempfile'
 
 require 'redpomo/config'
 require 'redpomo/task_list'
 require 'redpomo/entry'
 require 'redpomo/entries_printer'
 require 'redpomo/fuzzy_converter'
-require 'redpomo/config_generator'
+# require 'redpomo/issue_generator'
 
 module Redpomo
   class CLI < ::Thor
-    map "p" => :pull
+    include Thor::Actions
+
+    def initialize(*)
+      super
+      the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell)
+      Redpomo.ui = UI::Shell.new(the_shell)
+      configure!
+    end
+
+    default_task :pull
+    class_option "config", :aliases => "-c", default: '~/.redpomo'
+    class_option "no-color", :type => :boolean
+
     map "o" => :open
     map "c" => :close
+    map "a" => :add
+
+    desc "add", "creates a new task on Todo.txt, forwarding it to the remote tracker"
+    method_option :description, aliases: "-d"
+    def add(subject = nil)
+      description = @options[:description]
+
+      if subject.blank?
+        message_path = Tempfile.new('issue').path + ".textile"
+        template "issue_stub.textile", message_path, verbose: false
+        subject, description = parse_message edit(message_path)
+      end
+
+      issue = Task.new(nil, subject).to_issue
+      issue.description = description
+      issue.create!
+
+      task = issue.to_task
+      task.add!
+
+      Redpomo.ui.info "Issue created, see it at #{task.url}"
+    end
 
     desc "pull", "imports Redmine open issues into local todo.txt"
-    method_option :config, aliases: "-c", default: '~/.redpomo'
     def pull
-      configure!
       TaskList.pull_from_trackers!
     end
 
     desc "push LOGFILE", "parses Pomodoro export file and imports to Redmine clients"
-    method_option :config, aliases: "-c", default: '~/.redpomo'
     method_option :fuzzy,  aliases: "-f", type: :boolean
     method_option :dry_run, aliases: "-n", type: :boolean
     def push(path)
-      configure!
-
       entries = Entry.load_from_csv(path)
       entries = FuzzyConverter.convert(entries) if @options[:fuzzy]
 
-      unless @options[:dry_run]
+      if @options[:dry_run]
+        EntriesPrinter.print(entries)
+      else
         entries.each(&:push!)
+        Redpomo.ui.info "Pushed #{entries.count} time entries!"
       end
-
-      EntriesPrinter.print(entries)
     end
 
     desc "open TASK", "opens up the Redmine issue page of the selected task"
-    method_option :config, aliases: "-c", default: '~/.redpomo'
     def open(task_number)
-      configure!
-
       task = TaskList.find(task_number)
       task.open_in_browser!
     end
 
     desc "start TASK", "starts a Pomodoro session for the selected task"
-    method_option :config, aliases: "-c", default: '~/.redpomo'
     def start(task_number)
-      configure!
-
       task = TaskList.find(task_number)
       task.start_pomodoro!
     end
 
     desc "close TASK", "marks a todo.txt task as complete, and closes the related Redmine issue"
-    method_option :config, aliases: "-c", default: '~/.redpomo'
     method_option :message, aliases: "-m"
     def close(task_number)
-      configure!
-
       task = TaskList.find(task_number)
       task.done!
-      task.close_issue!
+      task.close_issue!(@options[:message])
+
+      Redpomo.ui.info "Issue updated, see it at #{task.url}"
     end
 
     desc "init", "generates a .redpomo configuration file on your home directory"
-    method_option :path, aliases: "-p", default: '~/.redpomo'
-    def init
-      ConfigGenerator.start([ @options[:path] ])
+    def init(path = '~/.redpomo')
+      path =  File.expand_path(path)
+      template "config.yml", path, verbose: false
+
+      editor = [ENV['REDPOMO_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? }
+      if editor
+        command = "#{editor} #{path}"
+        system(command)
+        File.read(path)
+      else
+        Redpomo.ui.info("To open the .redpomo config file, set $EDITOR or $REDPOMO_EDITOR")
+      end
     end
 
     private
 
     def configure!
-      Config.load_from_yaml(@options[:config])
+      Config.load_from_yaml(options["config"])
+    end
+
+    def self.source_root
+      File.dirname(__FILE__) + "/templates"
+    end
+
+    def parse_message(message)
+      # remove comments
+      message.gsub! /#.*$/, ''
+      # remove empty lines at beginning of string
+      message.gsub! /\A\n*/, ''
+
+      # first line is the subject, the rest is description
+      subject, description = message.split(/\n/, 2)
+
+      subject ||= ''
+      description ||= ''
+
+      [subject.strip, description.strip]
     end
 
   end

data/lib/redpomo/config.rb

@@ -13,9 +13,11 @@ module Redpomo
     @@cache = NullCache
 
     def self.load_from_yaml(path)
-      data = YAML::load_file(File.expand_path(path))
+      config_path = File.expand_path(path)
+      return unless File.exists?(config_path)
+      data = YAML::load_file(config_path)
 
-      @@todo_path = File.expand_path(data["todo"])
+      @@todo_path = File.expand_path(data["todo"], File.dirname(config_path))
       @@trackers_data = data["trackers"].symbolize_keys!
       @@cache = data["cache"] ? FileCache : NullCache
     end

data/lib/redpomo/issue.rb

@@ -1,30 +1,37 @@
 module Redpomo
   class Issue
 
-    attr_reader :title, :issue_id, :project, :tracker, :due_date
+    attr_accessor :subject, :description
+    attr_accessor :issue_id, :project_id, :tracker
+    attr_accessor :due_date, :priority_id
 
-    def initialize(tracker, data)
-      @title = data["subject"]
+    def initialize(tracker, data = {})
+      @subject = data["subject"]
       @issue_id = data["id"]
-      @project = data["project"]
-      @priority = data["priority"]["name"]
+      @project_id = data["project_id"]
+      @priority_id = data["priority"]["id"] if data["priority"].present?
       @due_date = Date.parse(data["due_date"]) if data["due_date"].present?
       @tracker = tracker
     end
 
     def to_task
       label = []
-      if @priority.present?
-        if priority = @tracker.todo_priority(@priority)
+      if @priority_id.present?
+        if priority = @tracker.todo_priority(@priority_id)
           label << priority
         end
       end
-      label << @title
       label << @due_date.strftime("%Y-%m-%d") if @due_date.present?
+      label << @subject
       label << "##{issue_id}"
-      label << "+#{project}"
+      label << "+#{project_id}"
       label << "@#{tracker.name}"
-      Todo::Task.new(label.join(" "))
+      Task.new(nil, label.join(" "))
+    end
+
+    def create!
+      data = tracker.create_issue!(self)
+      @issue_id = data["issue"]["id"]
     end
 
   end

data/lib/redpomo/task.rb

@@ -16,6 +16,8 @@ module Redpomo
   class Task
 
     delegate :orig, to: :@task
+    delegate :priority, to: :@task
+    delegate :date, to: :@task
 
     ISSUES_REGEXP = /(?:\s+|^)#[0-9]+/
 
@@ -54,6 +56,10 @@ module Redpomo
       @list.remove!(self)
     end
 
+    def add!
+      TaskList.add!(self)
+    end
+
     def open_in_browser!
       require 'launchy'
       Launchy.open(url)
@@ -82,6 +88,15 @@ module Redpomo
       Tracker.find(context)
     end
 
+    def to_issue
+      issue = Issue.new(tracker)
+      issue.subject = text
+      issue.project_id = project
+      issue.due_date = date
+      issue.priority_id = tracker.issue_priority_id(priority)
+      issue
+    end
+
   end
 end
 

data/lib/redpomo/task_list.rb

@@ -14,6 +14,11 @@ module Redpomo
       list.pull_from_trackers!
     end
 
+    def self.add!(task)
+      list = TaskList.new(Config.todo_path)
+      list.add!(task)
+    end
+
     def initialize(path)
       @path = path
       File.read(path).split("\n").each do |line|
@@ -30,6 +35,11 @@ module Redpomo
       write!
     end
 
+    def add!(task)
+      push task
+      write!
+    end
+
     def pull_from_trackers!
       issue_tasks = Tracker.all.map(&:issues).flatten.map(&:to_task)
       delete_if do |task|
@@ -38,6 +48,7 @@ module Redpomo
       self << issue_tasks
       self.flatten!
       write!
+      Redpomo.ui.info "Pulled #{issue_tasks.count} issues."
     end
 
     def write!

data/lib/redpomo/templates/config.yml

@@ -1,9 +1,40 @@
 ---
-todo: "~/Documents/todo/todo.txt"                    # path of your local todo.txt
+todo: "~/Documents/todo/todo.txt"     # Path of your local Todo.txt
+
 trackers:
-  my_tracker:                                        # this is the name of the context you want to use i.e. @my_tracker
-    url: "http://my_tracker.com"                     # the URL of your Redmine instance
-    token: ""                                        # find the API key in "http://mytracker.com/my/account"
-    default_project: "project"                       # if timetracks you need to push don't have a +project specified, use this
-    closed_status: 5                                 # identifier of the status used to mark issues as closed (5 should be "Closed" on most Redmine instances)
-    priorities: [ "Immediate", "Urgent", "High" ]    # list of priorities sorted by.. uhm.. priority. The first one with get (A), then (B), (C), etc.
+
+  my_tracker:                        # This is the name of the context you want
+                                     # to use for this tracker (--> @my_tracker)
+
+    url: "http://my_tracker.com"     # The URL of your Redmine instance
+
+    token: ""                        # Find this at the following URL:
+                                     # http://mytracker.com/my/account
+
+    default_project_id: "project"    # If timetracks you're pushing don't have
+                                     # a +project specified, use this.
+
+    default_priority_id: 4           # If issues you're adding don't have a
+                                     # priority specified, then use this.
+                                     #
+                                     # -- 4 should be "Normal" on most Redmines
+
+    closed_status_id: 5              # Identifier of the status used to mark
+                                     # issues as closed. Find this ID here:
+                                     # http://mytracker.com/issue_statuses
+                                     #
+                                     # -- 5 should be "Closed" on most Redmines
+
+    priority_ids:                    # Map a Todo.txt priority with a Redmine
+                                     # priority ID.
+
+      - 7                            # -> (A)
+      - 6                            # -> (B)
+      - 5                            # -> (C)
+                                     # ... and so on
+                                     #
+                                     # Find those IDs at the following URL:
+                                     # http://mytracker.com/enumerations
+                                     #
+                                     # -- 7, 6 and 5 should be "Immediate",
+                                     # "Urgent" and "High" on most Redmines

data/lib/redpomo/templates/issue_stub.textile

@@ -0,0 +1,7 @@
+
+
+# Please enter the description of your new task on the first line.
+# Following lines will be used as issue descripton (textile allowed).
+#
+# Make sure to add a project and context. Lines starting with '#'
+# will be ignored, and an empty message aborts the creation.

data/lib/redpomo/tracker.rb

@@ -2,6 +2,9 @@ require 'active_support/core_ext/hash'
 require 'redpomo/issue'
 require 'redpomo/config'
 
+require 'rest_client'
+require 'json'
+
 module Redpomo
   class Tracker
 
@@ -24,28 +27,47 @@ module Redpomo
       @name = name
       @base_url = options[:url]
       @api_key = options[:token]
-      @default_project = options[:default_project]
-      @closed_status_id = options[:closed_status].to_i
-      @priorities = options[:priorities]
+      @default_project_id = options[:default_project_id]
+      @default_priority_id = options[:default_priority_id]
+      @closed_status_id = options[:closed_status_id].to_i
+      @priorities = options[:priority_ids]
     end
 
     def todo_priority(priority_name)
       return nil if @priorities.nil?
+      alphabet = ('A' .. 'Z').to_a.join
       if index = @priorities.index(priority_name)
-        "(#{"ABCDE"[index]})"
-      else
-        nil
+        "(#{alphabet[index]})"
+      end
+    end
+
+    def issue_priority_id(priority_val)
+      if index = ('A' .. 'Z').to_a.index(priority_val)
+        @priorities[index]
       end
     end
 
     def issues
       data = get("/issues", assigned_to_id: current_user_id, status_id: "open", limit: 100)
       data["issues"].map do |issue|
-        issue["project"] = project_identifier_for(issue["project"]["id"])
+        issue["project_id"] = project_identifier_for(issue["project"]["id"])
         Issue.new(self, issue)
       end
     end
 
+    def create_issue!(issue)
+      data = {
+        subject: issue.subject,
+        description: issue.description,
+        due_date: issue.due_date,
+        project_id: issue.project_id || @default_project_id,
+        priority_id: issue.priority_id || @default_priority_id,
+        assigned_to_id: current_user_id
+      }
+
+      post("/issues", issue: data)
+    end
+
     def push_entry!(entry)
       task = entry.to_task
       time_entry = {}
@@ -55,7 +77,7 @@ module Redpomo
       elsif project = task.project
         time_entry[:project_id] = project
       else
-        time_entry[:project_id] = @default_project
+        time_entry[:project_id] = @default_project_id
       end
 
       time_entry[:spent_on] = entry.datetime
@@ -97,8 +119,6 @@ module Redpomo
     end
 
     def request(type, url, params = {})
-      require 'rest_client'
-      require 'json'
       args = []
       args << @base_url + url + ".json"
       args << params.delete(:body).to_json unless type == :get

data/lib/redpomo/ui.rb

@@ -0,0 +1,73 @@
+module Redpomo
+
+  class UI
+    def warn(message, newline = nil)
+    end
+
+    def debug(message, newline = nil)
+    end
+
+    def error(message, newline = nil)
+    end
+
+    def info(message, newline = nil)
+    end
+
+    def confirm(message, newline = nil)
+    end
+
+    def debug?
+      false
+    end
+
+    class Shell < UI
+      attr_writer :shell
+
+      def initialize(shell)
+        @shell = shell
+        @quiet = false
+        @debug = ENV['DEBUG']
+      end
+
+      def info(msg, newline = nil)
+        tell_me(msg, nil, newline) if !@quiet
+      end
+
+      def confirm(msg, newline = nil)
+        tell_me(msg, :green, newline) if !@quiet
+      end
+
+      def warn(msg, newline = nil)
+        tell_me(msg, :yellow, newline)
+      end
+
+      def error(msg, newline = nil)
+        tell_me(msg, :red, newline)
+      end
+
+      def be_quiet!
+        @quiet = true
+      end
+
+      def debug?
+        # needs to be false instead of nil to be newline param to other methods
+        !!@debug && !@quiet
+      end
+
+      def debug!
+        @debug = true
+      end
+
+      def debug(msg, newline = nil)
+        tell_me(msg, nil, newline) if debug?
+      end
+
+      private
+      # valimism
+      def tell_me(msg, color = nil, newline = nil)
+        newline.nil? ? @shell.say(msg, color) : @shell.say(msg, color, newline)
+      end
+    end
+
+  end
+end

data/lib/redpomo/version.rb

@@ -1,3 +1,3 @@
 module Redpomo
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/redpomo.rb

@@ -1,15 +1,10 @@
-# require "active_support/core_ext"
-# require "rest-client"
-# require "todo-txt"
-# require "yaml"
-# require "json"
-# require "csv"
-# require "launchy"
-# require "applescript"
-
+require 'active_support/core_ext/module/attribute_accessors'
 require "redpomo/version"
-# require "redpomo/ext"
-# require "redpomo/cli"
+require "redpomo/ui"
 
 module Redpomo
+
+  mattr_accessor :ui
+  self.ui = UI.new
+
 end

data/spec/fixtures/add_results.txt

@@ -0,0 +1,4 @@
+Make screenshot #838 @cantiere
+Fix #3290 @welaika
+Another task @home
+foobar #3397 +olasagasti @welaika