exercism_config 0.21.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c24cc2300139fb5053af4489866ee9994265766f12f5b91fe676ed055c4d3a7
-  data.tar.gz: b657a28b1adccf1b74b1a57005eb324889466a1f92a7ac581094f576e904df99
+  metadata.gz: fc1b4facff164813306b5b40a77e41426e8ec8bf8b559ed334572b7339ac1bfe
+  data.tar.gz: 541c70f5546de7dccca0825e34eeee9cc68e6310780fa87c6c3d1e0f7c5fc3cf
 SHA512:
-  metadata.gz: c6bd5340aa8d762d42891713b7c0768edee802e884ca19489f41cb72613eb0362c53887a7963425f0e83661028ffe0fdb62dc7040bf559a9c45854abd6665505
-  data.tar.gz: 27ae8d52eebdf0196e3a2c3414fbfe3726ad532728c8b81970ab96e7333224333508cf5653b2566d334d6a69949cfbc6d0599b80dd18a06c63374d7907150c08
+  metadata.gz: ec77fc99f27705b35234d3262b618a5a5b993d36f1a1dafd00118bdb53f4500dd873af5a70790b00b4e1a73574df69acf9b98a01a77802b3a316b308264df994
+  data.tar.gz: ee10e2d61d426d6e959598b68798888c10ffc0e5ebb660b8f54493fa387509e5d775beced839cf1671eca38995fc703a6e2784a9764b71b6480c639996983019

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    exercism_config (0.18.0)
+    exercism_config (0.21.0)
       aws-sdk-dynamodb (~> 1.0)
       mandate
       zeitwerk

data/bin/setup_exercism_config

@@ -2,6 +2,7 @@
 
 require "bundler/setup"
 require "exercism_config"
+require 'erb'
 require 'yaml'
 
 env = ExercismConfig::DetermineEnvironment.()
@@ -76,7 +77,7 @@ settings_file =
   end
 
 puts "Using settings file: #{settings_file}"
-settings = YAML.load(File.read(settings_file))
+settings = YAML.load(ERB.new(File.read(settings_file)).result)
 
 settings.each do |key, value|
   set_config_value(client, key, value)

data/exercism_config.gemspec

@@ -30,4 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "mocha"
+
+  # This isn't a compulsary dependency
+  # but can be used if someone puts it in their
+  # own gemfile
+  spec.add_development_dependency "aws-sdk-s3"
 end

data/lib/exercism_config.rb

@@ -6,6 +6,7 @@ require 'json'
 require_relative 'exercism_config/determine_environment'
 require_relative 'exercism_config/generate_aws_settings'
 require_relative 'exercism_config/setup_dynamodb_client'
+require_relative 'exercism_config/setup_s3_client'
 require_relative 'exercism_config/retrieve'
 require_relative 'exercism_config/generate_aws_settings'
 require_relative "exercism_config/version"

data/lib/exercism_config/determine_environment.rb

@@ -7,7 +7,7 @@ module ExercismConfig
       raise Exercism::ConfigError, "No environment set - set one of EXERCISM_ENV, RAILS_ENV or APP_ENV" unless env
 
       unless %w[development test production].include?(env)
-        raise Exercism::ConfigError, "environments must be one of development test production. Got #{env}"
+        raise Exercism::ConfigError, "environment must be one of development, test or production. Got #{env}."
       end
 
       env.to_sym

data/lib/exercism_config/retrieve.rb

@@ -3,6 +3,22 @@ module ExercismConfig
     include Mandate
 
     def call
+      return generate_mock if Exercism.environment == :test
+      retrieve_from_dynamodb
+    end
+
+    private
+
+    def generate_mock
+      require 'erb'
+      require 'yaml'
+
+      settings_file = File.expand_path("../../../settings/test.yml", __FILE__)
+      settings = YAML.load(ERB.new(File.read(settings_file)).result)
+      Exercism::Config.new(settings, {})
+    end
+
+    def retrieve_from_dynamodb
       client = SetupDynamoDBClient.()
 
       resp = client.scan({table_name: "config"})

data/lib/exercism_config/setup_dynamodb_client.rb

