tokite 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd4cf7e3df9af634d1a79b71996448181b6d3992
-  data.tar.gz: 99655b09461cd497c09704ae861a43f72b4bd429
+  metadata.gz: e5713f325c58d3d8111e0a7d23474ff6f5102a15
+  data.tar.gz: c8c4507ea06af90e808469887e83dc8038af430e
 SHA512:
-  metadata.gz: b1faa8d9d5bef41d2fe78b5929d4f9d7e307bb616c827e179d755a5d3787cb48953d86b16afe0ccc39a1b1c22de5627561c803fd917c8229166be1f4c9bb2ca2
-  data.tar.gz: 55b16a25db1f016a4e94f116d88d07124f475d790acdd5e9dc1367da895a10189cd38c71665235f8b75ce3da8fcfecd23340ede0fd4af359241fb7d9ebe8714b
+  metadata.gz: 8f13bf68e97bf9ce0b3ff43f1a6326964433545e1b4c6a6456da5371eecda96aa67f88d18e50c5591356cf7a0455f1a8557085f18703deb009eac3d808d9d602
+  data.tar.gz: 106be23f58cb08f37146689762decbd6e5d05a902c46ed03afb58392574c88b5715ee8fd0d7bb0a57bdc0d09fcb9c2fbd67f6bc59c5e9e4198afd723d5a98b09

data/app/controllers/tokite/application_controller.rb

@@ -2,8 +2,8 @@ module Tokite
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
   
-    helper_method :current_user
-  
+    helper_method :current_user, :current_user_token
+
     before_action :require_login
   
     private
@@ -11,10 +11,18 @@ module Tokite
     def current_user
       @current_user ||= User.find_by(id: session[:user_id]) if session[:user_id]
     end
-  
+
+    def current_user_token
+      current_user&.token
+    end
+
     def require_login
       return if current_user
       redirect_to sign_in_path
     end
+
+    def octokit_client
+      @octokit_client ||= Octokit::Client.new(access_token: current_user_token, auto_paginate: true)
+    end
   end
 end

data/app/controllers/tokite/hooks_controller.rb

@@ -5,6 +5,7 @@ module Tokite
     GITHUB_EVENT_HEADER = "X-GitHub-Event"
   
     def create
+      logger.debug("Hook triggered: #{github_event}")
       Hook.fire!(github_event, request.request_parameters)
       render plain: "ok"
     end

data/app/controllers/tokite/repositories_controller.rb

@@ -0,0 +1,41 @@
+module Tokite
+  class RepositoriesController < ApplicationController
+    before_action :require_github_token, only: [:new, :create, :destroy]
+
+    def index
+      @repositories = Repository.all
+    end
+
+    def new
+      github_repos = octokit_client.repositories.select{|r| r.permissions.admin }.delete_if(&:fork)
+      @repositories = github_repos.map do |repo|
+        Repository.new(name: repo.full_name, url: repo.html_url)
+      end
+      Repository.all.pluck(:name).each do |existing_name|
+        @repositories.delete_if {|repo| repo.name == existing_name }
+      end
+    end
+
+    def create
+      params[:names].each do |name|
+        github_repo = octokit_client.repository(name)
+        Repository.hook!(octokit_client, github_repo)
+      end
+      flash[:info] = "Import repositories."
+      redirect_to repositories_path
+    end
+
+    def destroy
+      repo = Repository.find(params[:id])
+      repo.unhook!(octokit_client)
+      flash[:info] = "Unhook repository #{repo.name}"
+      redirect_to repositories_path
+    end
+
+    private
+
+    def require_github_token
+      redirect_to repositories_path unless current_user_token
+    end
+  end
+end

data/app/controllers/tokite/rules_controller.rb

@@ -5,49 +5,48 @@ module Tokite
     end
   
     def new
-      @rule = rule_user.rules.build
+      @rule_user = User.find(params[:user_id])
+      @rule = @rule_user.rules.build
     end
   
     def create
-      @rule = rule_user.rules.new(rule_params)
+      @rule_user = User.find(params[:user_id])
+      @rule = @rule_user.rules.new(rule_params)
       if @rule.save
         flash[:info] = "Rule created."
-        redirect_to edit_user_rule_path(params[:user_id], @rule)
+        redirect_to user_path(@rule.user_id)
       else
         render "new"
       end
     end
   
     def edit
-      @rule = rule_user.rules.find(params[:id])
+      @rule_user = nil
+      @rule = Rule.find(params[:id])
     end
   
     def update
-      @rule = rule_user.rules.find(params[:id])
+      @rule = Rule.find(params[:id])
       @rule.assign_attributes(rule_params)
       if @rule.save
         flash[:info] = "Rule updated."
-        redirect_to edit_user_rule_path(params[:user_id], @rule)
+        redirect_to user_path(@rule.user_id)
       else
         render "edit"
       end
     end
-  
+
     def destroy
-      @rule = rule_user.rules.find(params[:id])
+      @rule = Rule.find(params[:id])
       @rule.destroy!
       flash[:info] = "Rule deleted."
-      redirect_to user_rules_path(params[:user_id])
+      redirect_to user_path(@rule.user_id)
     end
-  
+
     private
-  
-    def rule_user
-      @rule_user ||= User.find(params[:user_id])
-    end
-  
+
     def rule_params
-      params.require(:rule).permit(:name, :query, :channel, :icon_emoji, :additional_text)
+      params.require(:rule).permit(:user_id, :name, :query, :channel, :icon_emoji, :additional_text)
     end
   end
 end

data/app/controllers/tokite/sessions_controller.rb

@@ -7,18 +7,7 @@ module Tokite
   
     def create
       auth = request.env["omniauth.auth"]
-      user = User.find_or_initialize_by(
-        provider: auth[:provider],
-        uid: auth[:uid],
-      )
-      unless user.persisted?
-        user.update!(
-          name: auth[:info][:name],
-          email: auth[:info][:email],
-          image_url: auth[:info][:image],
-        )
-      end
-
+      user = User.login!(auth)
       session[:user_id] = user.id
       redirect_to root_path
     end

data/app/controllers/tokite/transfers_controller.rb

@@ -0,0 +1,14 @@
+module Tokite
+  class TransfersController < ApplicationController
+    def new
+      @transfer = Transfer.new(rule_id: params[:rule_id])
+      @rule = @transfer.rule
+      @users = User.where.not(id: @rule.user_id)
+    end
+
+    def create
+      @transfer = Transfer.create!(rule_id: params[:rule_id], user_id: params[:transfer][:user_id])
+      redirect_to user_path(@transfer.rule.user_id)
+    end
+  end
+end

data/app/helpers/tokite/application_helper.rb

@@ -26,5 +26,9 @@ module Tokite
           end
       end
     end
+
+    def show_admin_menu?
+      params[:admin]
+    end
   end
 end

data/app/models/tokite/repository.rb

@@ -0,0 +1,41 @@
+module Tokite
+  class Repository < ApplicationRecord
+    def self.hook!(octokit_client, github_repo)
+      repo_name = github_repo.full_name
+      existing_hook = find_hook(octokit_client, repo_name)
+      if existing_hook
+        octokit_client.edit_hook(repo_name, existing_hook.id, "web", hook_config, hook_options)
+      else
+        octokit_client.create_hook(repo_name, "web", hook_config, hook_options)
+      end
+      create!(name: repo_name, url: github_repo.html_url)
+    end
+
+    def self.find_hook(octokit_client, repo_name)
+      octokit_client.hooks(repo_name).find {|hook| hook.config.url == hooks_url }
+    end
+
+    def self.hook_config
+      {
+        content_type: "json",
+        url: hooks_url,
+      }
+    end
+
+    def self.hook_options
+      {
+        events: ["*"]
+      }
+    end
+
+    def self.hooks_url
+      Tokite::Engine.routes.url_helpers.hooks_url
+    end
+
+    def unhook!(octokit_client)
+      hook = self.class.find_hook(octokit_client, name)
+      octokit_client.remove_hook(name, hook.id) if hook
+      destroy!
+    end
+  end
+end

data/app/models/tokite/rule.rb

@@ -5,7 +5,8 @@ module Tokite
     belongs_to :user
   
     validate :validate_query
-  
+    validate :validate_user_id
+
     # TODO: Performance
     def self.matched_rules(event)
       Rule.all.to_a.select do |rule|
@@ -30,11 +31,11 @@ module Tokite
     end
   
     def rule_name_link
