ruby-zoom 5.2.4 → 5.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/zoom/editor.rb +29 -14
  3. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3755b79234e3c33b89c36428590015bcd56c76ffc666993d95bcc6578d7326b3
4
- data.tar.gz: 34d14ecd4c85fe8fb3a9e8ae4e7980dfa0a09d1c216bfe47953056835d569610
3
+ metadata.gz: 142f012f19627bbd7fd91f9177af11aa8bef1e4f7c4a06f269775ee64c9d9c85
4
+ data.tar.gz: a558e2fb27f3b7dd5a6054ba75eb869b979f9225db56b2ec955ecaafbed5f8d2
5
5
  SHA512:
6
- metadata.gz: 6ddd9c9d48e785a22d0bea94a0b071eb318a3555e7e20168b669f546d2fbeaee29262ba9ca5a68bf13b24910b611ff377fb5fb813242946813877c98133d7d76
7
- data.tar.gz: 65d3f32034b839c110f731d5f960a2b48e994e79e4d5366b0522b67e65bf6c39ce8a317a3e4ad094f29e32fe3446c2f3b063ab0b9d4c036728f905f5e707bbc6
6
+ metadata.gz: d609b04d7b73b15909642f2542b4178e8339d6ff2570270973bfffc02cbf8456e1449b15a6d18fe19ecb46668c48e81f8ee5ae6ccff55121cbd945a3382c68b9
7
+ data.tar.gz: df9abdb6910f1543cce1a03e9756ded0e668a38872a9946a436718ab3dc8306a214dd13a438cb09c7b783d70b349ce194bf06543e2de5b54178794ceefb5ee13
@@ -64,16 +64,20 @@ class Zoom::Editor
64
64
 
65
65
  def open_result(result)
66
66
  if (result.grep_like?)
67
- filename = result.filename
67
+ if (result.filename.start_with?("/"))
68
+ filename = result.filename
69
+ else
70
+ filename = result.pwd + "/" + result.filename
71
+ end
68
72
  lineno = result.lineno
69
- pwd = result.pwd
70
- system(
71
- "#{@editor} #{@flags} +#{lineno} '#{pwd}/#{filename}'"
72
- )
73
+ system("#{@editor} #{@flags} +#{lineno} '#{filename}'")
73
74
  else
74
- filename = result.contents
75
- pwd = result.pwd
76
- system("#{@editor} #{@flags} '#{pwd}/#{filename}'")
75
+ if (result.contents.start_with?("/"))
76
+ filename = result.contents
77
+ else
78
+ filename = result.pwd + "/" + result.contents
79
+ end
80
+ system("#{@editor} #{@flags} '#{filename}'")
77
81
  end
78
82
  end
79
83
  private :open_result
@@ -101,19 +105,30 @@ class Zoom::Editor
101
105
 
102
106
  files = Array.new
103
107
  results.each do |result|
104
- filename = result.filename if (result.grep_like?)
105
- filename ||= result.contents
108
+ if (result.grep_like?)
109
+ if (result.filename.start_with?("/"))
110
+ filename = result.filename
111
+ else
112
+ filename = result.pwd + "/" + result.filename
113
+ end
114
+ else
115
+ if (result.contents.start_with?("/"))
116
+ filename = result.contents
117
+ else
118
+ filename = result.pwd + "/" + result.contents
119
+ end
120
+ end
121
+
106
122
  lineno = result.lineno
107
123
  match = result.match
108
- pwd = result.pwd
109
124
 
110
- if (!files.include?("#{pwd}/#{filename}"))
111
- files.push("#{pwd}/#{filename}")
125
+ if (!files.include?(filename))
126
+ files.push(filename)
112
127
  zs.write("#{lineno}\nbnext\n") if (result.grep_like?)
113
128
  end
114
129
 
115
130
  if (result.grep_like?)
116
- zq.write("#{pwd}/#{filename}:#{lineno}: #{match}\n")
131
+ zq.write("#{filename}:#{lineno}: #{match}\n")
117
132
  end
118
133
  end
119
134
  zs.write("silent cfile #{quickfix}\n")
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ruby-zoom
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.2.4
4
+ version: 5.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miles Whittaker
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-03-11 00:00:00.000000000 Z
11
+ date: 2019-05-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: minitest