Skip to content

Commit

Permalink
standardrb --fix
Browse files Browse the repository at this point in the history
  • Loading branch information
leklund committed Feb 23, 2022
1 parent e05d397 commit 25bc1d8
Show file tree
Hide file tree
Showing 46 changed files with 677 additions and 754 deletions.
68 changes: 0 additions & 68 deletions .rubocop.yml

This file was deleted.

17 changes: 9 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# frozen_string_literal: true

source 'https://rubygems.org'
source "https://rubygems.org"

gemspec

gem 'bundler-audit'
gem 'newrelic_rpm', require: false
gem 'overcommit', '~> 0.32.0'
gem 'rake'
gem 'rdoc'
gem 'rubocop', '~> 0.51.0'
gem 'rubygems-tasks', '~> 0.2'
gem "bundler-audit"
gem "newrelic_rpm", require: false
gem "overcommit", "~> 0.32.0"
gem "rake"
gem "rdoc"
gem "standard"
gem "rubygems-tasks", "~> 0.2"
gem "nsq-ruby", github: "fastly/nsq-ruby", tag: "v2.4.0"
21 changes: 10 additions & 11 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,37 +1,36 @@
# frozen_string_literal: true

require 'rubygems'
require "rubygems"

begin
require 'bundler/setup'
require "bundler/setup"
rescue LoadError => e
abort e.message
end

require 'rake'
require "rake"

require 'rubygems/tasks'
require "rubygems/tasks"
Gem::Tasks.new

require 'rdoc/task'
require "rdoc/task"
RDoc::Task.new
task doc: :rdoc

require 'rspec/core/rake_task'
require "rspec/core/rake_task"
RSpec::Core::RakeTask.new(:spec)

require 'bundler/audit/cli'
require "bundler/audit/cli"
namespace :bundler do
desc 'Updates the ruby-advisory-db and runs audit'
desc "Updates the ruby-advisory-db and runs audit"
task :audit do
%w[update check].each do |command|
Bundler::Audit::CLI.start [command]
end
end
end

require 'rubocop/rake_task'
RuboCop::RakeTask.new
require "standard/rake"

task(:default).clear
task default: ['spec', 'rubocop', 'bundler:audit']
task default: ["spec", "standard", "bundler:audit"]
52 changes: 26 additions & 26 deletions fastly_nsq.gemspec
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
# frozen_string_literal: true

lib = File.expand_path('../lib', __FILE__)
lib = File.expand_path("../lib", __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'fastly_nsq/version'
require "fastly_nsq/version"

Gem::Specification.new do |gem|
gem.name = 'fastly_nsq'
gem.version = FastlyNsq::VERSION
gem.summary = 'Fastly NSQ Adapter'
gem.description = "Helper classes for Fastly's NSQ Services"
gem.license = 'MIT'
gem.authors = ["Tommy O'Neil", 'Adarsh Pandit', 'Joshua Wehner', 'Lukas Eklund', 'Josh Lane', 'Hassan Shahid']
gem.email = '[email protected]'
gem.homepage = 'https://github.com/fastly/fastly_nsq'
gem.name = "fastly_nsq"
gem.version = FastlyNsq::VERSION
gem.summary = "Fastly NSQ Adapter"
gem.description = "Helper classes for Fastly's NSQ Services"
gem.license = "MIT"
gem.authors = ["Tommy O'Neil", "Adarsh Pandit", "Joshua Wehner", "Lukas Eklund", "Josh Lane", "Hassan Shahid"]
gem.email = "[email protected]"
gem.homepage = "https://github.com/fastly/fastly_nsq"

gem.files = `git ls-files`.split("\n")
gem.files = `git ls-files`.split("\n")

gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
gem.test_files = gem.files.grep(%r{^(test|features)/})
gem.require_paths = ['lib']
gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
gem.test_files = gem.files.grep(%r{^(test|features)/})
gem.require_paths = ["lib"]

gem.add_development_dependency 'awesome_print', '~> 1.6'
gem.add_development_dependency 'bundler'
gem.add_development_dependency 'dotenv'
gem.add_development_dependency 'pry-byebug', '~> 3.3'
gem.add_development_dependency 'rspec', '~> 3.4'
gem.add_development_dependency 'rspec-eventually', '0.2'
gem.add_development_dependency 'timecop'
gem.add_development_dependency 'webmock', '~> 3.0'
gem.add_development_dependency 'yard'
gem.add_development_dependency "awesome_print", "~> 1.6"
gem.add_development_dependency "bundler"
gem.add_development_dependency "dotenv"
gem.add_development_dependency "pry-byebug", "~> 3.3"
gem.add_development_dependency "rspec", "~> 3.4"
gem.add_development_dependency "rspec-eventually", "0.2"
gem.add_development_dependency "timecop"
gem.add_development_dependency "webmock", "~> 3.0"
gem.add_development_dependency "yard"

gem.add_dependency 'concurrent-ruby', '~> 1.0'
gem.add_dependency 'nsq-ruby', '~> 2.3'
gem.add_dependency 'priority_queue_cxx', '~> 0.3'
gem.add_dependency "concurrent-ruby", "~> 1.0"
gem.add_dependency "nsq-ruby", "~> 2.3"
gem.add_dependency "priority_queue_cxx", "~> 0.3"
end
54 changes: 26 additions & 28 deletions lib/fastly_nsq.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# frozen_string_literal: true

require 'nsq'
require 'concurrent'
require 'fc'
require 'set'
require 'logger'
require 'forwardable'
require 'digest/md5'
require "nsq"
require "concurrent"
require "fc"
require "set"
require "logger"
require "forwardable"
require "digest/md5"

module FastlyNsq
NotConnectedError = Class.new(StandardError)
Expand Down Expand Up @@ -112,21 +112,21 @@ def manager=(manager)
# @return [Integer]
# @see https://nsq.io/components/nsqd.html#command-line-options
def max_req_timeout
@max_req_timeout ||= ENV.fetch('MAX_REQ_TIMEOUT', 60 * 60 * 1_000).to_i
@max_req_timeout ||= ENV.fetch("MAX_REQ_TIMEOUT", 60 * 60 * 1_000).to_i
end

# Maximum number of threads for FastlyNsq::PriorityThreadPool
# Default setting is 5 and can be set via ENV['MAX_PROCESSING_POOL_THREADS']
# @return [Integer]
def max_processing_pool_threads
@max_processing_pool_threads ||= ENV.fetch('MAX_PROCESSING_POOL_THREADS', 5).to_i
@max_processing_pool_threads ||= ENV.fetch("MAX_PROCESSING_POOL_THREADS", 5).to_i
end

##
# Return an array of NSQ lookupd http addresses sourced from ENV['NSQLOOKUPD_HTTP_ADDRESS']
# @return [Array<String>] list of nsqlookupd http addresses
def lookupd_http_addresses
ENV.fetch('NSQLOOKUPD_HTTP_ADDRESS').split(',').map(&:strip)
ENV.fetch("NSQLOOKUPD_HTTP_ADDRESS").split(",").map(&:strip)
end

# Register a block to run at a point in the lifecycle.
Expand All @@ -151,11 +151,9 @@ def on(event, &block)
def fire_event(event)
blocks = FastlyNsq.events.fetch(event)
blocks.each do |block|
begin
block.call
rescue => e
logger.error "[#{event}] #{e.inspect}"
end
block.call
rescue => e
logger.error "[#{event}] #{e.inspect}"
end
end

Expand All @@ -168,16 +166,16 @@ def tracer
end
end

require 'fastly_nsq/consumer'
require 'fastly_nsq/feeder'
require 'fastly_nsq/launcher'
require 'fastly_nsq/listener'
require 'fastly_nsq/manager'
require 'fastly_nsq/message'
require 'fastly_nsq/messenger'
require 'fastly_nsq/new_relic'
require 'fastly_nsq/priority_queue'
require 'fastly_nsq/priority_thread_pool'
require 'fastly_nsq/producer'
require 'fastly_nsq/tls_options'
require 'fastly_nsq/version'
require "fastly_nsq/consumer"
require "fastly_nsq/feeder"
require "fastly_nsq/launcher"
require "fastly_nsq/listener"
require "fastly_nsq/manager"
require "fastly_nsq/message"
require "fastly_nsq/messenger"
require "fastly_nsq/new_relic"
require "fastly_nsq/priority_queue"
require "fastly_nsq/priority_thread_pool"
require "fastly_nsq/producer"
require "fastly_nsq/tls_options"
require "fastly_nsq/version"
Loading

0 comments on commit 25bc1d8

Please sign in to comment.