-      "<#{Tokite::Engine.routes.url_helpers.edit_user_rule_url(user, self)}|#{name}>"
+      "<#{Tokite::Engine.routes.url_helpers.edit_rule_url(self)}|#{name}>"
     end
   
     def user_link
-      "<#{Tokite::Engine.routes.url_helpers.user_rules_url(user)}|#{user.name}>"
+      "<#{Tokite::Engine.routes.url_helpers.user_url(user)}|#{user.name}>"
     end
   
     def validate_query
@@ -42,5 +43,11 @@ module Tokite
     rescue SearchQuery::ParseError => e
       errors.add(:query, e.message)
     end
+
+    def validate_user_id
+      unless User.find_by(id: user_id)
+        errors.add(:user_id, "Unknown user_id: #{user_id}")
+      end
+    end
   end
 end

data/app/models/tokite/secure_user_token.rb

@@ -0,0 +1,5 @@
+module Tokite
+  class SecureUserToken < ApplicationRecord
+    belongs_to :user
+  end
+end

data/app/models/tokite/transfer.rb

@@ -0,0 +1,19 @@
+module Tokite
+  class Transfer
+    include ActiveModel::Model
+
+    attr_accessor :rule_id, :user_id
+    attr_reader :rule
+
+    def self.create!(attributes)
+      transfer = new(attributes)
+      transfer.rule.update!(user_id: transfer.user_id)
+
+      return transfer
+    end
+
+    def rule
+      @rule ||= Rule.find(rule_id)
+    end
+  end
+end

data/app/models/tokite/user.rb

@@ -1,13 +1,36 @@
 module Tokite
   class User < ApplicationRecord
     has_many :rules, dependent: :destroy
-  
+
+    has_one :secure_user_token
+
+    delegate :token, to: :secure_user_token, allow_nil: true
+
+    def self.login!(auth)
+      user = find_or_initialize_by(
+        provider: auth[:provider],
+        uid: auth[:uid],
+      )
+      if user.persisted?
+        user.secure_user_token.update!(token: auth[:credentials][:token])
+      else
+        user.assign_attributes(
+          name: auth[:info][:name],
+          image_url: auth[:info][:image],
+        )
+        user.build_secure_user_token(token: auth[:credentials][:token])
+        transaction do
+          user.save!
+        end
+      end
+      user
+    end
+
     def self.create_group_user!(name)
       uuid = SecureRandom.uuid.tr("-", "")
       create!(
         provider: "GROUP",
         uid: uuid,
-        email: uuid,
         image_url: "",
         name: name
       )
@@ -16,5 +39,9 @@ module Tokite
     def group_user?
       provider == "GROUP"
     end
+
+    def name_with_provider
+      "#{name} (#{provider})"
+    end
   end
 end

data/app/views/layouts/tokite/application.html.haml

@@ -1,5 +1,5 @@
 !!!
-%html
+%html{lang: :en}
   %head
     %title Tokite
     = csrf_meta_tags
@@ -15,6 +15,9 @@
             = nav_list_item "Top", root_path, ["top"]
             = nav_list_item "Users", users_path, ["users"]
             = nav_list_item "Rules", rules_path, ["rules"]
+            = nav_list_item "Repositories", repositories_path, ["repositories"]
+          .nav-right
+            %span.nav-item.is-tab= current_user.name_with_provider
 
     %section.section
       - if flash[:info]

data/app/views/tokite/repositories/index.html.haml

@@ -0,0 +1,13 @@
+- if current_user_token
+  = link_to "Watch new repositories", new_repository_path, class: "button is-primary"
+
+.vspace-40
+
+%h1.title Watching repositories
+
+%table.table.is-bordered
+  - @repositories.each do |repo|
+    %tr
+      %td= link_to repo.name, repo.url
+      - if show_admin_menu?
+        %td= link_to "Unwatch", repo, method: :delete, class: "button is-danger", data: { confirm: "Unwatch repository?" }

data/app/views/tokite/repositories/new.html.haml

@@ -0,0 +1,18 @@
+- if @repositories.present?
+  = form_tag repositories_path do |f|
+    %ul
+      - @repositories.each do |repo|
+        %li.field
+          .control
+            %label.checkbox
+              = check_box_tag "names[]", repo.name, false, id: "names_#{sanitize_to_id(repo.name)}", multiple: true
+              = repo.name
+              = link_to "@", repo.url
+
+    .vspace-40
+
+    .field
+      .control
+        = submit_tag "Import repositories", class: "button is-primary"
+- else
+  No importable repositories.

