dekiru 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 330d70144b34832a164e57edbb711725e08427bb
-  data.tar.gz: ce33f3ed885a4a04cb3073bedda45637399cc925
+  metadata.gz: ff05387e945ee17a774a68e183fc7ffe083430fb
+  data.tar.gz: 581be62ea26d644bf1e19c13c6515404b11ebca9
 SHA512:
-  metadata.gz: e5ba92b4cd09f5f257d1319dfa453af492fb31af3116a1d9feeffc5285813ccea8c185feedc166e80140134810ca8a80a16c283f5b5ec663b4c551aa172e855f
-  data.tar.gz: 32a1d76e5fbb9c6af7d2485e57a3a3ef8d66ecda220f3738408a7887694aa4ad0d154f250006a94a1fe73212d5d7f9322c99e33c4a96203da7613f8285ef5f99
+  metadata.gz: 72a811cf2cade7273accb62a2118bed7e50b730fd17c5505aaa0b64f83bea914a32b2f0d1b0aa49ff36af7c3abe6647a5c9937eec0d480cc933bb0492b4ce8b9
+  data.tar.gz: 7d38401d0bdf6e5132b2d3a6523f8b63a9484c8d3f244d07f2da2979c8f47aa06f35669e18a9743f2cd0ba87bff4086eef167adddb641b014a1ca350d47f1e75

data/.ruby-version

@@ -0,0 +1 @@
+2.2.4

data/README.md

@@ -20,7 +20,36 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+以下のコマンドを実行すると、監視のための設定ファイルが自動的に生成される。
+
+```
+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
+```
+
 
 ## Contributing
 

data/Rakefile

@@ -8,3 +8,18 @@ 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

@@ -19,4 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rails'
   gem.add_development_dependency 'rake', [">= 0"]
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'webmock', ['>= 1.19.0']
+  gem.add_development_dependency 'faraday'
+  gem.add_development_dependency 'faraday_middleware'
 end

data/lib/dekiru.rb

@@ -3,5 +3,12 @@ require "dekiru/railtie" if defined?(::Rails)
 require "dekiru/helper"
 require "dekiru/controller_additions"
 
+require 'active_support'
+require 'active_support/all'
+require 'faraday'
+require 'faraday_middleware'
+
 module Dekiru
 end
+
+require_relative "dekiru/configure"

data/lib/dekiru/configure.rb

@@ -0,0 +1,14 @@
+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/rake_monitor.rb

@@ -0,0 +1,57 @@
+module Dekiru
+  module RakeMonitor
+    def resolve_args(args)
+      estimate_time = args.first.delete(:estimate_time)
+      [args, estimate_time]
+    end
+
+    def conn
+      @conn ||= Faraday.new(:url => 'https://job-mon.herokuapp.com') 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 monitor_email
+      Dekiru.configure.monitor_email
+    end
+
+    def job_start(task, estimate_time)
+      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
+        response = conn.put "/api/apps/#{api_key}/jobs/#{job_id}/finished.json", nil
+      end
+    end
+
+    def task_with_monitor(*args, &block)
+      args, estimate_time = resolve_args(args)
+      task *args do |t|
+        job_id = job_start(t, estimate_time)
+        block.call
+        job_end(job_id)
+      end
+    end
+  end
+end
+
+self.extend Dekiru::RakeMonitor

data/lib/dekiru/version.rb

@@ -1,3 +1,3 @@
 module Dekiru
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/lib/generators/dekiru/dekiru_generator.rb

@@ -0,0 +1,38 @@
+require 'rails/generators'
+require 'faraday'
+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
+
+  private
+
+  def fetch_api_key
+    res = api_conn.post '/api/apps.json', { app: { name: fetch_app_name } }
+    res.body['api_key']
+  end
+
+  def fetch_app_name
+    File.basename(Rails.root)
+  end
+
+  def api_conn
+    @conn ||= Faraday.new(url: 'https://job-mon.herokuapp.com') do |faraday|
+      faraday.request  :url_encoded
+      faraday.request  :json
+      faraday.response :json
+      faraday.adapter  Faraday.default_adapter
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dekiru
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Akihiro Matsumura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_accept_language
@@ -66,6 +66,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.19.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.19.0
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  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: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Usefull helper methods for Ruby on Rails
 email:
 - matsumura.aki@gmail.com
@@ -74,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -81,13 +124,16 @@ files:
 - Rakefile
 - dekiru.gemspec
 - lib/dekiru.rb
+- lib/dekiru/configure.rb
 - lib/dekiru/controller_additions.rb
 - lib/dekiru/helper.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/smtp_check.rake
 - lib/dekiru/version.rb
+- lib/generators/dekiru/dekiru_generator.rb
 - spec/dekiru/helper_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -109,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Usefull helper methods for Ruby on Rails