gitlab-mirror-pull 0.3.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3a69f7182c94ae3254645abc783683ecd7e4e5a95c33fedb9d2ecfd7baf2284
-  data.tar.gz: 72dfca3933fa3cb0f535918315d21f6dde6e96fb47e506020735f12dd454c11e
+  metadata.gz: c8016146894292c81c368013de92acb4479279c0eb2cea7f03ade1c6a9fa4b8d
+  data.tar.gz: 2fd57a6bbdfb8f55c533f435111a33d33d88782e435a86171ef66e35a73894f1
 SHA512:
-  metadata.gz: 136029157168d5028a479e26ca629195e422e6bf2aef0be0b8ba379f65b931cd3b9f26322fc25bde97f438f119de0397890f713b166aaec446d9a60c38a7ef6c
-  data.tar.gz: ebf14424ebb898787b5d308138ae682af4908dab8c1e41a3acc923fb0bcef43c263e47a9aedab306d133cc35afffbcd6a82f54a97da272f6ab6c2d6611b208d8
+  metadata.gz: bdb0685b902726494e7daa0c986f03cad1563edcd673cfb78885951861e74ab9c3cb17e62c944082031bc2f8ae1ea7f3999ccfec495998a930b08994c28deb60
+  data.tar.gz: 97535c04d0ef00971c5075643a0b5f02404bf4393f06a873347588a331f72df6be5b8ca71037e595aa42d8878fa453a494aad8409130d857a0de3a60891fc6b4

data/bin/gitlab-mirror-pull

@@ -63,6 +63,7 @@ if options[:run] == 'server'
   pull = GitlabMirrorPull.new(options[:config], options[:log_level])
 
   # Configure server
+  set :server, 'webrick'
   set :port, config['server']['port']
   set :bind, config['server']['bind']
   # Set to true to run sinatra webserver in production
@@ -70,10 +71,14 @@ if options[:run] == 'server'
 
   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 + ".git")
-    pull.fetch_repositories([repo_path])
-    return ''
+
+    if File.exists?(repo_path)
+      pull.fetch_repositories([repo_path])
+      halt 200
+    else
+      halt 404
+    end
   end
 
 else

data/lib/gitlab_mirror_pull.rb

@@ -15,9 +15,7 @@ class GitlabMirrorPull
   #
   # @return Returns `@log` and `@config`
   #
-  def initialize(config = File.join(File.dirname(__FILE__), "../config.example.yml"), log_level = Logger::ERROR)
-
-    # Configure Logger
+  def initialize(config = File.join(File.dirname(__FILE__), "../config.yml"), log_level = Logger::ERROR)
     @log = Logger.new(STDOUT)
     @log.level = log_level
     @config = YAML.load_file(config)
@@ -29,7 +27,7 @@ class GitlabMirrorPull
   #
   def repositories_to_fetch
     # Find all .git Repositories - Ignore *.wiki.git
-    repos = Dir.glob("#{config['git']['repos']}/*/*{[!.wiki]}.git")
+    repos = Dir.glob("#{@config['git']['repos']}/*/*{[!.wiki]}.git")
 
     # Build up array of NOT ignored repositories
     delete_path = []
@@ -53,7 +51,7 @@ class GitlabMirrorPull
     Git.configure do |config|
       config.binary_path = "#{@config['git']['path']}"
     end
-
+    @return_repos = []
     # Loop through repos and fetch it
     repos_to_fetch = repos.nil? ? self.repositories_to_fetch : repos
     repos_to_fetch.each do |repo|
@@ -65,11 +63,12 @@ class GitlabMirrorPull
           if @config['provider'].include?("#{remote}")
             @log.info("Fetching remote #{remote} in #{repo}")
             g.remote(remote).fetch
+            @return_repos << repo
           end
         end
       end
     end
-
+    @return_repos
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-mirror-pull
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
 platform: ruby
 authors:
 - ochorocho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-16 00:00:00.000000000 Z
+date: 2018-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git