gitlab-mirror-pull 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1661ac7caf5f8acda7e034ba84e71e262379c5bf1c4566f99e9df448d35bede7
-  data.tar.gz: b2784aa89b5380ccd51ccfe8a6033c0de63a8b9df943c9a3acd57493c81c97d0
+  metadata.gz: c847596586376e72096363509de165d2b7a7c0523999c683433b2de163e35c28
+  data.tar.gz: be7a17f14463e9173d37f0243267d2b78459f73c030874bf53ac6ddab7fac255
 SHA512:
-  metadata.gz: 9729df121785f1545a5b6389079ea8a3f9c85c02c1636e87027cd67470908b347fc8750ccf3ff78bf735fa475d5340cf174712aa0b04e888d32127a8c6065674
-  data.tar.gz: 0e46b6765c707f6e9eac553336c742535818b182568aaf0c71e9ccd353731700dba8af3e52e77383bdb2dbb4553d4bdfa883b074a5dbd1be1490738d90488e1e
+  metadata.gz: 1cc83bfa75b327b0fbc99252600158366ade011c6564952b447db416eb9503943d70b619740fd5e8d33488dd7a1d38b9b7d75732835bac484280f6a72e7b6349
+  data.tar.gz: 5b23b8accb84df8dc0a08110d8edf6db929a3e1fe3cab69c6545859c2f1535efe4aab492c7ae247afeb2544f2f09baba488c4e60a368f407698436fe66a8f5ca

data/README.md

@@ -6,40 +6,64 @@ Description
 
 Update your git repositories automatically when `remote` is set
 
-Install
--------
+* Adds a command to fetch repositories
+* Run a tiny Webserver to integrate with Gitlabs webhooks
+* Adds init script to `/etc/init.d/gitlab-mirror-server`
 
-- Clone repository: `git clone https://github.com/ochorocho/gitlab-mirror-pull.git`
-- Run bundler: `bundle install`
-- Copy and modify `config.example.yml` to `config.yml`
+# Install (for development)
 
-Run
----
+* Clone repository: `git clone https://github.com/ochorocho/gitlab-mirror-pull.git`
+* Run bundler: `bundle install`
+* Copy and modify `config.example.yml` to `config.yml`
 
-```ruby
-ruby gitlab-mirror-pull.rb
+## Run
+
+```bash
+./bin/gitlab-mirror-pull -c config.yml -l INFO
 ```
 
-Setup a CronJob
----------------
+# Using 'gem install'
 
-If you want to trigger periodically 
+### Install
 
 ```bash
-0 */1 * * *	/usr/bin/ruby /path/to/gitlab-mirror-pull.rb
+gem install gitlab-mirror-pull
 ```
 
-Using 'gem install'
--------------------
+### Run
 
-Install
+```bash
+gitlab-mirror-pull -c /path/to/config.yml
+```
+
+Default config location
 
 ```bash
-gem install gitlab-mirror-pull
+/etc/gitlab-mirror-pull/config.yml
 ```
 
-Run
+## Setup a CronJob
+
+If you want to trigger periodically 
 
 ```bash
-gitlab-mirror-pull -c /path/to/config.yml
+* */1 * * *     git /usr/bin/ruby /usr/local/bin/gitlab-mirror-pull
 ```
+
+## Setup gitlab webhook
+
+Allow webhooks on `localhost` in gitlab (Admin -> Settings -> Outbound requests) 
+and check `Allow requests to the local network from hooks and services` and hit save 
+
+Go to your porject -> Settings -> Integrations:
+
+* Add URL `http://localhost:8088/commit`
+* Leave Token empty
+* Check `Enable SSL verification` 
+* Tick boxes to enable `Triggers`
+* Run server `sudo /etc/init.d/gitlab-mirror-server start`
+
+**Logs**
+
+* `/var/log/gitlab-mirror-server.err`
+* `/var/log/gitlab-mirror-server.log`

data/bin/gitlab-mirror-pull

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/gitlab-mirror-pull.rb'
+require_relative '../lib/gitlab_mirror_pull.rb'
 
 options = {
-  :config => File.join(File.dirname(__FILE__), "../config.example.yml"),
+  :config => "/etc/gitlab-mirror-pull/config.yml",
   :log_level => Logger::ERROR
 }
 
@@ -21,7 +21,7 @@ OptionParser.new do |opts|
   opts.set_summary_indent('   ')
   opts.set_summary_width(50)
   opts.define_head "Fetch gitlab repositories when remote set.
-Default config #{File.join(File.dirname(__FILE__), "../config.example.yml")}\n\n"
+Default config /etc/gitlab-mirror-pull/config.yml\n\n"
 
   # Config argument
   opts.on("-c", "--config [config.yml]", "Specify config yaml") do |yml|
@@ -60,19 +60,24 @@ if options[:run] == 'server'
   require 'multi_json'
 
   config = YAML.load_file(options[:config])
+  pull = GitlabMirrorPull.new(options[:config], options[:log_level])
 
   # Configure server
   set :port, config['server']['port']
   set :bind, config['server']['bind']
+  # Set to true to run sinatra webserver in production
+  set :run, true
 
   post '/commit' do
     gitlab_json = MultiJson.load(request.body.read)
     # File.join(File.dirname(__FILE__), "../config.example.yml")
-    repo_path = File.join(config['git']['repos'], gitlab_json['project']['namespace'].downcase, gitlab_json['project']['name'].downcase)
-    puts repo_path
+    repo_path = File.join(config['git']['repos'], gitlab_json['project']['namespace'].downcase, gitlab_json['project']['name'].downcase + ".git")
+    pull.fetch_repositories([repo_path])
+    return ''
   end
 
 else
   # Run `git fetch` depending on options[:config]
