watnow 0.0.1 → 0.0.2

data/lib/watnow.rb

@@ -100,16 +100,20 @@ module Watnow
     # Supported editors are TextMate, Vim & Sublime Text
     def open_file_at_line(filename, line)
       command = filename
+      editor = ENV['EDITOR']
 
       if ENV['EDITOR'] =~ /mate/
         command = "#{filename} --line #{line}"
+        # Remove TextMate -w (wait) option
+        editor =~ /(-\w*(w))/
+        editor = editor.gsub($1, $1.gsub($2, ''))
       elsif ENV['EDITOR'] =~ /vi|vim/
         command = "+#{line} #{filename}"
       elsif ENV['EDITOR'] =~ /subl/
         command = "#{filename}:#{line}"
       end
 
-      Kernel.system("$EDITOR #{command}")
+      Kernel.system("#{editor} #{command}")
     end
 
     # Remove line from given file
@@ -139,7 +143,7 @@ module Watnow
           tag_spaces = Array.new(tag_spaces_count + 1).join(' ')
 
           # Boolean. True if current user is being mentioned in the annotation line
-          is_mentioned = (annotation_line.mention.downcase == Config.username.downcase)
+          is_mentioned = !Config.username.empty? && (annotation_line.mention.downcase == Config.username.downcase)
 
           # The actual outputting
           display_text '[ ', 'green', is_mentioned

data/lib/watnow/config.rb

@@ -22,7 +22,7 @@ module Watnow::Config
 
     # Merge defaults with custom options
     # Add default constants
-    options = defaults.merge(custom_options)
+    options = custom_options ? defaults.merge(custom_options) : defaults
     options['folder_ignore'].concat(FOLDER_IGNORE)
     options['file_extension_ignore'].concat(FILE_EXTENSION_IGNORE)
     options['patterns'].concat(PATTERNS)

data/lib/watnow/version.rb

@@ -1,3 +1,3 @@
 module Watnow
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watnow
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored