Skip to content

Commit 1bb551c

Browse files
committed
Fix path comparison
1 parent 370560e commit 1bb551c

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
lines changed

build.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,10 @@ def copy(src, dest):
9898

9999
usage = """
100100
Usage: python build.py --[option]
101+
Example: python build.py --test --install
101102
102103
Options:
104+
--dist : creates the distributable.
103105
--test : runs unit tests.
104106
--install : installs python plugin and generates the pip package
105107
"""
@@ -123,15 +125,15 @@ def main():
123125
if len(sys.argv) < 2:
124126
print(usage)
125127
else:
126-
if sys.argv[1] == '--dist':
128+
if '--dist' in sys.argv:
127129
create_zip()
128130
generate_package()
129-
else:
131+
if '--test' in sys.argv:
130132
exit_code = run_tests()
131133
if exit_code != 0:
132134
sys.exit(exit_code)
133-
elif sys.argv[1] == '--install':
134-
install()
135+
if '--install' in sys.argv:
136+
install()
135137

136138

137139
if __name__ == '__main__':

getgauge/registry.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,26 +172,28 @@ def get_step_positions(self, file_name):
172172
positions = []
173173
for step, infos in self.__steps_map.items():
174174
positions = positions + [{'stepValue': step, 'span': i.span}
175-
for i in infos if i.file_name == file_name]
175+
for i in infos if str(i.file_name).lower() == str(file_name).lower()]
176176
return positions
177177

178178
def _get_all_hooks(self, file_name):
179179
all_hooks = []
180180
for hook in self.hooks:
181181
all_hooks = all_hooks + \
182182
[h for h in getattr(self, "__{}".format(hook))
183-
if h.file_name == file_name]
183+
if str(h.file_name).lower() == str(file_name).lower()]
184184
return all_hooks
185185

186186
def get_all_methods_in(self, file_name):
187187
methods = []
188188
for _, infos in self.__steps_map.items():
189-
methods = methods + [i for i in infos if i.file_name == file_name]
189+
# Using relative paths may lead to different spelling of the C drive (lower or capital C)
190+
methods = methods + [i for i in infos if str(i.file_name).lower() == str(file_name).lower()]
190191
return methods + self._get_all_hooks(file_name)
191192

192193
def is_file_cached(self, file_name):
193194
for _, infos in self.__steps_map.items():
194-
if any(i.file_name == file_name for i in infos):
195+
# Using relative paths may lead to different spelling of the C drive (lower or capital C)
196+
if any(str(i.file_name).lower() == str(file_name).lower() for i in infos):
195197
return True
196198
return False
197199

getgauge/util.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ def get_step_impl_dirs():
1616
full_path_dir_names = []
1717
for name in step_impl_dir_names:
1818
name = name.replace("/", os.path.sep).replace("\\", os.path.sep)
19-
imple_dir = name if os.path.isabs(name) else os.path.join(get_project_root(), name)
20-
full_path_dir_names.append(imple_dir)
19+
impl_dir = name if os.path.isabs(name) else os.path.join(get_project_root(), name)
20+
full_path_dir_names.append(impl_dir)
2121
return full_path_dir_names
2222

2323

python.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "python",
3-
"version": "0.4.11",
3+
"version": "0.4.12",
44
"description": "Python support for gauge",
55
"run": {
66
"windows": [

0 commit comments

Comments
 (0)