inst-jobs 2.2.1 → 2.4.1

data/spec/delayed/worker/consul_health_check_spec.rb

@@ -1,50 +1,50 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 RSpec.describe Delayed::Worker::ConsulHealthCheck do
-  let(:health_check) { Delayed::Worker::ConsulHealthCheck.new(worker_name: 'foobar') }
+  let(:health_check) { described_class.new(worker_name: "foobar") }
 
-  describe '#initialize' do
-    it 'must use a default service client when the config is mostly empty' do
-      check = Delayed::Worker::ConsulHealthCheck.new(worker_name: 'foobar')
-      expect(check.service_client.configuration.url.to_s).to eq 'http://localhost:8500'
+  describe "#initialize" do
+    it "must use a default service client when the config is mostly empty" do
+      check = described_class.new(worker_name: "foobar")
+      expect(check.service_client.configuration.url.to_s).to eq "http://localhost:8500"
     end
 
-    it 'must create a new service API client when the config has relevant keys set' do
-      check = Delayed::Worker::ConsulHealthCheck.new(worker_name: 'foobar', config: {url: 'http://consul.example.com:8500'})
+    it "must create a new service API client when the config has relevant keys set" do
+      check = described_class.new(worker_name: "foobar",
+                                  config: { url: "http://consul.example.com:8500" })
       service_client = check.service_client
-      expect(service_client.configuration.url.to_s).to eq 'http://consul.example.com:8500'
+      expect(service_client.configuration.url.to_s).to eq "http://consul.example.com:8500"
     end
   end
 
-  describe '#start' do
-    it 'must register this process as a service with consul' do
+  describe "#start" do
+    it "must register this process as a service with consul" do
       stub = stub_request(:put, "localhost:8500/v1/agent/service/register")
-        .with(body: hash_including({id: 'foobar' }))
+             .with(body: hash_including({ id: "foobar" }))
 
       health_check.start
 
       expect(stub).to have_been_requested
     end
 
-
-    it 'must supply a args style check' do
+    it "must supply a args style check" do
       stub = stub_request(:put, "localhost:8500/v1/agent/service/register")
-        .with(body: hash_including({check:  WebMock::API.hash_including({args: anything})}))
+             .with(body: hash_including({ check:  WebMock::API.hash_including({ args: anything }) }))
 
       health_check.start
 
       expect(stub).to have_been_requested
     end
 
-    it 'must include the docker container id when the docker option is set to true' do
+    it "must include the docker container id when the docker option is set to true" do
       stub = stub_request(:put, "localhost:8500/v1/agent/service/register")
-        .with(body: hash_including({check:  WebMock::API.hash_including({docker_container_id: anything})}))
+             .with(body: hash_including({ check:  WebMock::API.hash_including({ docker_container_id: anything }) }))
 
-      local_health_check = Delayed::Worker::ConsulHealthCheck.new(
-        worker_name: 'foobar',
-        config: {docker: true}
+      local_health_check = described_class.new(
+        worker_name: "foobar",
+        config: { docker: true }
       )
       local_health_check.start
 
@@ -52,8 +52,8 @@ RSpec.describe Delayed::Worker::ConsulHealthCheck do
     end
   end
 
-  describe '#stop' do
-    it 'must deregister the service from consul' do
+  describe "#stop" do
+    it "must deregister the service from consul" do
       stub = stub_request(:put, "localhost:8500/v1/agent/service/deregister/foobar")
 
       health_check.stop

data/spec/delayed/worker/health_check_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 RSpec.describe Delayed::Worker::HealthCheck do
   let(:klass) { Class.new(Delayed::Worker::HealthCheck) { self.type_name = :test } }
@@ -10,116 +10,118 @@ RSpec.describe Delayed::Worker::HealthCheck do
   end
 
   after do
-    Delayed::Worker::HealthCheck.subclasses.delete(klass)
+    described_class.subclasses.delete(klass)
   end
 
   it "must maintain a list of its subclasses" do
     klass
-    expect(Delayed::Worker::HealthCheck.subclasses).to include klass
+    expect(described_class.subclasses).to include klass
   end
 
-  describe '.build(type:, config: {})' do
-    it 'must select the concrete class to use by the type_name in the subclass' do
-      check = Delayed::Worker::HealthCheck.build(type: 'test', worker_name: 'foobar')
+  describe ".build(type:, config: {})" do
+    it "must select the concrete class to use by the type_name in the subclass" do
+      check = described_class.build(type: "test", worker_name: "foobar")
       expect(check).to be_a(klass)
     end
 
     it "must raise ArgumentError when the specified type doesn't exist" do
-      expect {
-        Delayed::Worker::HealthCheck.build(type: 'nope', config: {worker_name: 'foobar'})
-      }.to raise_error ArgumentError
+      expect do
+        described_class.build(type: "nope", config: { worker_name: "foobar" })
+      end.to raise_error ArgumentError
     end
 
-    it 'must initiaize the specified class using the supplied config' do
-      config = {foo: 'bar'}.with_indifferent_access
-      check = Delayed::Worker::HealthCheck.build(type: 'test', worker_name: 'foobar', config: config)
+    it "must initiaize the specified class using the supplied config" do
+      config = { foo: "bar" }.with_indifferent_access
+      check = described_class.build(type: "test", worker_name: "foobar", config: config)
       expect(check.config).to eq config
     end
   end
 
-  describe '.reschedule_abandoned_jobs' do
-    let(:klass) { Class.new(Delayed::Worker::HealthCheck) {
-      self.type_name = :fake
-      class << self
-        attr_accessor :live_workers
+  describe ".reschedule_abandoned_jobs" do
+    let(:klass) do
+      Class.new(Delayed::Worker::HealthCheck) do
+        self.type_name = :fake
+        class << self
+          attr_accessor :live_workers
+        end
+
+        def live_workers
+          self.class.live_workers
+        end
       end
-
-      def live_workers
-        self.class.live_workers
-      end
-    } }
+    end
 
     let(:initial_run_at) { Time.zone.now }
 
     before do
-      klass.live_workers = %w{alive}
+      klass.live_workers = %w[alive]
       Delayed.select_backend(Delayed::Backend::ActiveRecord::Job)
 
       2.times { Delayed::Job.enqueue(SimpleJob.new, run_at: initial_run_at, max_attempts: 4) }
       @alive_job = Delayed::Job.first
       @alive_job.update!({
-        locked_by: 'alive',
-        locked_at: initial_run_at
-      })
+                           locked_by: "alive",
+                           locked_at: initial_run_at
+                         })
       @dead_job = Delayed::Job.last
       @dead_job.update!({
-        locked_by: 'dead',
-        locked_at: initial_run_at
-      })
+                          locked_by: "dead",
+                          locked_at: initial_run_at
+                        })
       Delayed::Settings.worker_health_check_type = :fake
       Delayed::Settings.worker_health_check_config = {}
     end
 
     after do
-      Delayed::Worker::HealthCheck.subclasses.delete(klass)
+      described_class.subclasses.delete(klass)
       Delayed::Settings.worker_health_check_type = :none
       Delayed::Settings.worker_health_check_config = {}
     end
 
-    it 'must leave jobs locked by live workers alone' do
-      Delayed::Worker::HealthCheck.reschedule_abandoned_jobs
+    it "must leave jobs locked by live workers alone" do
+      described_class.reschedule_abandoned_jobs
       @alive_job.reload
       expect(@alive_job.run_at.to_i).to eq initial_run_at.to_i
       expect(@alive_job.locked_at.to_i).to eq initial_run_at.to_i
-      expect(@alive_job.locked_by).to eq 'alive'
+      expect(@alive_job.locked_by).to eq "alive"
     end
 
-    it 'must reschedule jobs locked by dead workers' do
-      Delayed::Worker::HealthCheck.reschedule_abandoned_jobs
+    it "must reschedule jobs locked by dead workers" do
+      described_class.reschedule_abandoned_jobs
       @dead_job.reload
       expect(@dead_job.run_at).to be > initial_run_at
       expect(@dead_job.locked_at).to be_nil
       expect(@dead_job.locked_by).to be_nil
     end
 
-    it 'ignores jobs that are re-locked after fetching from db' do
-      Delayed::Job.where(id: @dead_job).update_all(locked_by: 'someone_else')
+    it "ignores jobs that are re-locked after fetching from db" do
+      Delayed::Job.where(id: @dead_job).update_all(locked_by: "someone_else")
       allow(Delayed::Job).to receive(:running_jobs).and_return([@dead_job])
-      Delayed::Worker::HealthCheck.reschedule_abandoned_jobs
+      described_class.reschedule_abandoned_jobs
       @dead_job.reload
-      expect(@dead_job.locked_by).to eq 'someone_else'
+      expect(@dead_job.locked_by).to eq "someone_else"
     end
 
-    it 'ignores jobs that are prefetched' do
-      Delayed::Job.where(id: @dead_job).update_all(locked_by: 'prefetch:some_node')
+    it "ignores jobs that are prefetched" do
+      Delayed::Job.where(id: @dead_job).update_all(locked_by: "prefetch:some_node")
       allow(Delayed::Job).to receive(:running_jobs).and_return([@dead_job])
-      Delayed::Worker::HealthCheck.reschedule_abandoned_jobs
+      described_class.reschedule_abandoned_jobs
       @dead_job.reload
-      expect(@dead_job.locked_by).to eq 'prefetch:some_node'
+      expect(@dead_job.locked_by).to eq "prefetch:some_node"
     end
 
     it "bails immediately if advisory lock already taken" do
-      allow(Delayed::Worker::HealthCheck).to receive(:attempt_advisory_lock).and_return(false)
-      Delayed::Worker::HealthCheck.reschedule_abandoned_jobs
+      allow(described_class).to receive(:attempt_advisory_lock).and_return(false)
+      described_class.reschedule_abandoned_jobs
       @dead_job.reload
       expect(@dead_job.run_at.to_i).to eq(initial_run_at.to_i)
-      expect(@dead_job.locked_at).to_not be_nil
-      expect(@dead_job.locked_by).to_not be_nil
+      expect(@dead_job.locked_at).not_to be_nil
+      expect(@dead_job.locked_by).not_to be_nil
     end
   end
 
-  describe '#initialize' do
-    it 'must raise ArgumentError when the worker name is not supplied' do
+  describe "#initialize" do
+    it "must raise ArgumentError when the worker name is not supplied" do
       expect { klass.new }.to raise_error ArgumentError
     end
   end

data/spec/delayed/worker_spec.rb

@@ -3,22 +3,27 @@
 require_relative "../spec_helper"
 
 describe Delayed::Worker do
-  let(:worker_config) { {
-      queue: "test", min_priority: 1, max_priority: 2, stuff: "stuff",
-  }.freeze }
-  let(:job_attrs) { {
-    id: 42, name: "testjob", full_name: "testfullname", :last_error= => nil,
-    attempts: 1, reschedule: nil, :expired? => false,
-    payload_object: {}, priority: 25
-  }.freeze }
   subject { described_class.new(worker_config.dup) }
 
-  after { Delayed::Worker.lifecycle.reset! }
+  let(:worker_config) do
+    {
+      queue: "test", min_priority: 1, max_priority: 2, stuff: "stuff"
+    }.freeze
+  end
+  let(:job_attrs) do
+    {
+      id: 42, name: "testjob", full_name: "testfullname", :last_error= => nil,
+      attempts: 1, reschedule: nil, :expired? => false,
+      payload_object: {}, priority: 25
+    }.freeze
+  end
+
+  after { described_class.lifecycle.reset! }
 
   describe "#perform" do
     it "fires off an error callback when a job raises an exception" do
       fired = false
-      Delayed::Worker.lifecycle.before(:error) {|worker, exception| fired = true}
+      described_class.lifecycle.before(:error) { |_worker, _exception| fired = true }
       job = double(job_attrs)
       output_count = subject.perform(job)
       expect(fired).to be_truthy
@@ -27,8 +32,8 @@ describe Delayed::Worker do
 
     it "uses the retry callback for a retriable exception" do
       error_fired = retry_fired = false
-      Delayed::Worker.lifecycle.before(:error) {|worker, exception| error_fired = true }
-      Delayed::Worker.lifecycle.before(:retry) {|worker, exception| retry_fired = true}
+      described_class.lifecycle.before(:error) { |_worker, _exception| error_fired = true }
+      described_class.lifecycle.before(:retry) { |_worker, _exception| retry_fired = true }
       job = Delayed::Job.new(payload_object: {}, priority: 25, strand: "test_jobs", max_attempts: 3)
       expect(job).to receive(:invoke_job) do
         raise Delayed::RetriableError, "that's all this job does"
@@ -40,15 +45,13 @@ describe Delayed::Worker do
     end
 
     it "reloads" do
-      fakeApplication = double('Rails.application',
-          config: double('Rails.application.config',
-          cache_classes: false,
-          reload_classes_only_on_change: false
-        ),
-        reloader: double()
-      )
+      fake_application = double("Rails.application",
+                                config: double("Rails.application.config",
+                                               cache_classes: false,
+                                               reload_classes_only_on_change: false),
+                                reloader: double)
 
-      allow(Rails).to receive(:application).and_return(fakeApplication)
+      allow(Rails).to receive(:application).and_return(fake_application)
       if Rails::VERSION::MAJOR >= 5
         expect(Rails.application.reloader).to receive(:reload!).once
       else
@@ -61,7 +64,7 @@ describe Delayed::Worker do
   end
 
   describe "#log_job" do
-    around(:each) do |block|
+    around do |block|
       prev_logger = Delayed::Settings.job_detailed_log_format
       block.call
       Delayed::Settings.job_detailed_log_format = prev_logger
@@ -73,11 +76,11 @@ describe Delayed::Worker do
       short_log_format = subject.log_job(job, :short)
       expect(short_log_format).to eq("RSpec::Mocks::Double")
       long_format = subject.log_job(job, :long)
-      expect(long_format).to eq("RSpec::Mocks::Double {\"priority\":25,\"attempts\":0,\"created_at\":null,\"tag\":\"RSpec::Mocks::Double#perform\",\"max_attempts\":null,\"strand\":\"test_jobs\",\"source\":null}")
+      expect(long_format).to eq("RSpec::Mocks::Double {\"priority\":25,\"attempts\":0,\"created_at\":null,\"tag\":\"RSpec::Mocks::Double#perform\",\"max_attempts\":null,\"strand\":\"test_jobs\",\"source\":null}") # rubocop:disable Layout/LineLength
     end
 
     it "logging format can be changed with settings" do
-      Delayed::Settings.job_detailed_log_format = ->(job){ "override format #{job.strand}"}
+      Delayed::Settings.job_detailed_log_format = ->(job) { "override format #{job.strand}" }
       payload = double(perform: nil)
       job = Delayed::Job.new(payload_object: payload, priority: 25, strand: "test_jobs")
       short_log_format = subject.log_job(job, :short)
@@ -89,8 +92,8 @@ describe Delayed::Worker do
 
   describe "#run" do
     it "passes extra config options through to the WorkQueue" do
-      expect(subject.work_queue).to receive(:get_and_lock_next_available).
-        with(subject.name, worker_config).and_return(nil)
+      expect(subject.work_queue).to receive(:get_and_lock_next_available)
+        .with(subject.name, worker_config).and_return(nil)
       subject.run
     end
   end

data/spec/gemfiles/52.gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
-gemspec :path=>"../../"
+gemspec path: "../../"
 
 gem "rails", "~> 5.2.0"
-gem 'sinatra', "2.0.0.beta2"
-gem 'sinatra-contrib', "2.0.0.beta2"
+gem "sinatra", "~> 2.0"
+gem "sinatra-contrib", "~> 2.0"

data/spec/gemfiles/52.gemfile.lock

@@ -0,0 +1,240 @@
+PATH
+  remote: ../..
+  specs:
+    inst-jobs (2.3.3)
+      activerecord (>= 5.2)
+      activesupport (>= 5.2)
+      after_transaction_commit (>= 1.0, < 3)
+      debug_inspector (~> 1.0)
+      fugit (~> 1.3)
+      railties (>= 5.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
+      globalid (>= 0.3.6)
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
+      arel (>= 9.0)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
+      marcel (~> 1.0.0)
+    activesupport (5.2.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    after_transaction_commit (2.2.2)
+      activerecord (>= 5.2)
+    arel (9.0.0)
+    builder (3.2.4)
+    bump (0.10.0)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    crack (0.4.5)
+      rexml
+    crass (1.0.6)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    debug_inspector (1.1.0)
+    deep_merge (1.2.1)
+    diff-lcs (1.4.4)
+    diplomat (2.5.1)
+      deep_merge (~> 1.2)
+      faraday (>= 0.9)
+    erubi (1.10.0)
+    et-orbi (1.2.4)
+      tzinfo
+    faraday (1.7.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    fugit (1.5.0)
+      et-orbi (~> 1.1, >= 1.1.8)
+      raabro (~> 1.4)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
+    hashdiff (1.0.1)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    loofah (2.12.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (1.0.1)
+    method_source (1.0.0)
+    mini_mime (1.1.0)
+    minitest (5.14.4)
+    multi_json (1.15.0)
+    multipart-post (2.1.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    nio4r (2.5.8)
+    nokogiri (1.12.3-x86_64-darwin)
+      racc (~> 1.4)
+    pg (1.2.3)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
+    raabro (1.4.0)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-protection (2.1.0)
+      rack
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.6)
+      actioncable (= 5.2.6)
+      actionmailer (= 5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      activemodel (= 5.2.6)
+      activerecord (= 5.2.6)
+      activestorage (= 5.2.6)
+      activesupport (= 5.2.6)
+      bundler (>= 1.3.0)
+      railties (= 5.2.6)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (13.0.6)
+    redis (4.4.0)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby2_keywords (0.0.5)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
+      tilt (~> 2.0)
+    sinatra-contrib (2.1.0)
+      multi_json
+      mustermann (~> 1.0)
+      rack-protection (= 2.1.0)
+      sinatra (= 2.1.0)
+      tilt (~> 2.0)
+    sprockets (4.0.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (1.1.0)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    timecop (0.9.4)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    wwtd (1.4.1)
+
+PLATFORMS
+  x86_64-darwin-20
+
+DEPENDENCIES
+  bump
+  byebug
+  database_cleaner (~> 2.0)
+  database_cleaner-active_record (~> 2.0)
+  diplomat (~> 2.5.1)
+  inst-jobs!
+  pg
+  pry
+  rack-test
+  rails (~> 5.2.0)
+  rake
+  rspec (~> 3.10)
+  sinatra (~> 2.0)
+  sinatra-contrib (~> 2.0)
+  timecop (= 0.9.4)
+  webmock
+  wwtd (~> 1.4.0)
+
+BUNDLED WITH
+   2.2.24

data/spec/gemfiles/60.gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
-gemspec :path=>"../../"
+gemspec path: "../../"
 
 gem "rails", "~> 6.0.0"
-gem 'sinatra', "2.0.0.beta2"
-gem 'sinatra-contrib', "2.0.0.beta2"
+gem "sinatra", "~> 2.0"
+gem "sinatra-contrib", "~> 2.0"