exercism_config 0.19.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d8f9947448e72f417cd4da6d1ba5700a8cf3b171b387d3a1112dc23d9d953b6
-  data.tar.gz: 07c32a1e10c2ea8e7599086a3038e98ef11e1580e59b833ac45aea4510066d13
+  metadata.gz: d7e49af42a0c31a943a072556d1ddb4113aa5180f18c659995d38b0677c46a5a
+  data.tar.gz: 74fcaf76457c34b7c74a2947e32bb571b9aefe172c550c473e56e218bd07a6f9
 SHA512:
-  metadata.gz: abc918c726bb0810528365950c4363901a124815daa5f44356021e8f07d2dd3dec61ed29fb09fc7a4b482ee1b53208a866ccbed473ef501e5616dab0254dab2a
-  data.tar.gz: 05c42ebedca84160661fc68f2bc4d6d3115978da15295eded25f19e2d2c21d60ac18b0983c6067a7b3e2df931e1a76f8565b5ae48c77a68efcf316b211447025
+  metadata.gz: 718bb639f213a601583190ef48dfc2072218cafe0e66831b89b9c6d3184e4985773948cbf610618ff9aade4ba047a2ace6451438a1d2f17b8e3944ecb37ce60d
+  data.tar.gz: 0f5eab12fb96f6972e5696ffea00c43f0021b47226f9f0126a0316a17fea526c1669a2faaa2fed6d668e389925a600528e5d8ec526b8505804aa05bea0733718

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.()
@@ -68,13 +69,15 @@ settings_file =
   if settings_file_arg
     settings_file_arg.split("=").last
   elsif ENV["EXERCISM_DOCKER"]
-    File.expand_path("../../settings-docker.yml", __FILE__)
+    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__)
+    File.expand_path("../../settings/development.yml", __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/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:9090" : "localhost:3041"
+      "http://#{host}"
+    end
+  end
+end
+

data/lib/exercism_config/version.rb

@@ -1,3 +1,3 @@
 module ExercismConfig
-  VERSION = "0.19.0"
+  VERSION = "0.25.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"] %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exercism_config
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.25.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,9 +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-development.yml
-- settings-docker.yml
+- settings/ci.yml
+- settings/development.yml
+- settings/docker.yml
 homepage: https://exercism.io
 licenses: []
 metadata: