Merge branch 'release/0.17.4'

.gitignore

@@ -39,6 +39,7 @@ htmlcov/
 .coverage
 .coverage.*
 .cache
+.noseids
 nosetests.xml
 coverage.xml
 *,cover

cpt/__init__.py

@@ -1,2 +1,2 @@
 
-__version__ = '0.17.3'
+__version__ = '0.17.4'

cpt/ci_manager.py

@@ -154,6 +154,13 @@ def __init__(self, printer):
         super(BambooManager, self).__init__(printer)
         self.printer.print_message("CI detected: Bamboo")
 
+        for var in list(os.environ.keys()):
+            result = re.match('\Abamboo\.(.*)', var)
+            if result != None:
+                self.printer.print_message("de-bambooized env var : %s " % result.group(1))
+                os.environ[result.group(1)] = os.environ[var]
+
+
     def get_branch(self):
         return os.getenv("bamboo_planRepository_branch", None)
 

cpt/test/unit/ci_manager_test.py

@@ -136,3 +136,14 @@ def test_build_policy(self):
                                        }):
             manager = CIManager(self.printer)
             self.assertRaises(Exception, manager.get_commit_build_policy)
+
+    def test_bamboo_env_vars(self):
+        self.assertIsNone(os.getenv('CONAN_LOGIN_USERNAME'))
+
+        with tools.environment_append({"bamboo_buildNumber": "xx",
+                                       "bamboo_planRepository_branch": "mybranch",
+                                       "bamboo.CONAN_LOGIN_USERNAME": "bamboo"}):
+            manager = CIManager(self.printer)
+            self.assertEquals(manager.get_branch(), "mybranch") # checks that manager is Bamboo 
+
+            self.assertEquals(os.getenv('CONAN_LOGIN_USERNAME'), "bamboo")