redpomo 0.0.9 → 0.0.10

data/README.md

@@ -15,14 +15,14 @@ Redpomo is the classic "scratch your own itch" project:
 
     › redpomo help
     Tasks:
-      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 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
+      redpomo init            # generates a .redpomo configuration file on your home directory
+      redpomo pull            # imports Redmine open issues into local todo.txt
+      redpomo push [LOGFILE]  # parses Pomodoro export file and imports to Redmine clients
+      redpomo add [TASK]      # 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 open TASK       # opens up the Redmine issue page of the selected task
+      redpomo start TASK      # starts a Pomodoro session for the selected task
+      redpomo help [TASK]     # Describe available tasks or one specific task
 
     Options:
       -c, [--config=CONFIG] # Default: ~/.redpomo

data/lib/redpomo/cli.rb

@@ -6,7 +6,6 @@ require 'redpomo/task_list'
 require 'redpomo/entry'
 require 'redpomo/entries_printer'
 require 'redpomo/fuzzy_converter'
-# require 'redpomo/issue_generator'
 
 module Redpomo
   class CLI < ::Thor
@@ -27,7 +26,7 @@ module Redpomo
     map "c" => :close
     map "a" => :add
 
-    desc "add", "creates a new task on Todo.txt, forwarding it to the remote tracker"
+    desc "add [TASK]", "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]
@@ -35,17 +34,22 @@ module Redpomo
       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)
+        subject, description = parse_message open_editor(message_path)
       end
 
       issue = Task.new(nil, subject).to_issue
       issue.description = description
-      issue.create!
 
-      task = issue.to_task
-      task.add!
+      if issue.tracker.present?
+        issue.create!
+        task = issue.to_task
+        task.add!
 
-      Redpomo.ui.info "Issue created, see it at #{task.url}"
+        Redpomo.ui.info "Issue created, see it at #{task.url}"
+      else
+        Redpomo.ui.error "Cannot create issue, unknown tracker."
+        exit 1
+      end
     end
 
     desc "pull", "imports Redmine open issues into local todo.txt"
@@ -116,15 +120,7 @@ module Redpomo
     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
+      open_editor(path)
     end
 
     private
@@ -152,5 +148,17 @@ module Redpomo
       [subject.strip, description.strip]
     end
 
+    def open_editor(path)
+      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.error("To open #{path}, set $EDITOR or $REDPOMO_EDITOR")
+        exit 1
+      end
+    end
+
   end
 end

data/lib/redpomo/file_cache.rb

@@ -27,7 +27,11 @@ module Redpomo
     end
 
     def existing_keys
-      File.exists?(cache_path) ? (YAML::load_file(cache_path) || {}) : {}
+      if File.exists?(cache_path)
+        YAML::load_file(cache_path) || {}
+      else
+        {}
+      end
     end
 
     def set(key, val)

data/lib/redpomo/task.rb

@@ -93,7 +93,7 @@ module Redpomo
       issue.subject = text
       issue.project_id = project
       issue.due_date = date
-      issue.priority_id = tracker.issue_priority_id(priority)
+      issue.priority_id = tracker.issue_priority_id(priority) if tracker.present?
       issue
     end
 

data/lib/redpomo/version.rb

@@ -1,3 +1,3 @@
 module Redpomo
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/file_cache_spec.rb

@@ -6,11 +6,16 @@ describe Redpomo::FileCache do
 
   describe "#get" do
     it "executes the block on cache miss" do
-      Redpomo::FileCache.instance.cache_path = Tempfile.new('cache').path
+      old_cache_path = Redpomo::FileCache.instance.cache_path
+      Redpomo::FileCache.instance.cache_path = tmp_path("cache_file")
+
       counter = Redpomo::FileCache.get("foobar") { 5 }
       counter.should == 5
+
       counter = Redpomo::FileCache.get("foobar") { 10 }
       counter.should == 5
+
+      Redpomo::FileCache.instance.cache_path = old_cache_path
     end
   end
 

data/spec/integration/add_spec.rb

@@ -0,0 +1,29 @@
+require 'tempfile'
+require 'spec_helper'
+
+describe "redpomo add" do
+
+  let(:config_path) { tmp_path('redpomo') }
+
+  it "opens up a template file with REDPOMO_EDITOR as highest priority" do
+    redpomo "add", :env => {"EDITOR" => "echo editor", "VISUAL" => "echo visual", "REDPOMO_EDITOR" => "echo redpomo_editor"}
+    out.should =~ /^redpomo_editor .*issue.*\.textile/
+  end
+
+  it "opens up a template file with VISUAL as 2nd highest priority" do
+    redpomo "add", :env => {"EDITOR" => "echo editor", "VISUAL" => "echo visual", "REDPOMO_EDITOR" => ""}
+    out.should =~ /^visual .*issue.*\.textile/
+  end
+
+  it "opens up a template file with EDITOR as 3rd highest priority" do
+    redpomo "add", :env => {"EDITOR" => "echo editor", "VISUAL" => "", "REDPOMO_EDITOR" => ""}
+    out.should =~ /^editor .*issue.*\.textile/
+  end
+
+  it "complains if no EDITOR is set" do
+    redpomo "add", :env => {"EDITOR" => "", "VISUAL" => "", "REDPOMO_EDITOR" => ""}
+    out.should include "set $EDITOR or $REDPOMO_EDITOR"
+  end
+
+end
+

data/spec/integration/init_spec.rb

@@ -3,12 +3,7 @@ require 'spec_helper'
 
 describe "redpomo init" do
 
-  let(:config_path) {
-    new_config = Tempfile.new('redpomo')
-    new_config_path = new_config.path
-    new_config.unlink
-    new_config_path
-  }
+  let(:config_path) { tmp_path('redpomo') }
 
   it "generates a .redpomo config file" do
     redpomo "init #{config_path}", env: { "EDITOR" => "echo editor" }
@@ -32,7 +27,7 @@ describe "redpomo init" do
 
   it "complains if no EDITOR is set" do
     redpomo "init #{config_path}", :env => {"EDITOR" => "", "VISUAL" => "", "REDPOMO_EDITOR" => ""}
-    out.should == "To open the .redpomo config file, set $EDITOR or $REDPOMO_EDITOR"
+    out.should include "set $EDITOR or $REDPOMO_EDITOR"
   end
 
-end
+end

data/spec/lib/redpomo/entry_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'redpomo/entry'
 
 describe Redpomo::Entry do
 

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'bundler'
+require 'active_support/core_ext/object'
 
 if ENV['SIMPLECOV']
   require 'simplecov'

data/spec/support/fixtures.rb

@@ -1,6 +1,13 @@
 module Spec
   module Fixtures
 
+    def tmp_path(name)
+      file = Tempfile.new(name)
+      path = file.path
+      file.unlink
+      path
+    end
+
     def tmp(path)
       File.expand_path("../../tmp/#{path}", __FILE__)
     end

data/spec/support/ruby_ext.rb

@@ -15,6 +15,6 @@ class IO
       end
     end
 
-    return buffer.join
+    buffer.join
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redpomo
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70364147396960 !ruby/object:Gem::Requirement
+  requirement: &70127037894840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364147396960
+  version_requirements: *70127037894840
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70364147396120 !ruby/object:Gem::Requirement
+  requirement: &70127037894420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364147396120
+  version_requirements: *70127037894420
 - !ruby/object:Gem::Dependency
   name: todo-txt
-  requirement: &70364147395680 !ruby/object:Gem::Requirement
+  requirement: &70127037894000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364147395680
+  version_requirements: *70127037894000
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70364147395260 !ruby/object:Gem::Requirement
+  requirement: &70127037893580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364147395260
+  version_requirements: *70127037893580
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70364147394760 !ruby/object:Gem::Requirement
+  requirement: &70127037893160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364147394760
+  version_requirements: *70127037893160
 - !ruby/object:Gem::Dependency
   name: applescript
-  requirement: &70364147394100 !ruby/object:Gem::Requirement
+  requirement: &70127037892740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364147394100
+  version_requirements: *70127037892740
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &70364147409820 !ruby/object:Gem::Requirement
+  requirement: &70127037892320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364147409820
+  version_requirements: *70127037892320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70364147409200 !ruby/object:Gem::Requirement
+  requirement: &70127037891900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364147409200
+  version_requirements: *70127037891900
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70364147408560 !ruby/object:Gem::Requirement
+  requirement: &70127037891480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364147408560
+  version_requirements: *70127037891480
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70364147407920 !ruby/object:Gem::Requirement
+  requirement: &70127037891060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364147407920
+  version_requirements: *70127037891060
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70364147407300 !ruby/object:Gem::Requirement
+  requirement: &70127037890640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364147407300
+  version_requirements: *70127037890640
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70364147406680 !ruby/object:Gem::Requirement
+  requirement: &70127037890220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364147406680
+  version_requirements: *70127037890220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70364147406020 !ruby/object:Gem::Requirement
+  requirement: &70127037889800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364147406020
+  version_requirements: *70127037889800
 description: A nice little gem that integrates Redmine, Todo.txt and Pomodoro.app
 email:
 - stefano.verna@welaika.com
@@ -205,6 +205,7 @@ files:
 - spec/fixtures/pull_results.txt
 - spec/fixtures/tasks.txt
 - spec/fixtures/timelog.csv
+- spec/integration/add_spec.rb
 - spec/integration/init_spec.rb
 - spec/lib/redpomo/cli_spec.rb
 - spec/lib/redpomo/entry_spec.rb
@@ -258,6 +259,7 @@ test_files:
 - spec/fixtures/pull_results.txt
 - spec/fixtures/tasks.txt
 - spec/fixtures/timelog.csv
+- spec/integration/add_spec.rb
 - spec/integration/init_spec.rb
 - spec/lib/redpomo/cli_spec.rb
 - spec/lib/redpomo/entry_spec.rb