summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Poignant <oliver@poignant.se>2016-03-06 23:28:01 +0100
committerOliver Poignant <oliver@poignant.se>2016-03-06 23:28:01 +0100
commitcb4e95bcaeef4c1e8fc75349feb11ccaa3b08327 (patch)
tree2c47edc5f68fe02563c52275aee224d79077db3a
parent1fcaefe47659877814b2b327f3bd21051e91ef3f (diff)
downloadGit-Auto-Deploy-cb4e95bcaeef4c1e8fc75349feb11ccaa3b08327.zip
Git-Auto-Deploy-cb4e95bcaeef4c1e8fc75349feb11ccaa3b08327.tar.gz
Git-Auto-Deploy-cb4e95bcaeef4c1e8fc75349feb11ccaa3b08327.tar.bz2
Added structure for config generating script (needed when installing using setup.py or pip)
-rwxr-xr-xGitAutoDeploy.conf.json.sample (renamed from GitAutoDeploy.conf.json.example)0
-rw-r--r--README.md2
-rw-r--r--bin/gad-generate-config8
-rw-r--r--gitautodeploy/__init__.py1
-rw-r--r--gitautodeploy/cli/__init__.py1
-rw-r--r--gitautodeploy/cli/config.py4
-rw-r--r--setup.py1
7 files changed, 16 insertions, 1 deletions
diff --git a/GitAutoDeploy.conf.json.example b/GitAutoDeploy.conf.json.sample
index babdb98..babdb98 100755
--- a/GitAutoDeploy.conf.json.example
+++ b/GitAutoDeploy.conf.json.sample
diff --git a/README.md b/README.md
index 849382c..8d45d90 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Additionally, ```GitAutoDeploy.py``` can be configured to execute a shell comman
## Configuration
-* Copy ```GitAutoDeploy.conf.json.example``` to ```GitAutoDeploy.conf.json```
+* Copy ```GitAutoDeploy.conf.json.sample``` to ```GitAutoDeploy.conf.json```
* Modify ```GitAutoDeploy.conf.json``` to match your project setup
* Make sure that the ```pidfilepath``` path is writable for the user running the script, as well as any other path configured for your repositories.
* If you don't want to execute ```git pull``` after webhook was fired, you can leave field ```"path"``` empty.
diff --git a/bin/gad-generate-config b/bin/gad-generate-config
new file mode 100644
index 0000000..dc556f6
--- /dev/null
+++ b/bin/gad-generate-config
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+if __name__ == '__main__':
+ import sys
+ import os
+ sys.path.append(os.path.realpath(os.path.join(os.path.dirname(os.path.realpath(__file__)), '../')))
+ from gitautodeploy.cli import generate_config
+ generate_config()
diff --git a/gitautodeploy/__init__.py b/gitautodeploy/__init__.py
index 023961a..c8a461c 100644
--- a/gitautodeploy/__init__.py
+++ b/gitautodeploy/__init__.py
@@ -2,3 +2,4 @@ from wrappers import *
from lock import *
from parsers import *
from gitautodeploy import *
+from cli import * \ No newline at end of file
diff --git a/gitautodeploy/cli/__init__.py b/gitautodeploy/cli/__init__.py
new file mode 100644
index 0000000..1725ebe
--- /dev/null
+++ b/gitautodeploy/cli/__init__.py
@@ -0,0 +1 @@
+from config import *
diff --git a/gitautodeploy/cli/config.py b/gitautodeploy/cli/config.py
new file mode 100644
index 0000000..332b03e
--- /dev/null
+++ b/gitautodeploy/cli/config.py
@@ -0,0 +1,4 @@
+
+
+def generate_config():
+ print "Generating config" \ No newline at end of file
diff --git a/setup.py b/setup.py
index ab0e054..ee1ff30 100644
--- a/setup.py
+++ b/setup.py
@@ -9,6 +9,7 @@ setup(name='git-auto-deploy',
entry_points={
'console_scripts': [
'gad-server = gitautodeploy.__main__:main'
+ 'gad-generate-config = gitautodeploy.__main__:main'
]
},
description = "Deploy your GitHub, GitLab or Bitbucket projects automatically on Git push events or webhooks.",