data/app/views/tokite/rules/_form.html.haml

@@ -4,10 +4,11 @@
   = form_text_field f, :channel, size: 40, class: "input"
   = form_text_field f, :icon_emoji, size: 40, class: "input"
   = form_text_field f, :additional_text, size: 40, class: "input"
-  .field
-    = f.submit class: "button is-primary"
+  .field.columns
+    .column.is-8= f.submit "Update", class: "button is-primary"
     - if @rule.persisted?
-      = link_to "Delete rule", user_rule_path(@rule_user, @rule), method: :delete, data: { confirm: %(Delete "#{@rule.name}"?) }, class: "button is-danger is-pulled-right"
+      .column.is-2= link_to "Transfer", new_rule_transfers_path(@rule), class: "button is-primary"
+      .column.is-2= link_to "Delete", rule_path(@rule), method: :delete, data: { confirm: %(Delete "#{@rule.name}"?) }, class: "button is-danger"
 
 .message.vspace-40
   .message-header

data/app/views/tokite/rules/_rules.html.haml

@@ -2,7 +2,7 @@
   %h3 Rules
   %ul
     - user.rules.order(:id).each do |rule|
-      %li= link_to rule.name, edit_user_rule_path(user, rule)
+      %li= link_to rule.name, edit_rule_path(rule)
 
 .content
   = link_to "New Rule", new_user_rule_path(user), class: "button is-primary"

data/app/views/tokite/sessions/new.html.haml

@@ -1 +1 @@
-= link_to "Login with Google+", "/auth/google_oauth2"
+= link_to "Login with GitHub", "/auth/github"

data/app/views/tokite/transfers/new.html.haml

@@ -0,0 +1,8 @@
+%h1.title
+  Transfer
+  = link_to @rule.name, edit_rule_path(@rule)
+
+= form_for [@rule, @transfer] do |f|
+  = f.collection_select :user_id, @users, :id, :name_with_provider
+  .field.columns
+    .column.is-8= f.submit "Transfer", class: "button is-primary"

data/app/views/tokite/users/index.html.haml

@@ -8,7 +8,7 @@
       %tr
         %td= user.id
         %td
-          = link_to user.name, user_path(user)
+          = link_to user.name_with_provider, user_path(user)
 
 = link_to "Create group", users_path, method: :post, data: { confirm: %(Create Group?) }, class: "button is-primary"
 

data/config/initializers/octokit.rb

@@ -0,0 +1,7 @@
+require "octokit"
+
+if ENV["GITHUB_HOST"].present?
+  Octokit.configure do |c|
+    c.api_endpoint = URI.join(ENV["GITHUB_HOST"], "/api/v3/").to_s
+  end
+end

data/config/initializers/omniauth.rb

@@ -1,7 +1,16 @@
-require "omniauth-google-oauth2"
+require "omniauth-github"
 
 Tokite::Engine.config.middleware.use OmniAuth::Builder do
-  provider :google_oauth2, ENV["GOOGLE_CLIENT_ID"], ENV["GOOGLE_CLIENT_SECRET"], {
-    hd: ENV["GOOGLE_HOSTED_DOMAIN"].present? ? ENV["GOOGLE_HOSTED_DOMAIN"] : nil,
-  }
+  options = { scope: "repo,write:repo_hook" }
+  host = ENV["GITHUB_HOST"]
+  if host.present?
+    options.merge!(
+      client_options: {
+        site: "#{host}/api/v3",
+        authorize_url: "#{host}/login/oauth/authorize",
+        token_url: "#{host}/login/oauth/access_token",
+      }
+    )
+  end
+  provider :github, ENV["GITHUB_CLIENT_ID"], ENV["GITHUB_CLIENT_SECRET"], options
 end

data/config/routes.rb

@@ -3,12 +3,15 @@ Tokite::Engine.routes.draw do
 
   resources :hooks, only: %w(create)
   resources :users, only: %w(index show create edit update destroy) do
-    resources :rules, only: %w(new create edit update destroy)
+    resources :rules, only: %w(new create edit update destroy), shallow: true do
+      resource :transfers, only: %w(new create)
+    end
   end
   resources :rules, only: %w(index)