-  GitlabMirrorPull.new(options[:config], options[:log_level])
+  pull = GitlabMirrorPull.new(options[:config], options[:log_level])
+  pull.fetch_repositories
 end

data/extconf.rb

@@ -0,0 +1,18 @@
+require "fileutils"
+
+# Create fake Makefile - without this install fails due to missing Makefile
+require "mkmf"
+create_makefile ''
+
+# Make sure config folder exists
+directory_name = "/etc/gitlab-mirror-pull/"
+Dir.mkdir(directory_name) unless File.exists?(directory_name)
+
+# Copy config if it does not exist
+config_copy = "/etc/gitlab-mirror-pull/config.yml"
+FileUtils.cp("./config.example.yml",config_copy) unless File.exists?(config_copy)
+
+# Copy init script into place
+init_copy = "/etc/init.d/gitlab-mirror-server"
+FileUtils.rm(init_copy) unless File.exists?(init_copy)
+FileUtils.cp("./init.d/gitlab-mirror-server.sh",init_copy)

data/init.d/gitlab-mirror-server.sh

@@ -0,0 +1,100 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start gitlab-mirror-pull webserver
+# Description:       Start gitlab-mirror-pull webserver. Set url to http://localhost:[:port] to trigger git fetch on triggered repo
+### END INIT INFO
+
+dir="/"
+binary=`which gitlab-mirror-pull`
+config="/etc/gitlab-mirror-pull/config.yml"
+cmd="$binary -r server -c $config -l ERROR"
+user=""
+
+name=`basename $0`
+pid_file="/var/run/$name.pid"
+stdout_log="/var/log/$name.log"
+stderr_log="/var/log/$name.err"
+
+get_pid() {
+    cat "$pid_file"
+}
+
+is_running() {
+    [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1
+}
+
+case "$1" in
+    start)
+    if is_running; then
+        echo "$name already started ..."
+    else
+        echo "Starting $name ..."
+        cd "$dir"
+        if [ -z "$user" ]; then
+            sudo $cmd >> "$stdout_log" 2>> "$stderr_log" &
+        else
+            sudo -u "$user" $cmd >> "$stdout_log" 2>> "$stderr_log" &
+        fi
+        echo $! > "$pid_file"
+        if ! is_running; then
+            echo "Unable to start, see $stdout_log and $stderr_log"
+            exit 1
+        fi
+    fi
+    ;;
+    stop)
+    if is_running; then
+        echo -n "Stopping $name ..."
+        kill `get_pid`
+        for i in {1..10}
+        do
+            if ! is_running; then
+                break
+            fi
+
+            echo -n "."
+            sleep 1
+        done
+        echo
+
+        if is_running; then
+            echo "Not stopped; may still be shutting down or shutdown may have failed"
+            exit 1
+        else
+            echo "$name stopped ..."
+            if [ -f "$pid_file" ]; then
+                rm "$pid_file"
+            fi
+        fi
+    else
+        echo "$name not running ..."
+    fi
+    ;;
+    restart)
+    $0 stop
+    if is_running; then
+        echo "Unable to stop, will not attempt to start"
+        exit 1
+    fi
+    $0 start
+    ;;
+    status)
+    if is_running; then
+        echo "$name is running ..."
+    else
+        echo "$name stopped ..."
+        exit 1
+    fi
+    ;;
+    *)
+    echo "Usage: $0 {start|stop|restart|status}"
+    exit 1
+    ;;
+esac
+
+exit 0

data/lib/{gitlab-mirror-pull.rb → gitlab_mirror_pull.rb}

@@ -3,6 +3,7 @@ require 'git'
 require 'logger'
 require 'yaml'
 
+# Fetch Gitlab repositories
 class GitlabMirrorPull
 
   attr_accessor :config, :log_level
@@ -20,7 +21,6 @@ class GitlabMirrorPull
     @log = Logger.new(STDOUT)
     @log.level = log_level
     @config = YAML.load_file(config)
-    self.fetch_repositories
   end
 
   # Prepare list of repositories
@@ -45,16 +45,17 @@ class GitlabMirrorPull
 
   # Fetch repositories return by `repositories_to_fetch`
   #
+  # @param [Array<String>] repos with absolute path to repositories you want to fetch
   # @return Logging infos on fetched repos
   #
-  def fetch_repositories
+  def fetch_repositories(repos = nil)
     # Init git settings
     Git.configure do |config|
       config.binary_path = "#{@config['git']['path']}"
     end
 
     # Loop through repos and fetch it
-    repos_to_fetch = self.repositories_to_fetch
+    repos_to_fetch = repos.nil? ? self.repositories_to_fetch : repos
     repos_to_fetch.each do |repo|
       if File.directory?(repo)
         # Get branches

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-mirror-pull
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - ochorocho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -55,13 +55,16 @@ description: Checks for repositories with a set remote and run git fetch on thes
 email: rothjochen@gmail.com
 executables:
 - gitlab-mirror-pull
-extensions: []
+extensions:
+- extconf.rb
 extra_rdoc_files: []
 files:
 - README.md
 - bin/gitlab-mirror-pull
 - config.example.yml
-- lib/gitlab-mirror-pull.rb
+- extconf.rb
+- init.d/gitlab-mirror-server.sh
+- lib/gitlab_mirror_pull.rb
 homepage: https://github.com/ochorocho/gitlab-mirror-pull
 licenses:
 - MIT