overlay 2.1.6 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 002727d7c83076cee89989a93a02782b495b8c6e
-  data.tar.gz: 095bd4654b2102672962922a99bea069578b40e3
+  metadata.gz: 40209f5a3f90eb0e0d419a56852c206682fc018b
+  data.tar.gz: 557e94ab77d1ad47dc2b2e2ce8e600b4d9e936dd
 SHA512:
-  metadata.gz: a4224c70752c4813b13279c79cb323185cda00afc5ea84715c067954199048b00f7addf04190945e1f76df228ecbdf51c1dff36ab1031ec32c45c14e02dfe1d7
-  data.tar.gz: ebd03859f18bd2006e0d26f031e87a92bb42356e3b77d11db311d130a4a0e8163112414e941848a114a77b10f83d910dacb4549a9c6224e3be67d2aa55d75d6e
+  metadata.gz: 01e8a094a9f4495bf35db856de6bdfb916adcd2b4102bb6bc2c4f665b8f6a1b122b5b5c0e9a7afbc78ec9cc779cc230e01b0d65dc0001e7822a07c08f798f130
+  data.tar.gz: 6b903dbab503768ccb890c4a3b673ea49fb77c611d20ee9f1fce780cbfa8720fc9b0498ebb230a3b72743a889bf084c04035a6ce0f01b73261e1488f0306791e

data/lib/overlay/github.rb

@@ -155,26 +155,35 @@ module Overlay
 
     # Overlay all the files specifiec by the repo_config.  This
     # process can be long_running so we fork.  We should only be running
-    # this method in initialization of the application.
+    # this method in initialization of the application or on explicit call.
+    # This method must succeed to completion to guarantee we have all the files
+    # we need so we will continue to retyr until we are complete
     def overlay_repo repo_config
       Rails.logger.info "Overlay started processing repo with config #{repo_config.inspect}"
 
       # Get our root entries
       root = repo_config.root_source_path || '/'
 
-      # If we have a root defined, jump right into it
-      if root != '/'
-        overlay_directory(root, repo_config)
-      else
-        root_entries = repo_config.github_api.contents.get(repo_config.org, repo_config.repo, root, ref: repo_config.branch).response.body
+      begin
+        # If we have a root defined, jump right into it
+        if root != '/'
+          overlay_directory(root, repo_config)
+        else
+          root_entries = repo_config.github_api.contents.get(repo_config.org, repo_config.repo, root, ref: repo_config.branch).response.body
 
-        # We aren't pulling anything out of root.  Cycle through directories and overlay
-        root_entries.each do |entry|
-          if entry.type == 'dir'
-            overlay_directory(entry.path, repo_config)
+          # We aren't pulling anything out of root.  Cycle through directories and overlay
+          root_entries.each do |entry|
+            if entry.type == 'dir'
+              overlay_directory(entry.path, repo_config)
+            end
           end
         end
+      rescue => e
+        Rails.logger.error "Overlay encountered an error during overlay_repo and is retrying: #{e.message}"
+        sleep 5
+        retry
       end
+
       Rails.logger.info "Overlay finished processing repo with config #{repo_config.inspect}"
     end
 
@@ -199,23 +208,31 @@ module Overlay
 
     # Fork a new process and subscribe to a redis channel
     def subscribe_to_channel key, repo_config
-      redis = Redis.new(:timeout => 30, :host => repo_config.redis_server, :port => repo_config.redis_port)
+      redis = Redis.new(:host => repo_config.redis_server, :port => repo_config.redis_port)
 
       # This key is going to receive a publish event
       # for any changes to the target repo.  We need to verify
-      # that the payload references our branch and our watch direstory
-      redis.subscribe(key) do |on|
-        on.message do |channel, msg|
-          Rails.logger.info "Overlay received publish event for channel #{key} with payload: #{msg}"
-          hook = JSON.parse(msg)
-
-          # Make sure this is the branch we are watching
-          if (hook['ref'] == "refs/heads/#{repo_config.branch}")
-            Rails.logger.info "Overlay enqueueing Github hook processing job for repo: #{repo_config.repo} and branch: #{repo_config.branch}"
-            process_hook(hook, repo_config)
-            Rails.logger.info "Overlay done processing job for repo: #{repo_config.repo} and branch: #{repo_config.branch}"
+      # that the payload references our branch and our watch direstory.
+      # The subscribe call is persistent.
+      begin
+        redis.subscribe(key) do |on|
+          on.message do |channel, msg|
+            Rails.logger.info "Overlay received publish event for channel #{key} with payload: #{msg}"
+            hook = JSON.parse(msg)
+
+            # Make sure this is the branch we are watching
+            if (hook['ref'] == "refs/heads/#{repo_config.branch}")
+              Rails.logger.info "Overlay enqueueing Github hook processing job for repo: #{repo_config.repo} and branch: #{repo_config.branch}"
+              process_hook(hook, repo_config)
+              Rails.logger.info "Overlay done processing job for repo: #{repo_config.repo} and branch: #{repo_config.branch}"
+            end
           end
         end
+        Rails.logger.error "Overlay subscribe closed for unknown reason."
+      rescue => e
+        Rails.logger.error "Overlay encountered an error during subscribe_to_channel on key #{key} and is retrying: #{e.message}"
+        sleep 5
+        retry
       end
     end
 

data/lib/overlay/version.rb

@@ -1,3 +1,3 @@
 module Overlay
-  VERSION = "2.1.6"
+  VERSION = "2.2.0"
 end

data/spec/dummy/log/test.log

@@ -2041,3 +2041,388 @@ Overlay found modified file in hook: lib/test/test_modified.rb
 Overlay subscribing to redis channel: test_key
 Overlay register webhook for repo: org => test_org, repo => test_repo
 Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay subscribing to redis channel: test_key
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+  Rendered text template (0.0ms)
+Completed 200 OK in 7ms (Views: 6.7ms)
+Processing by Overlay::GithubController#update as HTML
+Completed 200 OK in 0ms (Views: 0.2ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+  Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 3.2ms)
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay subscribing to redis channel: test_key
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Processing by Overlay::GithubController#update as HTML
+Completed 200 OK in 0ms (Views: 0.2ms)
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay subscribing to redis channel: test_key
+Overlay subscribe closed for unknown reason.
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Processing by Overlay::GithubController#update as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 3.2ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+Completed 200 OK in 0ms (Views: 0.1ms)
+Overlay subscribing to redis channel: test_key
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+  Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 3.2ms)
+Processing by Overlay::GithubController#update as HTML
+Completed 200 OK in 0ms (Views: 0.1ms)
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay subscribing to redis channel: test_key
+Overlay subscribe closed for unknown reason.
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Processing by Overlay::GithubController#update as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 5ms (Views: 4.2ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+Completed 200 OK in 0ms (Views: 0.2ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+  Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 3.3ms)
+Processing by Overlay::GithubController#update as HTML
+Completed 200 OK in 0ms (Views: 0.2ms)
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay subscribing to redis channel: test_key
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay subscribe closed for unknown reason.
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Processing by Overlay::GithubController#update as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 3.4ms)
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay subscribe closed for unknown reason.
+Overlay subscribing to redis channel: test_key
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay started processing repo with config #<Overlay::GithubRepo:0x007fbcdf3344f8 @org="test_org", @repo="test_repo", @auth="test_user:test_pass", @root_source_path="/", @root_dest_path="spec", @redis_server=nil, @redis_port=nil, @registration_server=nil, @endpoint=nil, @site=nil, @branch="master", @use_publisher=false, @github_api=#<Github::Repos:0x007fbcdf334480 @current_options={:adapter=>:net_http, :client_id=>nil, :client_secret=>nil, :oauth_token=>nil, :endpoint=>"https://api.github.com", :site=>"https://github.com", :ssl=>{:verify=>false}, :mime_type=>:json, :user_agent=>"Github Ruby Gem 0.11.2", :connection_options=>{}, :repo=>"test_repo", :user=>nil, :org=>"test_org", :login=>"test_user", :password=>"test_pass", :basic_auth=>"test_user:test_pass", :auto_pagination=>false}, @adapter=:net_http, @client_id=nil, @client_secret=nil, @oauth_token=nil, @endpoint="https://api.github.com", @site="https://github.com", @ssl={:verify=>false}, @mime_type=:json, @user_agent="Github Ruby Gem 0.11.2", @connection_options={}, @repo="test_repo", @user=nil, @org="test_org", @login="test_user", @password="test_pass", @basic_auth="test_user:test_pass", @auto_pagination=false>>
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+Completed 200 OK in 0ms (Views: 0.2ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+  Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 3.2ms)
+Processing by Overlay::GithubController#update as HTML
+Completed 200 OK in 0ms (Views: 0.2ms)
+Overlay started processing repo with config #<Overlay::GithubRepo:0x007f9f8ec41fc8 @org="test_org", @repo="test_repo", @auth="test_user:test_pass", @root_source_path="spec", @root_dest_path="spec", @redis_server=nil, @redis_port=nil, @registration_server=nil, @endpoint=nil, @site=nil, @branch="master", @use_publisher=false, @github_api=#<Github::Repos:0x007f9f8ec41f28 @current_options={:adapter=>:net_http, :client_id=>nil, :client_secret=>nil, :oauth_token=>nil, :endpoint=>"https://api.github.com", :site=>"https://github.com", :ssl=>{:verify=>false}, :mime_type=>:json, :user_agent=>"Github Ruby Gem 0.11.2", :connection_options=>{}, :repo=>"test_repo", :user=>nil, :org=>"test_org", :login=>"test_user", :password=>"test_pass", :basic_auth=>"test_user:test_pass", :auto_pagination=>false}, @adapter=:net_http, @client_id=nil, @client_secret=nil, @oauth_token=nil, @endpoint="https://api.github.com", @site="https://github.com", @ssl={:verify=>false}, @mime_type=:json, @user_agent="Github Ruby Gem 0.11.2", @connection_options={}, @repo="test_repo", @user=nil, @org="test_org", @login="test_user", @password="test_pass", @basic_auth="test_user:test_pass", @auto_pagination=false>>
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay finished processing repo with config #<Overlay::GithubRepo:0x007f9f8ec41fc8 @org="test_org", @repo="test_repo", @auth="test_user:test_pass", @root_source_path="spec", @root_dest_path="spec", @redis_server=nil, @redis_port=nil, @registration_server=nil, @endpoint=nil, @site=nil, @branch="master", @use_publisher=false, @github_api=#<Github::Repos:0x007f9f8ec41f28 @current_options={:adapter=>:net_http, :client_id=>nil, :client_secret=>nil, :oauth_token=>nil, :endpoint=>"https://api.github.com", :site=>"https://github.com", :ssl=>{:verify=>false}, :mime_type=>:json, :user_agent=>"Github Ruby Gem 0.11.2", :connection_options=>{}, :repo=>"test_repo", :user=>nil, :org=>"test_org", :login=>"test_user", :password=>"test_pass", :basic_auth=>"test_user:test_pass", :auto_pagination=>false}, @adapter=:net_http, @client_id=nil, @client_secret=nil, @oauth_token=nil, @endpoint="https://api.github.com", @site="https://github.com", @ssl={:verify=>false}, @mime_type=:json, @user_agent="Github Ruby Gem 0.11.2", @connection_options={}, @repo="test_repo", @user=nil, @org="test_org", @login="test_user", @password="test_pass", @basic_auth="test_user:test_pass", @auto_pagination=false>>
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay subscribing to redis channel: test_key
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay subscribe closed for unknown reason.
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay started processing repo with config #<Overlay::GithubRepo:0x007ff436b9a398 @org="test_org", @repo="test_repo", @auth="test_user:test_pass", @root_source_path="spec", @root_dest_path="spec", @redis_server=nil, @redis_port=nil, @registration_server=nil, @endpoint=nil, @site=nil, @branch="master", @use_publisher=false, @github_api=#<Github::Repos:0x007ff436b9a320 @current_options={:adapter=>:net_http, :client_id=>nil, :client_secret=>nil, :oauth_token=>nil, :endpoint=>"https://api.github.com", :site=>"https://github.com", :ssl=>{:verify=>false}, :mime_type=>:json, :user_agent=>"Github Ruby Gem 0.11.2", :connection_options=>{}, :repo=>"test_repo", :user=>nil, :org=>"test_org", :login=>"test_user", :password=>"test_pass", :basic_auth=>"test_user:test_pass", :auto_pagination=>false}, @adapter=:net_http, @client_id=nil, @client_secret=nil, @oauth_token=nil, @endpoint="https://api.github.com", @site="https://github.com", @ssl={:verify=>false}, @mime_type=:json, @user_agent="Github Ruby Gem 0.11.2", @connection_options={}, @repo="test_repo", @user=nil, @org="test_org", @login="test_user", @password="test_pass", @basic_auth="test_user:test_pass", @auto_pagination=false>>
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay finished processing repo with config #<Overlay::GithubRepo:0x007ff436b9a398 @org="test_org", @repo="test_repo", @auth="test_user:test_pass", @root_source_path="spec", @root_dest_path="spec", @redis_server=nil, @redis_port=nil, @registration_server=nil, @endpoint=nil, @site=nil, @branch="master", @use_publisher=false, @github_api=#<Github::Repos:0x007ff436b9a320 @current_options={:adapter=>:net_http, :client_id=>nil, :client_secret=>nil, :oauth_token=>nil, :endpoint=>"https://api.github.com", :site=>"https://github.com", :ssl=>{:verify=>false}, :mime_type=>:json, :user_agent=>"Github Ruby Gem 0.11.2", :connection_options=>{}, :repo=>"test_repo", :user=>nil, :org=>"test_org", :login=>"test_user", :password=>"test_pass", :basic_auth=>"test_user:test_pass", :auto_pagination=>false}, @adapter=:net_http, @client_id=nil, @client_secret=nil, @oauth_token=nil, @endpoint="https://api.github.com", @site="https://github.com", @ssl={:verify=>false}, @mime_type=:json, @user_agent="Github Ruby Gem 0.11.2", @connection_options={}, @repo="test_repo", @user=nil, @org="test_org", @login="test_user", @password="test_pass", @basic_auth="test_user:test_pass", @auto_pagination=false>>
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay subscribing to redis channel: test_key
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+  Rendered text template (0.0ms)
+Completed 200 OK in 5ms (Views: 4.4ms)
+Processing by Overlay::GithubController#update as HTML
+Completed 200 OK in 0ms (Views: 0.1ms)
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay subscribe closed for unknown reason.
+Overlay subscribing to redis channel: test_key
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay started processing repo with config #<Overlay::GithubRepo:0x007fb11a5c2448 @org="test_org", @repo="test_repo", @auth="test_user:test_pass", @root_source_path="spec", @root_dest_path="spec", @redis_server=nil, @redis_port=nil, @registration_server=nil, @endpoint=nil, @site=nil, @branch="master", @use_publisher=false, @github_api=#<Github::Repos:0x007fb11a5c23a8 @current_options={:adapter=>:net_http, :client_id=>nil, :client_secret=>nil, :oauth_token=>nil, :endpoint=>"https://api.github.com", :site=>"https://github.com", :ssl=>{:verify=>false}, :mime_type=>:json, :user_agent=>"Github Ruby Gem 0.11.2", :connection_options=>{}, :repo=>"test_repo", :user=>nil, :org=>"test_org", :login=>"test_user", :password=>"test_pass", :basic_auth=>"test_user:test_pass", :auto_pagination=>false}, @adapter=:net_http, @client_id=nil, @client_secret=nil, @oauth_token=nil, @endpoint="https://api.github.com", @site="https://github.com", @ssl={:verify=>false}, @mime_type=:json, @user_agent="Github Ruby Gem 0.11.2", @connection_options={}, @repo="test_repo", @user=nil, @org="test_org", @login="test_user", @password="test_pass", @basic_auth="test_user:test_pass", @auto_pagination=false>>
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay finished processing repo with config #<Overlay::GithubRepo:0x007fb11a5c2448 @org="test_org", @repo="test_repo", @auth="test_user:test_pass", @root_source_path="spec", @root_dest_path="spec", @redis_server=nil, @redis_port=nil, @registration_server=nil, @endpoint=nil, @site=nil, @branch="master", @use_publisher=false, @github_api=#<Github::Repos:0x007fb11a5c23a8 @current_options={:adapter=>:net_http, :client_id=>nil, :client_secret=>nil, :oauth_token=>nil, :endpoint=>"https://api.github.com", :site=>"https://github.com", :ssl=>{:verify=>false}, :mime_type=>:json, :user_agent=>"Github Ruby Gem 0.11.2", :connection_options=>{}, :repo=>"test_repo", :user=>nil, :org=>"test_org", :login=>"test_user", :password=>"test_pass", :basic_auth=>"test_user:test_pass", :auto_pagination=>false}, @adapter=:net_http, @client_id=nil, @client_secret=nil, @oauth_token=nil, @endpoint="https://api.github.com", @site="https://github.com", @ssl={:verify=>false}, @mime_type=:json, @user_agent="Github Ruby Gem 0.11.2", @connection_options={}, @repo="test_repo", @user=nil, @org="test_org", @login="test_user", @password="test_pass", @basic_auth="test_user:test_pass", @auto_pagination=false>>
+Processing by Overlay::GithubController#update as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 3.6ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+Completed 200 OK in 0ms (Views: 0.2ms)
+Processing by Overlay::GithubController#update as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 3.5ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+Completed 200 OK in 0ms (Views: 0.2ms)
+Overlay subscribing to redis channel: test_key
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay subscribe closed for unknown reason.
+Overlay started processing repo with config #<Overlay::GithubRepo:0x007fb5ffc23640 @org="test_org", @repo="test_repo", @auth="test_user:test_pass", @root_source_path="spec", @root_dest_path="spec", @redis_server=nil, @redis_port=nil, @registration_server=nil, @endpoint=nil, @site=nil, @branch="master", @use_publisher=false, @github_api=#<Github::Repos:0x007fb5ffc23578 @current_options={:adapter=>:net_http, :client_id=>nil, :client_secret=>nil, :oauth_token=>nil, :endpoint=>"https://api.github.com", :site=>"https://github.com", :ssl=>{:verify=>false}, :mime_type=>:json, :user_agent=>"Github Ruby Gem 0.11.2", :connection_options=>{}, :repo=>"test_repo", :user=>nil, :org=>"test_org", :login=>"test_user", :password=>"test_pass", :basic_auth=>"test_user:test_pass", :auto_pagination=>false}, @adapter=:net_http, @client_id=nil, @client_secret=nil, @oauth_token=nil, @endpoint="https://api.github.com", @site="https://github.com", @ssl={:verify=>false}, @mime_type=:json, @user_agent="Github Ruby Gem 0.11.2", @connection_options={}, @repo="test_repo", @user=nil, @org="test_org", @login="test_user", @password="test_pass", @basic_auth="test_user:test_pass", @auto_pagination=false>>
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay finished processing repo with config #<Overlay::GithubRepo:0x007fb5ffc23640 @org="test_org", @repo="test_repo", @auth="test_user:test_pass", @root_source_path="spec", @root_dest_path="spec", @redis_server=nil, @redis_port=nil, @registration_server=nil, @endpoint=nil, @site=nil, @branch="master", @use_publisher=false, @github_api=#<Github::Repos:0x007fb5ffc23578 @current_options={:adapter=>:net_http, :client_id=>nil, :client_secret=>nil, :oauth_token=>nil, :endpoint=>"https://api.github.com", :site=>"https://github.com", :ssl=>{:verify=>false}, :mime_type=>:json, :user_agent=>"Github Ruby Gem 0.11.2", :connection_options=>{}, :repo=>"test_repo", :user=>nil, :org=>"test_org", :login=>"test_user", :password=>"test_pass", :basic_auth=>"test_user:test_pass", :auto_pagination=>false}, @adapter=:net_http, @client_id=nil, @client_secret=nil, @oauth_token=nil, @endpoint="https://api.github.com", @site="https://github.com", @ssl={:verify=>false}, @mime_type=:json, @user_agent="Github Ruby Gem 0.11.2", @connection_options={}, @repo="test_repo", @user=nil, @org="test_org", @login="test_user", @password="test_pass", @basic_auth="test_user:test_pass", @auto_pagination=false>>
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test_repo"}}
+  Rendered text template (0.0ms)
+Completed 200 OK in 3ms (Views: 3.2ms)
+Processing by Overlay::GithubController#update as HTML
+Completed 200 OK in 0ms (Views: 0.2ms)
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay register webhook for repo: org => test_org, repo => test_repo
+Overlay started processing repo with config #<Overlay::GithubRepo:0x007fce6ebf16b8 @org="test_org", @repo="test_repo", @auth="test_user:test_pass", @root_source_path="spec", @root_dest_path="spec", @redis_server=nil, @redis_port=nil, @registration_server=nil, @endpoint=nil, @site=nil, @branch="master", @use_publisher=false, @github_api=#<Github::Repos:0x007fce6ebf1640 @current_options={:adapter=>:net_http, :client_id=>nil, :client_secret=>nil, :oauth_token=>nil, :endpoint=>"https://api.github.com", :site=>"https://github.com", :ssl=>{:verify=>false}, :mime_type=>:json, :user_agent=>"Github Ruby Gem 0.11.2", :connection_options=>{}, :repo=>"test_repo", :user=>nil, :org=>"test_org", :login=>"test_user", :password=>"test_pass", :basic_auth=>"test_user:test_pass", :auto_pagination=>false}, @adapter=:net_http, @client_id=nil, @client_secret=nil, @oauth_token=nil, @endpoint="https://api.github.com", @site="https://github.com", @ssl={:verify=>false}, @mime_type=:json, @user_agent="Github Ruby Gem 0.11.2", @connection_options={}, @repo="test_repo", @user=nil, @org="test_org", @login="test_user", @password="test_pass", @basic_auth="test_user:test_pass", @auto_pagination=false>>
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay encountered an error during overlay_repo and is retrying: StandardError
+Overlay finished processing repo with config #<Overlay::GithubRepo:0x007fce6ebf16b8 @org="test_org", @repo="test_repo", @auth="test_user:test_pass", @root_source_path="spec", @root_dest_path="spec", @redis_server=nil, @redis_port=nil, @registration_server=nil, @endpoint=nil, @site=nil, @branch="master", @use_publisher=false, @github_api=#<Github::Repos:0x007fce6ebf1640 @current_options={:adapter=>:net_http, :client_id=>nil, :client_secret=>nil, :oauth_token=>nil, :endpoint=>"https://api.github.com", :site=>"https://github.com", :ssl=>{:verify=>false}, :mime_type=>:json, :user_agent=>"Github Ruby Gem 0.11.2", :connection_options=>{}, :repo=>"test_repo", :user=>nil, :org=>"test_org", :login=>"test_user", :password=>"test_pass", :basic_auth=>"test_user:test_pass", :auto_pagination=>false}, @adapter=:net_http, @client_id=nil, @client_secret=nil, @oauth_token=nil, @endpoint="https://api.github.com", @site="https://github.com", @ssl={:verify=>false}, @mime_type=:json, @user_agent="Github Ruby Gem 0.11.2", @connection_options={}, @repo="test_repo", @user=nil, @org="test_org", @login="test_user", @password="test_pass", @basic_auth="test_user:test_pass", @auto_pagination=false>>
+Overlay subscribing to redis channel: test_key
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay encountered an error during subscribe_to_channel on key test and is retrying: StandardError
+Overlay subscribe closed for unknown reason.
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb
+Overlay found added file in hook: lib/test/test_added.rb
+Overlay found modified file in hook: lib/test/test_modified.rb
+Overlay found deleted file in hook: lib/test/test_removed.rb

