mshard 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: de175ccd52325447343f0fc921f9a179ce00781c
-  data.tar.gz: 66842743f204b3dc2b4edfc4eac63f05905e9dd4
+SHA256:
+  metadata.gz: c1c3402edf233d0507268a414888a70b2ba1f34ebfdfe340ed85d41ae301ac4a
+  data.tar.gz: 984aa0b58c23299638b77f2cb3ecd03d7a1e98e410cfd86ae1738068f0ad8399
 SHA512:
-  metadata.gz: d8fa017c7ee81f5453dfa6e0155d489ec2057b4dff4a22154fd261fdefbb7e5c846278731e6222e60e96836334fe8ae2ea72d95bcd3bc0b113d51bb316be7ce7
-  data.tar.gz: 84ac787249a1d035c94e397184ebc84d5fbb89c1f1b9dc3ae68b8f925ae90cd9538d185b12666619ce2c715f9d0dee9c1d409c684698687bac4c6fe4e447ede5
+  metadata.gz: b47ea5e4e1dad5c263139deb310cd9a92624857f89a06f0216bb0079cd7d6d6bff81fb338bd189280cfb5799fe976d18764e7367115ede3ca7715876bed06f89
+  data.tar.gz: bd62b6289966690e80297fd72d4d9245754edde823342f47461db12daa8929777fdb7da6c5f76d87db5bf27fcb53c5e0609da9bfc1399b5f59e8c762c32ac764

data/.rubocop.local.yml

@@ -0,0 +1,2 @@
+AllCops:
+  TargetRubyVersion: 2.4

data/.rubocop.yml

@@ -1,15 +1,5 @@
-inherit_from: .rubocop_todo.yml
-
-Style/RegexpLiteral:
-  Exclude:
-    - 'Guardfile'
-    - 'mshard.gemspec'
-
-Metrics/LineLength:
-  Exclude:
-    - 'spec/spec_helper.rb'
-
-Metrics/BlockLength:
-  Exclude:
-    - '*.gemspec'
-    - 'spec/**/*'
+inherit_gem:
+  mbs: rubocop.yml
+inherit_from:
+  - .rubocop_todo.yml
+  - .rubocop.local.yml

data/.rubocop_todo.yml

@@ -1,10 +0,0 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-07-30 20:01:55 +0900 using RuboCop version 0.29.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 3
-Style/Documentation:
-  Enabled: false

data/.travis.yml

@@ -2,9 +2,11 @@ language: ruby
 sudo: false
 rvm:
   - ruby-head
-  - 2.2.5
-  - 2.3.1
-  - 2.4.0
+  - '2.2.5'
+  - '2.3.1'
+  - '2.4.0'
+  - '2.4.2'
+  - '2.5.0'
 before_install:
   - gem update --system
   - gem install bundler

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org'
 
 # Specify your gem's dependencies in mshard.gemspec

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    mshard (0.5.1)
-      haml
+    mshard (0.6.0)
       httparty
       no_proxy_fix
+      slack-notifier
       thor
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ast (2.3.0)
-    codecov (0.1.9)
+    ast (2.4.0)
+    codecov (0.1.10)
       json
       simplecov
       url
-    coderay (1.1.1)
+    coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.1.5)
-    ffi (1.9.17)
+    ffi (1.9.23)
     formatador (0.2.5)
