Fixed #115

  * added new variant of copyright statement
  * also renamed the env var used for copyright debugging

Author: pombredanne

src/cluecode/copyrights.py

@@ -38,7 +38,7 @@
 
 
 logger = logging.getLogger(__name__)
-if os.environ.get('SC_COPYRIGHT_DEBUG'):
+if os.environ.get('SCANCODE_COPYRIGHT_DEBUG'):
     import sys
     logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
     logger.setLevel(logging.DEBUG)
@@ -365,6 +365,8 @@ def detect(location):
     COPYRIGHT: {<COPY> <COPY> <NN> <NAME> <YR-RANGE>}
     COPYRIGHT: {<COPY> <NN> <NAME> <YR-RANGE>}
 
+    COPYRIGHT: {<COPY>+ <BY> <NAME|NAME2|NAME3>+}
+
     COPYRIGHT: {<COPY> <COPY> <COMP>+}
 
     COPYRIGHT: {<COPY> <COPY> <NN>+ <COMPANY|NAME|NAME2>+}

tests/cluecode/test_copyrights.py

@@ -1253,7 +1253,6 @@ def test_copyright_java(self):
         ]
         check_detection(expected, test_file)
 
-    @expectedFailure
     def test_copyright_java_passing(self):
         test_file = self.get_test_loc('copyrights/copyright_java-java.java')
         expected = [
@@ -3939,3 +3938,8 @@ def test_copyright_with_dots_and_all_lowercase_on_single_line(self):
         test_lines = [u'Copyright . 2008 foo name, inc.']
         expected = [u'Copyright . 2008 foo name, inc.']
         check_detection(expected, test_lines)
+
+    def test_copyright_copy_copy_by_name3(self):
+        test_lines = [u'Copyright (c) by 2007  Joachim Foerster <[email protected]>']
+        expected = [u'Copyright (c) by 2007 Joachim Foerster <[email protected]>']
+        check_detection(expected, test_lines)