Merge pull request #39 from figma/ck/replace-ruby-dir

Revert ruby/ dir to michaelnyu/ci-queue/ruby @ ec48cc2

Author: ckilpatrick-stay-hydrated-call-your-mom

.DS_Store

@@ -4,6 +4,7 @@ test/fixtures/log/test_data.json
 /.byebug_history
 /.bundle/
 /.yardoc
+/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

ruby/.gitignore

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in ci-queue.gemspec
 gemspec
 
-gem 'activesupport'
+gem 'activesupport', '~> 5.2.0'

ruby/.ruby-version

@@ -19,8 +19,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/Shopify/ci-queue'
   spec.license       = 'MIT'
 
-  spec.required_ruby_version = '>= 2.7'
-
   spec.files         = lua_scripts + `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
@@ -31,8 +29,6 @@ Gem::Specification.new do |spec|
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
-  spec.add_runtime_dependency 'logger'
-
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest', ENV.fetch('MINITEST_VERSION', '~> 5.11')

ruby/Gemfile

@@ -3,9 +3,9 @@
 name: ci-queue
 
 up:
-- ruby
+- ruby: 2.6.5
 - bundler
-- redis
+- isogun
 
 commands:
-  test: REDIS_URL=${REDIS_URL} bundle exec rake test TEST_FILES="$*"
+  test: REDIS_URL=${REDIS_URL:-redis://ci-queue.railgun/0} bundle exec rake test TEST_FILES="$*"

ruby/Gemfile.lock

@@ -0,0 +1,10 @@
+# This file is for Shopify employees development environment.
+# If you are an external contributor you don't have to bother with it.
+name: ci-queue
+
+vm:
+  ip_address: 192.168.64.245
+  memory: 1G
+  cores: 2
+services:
+   - redis

ruby/ci-queue.gemspec

@@ -2,7 +2,6 @@
 
 require 'uri'
 require 'cgi'
-require 'json'
 
 require 'ci/queue/version'
 require 'ci/queue/output_helpers'
@@ -21,21 +20,10 @@ module Queue
 
     attr_accessor :shuffler, :requeueable
 
-    Error = Class.new(StandardError)
-
     module Warnings
       RESERVED_LOST_TEST = :RESERVED_LOST_TEST
     end
 
-    GET_NOW = ::Time.method(:now)
-    private_constant :GET_NOW
-    def time_now
-      # Mocks like freeze_time should be cleaned when ci-queue runs, however,
-      # we experienced cases when tests were enqueued with wrong timestamps, so we
-      # safeguard Time.now here.
-      GET_NOW.call
-    end
-
     def requeueable?(test_result)
       requeueable.nil? || requeueable.call(test_result)
     end
@@ -55,7 +43,7 @@ def from_uri(url, config)
         Static
       when 'file', nil
         File
-      when 'redis', 'rediss'
+      when 'redis'
         require 'ci/queue/redis'
         Redis
       else

ruby/dev.yml

@@ -27,10 +27,6 @@ def failing_test
         Static.new([config.failing_test], config).populate(@all_tests)
       end
 
-      def failing_test_present?
-        @all_tests.find { |t| t.id == config.failing_test }
-      end
-
       def candidates
         Static.new(first_half + [config.failing_test], config).populate(@all_tests)
       end