dekiru 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f9b1e7e918814bcf4e4437eb398e239dc6af8da
-  data.tar.gz: c61905cf2a569b572bd2d712b0184ef0e1c1f74c
+  metadata.gz: 844c73ce0ab637db4415bd31e67ac17afb71323d
+  data.tar.gz: 1be786dc57003ad8ddc2c7937ca70beb3d7ca55b
 SHA512:
-  metadata.gz: 757e6e5d2fc1ecb642bcc8110a9be1980dc3014b1b1393934f784a243ebead80f46d1aacc439d694f775552b6a8d6da2f4c8fd81f4fa27f4abc10aa973b97ee3
-  data.tar.gz: 9a0c4a2a6ef0698adcb7c6e043e03a06b1eeda46c40dd0c3a72f49bd115ca9b5183fe0302843486846e479f47b486ddd5027eab3e10e18d1c8662a5297079611
+  metadata.gz: 855639c15c73a5299c143bb87fce7c71c4d5fa6ecac1f88653d85c46b4fce2c15d4c162ac944767671b421ad26c2aaaade8c35b32dbf8aa42bde349361f2cfcf
+  data.tar.gz: 6e1b89dbf1bf8daf8b02e0d4e2c379f2cca7bd2b7643380ae290c3c9b9d189424821d4b5324bcb9694a7788bc9e1a96df573fba94fb7ff3abccace51184bc6ca

data/README.md

@@ -18,38 +18,6 @@ Or install it yourself as:
 
     $ gem install dekiru
 
-## Usage
-
-以下のコマンドを実行すると、監視のための設定ファイルが自動的に生成される。
-
-```
-bin/rails g dekiru
-```
-
-メールアドレス、例外時の処理などは必要に応じて変更する。
-
-```
-Dekiru.configure do |config|
-  config.monitor_email   = "email@example.com"
-  config.monitor_api_key = "xxxxx-xxxx-xxxx-xxxx-xxxxxxxxx"
-  config.error_handle    = -> (e) { Bugsnag.notify(e) }
-end
-```
-
-Rakefile にて、'dekiru/rake_monitor' を読み込む。
-
-```
-require 'dekiru/rake_monitor'
-```
-
-rake で、`task_with_monitor` を使ってタスクを記述することで、 task を監視することができます。
-
-```
-task_with_monitor job: :environment, estimate_time: 10 do
-  puts "execute"
-end
-```
-
 ## Capybara Helpers
 
 以下の設定をすると Capybara 用のヘルパーメソッドが使えるようになる。
@@ -77,7 +45,6 @@ click_on 'Button in modal'
 ```
 
 
-
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -8,18 +8,3 @@ RSpec::Core::RakeTask.new do |t|
   t.rspec_opts = ['--color', "--format progress"]
   t.pattern = 'spec/dekiru/**/*_spec.rb'
 end
-
-require 'dekiru'
-require 'dekiru/rake_monitor'
-
-Dekiru.configure do |config|
-  config.monitor_email = "email@example.com"
-  config.monitor_api_key = "0680fa6b-c014-4985-8d05-1cca2d50512b"
-  config.error_handle = -> (e) {
-    puts e
-  }
-end
-
-task_with_monitor job: nil, estimate_time: 10 do
-  puts "execute"
-end

data/dekiru.gemspec

@@ -17,8 +17,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'http_accept_language', [">= 2.0.0"]
   gem.add_dependency 'rails'
-  gem.add_dependency 'faraday'
-  gem.add_dependency 'faraday_middleware'
   gem.add_development_dependency 'rake', [">= 0"]
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rubocop'

data/lib/dekiru.rb

@@ -8,5 +8,3 @@ require 'active_support/all'
 
 module Dekiru
 end
-
-require_relative 'dekiru/configure'

data/lib/dekiru/railtie.rb

@@ -12,8 +12,6 @@ module Dekiru
 
     rake_tasks do
       load 'dekiru/tasks/smtp_check.rake'
-      load 'dekiru/tasks/delayed_job_queue_check.rake'
-      load 'dekiru/tasks/delayed_job_queue_monitor.rake'
     end
   end
 end

data/lib/dekiru/version.rb

@@ -1,3 +1,3 @@
 module Dekiru
-  VERSION = '0.0.19'
+  VERSION = '0.0.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dekiru
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Akihiro Matsumura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_accept_language
@@ -38,34 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  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: faraday_middleware
-  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -139,18 +111,12 @@ files:
 - dekiru.gemspec
 - lib/dekiru.rb
 - lib/dekiru/capybara/helpers.rb
-- lib/dekiru/configure.rb
 - lib/dekiru/controller_additions.rb
 - lib/dekiru/helper.rb
-- lib/dekiru/job_mon_client.rb
 - lib/dekiru/railtie.rb
-- lib/dekiru/rake_monitor.rb
 - lib/dekiru/smtp_check_mailer.rb
-- lib/dekiru/tasks/delayed_job_queue_check.rake
-- lib/dekiru/tasks/delayed_job_queue_monitor.rake
 - lib/dekiru/tasks/smtp_check.rake
 - lib/dekiru/version.rb
-- lib/generators/dekiru/dekiru_generator.rb
 - spec/dekiru/helper_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -172,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Usefull helper methods for Ruby on Rails

data/lib/dekiru/configure.rb

@@ -1,14 +0,0 @@
-module Dekiru
-  def self.configure(&block)
-    @configure ||= Configure.new
-    yield @configure if block_given?
-    @configure
-  end
-
-  class Configure
-    attr_accessor :monitor_email, :monitor_api_key, :error_handle
-    def initialize
-      @error_handle = -> (e) {}
-    end
-  end
-end

data/lib/dekiru/job_mon_client.rb

@@ -1,58 +0,0 @@
-require 'faraday'
-require 'faraday_middleware'
-
-module Dekiru
-  class JobMonClient
-    def host
-      'https://job-mon.herokuapp.com'
-    end
-
-    def conn
-      @conn ||= Faraday.new(:url => host) do |faraday|
-        faraday.request  :url_encoded
-        faraday.request  :json
-        faraday.response :json
-        faraday.adapter  Faraday.default_adapter
-      end
-    end
-
-    def api_key
-      Dekiru.configure.monitor_api_key
-    end
-
-    def job_start(task, estimate_time, monitor_email)
-      body = {
-        job: {
-          name: task.name,
-          end_time: Time.current.since(estimate_time),
-          email: monitor_email
-        }
-      }
-      response = conn.post "/api/apps/#{api_key}/jobs.json", body
-      response.body['id']
-    rescue => e
-      Dekiru.configure.error_handle.call(e)
-      nil
-    end
-
-    def job_end(job_id)
-      if job_id
-        conn.put "/api/apps/#{api_key}/jobs/#{job_id}/finished.json"
-      end
-    end
-
-    def send_queue_log(count)
-      body = {
-        queue_log: {
-          count: count,
-          rails_env: Rails.env,
-        }
-      }
-      response = conn.post "/api/apps/#{api_key}/queue_logs.json", body
-      response.body['id']
-    rescue => e
-      Dekiru.configure.error_handle.call(e)
-      nil
-    end
-  end
-end

data/lib/dekiru/rake_monitor.rb

@@ -1,29 +0,0 @@
-require 'dekiru/job_mon_client'
-
-module Dekiru
-  module RakeMonitor
-    def resolve_args(args)
-      estimate_time = args.first.delete(:estimate_time)
-      [args, estimate_time]
-    end
-
-    def client
-      @client ||= JobMonClient.new
-    end
-
-    def monitor_email
-      Dekiru.configure.monitor_email
-    end
-
-    def task_with_monitor(*args, &block)
-      args, estimate_time = resolve_args(args)
-      task *args do |t|
-        job_id = client.job_start(t, estimate_time, monitor_email)
-        block.call
-        client.job_end(job_id)
-      end
-    end
-  end
-end
-
-self.extend Dekiru::RakeMonitor

data/lib/dekiru/tasks/delayed_job_queue_check.rake

@@ -1,18 +0,0 @@
-namespace :dekiru do
-  desc '[Deprecated] Ops check for Delayed::Job queue'
-  task delayed_job_queue_check: :environment do
-    Rails.logger.info "[INFO] Start dekiru:delayed_job_queue_check env:#{Rails.env}"
-    Rails.logger.warn '[WARNING] Use dekiru:delayed_job_queue_monitor'
-    if defined?(Delayed::Job)
-      if (count = Delayed::Job.where('run_at < ? or last_error IS NOT NULL', 30.seconds.since).count) > 0
-        message = "There are #{count} jobs that are not running for Delayed::Job. Check job list!"
-        if defined?(Bugsnag)
-          Bugsnag.notify(message)
-        else
-          fail(message)
-        end
-      end
-    end
-    Rails.logger.info "[INFO] End dekiru:delayed_job_queue_check env:#{Rails.env}"
-  end
-end

data/lib/dekiru/tasks/delayed_job_queue_monitor.rake

@@ -1,13 +0,0 @@
-require 'dekiru/job_mon_client'
-
-namespace :dekiru do
-  desc 'Ops monitor for Delayed::Job queue for job-mon'
-  task delayed_job_queue_monitor: :environment do
-    Rails.logger.info "[INFO] Start dekiru:delayed_job_queue_monitor env:#{Rails.env}"
-    if defined?(Delayed::Job)
-      count = Delayed::Job.where('run_at < ? or last_error IS NOT NULL', 30.seconds.since).count
-      Dekiru::JobMonClient.new.send_queue_log(count)
-    end
-    Rails.logger.info "[INFO] End dekiru:delayed_job_queue_monitor env:#{Rails.env}"
-  end
-end

data/lib/generators/dekiru/dekiru_generator.rb

@@ -1,34 +0,0 @@
-require 'rails/generators'
-require 'dekiru/job_mon_client'
-
-class DekiruGenerator < Rails::Generators::Base
-  source_root File.expand_path('../templates', __FILE__)
-
-  desc 'Configures the dekiru job monitor'
-  def create_initializer_file
-    initializer 'dekiru.rb' do
-      <<-EOF
-Dekiru.configure do |config|
-  config.monitor_email   = "support+#{fetch_app_name}@sonicgarden.jp"
-  config.monitor_api_key = "#{fetch_api_key}"
-  config.error_handle    = -> (e) { Bugsnag.notify(e) }
-end
-      EOF
-    end
-  end
-
-  def client
-    @client ||= Dekiru::JobMonClient.new
-  end
-
-  private
-
-  def fetch_api_key
-    res = client.conn.post '/api/apps.json', app: { name: fetch_app_name }
-    res.body['api_key']
-  end
-
-  def fetch_app_name
-    File.basename(Rails.root)
-  end
-end