exercism_config 0.20.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 744fa38ddb1c1232e2ce3e758174de17511af61274c1f12a588505d6a4db6823
-  data.tar.gz: 55aff6a0a094dc360fd5e85deb561240bfb73ec4082449ce115cc479b7dcc07b
+  metadata.gz: f3b9c7e4dcbf09e9d69d88fca3077c2e816ff287b67b3cba2a368709befcdf89
+  data.tar.gz: 5a303f30e356de04c8e5c358a099e391ac2c2c20cf75b96dacf0a0b5d89dddc4
 SHA512:
-  metadata.gz: 9539fc278aefaa2b28250cd06f05abd977f7472dbd5198845a2f1ceb212624ac84ce1a252bff91d0c3faafc816ee09bd3be8f3d6ac24d7c7b84b56e65c31c60e
-  data.tar.gz: afacdce64725a4b5757ce741135cd19f1b69072c3a9773e4815307f04ae3430e7cdd332a8b23ee880cfcb1271221fcd0bab788b89c4b866753665373cb2a5568
+  metadata.gz: 4b2702cb4c20e8ce11c0fd514d98d65af9effabb466d13e948fd3f872e1ad56e8b8b558bff34ef1a78ed95019b5cd67885d28ea75cd26b62978f2f2d3985ddaa
+  data.tar.gz: 3b673b37307b1eee3c6e125682fef0fed504d7c1d8e8f530ed97209514f16ab32fdb367e5e00d50e3800fcf93dabb1fd85c9813b7290924ffdfdde0881fcbbe3

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/setup_dynamodb_client.rb

@@ -20,9 +20,9 @@ module ExercismConfig
     memoize
     def config_endpoint
       return nil unless %i[development test].include?(Exercism.environment)
-      return "http://127.0.0.1:8000" if ENV["EXERCISM_CI"]
+      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.20.0"
+  VERSION = "0.26.0"
 end

data/settings/ci.yml

@@ -4,4 +4,5 @@ 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
 rds_master_endpoint: 127.0.0.1
-rds_port: 3306
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exercism_config
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-07-30 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,6 +145,7 @@ 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
@@ -156,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Retrieves stored config for Exercism

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