overlay 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1ed5b5ecabe7f6db32dcc1d22a27f014e3b7148
-  data.tar.gz: f298741a03ee2625883981d073b4f93045de10d7
+  metadata.gz: 80ccbfd578014c00094c8eb7b434a5ca509c75eb
+  data.tar.gz: cdd707ea7987ecbe0ac9cc01a872323408240099
 SHA512:
-  metadata.gz: f6ae58c5c453d6cb0b3d22a24d0f44c5fb3af5305bae5ea1fb6a6394ed829b67aa08be5077b7093d8a8bf44092ae42cec374ef4579af6fe5f3a4063c5015d47e
-  data.tar.gz: 4c2145676a72cb37da30019f20ba7925a0dd7880d1d75936a56af2f4f4f5b6644f5424472b71fe5bcb9a9166d656efcb2cb05ffb060c7c3d27e24ab84bee3b1a
+  metadata.gz: 02ff926a5c3600648642ce92f802b044ed97c0643a7faaf450012b807d8090757e8777b8de9bfbf0f5afb621224edbfd1589020c22867aee499032e8229e9b88
+  data.tar.gz: ad846c7c49712f864bf213857a4690486c07373d496786b97da699199dc762bca5be07334fdfbaf69b99de2e175279d8f3eda88941245091558ed375c510ef4a

data/app/controllers/overlay/github_controller.rb

@@ -3,6 +3,16 @@ require_dependency "overlay/application_controller"
 module Overlay
   class GithubController < ApplicationController
     def update
+      Overlay.configuration.repositories.each do |repo_config|
+        next unless repo_config.class == GithubRepo
+        branch = repo_config[:branch] || 'master'
+        if (params[:repository] && params[:webhook])
+          if (params[:repository][:name] == repo_config[:repo]) && (params[:webhook][:ref] == "refs/heads/#{branch}")
+            Overlay::Github.process_overlays
+          end
+        end
+      end
+      render :inline => github_update_url
     end
   end
 end

data/config/routes.rb

@@ -1,3 +1,3 @@
 Overlay::Engine.routes.draw do
-  get "github/update"
+  post "github/update"
 end

data/lib/overlay.rb

@@ -1,6 +1,6 @@
 require "overlay/engine"
 require "overlay/configuration"
-require "overlay/git"
+require "overlay/github"
 
 module Overlay
 end

data/lib/overlay/configuration.rb

@@ -7,7 +7,8 @@ module Overlay
     :auth,
     :repositories,
     :hostname,
-    :host_port
+    :host_port,
+    :relative_root_url
   ].freeze
 
   class << self
@@ -29,5 +30,5 @@ module Overlay
     end
   end
 
-  GithubRepo = Struct.new(:name, :repo, :branch)
+  GithubRepo = Struct.new(:user, :repo, :branch, :root_path)
 end

data/lib/overlay/github.rb

@@ -0,0 +1,114 @@
+require 'github_api'
+require 'fileutils'
+require 'socket'
+
+module Overlay
+  class Github
+    include Overlay::Engine.routes.url_helpers
+    # Cycle through all configured repositories and overlay
+    #
+    def self.process_overlays
+      # If we aren't running in Rails, bail out.  This may be some
+      # other request such as rake routes loading the environment
+      #
+      return unless defined?(Rails::Server)
+
+      # Configure github api
+      configure
+
+      Overlay.configuration.repositories.each do |repo_config|
+        next unless repo_config.class == GithubRepo
+
+        # Validate repository config
+        raise 'Respository config missing user' if (!repo_config[:user] || repo_config[:user].nil?)
+        raise 'Respository config missing repo' if (!repo_config[:repo] || repo_config[:repo].nil?)
+
+        repo_config[:branch] ||= 'master'
+
+        register_web_hook(repo_config)
+
+        overlay_repo(repo_config)
+      end
+    end
+
+    # Register our listener on the repo
+    #
+    def self.register_web_hook repo_config
+      # Make sure our routes are loaded
+      Rails.application.reload_routes!
+
+      # Build hook url
+      host = config.hostname || Socket.gethostname
+      port = config.host_port || Rails::Server.new.options[:Port]
+      path = Overlay::Engine.routes.url_for({:controller=>"overlay/github", :action=>"update", :only_path => true})
+      uri  = ActionDispatch::Http::URL::url_for({:host => host, :port => port, :path => "#{config.relative_root_url}#{path}"})
+
+      # Retrieve current web hooks
+      current_hooks = github_repo.hooks.list(repo_config[:user], repo_config[:repo]).response.body
+      if current_hooks.find {|hook| hook.config.url == uri}.nil?
+        #register hook
+        github_repo.hooks.create(repo_config[:user], repo_config[:repo], name: 'web', active: true, config: {:url => uri, :content_type => 'json'})
+      end
+    end
+
+    def self.overlay_repo repo_config
+      # Get our root entries
+      #
+      root_entries = github_repo.contents.get(repo_config[:user], repo_config[:repo], '/', 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
+
+    def self.overlay_directory path, repo_config
+      root_path = repo_config[:root_path].empty? ? "#{Rails.application.root}/#{repo_config[:root_path]}" : "#{Rails.application.root}"
+
+      FileUtils.mkdir_p "#{root_path}/#{path}"
+      directory_entries = github_repo.contents.get(repo_config[:user], repo_config[:repo], path, ref: repo_config[:branch]).response.body
+
+      directory_entries.each do |entry|
+        if entry.type == 'dir'
+          overlay_directory(entry.path, repo_config)
+        elsif entry.type == 'file'
+          clone_file(entry.path, repo_config)
+        end
+      end
+    end
+
+    def self.clone_file path, repo_config
+      root_path = repo_config[:root_path].empty? ? "#{Rails.application.root}/#{repo_config[:root_path]}" : "#{Rails.application.root}"
+
+      file = github_repo.contents.get(repo_config[:user], repo_config[:repo], path, ref: repo_config[:branch]).response.body.content
+      File.open("#{root_path}/#{path}", "wb") { |f| f.write(Base64.decode64(file)) }
+    end
+
+    private
+
+    def self.github_repo
+      @@github ||= ::Github::Repos.new
+    end
+
+    def self.config
+      @@overlay_config ||= Overlay.configuration
+    end
+
+    # Configure the github api
+    def self.configure
+      # Validate required config
+      raise 'Configuration github_overlays.basic_auth not set' if (!config.auth || config.auth.nil?)
+
+      ::Github.configure do |github_config|
+        github_config.endpoint    = config.endpoint if config.endpoint
+        github_config.site        = config.site if config.site
+        github_config.basic_auth  = config.auth
+        github_config.adapter     = :net_http
+        github_config.ssl         = {:verify => false}
+      end
+    end
+  end
+end

data/lib/overlay/version.rb

@@ -1,3 +1,3 @@
 module Overlay
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overlay
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Steve Saarinen
@@ -67,7 +67,7 @@ files:
 - config/routes.rb
 - lib/overlay/configuration.rb
 - lib/overlay/engine.rb
-- lib/overlay/git.rb
+- lib/overlay/github.rb
 - lib/overlay/version.rb
 - lib/overlay.rb
 - lib/tasks/overlay_tasks.rake

data/lib/overlay/git.rb

@@ -1,111 +0,0 @@
-require 'github_api'
-require 'fileutils'
-require 'socket'
-
-module Overlay
-  class Github
-    include Overlay::Engine.routes.url_helpers
-    # Cycle through all configured repositories and overlay
-    #
-    def self.process_overlays
-      # If we aren't running in Rails, bail out.  This may be some
-      # other request such as rake routes loading the environment
-      #
-      return unless defined?(Rails::Server)
-
-      # Configure github api
-      configure
-
-      Overlay.configuration.repositories.each do |repo_config|
-        break unless repo_config.class == GithubRepo
-
-        # Validate repository config
-        raise 'Respository config missing user' if (!repo_config[:user] || repo_config[:user].nil?)
-        raise 'Respository config missing repo' if (!repo_config[:repo] || repo_config[:repo].nil?)
-
-        branch = repo_config[:branch] || 'master'
-
-        register_web_hook(repo_config[:user], repo_config[:repo])
-
-        overlay_repo(repo_config[:user], repo_config[:repo], branch)
-      end
-    end
-
-    # Register our listener on the repo
-    #
-    def self.register_web_hook user, repo
-      # Make sure our routes are loaded
-      Rails.application.reload_routes!
-
-      # Build hook url
-      host = Overlay.configuration.hostname || Socket.gethostname
-      port = Overlay.configuration.host_port || Rails::Server.new.options[:Port]
-      uri  = Overlay::Engine.routes.url_for({:controller=>"github_overlays/webhooks", :action=>"update", :host => host, :port => port})
-
-      # Retrieve current web hooks
-      current_hooks = github_repo.hooks.list(user, repo).response.body
-      if current_hooks.find {|hook| hook.config.url == uri}.nil?
-        #register hook
-        github_repo.hooks.create(user, repo, name: 'web', active: true, config: {:url => uri, :content_type => 'json'})
-      end
-    end
-
-    def self.overlay_repo user, repo, branch
-      # Get our root entries
-      #
-      root_entries = github_repo.contents.get(user, repo, '/', ref: 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, user, repo, branch)
-        end
-      end
-    end
-
-    def self.overlay_directory path, user, repo, branch
-      FileUtils.mkdir_p "#{Rails.application.root}/#{path}"
-      directory_entries = github_repo.contents.get(user, repo, path, ref: branch).response.body
-
-      directory_entries.each do |entry|
-        if entry.type == 'dir'
-          overlay_directory(entry.path, user, repo, branch)
-        elsif entry.type == 'file'
-          clone_file(entry.path, user, repo, branch)
-        end
-      end
-    end
-
-    def self.clone_file path, user, repo, branch
-      file = github_repo.contents.get(user, repo, path, ref: branch).response.body.content
-      File.open("#{Rails.application.root}/#{path}", "wb") { |f| f.write(Base64.decode64(file)) }
-    end
-
-    private
-
-    def self.github_repo
-      @@github ||= Github::Repos.new
-    end
-
-    def self.config
-      @@overlay_config ||= Rails.application.config.github_overlays
-    end
-
-    # Configure the github api
-    def self.configure
-      overlay_config = Overlay.configuration
-
-      # Validate required config
-      raise 'Configuration github_overlays.basic_auth not set' if (!overlay_config.auth || overlay_config.auth.nil?)
-
-      Github.configure do |github_config|
-        github_config.endpoint    = overlay_config.endpoint if overlay_config.endpoint
-        github_config.site        = overlay_config.site if overlay_config.site
-        github_config.basic_auth  = overlay_config.auth
-        github_config.adapter     = :net_http
-        github_config.ssl         = {:verify => false}
-      end
-    end
-  end
-end