fixing a bug with using email addresses in steps

lettuce/core.py

@@ -708,9 +708,11 @@ class Scenario(object):
 
         def try_finding_with(regex):
             found = regex.search(original_string)
+
             if found:
                 tag_lines = found.group().splitlines()
-                return list(chain(*map(self._extract_tag, tag_lines)))
+                tags = list(chain(*map(self._extract_tag, tag_lines)))
+                return tags
 
         for regex in regexes:
             found = try_finding_with(regex)
@@ -720,8 +722,9 @@ class Scenario(object):
         return []
 
     def _extract_tag(self, item):
-        regex = re.compile(r'[@](\S+)')
-        return regex.findall(item)
+        regex = re.compile(r'(?:(?:^|\s+)[@]([^@\s]+))')
+        found = regex.findall(item)
+        return found
 
     def _resolve_steps(self, steps, outlines, with_file, original_string):
         for outline in outlines:

tests/unit/test_feature_parser.py

@@ -153,7 +153,7 @@ Feature: Yay tags
   @many @other
   @basic
   @tags @here @:)
-  Scenario: Holy tag, Batman
+  Scenario: Double Yay
     Given this scenario has tags
     Then it can be inspected from within the object
 """
@@ -175,7 +175,7 @@ Feature: Yay tags and many scenarios
 
 """
 
-FEATURE13 = """
+FEATURE13 = '''
 Feature: correct matching
   @runme
   Scenario: Holy tag, Batman
@@ -184,17 +184,20 @@ Feature: correct matching
 
   Scenario: This has no tags
     Given this scenario has tags
+    When I fill my email with gabriel@lettuce.it
     Then it can be inspected from within the object
 
   @slow
   Scenario: this is slow
     Given this scenario has tags
+    When I fill my email with "gabriel@lettuce.it"
     Then it can be inspected from within the object
 
   Scenario: Also without tags
     Given this scenario has tags
+    When I fill my email with 'gabriel@lettuce.it'
     Then it can be inspected from within the object
-"""
+'''
 
 FEATURE14 = """
 Feature:    Extra whitespace feature

tests/unit/test_main.py

@@ -22,7 +22,7 @@ from mox import Mox
 
 def test_has_version():
     "A nice python module is supposed to have a version"
-    assert_equals(lettuce.version, '0.2.0')
+    assert_equals(lettuce.version, '0.2.3')
 
 
 def test_has_release():