From ee348357deca62fccf506814186f31f5123a21e4 Mon Sep 17 00:00:00 2001
From: Will <whp3652@rit.edu>
Date: Wed, 15 Apr 2015 22:57:14 -0400
Subject: [PATCH] Fix version chomping

---
 lib/rtasklib.rb        | 16 +++++++++-------
 lib/rtasklib/taskrc.rb |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/rtasklib.rb b/lib/rtasklib.rb
index 4e921ee..b0312dc 100644
--- a/lib/rtasklib.rb
+++ b/lib/rtasklib.rb
@@ -6,12 +6,13 @@
 require_relative "rtasklib/taskrc"
 
 require "open3"
+require "pathname"
 
 module Rtasklib
 
   class TaskWarrior
-    attr_reader :taskrc, :version, :rc_location,
-                :data_location, :override, :create_new
+    attr_reader :taskrc, :version, :rc_location, :data_location,
+                :override, :create_new, :config
 
     DEFAULT_CONFIG = {
       json: {
@@ -24,12 +25,13 @@ class TaskWarrior
       },
     }
 
-    def initialize rc="#{Dir.home}/.taskrc", override=DEFAULT_CONFIG,
-                   create_new=false
-      @rc_location = rc
-      @data_location = rc.chomp('rc')
+    def initialize rc="#{Dir.home}/.taskrc", data="#{Dir.home}/.task/",
+                   override=DEFAULT_CONFIG, create_new=false
+      @rc_location = Pathname.new(rc)
+      @data_location = Pathname.new(data)
       @override = DEFAULT_CONFIG.merge(override)
       @create_new = create_new
+      @config = Rtasklib::Taskrc.new(rc)
 
       # Check TW version, and throw warning
       # begin
@@ -44,7 +46,7 @@ def check_version
       raw_ver, retval = Rtasklib::Execute.task(@create_new,
                                            "rc.data.location=#{@data_location}",
                                            "_version")
-      gem_ver = Gem::Version.new(raw_ver[0].chomp) if retval == 0
+      gem_ver = Gem::Version.new(raw_ver.chomp) if retval == 0
 
       if gem_ver < Gem::Version.new('2.4.0')
         warn "#{gem_ver} is untested"
diff --git a/lib/rtasklib/taskrc.rb b/lib/rtasklib/taskrc.rb
index f594d2d..0db36e2 100644
--- a/lib/rtasklib/taskrc.rb
+++ b/lib/rtasklib/taskrc.rb
@@ -12,7 +12,7 @@ class TaskrcModel
   class Taskrc
     attr_reader :config
 
-    def initialize rc="#{Dir.home}/.taskrc"
+    def initialize rc
       taskrc = []
 
       File.open(rc).each do |line|