exercism_config 0.18.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 555be062390d82c5998c347d504b0e158388bdc4cd6be78b696b05d6e64a4583
-  data.tar.gz: 4379e460085f1a7024ebf93a96380ec7bcd68392c7117cf9c3e13d7cac527944
+  metadata.gz: d5babef3a3749dac8779c483f8afaa93df5b1c11a07fb1c79e6bfa8a0ad628e3
+  data.tar.gz: 30d6b0c117bf61cadbcafbd2756c955eb7d57fddf77a3e9f6da47da2ac18afc5
 SHA512:
-  metadata.gz: fd335e5943218e1316c45c598d45940f4da31f193d30d6f2b7c271081553d770ecc886f59ebd6ab27be5a04088e84ea5d450adb2c3a7b2190e404c508d709968
-  data.tar.gz: e80961c8c6ff6a55f3eb272027611e6b575c5c365fb81b7f8a901694997dfb4628b8ec7d96943621bf6cae9063e8cf496274a5eef1e21cfae513e680d258e78f
+  metadata.gz: 6baf1d362986f1d905fa4c3579cc5f24ae2d654c302ad7074660ba2019d74516713f4802e9a33b7258c0273a18ba483f70511efe5c2795039aaddd34f730d0da
+  data.tar.gz: d73f47b8063a043feb2dbebe3972fa6edff048aeee4aad0e175a8c22edd24b364a5bb944a0fea4b0385b1be90802288584da06f89663ef0a33982f69e3ff89c6

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.()
@@ -64,20 +65,19 @@ rescue Aws::DynamoDB::Errors::ResourceInUseException => e
 end
 
 settings_file_arg = ARGV.select{|arg|arg.start_with?("--settings-file=")}.first
-if settings_file_arg
-  settings_file = settings_file_arg.split("=").last
-  settings = YAML.load(File.read(settings_file))
-else
-  settings = {
-    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',
-    rds_master_endpoint: "localhost",
-    mysql_socket: "/tmp/mysql.sock"
-  }
-end
+settings_file = 
+  if settings_file_arg
+    settings_file_arg.split("=").last
+  elsif ENV["EXERCISM_DOCKER"]
+    File.expand_path("../../settings/docker.yml", __FILE__)
+  elsif ENV["EXERCISM_CI"]
+    File.expand_path("../../settings/ci.yml", __FILE__)
+  else
+    File.expand_path("../../settings/development.yml", __FILE__)
+  end
+
+puts "Using settings file: #{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/setup_dynamodb_client.rb

@@ -19,13 +19,11 @@ module ExercismConfig
 
     memoize
     def config_endpoint
-      case Exercism.environment
-      when :development, :test
-        host = ENV["EXERCISM_DOCKER"] ? "dynamodb:8000" : "localhost:3039"
-        "http://#{host}"
-      else
-        nil
-      end
+      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:3040"
+      "http://#{host}"
     end
   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:3041" : "lvh.me:3041"
+      "http://#{host}"
+    end
+  end
+end
+

data/lib/exercism_config/version.rb

@@ -1,3 +1,3 @@
 module ExercismConfig
-  VERSION = "0.18.0"
+  VERSION = "0.23.0"
 end

data/settings/ci.yml

@@ -0,0 +1,7 @@
+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
+rds_master_endpoint: 127.0.0.1
+rds_port: <%= ENV["MYSQL_PORT"] %>

data/settings/development.yml

@@ -0,0 +1,7 @@
+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'
+rds_master_endpoint: localhost
+mysql_socket: /tmp/mysql.sock

data/settings/docker.yml

@@ -0,0 +1,7 @@
+aws_iterations_bucket: exercism-staging-iterations
+dynamodb_tooling_jobs_table: tooling_jobs
+tooling_orchestrator_url: http://tooling-orchestrator:3021
+anycable_redis_url: redis://redis:6379/1
+anycable_rpc_host: 0.0.0.0:50051
+rds_master_endpoint: mysql
+rds_port: 3306

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exercism_config
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Jeremy Walker
@@ -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
@@ -132,7 +146,11 @@ 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
 homepage: https://exercism.io
 licenses: []
 metadata: