Move FindCurrentGitCommits into separate module

4 files changed, 34 insertions, 13 deletions

diff --git a/icklib/__init__.py b/icklib/__init__.py
index 85668be..49810ca 100644
--- a/icklib/__init__.py
+++ b/icklib/__init__.py
@@ -24,6 +24,7 @@ from .run_state import RunState
 from .pipeline import BuildPipeline
 from .os_release import parse_os_release, OsRelease, NoOsReleaseInformation
 from .step_build_info import CreateBuildInfo, FinishBuildInfo
+from .step_find_current_commit import FindCurrentGitCommits
 from .step_git_clone import CloneGits
 from .step_project_info import LoadProjectInfo, SaveProjectInfo
 from .project import create_projects_from_ick
diff --git a/icklib/project.py b/icklib/project.py
index 8b680dc..adfc17e 100644
--- a/icklib/project.py
+++ b/icklib/project.py
@@ -223,15 +223,6 @@ class Project(object):
             remote_git_dir)
 
 
-class FindCurrentGitCommits(icklib.BuildStep):
-
-    def build(self):
-        self.run_state.commits = {}
-        for c in self.run_state.clones:
-            key = '{}@{}'.format(c.url, c.subdir)
-            self.run_state.commits[key] = c.get_HEAD_commit()
-
-
 class FindNewCommitToBuildForShell(icklib.BuildStep):
 
     def build(self):
@@ -982,7 +973,7 @@ def create_projects_from_ick(ick, wanted_names):
         'shell': [
             icklib.LoadProjectInfo,
             icklib.CloneGits,
-            FindCurrentGitCommits,
+            icklib.FindCurrentGitCommits,
             FindNewCommitToBuildForShell,
             icklib.CreateBuildInfo,
             RunShellCommandsOnEachTarget,
@@ -992,7 +983,7 @@ def create_projects_from_ick(ick, wanted_names):
         'local-shell': [
             icklib.LoadProjectInfo,
             icklib.CloneGits,
-            FindCurrentGitCommits,
+            icklib.FindCurrentGitCommits,
             FindNewCommitToBuildForLocalShell,
             icklib.CreateBuildInfo,
             RunLocalShellCommands,
@@ -1002,7 +993,7 @@ def create_projects_from_ick(ick, wanted_names):
         'debian-ci': [
             icklib.LoadProjectInfo,
             icklib.CloneGits,
-            FindCurrentGitCommits,
+            icklib.FindCurrentGitCommits,
             FindNewCommitToBuildForDebianCI,
             icklib.CreateBuildInfo,
             CollectDebianInfoAboutTargets,
@@ -1018,7 +1009,7 @@ def create_projects_from_ick(ick, wanted_names):
         'debian-release': [
             icklib.LoadProjectInfo,
             icklib.CloneGits,
-            FindCurrentGitCommits,
+            icklib.FindCurrentGitCommits,
             FindTagsToBuildForDebianRelease,
             icklib.CreateBuildInfo,
             CollectDebianInfoAboutTargets,
diff --git a/icklib/step_find_current_commit.py b/icklib/step_find_current_commit.py
new file mode 100644
index 0000000..c28fb63
--- /dev/null
+++ b/icklib/step_find_current_commit.py
@@ -0,0 +1,28 @@
+# Copyright 2016  Lars Wirzenius
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# =*= License: GPL-3+ =*=
+
+
+import icklib
+
+
+class FindCurrentGitCommits(icklib.BuildStep):
+
+    def build(self):
+        self.run_state.commits = {}
+        for c in self.run_state.clones:
+            key = '{}@{}'.format(c.url, c.subdir)
+            self.run_state.commits[key] = c.get_HEAD_commit()
diff --git a/without-tests b/without-tests
index 611291c..848ca6e 100644
--- a/without-tests
+++ b/without-tests
@@ -5,5 +5,6 @@ icklib/info.py
 icklib/version.py
 icklib/progress.py
 icklib/step_build_info.py
+icklib/step_find_current_commit.py
 icklib/step_git_clone.py
 icklib/step_project_info.py