-    guard (2.14.1)
+    guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -34,69 +34,69 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.2.0)
+    guard-rubocop (1.3.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
-    haml (4.0.7)
-      tilt
-    httparty (0.14.0)
+    httparty (0.16.0)
       multi_xml (>= 0.5.2)
-    json (2.0.3)
+    json (2.1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.11)
-    method_source (0.8.2)
+    lumberjack (1.0.12)
+    mbs (0.0.2)
+      thor
+    method_source (0.9.0)
     multi_xml (0.6.0)
     nenv (0.3.0)
-    no_proxy_fix (0.1.0)
+    no_proxy_fix (0.1.2)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parser (2.3.3.1)
-      ast (~> 2.2)
+    parallel (1.12.1)
+    parser (2.5.0.3)
+      ast (~> 2.4.0)
     powerpack (0.1.1)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rainbow (2.2.1)
+      method_source (~> 0.9.0)
+    rainbow (3.0.0)
     rake (10.5.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.47.1)
-      parser (>= 2.3.3.1, < 3.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rubocop (0.53.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
     shellany (0.0.1)
-    simplecov (0.13.0)
+    simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    thor (0.19.4)
-    tilt (2.0.6)
-    unicode-display_width (1.1.3)
+    simplecov-html (0.10.2)
+    slack-notifier (2.3.2)
+    thor (0.20.0)
+    unicode-display_width (1.3.0)
     url (0.3.2)
 
 PLATFORMS
@@ -108,6 +108,7 @@ DEPENDENCIES
   guard
   guard-rspec
   guard-rubocop
+  mbs
   mshard!
   pry
   rake (~> 10.0)
@@ -116,4 +117,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.14.3
+   1.16.1

data/Guardfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
@@ -50,7 +52,7 @@ guard :rspec, cmd: 'bundle exec rspec' do
 end
 
 guard :rubocop do
-  watch(%r{.+\.rb$})
+  watch(/.+\.rb$/)
   watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
   watch(%r{(?:.+/)?\.rubocop_todo\.yml$}) { |m| File.dirname(m[0]) }
 end

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
@@ -10,4 +12,4 @@ task :cov do
   Rake::Task[:spec].execute
 end
 
-task default: [:cov, :rubocop]
+task default: %i[cov rubocop]

data/exe/ding

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'mshard'
 require 'mshard/ding'

data/exe/ting

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'mshard'
 require 'mshard/ting'

data/lib/mshard/ding.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'mshard'
 
@@ -6,12 +8,7 @@ module MShard
     namespace :''
     argument :text, default: 'Ding!', required: false
     def ding
-      MShard.new.set_safe(
-        slack: true,
-        webhook_url: ENV['SLACK_WEBHOOK_URI'],
-        channel: ENV['SLACK_CHANNEL'],
-        text: text
-      )
+      MShard.new.notify(text: text)
     end
   end
 end

data/lib/mshard/mshard.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'httparty'
 require 'no_proxy_fix'
-require 'haml'
+require 'slack-notifier'
 
 module MShard
   class MShard
@@ -19,7 +21,7 @@ module MShard
       times.times do
         begin
           return yield
-        rescue
+        rescue StandardError
           sleep delay
         end
       end
@@ -30,39 +32,20 @@ module MShard
       try { get(*args) }
     end
 
-    def set_safe(*args) # rubocop:disable Style/AccessorMethodName
+    def set_safe(*args) # rubocop:disable Naming/AccessorMethodName
       try { set(*args) }
     end
 
-    ERROR_TEMPLATE = <<-HAML.freeze
-!!! 5
-%html
-  %head
-    %meta{ name: 'viewport', content: 'width=device-width,initial-scale=1.0' }
-    %title Error
-  %body
-    %p
-      %pre
-        &= e.inspect
-    %p
-      %pre
-        &= e.backtrace.join("\\n")
-      HAML
-
-    def error_to_html(e)
-      Haml::Engine.new(ERROR_TEMPLATE).render(Object.new, e: e)
+    def detour?
+      ENV['http_proxy']
     end
 
-    def set_error(e, **opt)
-      set_safe(
-        {
-          pushbullet: true,
-          type: 'link',
-          title: 'Error!',
-          body: "#{e.class}\nClick here",
-          contents: error_to_html(e)
-        }.merge(opt)
-      )
+    def notify(**args)
+      return set(args) if detour?
+      args[:slack] ||= true
+      args[:webhook_url] ||= ENV['SLACK_WEBHOOK_URI']
+      args[:channel] ||= ENV['SLACK_CHANNEL']
+      Slack::Notifier.new(args[:webhook_url], **args).ping(args[:text])
     end
   end
 end

data/lib/mshard/ting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'mshard'
 

data/lib/mshard/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MShard
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.0'
 end

data/lib/mshard.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mshard/version'
 
 module MShard

data/mshard.gemspec

@@ -1,9 +1,11 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mshard/version'
 
-Gem::Specification.new do |spec|
+Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.name          = 'mshard'
   spec.version       = MShard::VERSION
   spec.authors       = ['Minwoo Lee']
@@ -20,16 +22,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'httparty'
-  spec.add_dependency 'haml'
-  spec.add_dependency 'thor'
   spec.add_dependency 'no_proxy_fix'
+  spec.add_dependency 'slack-notifier'
+  spec.add_dependency 'thor'
   spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'guard-rubocop'
+  spec.add_development_dependency 'mbs'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'simplecov'
 end

data/spec/lib/mshard/mshard_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mshard'
 
 describe MShard::MShard do
@@ -35,21 +37,4 @@ describe MShard::MShard do
       expect(subject.set_safe(:params)).to eq(:id)
     end
   end
-
-  it '#set_error works' do
-    expect(described_class).to receive(:post).and_return('id' => :id)
-    e = double(inspect: :inspect, backtrace: [:a, :b])
-    expect(subject.set_error(e)).to eq(:id)
-  end
-
-  it '#error_to_html works' do
-    e = begin
-          raise
-        rescue => e
-          e
-        end
-    html = subject.error_to_html(e)
-    expect(html).to include('<title>Error</title>')
-    expect(html).to include('<pre>RuntimeError</pre>')
-  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mshard
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Minwoo Lee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: no_proxy_fix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: no_proxy_fix
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: mbs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rubocop
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -203,6 +217,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.local.yml"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
@@ -244,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: MShard