+  resources :repositories, only: %w(index new create destroy)
 
   get "sign_in", to: "sessions#new", as: "sign_in"
-  get "auth/google_oauth2/callback", to: "sessions#create"
+  get "auth/github/callback", to: "sessions#create"
   delete "sign_out", to: "sessions#destroy", as: "sign_out"
 
   get "site/sha", to: "sha#show"

data/lib/tasks/tokite.rake

@@ -12,12 +12,7 @@ namespace :tokite do
       yml = Rails.root.join("config/database.yml").to_s
       sh "bundle", "exec", "ridgepole", "-c", yml, "-E", Rails.env, *args
     end
-  
-    desc "Export current schema"
-    task :export do
-      ridgepole_exec("--export", app_path("schema/Schemafile"), "--split")
-    end
-  
+
     desc "Apply Schemafile"
     task :apply do
       ridgepole_exec("--file", app_path("schema/Schemafile"), "-a")
@@ -30,10 +25,21 @@ namespace :tokite do
   
     desc "Install schema"
     task :install do
+      tokite_schema_dir = app_path("schema/tokite")
+      mkdir(tokite_schema_dir) unless Dir.exist?(tokite_schema_dir)
+
       schema_dir = app_path("schema")
       mkdir(schema_dir) unless Dir.exist?(schema_dir)
-      Dir.glob("#{engine_path("schema")}/*").each do |f|
-        cp f, schema_dir
+
+      Dir.glob("#{engine_path("schema")}/*").each do |src_path|
+        basename = File.basename(src_path)
+        if File.exist?(File.join(tokite_schema_dir, basename))
+          puts "Skip install schema #{src_path}"
+        else
+          puts "Install schema #{src_path}"
+          cp src_path, tokite_schema_dir
+          cp src_path, schema_dir
+        end
       end
     end
   end

data/lib/tokite/version.rb

@@ -1,3 +1,3 @@
 module Tokite
-  VERSION = '0.1.5'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tokite
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - hogelog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,7 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-google-oauth2
+  name: omniauth-github
+  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: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,10 +193,12 @@ files:
 - app/assets/stylesheets/tokite/application.scss
 - app/controllers/tokite/application_controller.rb
 - app/controllers/tokite/hooks_controller.rb
+- app/controllers/tokite/repositories_controller.rb
 - app/controllers/tokite/rules_controller.rb
 - app/controllers/tokite/sessions_controller.rb
 - app/controllers/tokite/sha_controller.rb
 - app/controllers/tokite/top_controller.rb
+- app/controllers/tokite/transfers_controller.rb
 - app/controllers/tokite/users_controller.rb
 - app/helpers/tokite/application_helper.rb
 - app/jobs/tokite/application_job.rb
@@ -194,13 +210,18 @@ files:
 - app/models/tokite/hook_event/issue_comment.rb
 - app/models/tokite/hook_event/issues.rb
 - app/models/tokite/hook_event/pull_request.rb
+- app/models/tokite/repository.rb
 - app/models/tokite/revision.rb
 - app/models/tokite/rule.rb
 - app/models/tokite/search_query.rb
+- app/models/tokite/secure_user_token.rb
+- app/models/tokite/transfer.rb
 - app/models/tokite/user.rb
 - app/views/layouts/tokite/application.html.haml
 - app/views/layouts/tokite/mailer.html.erb
 - app/views/layouts/tokite/mailer.text.erb
+- app/views/tokite/repositories/index.html.haml
+- app/views/tokite/repositories/new.html.haml
 - app/views/tokite/rules/_form.html.haml
 - app/views/tokite/rules/_rules.html.haml
 - app/views/tokite/rules/edit.html.haml
@@ -208,10 +229,12 @@ files:
 - app/views/tokite/rules/new.html.haml
 - app/views/tokite/sessions/new.html.haml
 - app/views/tokite/top/show.html.haml
+- app/views/tokite/transfers/new.html.haml
 - app/views/tokite/users/_form.html.haml
 - app/views/tokite/users/edit.html.haml
 - app/views/tokite/users/index.html.haml
 - app/views/tokite/users/show.html.haml
+- config/initializers/octokit.rb
 - config/initializers/omniauth.rb
 - config/initializers/slack_notifier.rb
 - config/routes.rb