@@ -22,7 +22,7 @@ module ExercismConfig
       return nil unless %i[development test].include?(Exercism.environment)
       return "http://127.0.0.1:#{ENV["DYNAMODB_PORT"]}" if ENV["EXERCISM_CI"]
 
-      host = ENV["EXERCISM_DOCKER"] ? "dynamodb:8000" : "localhost:3039"
+      host = ENV["EXERCISM_DOCKER"] ? "dynamodb:8000" : "localhost:3040"
       "http://#{host}"
     end
   end

data/lib/exercism_config/setup_s3_client.rb

@@ -0,0 +1,33 @@
+module ExercismConfig
+  class SetupS3Client
+    include Mandate
+
+    def call
+      require 'aws-sdk-s3'
+
+      aws_settings = GenerateAwsSettings.().merge(
+        endpoint: config_endpoint,
+        force_path_style: true,
+
+        # We don't want a profile for this AWS service
+        # as we run it locally. But we do normally, so 
+        # we locally override this here.
+        profile: nil
+      ).select {|k,v|v}
+      Aws::S3::Client.new(aws_settings)
+    end
+
+    private
+    attr_reader :environment
+
+    memoize
+    def config_endpoint
+      return nil unless %i[development test].include?(Exercism.environment)
+      return "http://127.0.0.1:#{ENV["S3_PORT"]}" if ENV["EXERCISM_CI"]
+
+      host = ENV["EXERCISM_DOCKER"] ? "s3:9090" : "localhost:3041"
+      "http://#{host}"
+    end
+  end
+end
+

data/lib/exercism_config/version.rb

@@ -1,3 +1,3 @@
 module ExercismConfig
-  VERSION = "0.21.0"
+  VERSION = "0.27.0"
 end

data/settings/ci.yml

@@ -5,3 +5,4 @@ anycable_redis_url: redis://127.0.0.1:6379/1
 anycable_rpc_host: 127.0.0.1:50051
 rds_master_endpoint: 127.0.0.1
 rds_port: <%= ENV["MYSQL_PORT"] %>
+spi_url: http://127.0.0.1:3020

data/settings/development.yml

@@ -1,7 +1,8 @@
 aws_iterations_bucket: exercism-staging-iterations
 dynamodb_tooling_jobs_table: tooling_jobs
 tooling_orchestrator_url: http://127.0.0.1:3021
-anycable_redis_url: 'redis://127.0.0.1:6379/1'
-anycable_rpc_host: '127.0.0.1:50051'
+anycable_redis_url: redis://127.0.0.1:6379/1
+anycable_rpc_host: 127.0.0.1:50051
 rds_master_endpoint: localhost
 mysql_socket: /tmp/mysql.sock
+spi_url: http://127.0.0.1:3020

data/settings/docker.yml

@@ -5,3 +5,4 @@ anycable_redis_url: redis://redis:6379/1
 anycable_rpc_host: 0.0.0.0:50051
 rds_master_endpoint: mysql
 rds_port: 3306
+spi_url: http://website:3020

data/settings/test.yml

@@ -0,0 +1,7 @@
+aws_iterations_bucket: some-bucket
+dynamodb_tooling_jobs_table: some_table
+tooling_orchestrator_url: http://some-url:1234
+anycable_redis_url: redis://some-redis:1234/9
+anycable_rpc_host: 1.2.3.4:9876543
+rds_master_endpoint: some_url
+rds_port: 1234

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exercism_config
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-dynamodb
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - jez.walker@gmail.com
@@ -123,7 +137,6 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/setup
 - bin/setup_exercism_config
 - exercism_config.gemspec
 - lib/exercism/config.rb
@@ -132,10 +145,12 @@ files:
 - lib/exercism_config/generate_aws_settings.rb
 - lib/exercism_config/retrieve.rb
 - lib/exercism_config/setup_dynamodb_client.rb
+- lib/exercism_config/setup_s3_client.rb
 - lib/exercism_config/version.rb
 - settings/ci.yml
 - settings/development.yml
 - settings/docker.yml
+- settings/test.yml
 homepage: https://exercism.io
 licenses: []
 metadata:

data/bin/setup

@@ -1,8 +0,0 @@
-setup_#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here