data/spec/github_spec.rb

@@ -68,6 +68,18 @@ describe Overlay::Github do
     end
   end
 
+  describe 'initial overlay_repo' do
+    it 'should retry overlay_repo until completion' do
+      @times_called = 0
+      allow(Overlay::Github.instance).to receive(:sleep).and_return
+      expect(Overlay::Github.instance).to receive(:overlay_directory).exactly(5).times.and_return do
+        @times_called += 1
+        raise StandardError unless @times_called == 5
+      end
+      Overlay::Github.instance.send(:overlay_repo, repo_config)
+    end
+  end
+
   describe 'subscribe to a redis publisher' do
     before :each do
       # Configure the overlay
@@ -80,7 +92,7 @@ describe Overlay::Github do
 
       config = repo_config
       config.use_publisher        = true
-      config.redis_server         = 'localhost'
+      config.redis_server         = 'unreachable'
       config.redis_port           = 6734
       config.registration_server  = "http://www.test.com"
 
@@ -107,6 +119,19 @@ describe Overlay::Github do
 
       Overlay::Github.instance.process_overlays
     end
+
+    it 'should retry on error' do
+      allow(Overlay::Github.instance).to receive(:sleep).and_return
+      @times_called = 0
+      redis = double("Redis")
+      Redis.stub(:new).and_return(redis)
+      redis.stub(:subscribe).and_return do
+        @times_called += 1
+        raise StandardError unless @times_called == 5
+      end
+      expect(redis).to receive(:subscribe).exactly(5).times
+      Overlay::Github.instance.send(:subscribe_to_channel, "test", Overlay.configuration.repositories.first)
+    end
   end
 
   describe 'process webhook payload' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overlay
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.2.0
 platform: ruby
 authors:
 - Steve Saarinen