overlay 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fd82f435db3f9a9591ca004d817e5a3ef6f2a4f
-  data.tar.gz: 2bf524aa38d988ba19f82d993bb44d765f6acb4a
+  metadata.gz: af4c5cc9e0f3df5433871de6e021c072fc3e5122
+  data.tar.gz: 5a769dbe4d754ec40db970a19bd2b536299d30c6
 SHA512:
-  metadata.gz: 5861117357387d2a5ecc8d572204a883d1c8815b9dd646afe744ce8b9167fcb35aa86b640caf8fb8f1a46175d815c36b1d3540beedf3bcada791be499740935c
-  data.tar.gz: d04f4006859d68e932004d819eac1971025663f2dc1c0c848086bbc319160db5f8c535abdd62b4ea7e63161bae71dcd0a7bae7b20264f1fba61ac1ba5d6d8ac7
+  metadata.gz: 9566bcd6762c5035425aa5467fc1e5151366793335ad31c2de3668c5893f93f3e85d10b5a8a08d2924688c9e6c6660a8b4b38da490b338706ef1703bef328aab
+  data.tar.gz: b1981b111c43b6bab9b650ce86a07fab40fc77d83dc669982fda21f6be5ddecbd1ae67f79d1f8b25002a0d3a144cdf060194a468a36014eda30fa33facdade74

data/app/controllers/overlay/github_controller.rb

@@ -12,7 +12,7 @@ module Overlay
         if (params[:repository] && params[:ref])
           if (params[:repository][:name] == repo_config[:repo]) && (params[:ref] == "refs/heads/#{branch}")
             logger.info "Enqueueing GithubJob for repo: #{repo_config[:repo]} and branch: #{repo_config[:branch] || 'master'}"
-            GithubJob.new.async.perform repo_config
+            Overlay::Github.overlay_repo repo_config
           end
         end
       end

data/lib/overlay/github.rb

@@ -1,7 +1,6 @@
 require 'github_api'
 require 'fileutils'
 require 'socket'
-require 'sucker_punch'
 
 module Overlay
   class Github
@@ -29,7 +28,7 @@ module Overlay
 
         register_web_hook(repo_config)
 
-        GithubJob.new.async.perform repo_config
+        overlay_repo repo_config
       end
     end
 
@@ -54,25 +53,28 @@ module Overlay
     end
 
     def self.overlay_repo repo_config
-      # 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)
-        return
-      end
-
-      root_entries = github_repo.contents.get(repo_config[:user], 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)
+      Thread.new do
+        Rails.logger.info "Start 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 = github_repo.contents.get(repo_config[:user], 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)
+            end
+          end
         end
+        Rails.logger.info "Finished processing repo with config #{repo_config.inspect}"
       end
     end
 
@@ -124,17 +126,4 @@ module Overlay
       end
     end
   end
-
-  class GithubJob
-    include SuckerPunch::Job
-
-    def perform(repo_config)
-      Rails.logger.info "SuckerPunch processing job for #{repo_config[:repo]}"
-
-      # Configure github api
-      Github.configure
-
-      Github.overlay_repo repo_config
-    end
-  end
 end

data/lib/overlay/version.rb

@@ -1,3 +1,3 @@
 module Overlay
-  VERSION = "1.0.7"
+  VERSION = "1.1.0"
 end

data/spec/controllers/overlay/github_controller_spec.rb

@@ -16,6 +16,5 @@ module Overlay
         response.should be_success
       end
     end
-
   end
 end

data/spec/dummy/log/test.log

@@ -327,3 +327,61 @@ SuckerPunch processing job for overlay
 SuckerPunch processing job for overlay
 Terminating 3 actors...
 Shutdown completed cleanly
+Processing by Overlay::GithubController#update as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 5ms (Views: 4.4ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test"}}
+Enqueueing GithubJob for repo: test and branch: master
+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.4ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test"}}
+Enqueueing GithubJob for repo: test and branch: master
+Completed 200 OK in 0ms (Views: 0.1ms)
+Processing by Overlay::GithubController#update as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 4.1ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test"}}
+Enqueueing GithubJob for repo: test and branch: master
+Completed 200 OK in 0ms (Views: 0.2ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test"}}
+  Rendered text template (0.0ms)
+Enqueueing GithubJob for repo: test and branch: master
+Completed 200 OK in 4ms (Views: 4.1ms)
+Processing by Overlay::GithubController#update as HTML
+Completed 200 OK in 0ms (Views: 0.1ms)
+Processing by Overlay::GithubController#update as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 4ms (Views: 4.2ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test"}}
+Enqueueing GithubJob for repo: test and branch: master
+Completed 200 OK in 0ms (Views: 0.2ms)
+Processing by Overlay::GithubController#update as HTML
+  Parameters: {"ref"=>"refs/heads/master", "repository"=>{"name"=>"test"}}
+  Rendered text template (0.0ms)
+Enqueueing GithubJob for repo: test and branch: master
+Completed 200 OK in 5ms (Views: 4.3ms)
+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"}}
+  Rendered text template (0.0ms)
+Enqueueing GithubJob for repo: test and branch: master
+Completed 200 OK in 5ms (Views: 4.3ms)
+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"}}
+  Rendered text template (0.0ms)
+Enqueueing GithubJob for repo: test and branch: master
+Completed 200 OK in 6ms (Views: 5.3ms)
+Start processing repo with config #<struct Overlay::GithubRepo user="saarinen", repo="overlay", branch="master", root_source_path="spec", root_dest_path="spec">
+Finished processing repo with config #<struct Overlay::GithubRepo user="saarinen", repo="overlay", branch="master", root_source_path="spec", root_dest_path="spec">
+Processing by Overlay::GithubController#update as HTML
+Completed 200 OK in 0ms (Views: 0.2ms)

data/spec/github_spec.rb

@@ -81,7 +81,8 @@ describe Overlay::Github do
     it "should jump directly to overlay_directory if root set" do
       repo_config = Overlay::GithubRepo.new('saarinen', 'overlay', 'master', 'spec', 'spec')
       Overlay::Github.should_receive(:overlay_directory).once.with('spec', repo_config).and_return
-      Overlay::Github.overlay_repo repo_config
+      overlay_thread = Overlay::Github.overlay_repo repo_config
+      overlay_thread.join
     end
 
     it "should ignore any files in repo root"

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
-require 'sucker_punch/testing/inline'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overlay
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Steve Saarinen
@@ -38,20 +38,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: sucker_punch
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement