exercism-config 0.37.0 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c3553a925d735e0f255f9e3c7afc498b1b6c33d70d30026b138beed0fbd49d0
-  data.tar.gz: 9270aee69112a25339a7c9c68450f72418a7ddfdd59667b571151025e3cc89cc
+  metadata.gz: d16293bab1db89c167c3057474f342b2db3e741c4929b67b0529c9be72c73cf0
+  data.tar.gz: f0202eebe5d45b1c5703d09eeb1a4057807f47d05e032f6bdd5dc6666b79bf26
 SHA512:
-  metadata.gz: 5a8016773caff1b76a54e9d71febcda4b9e87b37e309859f02568a1146e54af2c0fc7f9336d351b6e5b24fa7ac82f14a5ead9ba71226583b64565ca67cccf5f3
-  data.tar.gz: 066ea0f51d9aaf4f3e6b4daf46b743510ebd41a399f299fca560e860f5dd17d39a5ccd31afe2bb6cabfed4f7524dc87d05bb0778f2b55082f3fbd823aaa2f567
+  metadata.gz: e7455d261fa9914f62b971eb05e9ad40b900f767d8228a30cddd4023a360daf613df5fa067261daad9c2193d749dc1691f785b12b9f3ea553ca743cf1fc9e92e
+  data.tar.gz: 51c76961b8c6be0264462c57dd9677659f4ef86b868fcdffa07ca284fb63c401922f6b9fcae559e3df42678a08f0d88e986d8754b312ffeb7a07a7aeab489150

data/.github/workflows/tests.yml

@@ -73,6 +73,7 @@ jobs:
       ###
       # Publish the coverage to CodeClimate
       - name: Publish code coverage
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
         env:
           GIT_BRANCH: ${GITHUB_REF/refs\/heads\//}
           CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}

data/.rubocop.yml

@@ -56,6 +56,10 @@ Style/Documentation:
 Style/DocumentationMethod:
   Enabled: false
 
+Style/GuardClause:
+  Exclude:
+    - lib/exercism_config/environment.rb
+
 Style/IfUnlessModifier:
   Exclude:
     - "lib/exercism_config/setup_dynamodb_client.rb"

data/Rakefile

@@ -8,3 +8,7 @@ Rake::TestTask.new(:test) do |t|
 end
 
 task default: :test
+
+task :lint do
+  sh 'bundle exec rubocop --except Metrics -a'
+end

data/bin/setup_exercism_config

@@ -5,8 +5,7 @@ require 'exercism-config'
 require 'erb'
 require 'yaml'
 
-env = ExercismConfig::DetermineEnvironment.call
-if env == :production
+if Exercism.env.production?
   puts 'Aborted! This script should not be run in production.'
   exit
 end
@@ -71,9 +70,9 @@ settings_file =
   elsif ENV['EXERCISM_DOCKER']
     File.expand_path('../settings/docker.yml', __dir__)
   elsif ENV['EXERCISM_CI']
-    File.expand_path('../settings/test-ci.yml', __dir__)
+    File.expand_path('../settings/ci.yml', __dir__)
   else
-    File.expand_path('../settings/development.yml', __dir__)
+    File.expand_path('../settings/local.yml', __dir__)
   end
 
 puts "Using settings file: #{settings_file}"

data/bin/setup_exercism_local_aws

@@ -13,15 +13,18 @@ Exercism.config.dynamodb_client = ExercismConfig::SetupDynamoDBClient.()
 # Setup local s3 #
 ##################
 
-# We don't need this running for CI atm as none of our
-# tests actually hit s3. Although we might choose to change this
-unless ENV["EXERCISM_CI"] || ENV["EXERCISM_SKIP_S3"]
-  begin
-    ExercismConfig::SetupS3Client.().create_bucket(bucket: Exercism.config.aws_iterations_bucket)
-  rescue Seahorse::Client::NetworkingError => e
-    puts "local S3 not up yet..."
-    sleep 2 # slighty retry delaty
-    retry
+unless ENV["EXERCISM_SKIP_S3"]
+  [
+    Exercism.config.aws_submissions_bucket,
+    Exercism.config.aws_tooling_jobs_bucket,
+  ].each do |bucket|
+    begin
+      ExercismConfig::SetupS3Client.().create_bucket(bucket: bucket)
+    rescue Seahorse::Client::NetworkingError => e
+      puts "local S3 not up yet..."
+      sleep 2 # slighty retry delaty
+      retry
+    end
   end
 end
 

data/lib/exercism_config/determine_environment.rb

@@ -4,6 +4,10 @@ module ExercismConfig
 
     def call
       env = ENV['EXERCISM_ENV'] || ENV['RAILS_ENV'] || ENV['APP_ENV']
+      unless env
+        env = Rails.env.to_s if Object.const_defined?(:Rails) && Rails.respond_to?(:env)
+      end
+
       raise Exercism::ConfigError, 'No environment set - set one of EXERCISM_ENV, RAILS_ENV or APP_ENV' unless env
 
       Environment.new(env)

data/lib/exercism_config/environment.rb

@@ -1,6 +1,6 @@
 module ExercismConfig
   class Environment
-    ALLOWED_ENVS = %{development test production}
+    ALLOWED_ENVS = %(development test production).freeze
     private_constant :ALLOWED_ENVS
 
     def initialize(raw_env)

data/lib/exercism_config/retrieve.rb

@@ -14,11 +14,11 @@ module ExercismConfig
       require 'yaml'
 
       filename = if ENV["EXERCISM_CI"]
-                   'test-ci'
+                   'ci'
                  elsif ENV["EXERCISM_DOCKER"]
-                   'test-docker'
+                   'docker'
                  else
-                   'test-local'
+                   'local'
                  end
 
       settings_file = File.expand_path("../../../settings/#{filename}.yml", __FILE__)
@@ -36,13 +36,6 @@ module ExercismConfig
         h[item['id']] = item['value']
       end
 
-      # Tweak things for dynamodb when we're running in test mode
-      if Exercism.env.test?
-        %w[dynamodb_tooling_jobs_table].each do |key|
-          data[key] = "#{data[key]}-test"
-        end
-      end
-
       aws_settings = GenerateAwsSettings.()
       Exercism::Config.new(data, aws_settings)
     rescue Exercism::ConfigError

data/lib/exercism_config/setup_dynamodb_client.rb

@@ -15,7 +15,6 @@ module ExercismConfig
     end
 
     private
-
     memoize
     def config_endpoint
       return nil if Exercism.env.production?

data/lib/exercism_config/setup_s3_client.rb

@@ -18,11 +18,10 @@ module ExercismConfig
     end
 
     private
-
     memoize
     def config_endpoint
       return nil if Exercism.env.production?
-      return "http://127.0.0.1:#{ENV['S3_PORT']}" if ENV['EXERCISM_CI']
+      return "http://127.0.0.1:#{ENV['S3_PORT']}" if Exercism.env.test? && ENV['EXERCISM_CI']
 
       host = ENV['EXERCISM_DOCKER'] ? 's3:9090' : 'localhost:3041'
       "http://#{host}"

data/lib/exercism_config/version.rb

@@ -1,3 +1,3 @@
 module ExercismConfig
-  VERSION = '0.37.0'.freeze
+  VERSION = '0.44.0'.freeze
 end

data/settings/{test-ci.yml → ci.yml}

@@ -1,7 +1,8 @@
 anycable_redis_url: redis://127.0.0.1:6379/1
 anycable_rpc_host: 127.0.0.1:50051
-aws_iterations_bucket: exercism-staging-iterations
-dynamodb_tooling_jobs_table: tooling_jobs-test
+aws_submissions_bucket: exercism-staging-submissions
+aws_tooling_jobs_bucket: exercism-staging-tooling-jobs
+dynamodb_tooling_jobs_table: tooling_jobs
 spi_url: http://127.0.0.1:3020
 tooling_orchestrator_url: http://127.0.0.1:3021
 

data/settings/docker.yml

@@ -1,6 +1,7 @@
 anycable_redis_url: redis://redis:6379/1
 anycable_rpc_host: 0.0.0.0:50051
-aws_iterations_bucket: exercism-staging-iterations
+aws_submissions_bucket: exercism-staging-submissions
+aws_tooling_jobs_bucket: exercism-staging-tooling-jobs
 dynamodb_tooling_jobs_table: tooling_jobs
 mysql_master_endpoint: mysql
 mysql_port: 3306

data/settings/{development.yml → local.yml}

@@ -1,6 +1,7 @@
 anycable_redis_url: redis://127.0.0.1:6379/1
 anycable_rpc_host: 127.0.0.1:50051
-aws_iterations_bucket: exercism-staging-iterations
+aws_submissions_bucket: exercism-staging-submissions
+aws_tooling_jobs_bucket: exercism-staging-tooling-jobs
 dynamodb_tooling_jobs_table: tooling_jobs
 mysql_master_endpoint: localhost
 mysql_socket: /tmp/mysql.sock

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exercism-config
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.44.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-dynamodb
@@ -131,7 +131,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/config/rubocop_linter_action.yml"
 - ".github/workflows/rubocop.yml"
 - ".github/workflows/tests.yml"
 - ".gitignore"
@@ -157,11 +156,9 @@ files:
 - lib/exercism_config/setup_s3_client.rb
 - lib/exercism_config/version.rb
 - package.json
-- settings/development.yml
+- settings/ci.yml
 - settings/docker.yml
-- settings/test-ci.yml
-- settings/test-docker.yml
-- settings/test-local.yml
+- settings/local.yml
 - yarn.lock
 homepage: https://exercism.io
 licenses: []

data/.github/config/rubocop_linter_action.yml

@@ -1,12 +0,0 @@
-check_name: 'Rubocop Results'
-
-rubocop_fail_level: 'refactor'
-
-rubocop_excluded_cops:
-  - 'Metrics'
-        
-versions:
-  - rubocop
-  - rubocop-rails
-  - rubocop-minitest
-  - rubocop-performance

data/settings/test-docker.yml

@@ -1,9 +0,0 @@
-anycable_redis_url: redis://some_anycable_redis_url:1234/9
-anycable_rpc_host: 1.2.3.4:9876543
-aws_iterations_bucket: some-iterations-bucket
-dynamodb_tooling_jobs_table: tooling_jobs-test
-spi_url: http://some_url:1234
-tooling_orchestrator_url: http://some_orchestrator_url:1234
-
-mysql_master_endpoint: mysql
-mysql_port: 3306

data/settings/test-local.yml

@@ -1,9 +0,0 @@
-anycable_redis_url: redis://some_anycable_redis_url:1234/9
-anycable_rpc_host: 1.2.3.4:9876543
-aws_iterations_bucket: some-iterations-bucket
-dynamodb_tooling_jobs_table: tooling_jobs-test
-spi_url: http://some_url:1234
-tooling_orchestrator_url: http://some_orchestrator_url:1234
-
-mysql_master_endpoint: localhost
-mysql_socket: /tmp/mysql.sock