exercism-config 0.36.0 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97a6e5acb4ba0d52a4c9ace53896415a63c223bad24b8efc9b0390f0740d7307
-  data.tar.gz: b5b66fdec816ae029fa2f4db3e1db28f538f29f74a4b71473e007e0991845565
+  metadata.gz: e7bef38e1eec4bdc3aec906661dc721b4962ce29c6ea8c28d4d36c8cb229a467
+  data.tar.gz: add38650e6608cbcb0de8cd1ce1c4494e89d5729fec70e3eee5ccdb83ccfeef3
 SHA512:
-  metadata.gz: a210de31c00337cfa8d713fa4fde4854a3ddd8ea08a8057179bd8996d829e6968a31b349e5a11e5e082a6c406f19192203321e6062670d9aa14e88da2c12017d
-  data.tar.gz: c623fa955cdeaa244540ecc5785d5dd862321aa06f0a004a2cc7cbe5ecd6d067415e02c5dc0db79f2fe052148847cdc7b81c462d05e31f9edce679eb10362a7e
+  metadata.gz: 5a7eaa5ee84d53f259ed47fc6a3bbd8bc0cd1f91f08ae2d92a555890e00b3dd8d5f31effe69c6311c31c0b5c27bc09c32a77f69b2bd8863d912abc95cf88b0a1
+  data.tar.gz: 545ad525ddaa2b43854dfcf9723c93a958393d0c2d270c82b0b81f1d19d95e2d6c338a9acf269b5b0733bfe1ce3e0f296014793e44c9d5669732039bd2bd2ef6

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/rubocop-quick

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-git diff --name-status --staged | grep '^[MA]' | grep -o '\\s\\+.*rb' | xargs bundle exec rubocop --except Metrics --auto-correct --format quiet --force-exclusion lib/exercism-config.rb && \
-git diff --name-status --staged | grep '^[MA]' | grep -o '\\s\\+.*rb' | xargs git add
+git diff --name-status --staged | grep '^[MA]' | grep -o '\s\+.*rb' | xargs bundle exec rubocop --except Metrics --auto-correct --format quiet --force-exclusion lib/exercism-config.rb && \
+git diff --name-status --staged | grep '^[MA]' | grep -o '\s\+.*rb' | xargs git add

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

@@ -3,7 +3,7 @@ require "bundler/setup"
 require "exercism-config"
 
 # Only allow this to run in development
-return unless Exercism.env.development?
+return if Exercism.env.production?
 
 puts "Create AWS/DynamoDB tables..."
 
@@ -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"]
-  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_iterations_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.rb

@@ -18,7 +18,7 @@ module Exercism
   class ConfigError < RuntimeError; end
 
   def self.env
-    @environment ||= ExercismConfig::DetermineEnvironment.()
+    @env ||= ExercismConfig::DetermineEnvironment.()
   end
 
   def self.environment

data/lib/exercism/config.rb

@@ -1,12 +1,26 @@
 module Exercism
   class Config < OpenStruct
+    PROPS_WITH_TEST_SUFFIX = %i[
+      dynamodb_tooling_jobs_table
+    ].freeze
+
     def initialize(data, aws_settings)
       super(data)
       self.aws_settings = aws_settings
     end
 
+    PROPS_WITH_TEST_SUFFIX.each do |prop|
+      define_method prop do
+        Exercism.env.test? ? "#{super()}-test" : super()
+      end
+    end
+
     def to_json(*_args)
-      to_h.to_json
+      hash = to_h
+      PROPS_WITH_TEST_SUFFIX.each do |prop|
+        hash[prop] = send(prop)
+      end
+      hash.to_json
     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.36.0'.freeze
+  VERSION = '0.43.0'.freeze
 end

data/settings/{test-ci.yml → ci.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_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_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_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.36.0
+  version: 0.43.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2020-08-29 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: some_tooling_table
-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: some_tooling_table
-spi_url: http://some_url:1234
-tooling_orchestrator_url: http://some_orchestrator_url:1234
-
-mysql_master_endpoint: localhost
-mysql_socket: /tmp/mysql.sock