exercism_config 0.11.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29923659114d2bf254bad2e019a321f070cb3ff299ed4ea8ce715e92b8fd316e
-  data.tar.gz: ab184837acd4f8df85259f8b92004a6b120232874d1b83cccdb7a4afcddaf8f8
+  metadata.gz: 75202fecc54b1825dc26f9e60d665857889b7811447c6901578934dc470b111b
+  data.tar.gz: 27f499b1562ad2ce6edde2cd8708f7cff05467f821f933f5e462dde483cdb4d1
 SHA512:
-  metadata.gz: 893a4ffaa832a31aed0896a6191ce52e466a5cf1341a2f96674a55373cf0b011a815e51f3e832b38e4166616a95102cc4347ed63b549f3407f67efc7fb533947
-  data.tar.gz: 424ce4177752ef4da4d8745ff1d3766396ff9ccd7a872cf1697383b3d73eec13933bc149dcf36665496f6eb8d8b11c1eacd44f989d8882eb9e0ebcb888f77a52
+  metadata.gz: 79df4d09897c5ed3c9ef96af5b0435d39e1418fa0d82b23b8047b4003c66d828d8651989353433a21e9d791e106e6fbf693770a0c6b2328d49bc324d29e72b98
+  data.tar.gz: 5385e1048f4eb054225447c5f7f84b7f9b433d231511698912c4681a15615d67b51a35b8977bf1af5baabe15038b5e7d0c2d3ea26fef412c017305659fb5526b

data/Gemfile.lock

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

data/lib/exercism_config.rb

@@ -3,8 +3,9 @@ require 'mandate'
 require "ostruct"
 require 'json'
 
+require_relative 'exercism_config/determine_environment'
 require_relative 'exercism_config/generate_aws_settings'
-require_relative 'exercism_config/setup_dynamodb_client.rb'
+require_relative 'exercism_config/setup_dynamodb_client'
 require_relative 'exercism_config/retrieve'
 require_relative 'exercism_config/generate_aws_settings'
 require_relative "exercism_config/version"
@@ -15,6 +16,10 @@ module Exercism
   class ConfigError < RuntimeError
   end
 
+  def self.environment
+    @environment ||= ExercismConfig::DetermineEnvironment.()
+  end
+
   def self.config
     @config ||= ExercismConfig::Retrieve.()
   end

data/lib/exercism_config/generate_aws_settings.rb

@@ -2,10 +2,6 @@ module ExercismConfig
   class GenerateAwsSettings
     include Mandate
 
-    def initialize(environment)
-      @environment = environment
-    end
-
     def call
       {
         region: 'eu-west-2',
@@ -17,7 +13,7 @@ module ExercismConfig
 
     memoize
     def aws_access_key_id
-      case environment
+      case Exercism.environment
       when :development, :test
         "FAKE"
       else 
@@ -27,7 +23,7 @@ module ExercismConfig
 
     memoize
     def aws_secret_access_key
-      case environment
+      case Exercism.environment
       when :development, :test
         "FAKE"
       else 
@@ -37,24 +33,10 @@ module ExercismConfig
 
     memoize
     def profile
-      case environment
+      case Exercism.environment
       when :production
         "exercism_staging"
       end
     end
-
-    memoize
-    def environment
-      return @environment.to_sym if @environment
-
-      env = ENV["EXERCISM_ENV"] || ENV["RAILS_ENV"] || ENV["APP_ENV"]
-      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}"
-      end
-
-      env.to_sym
-    end
   end
 end

data/lib/exercism_config/retrieve.rb

@@ -2,12 +2,8 @@ module ExercismConfig
   class Retrieve
     include Mandate
 
-    def initialize(environment = nil)
-      @environment = environment
-    end
-
     def call
-      client = SetupDynamodbClient.(environment)
+      client = SetupDynamoDBClient.()
 
       resp = client.scan({table_name: "config"})
       items = resp.to_h[:items]
@@ -15,7 +11,14 @@ module ExercismConfig
         h[item['id']] = item['value']
       end
 
-      aws_settings = GenerateAwsSettings.(environment)
+      # Tweak things for dynamodb when we're running in test mode
+      if Exercism.environment == :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
       raise
@@ -36,20 +39,6 @@ module ExercismConfig
 
       Aws::DynamoDB::Client.new(config)
     end
-
-    memoize
-    def environment
-      return @environment.to_sym if @environment
-
-      env = ENV["EXERCISM_ENV"] || ENV["RAILS_ENV"] || ENV["APP_ENV"]
-      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}"
-      end
-
-      env.to_sym
-    end
   end
 end
 

data/lib/exercism_config/setup_dynamodb_client.rb

@@ -1,13 +1,9 @@
 module ExercismConfig
-  class SetupDynamodbClient
+  class SetupDynamoDBClient
     include Mandate
 
-    def initialize(environment)
-      @environment = environment
-    end
-
     def call
-      aws_settings = GenerateAwsSettings.(environment).merge(
+      aws_settings = GenerateAwsSettings.().merge(
         endpoint: config_endpoint,
 
         # We don't want a profile for this AWS service
@@ -23,9 +19,10 @@ module ExercismConfig
 
     memoize
     def config_endpoint
-      case environment
+      case Exercism.environment
       when :development, :test
-        "http://localhost:3039"
+        host = ENV["EXERCISM_DOCKER"] ? "dynamodb:8000" : "localhost:3039"
+        "http://#{host}"
       else
         nil
       end

data/lib/exercism_config/version.rb

@@ -1,3 +1,3 @@
 module ExercismConfig
-  VERSION = "0.11.0"
+  VERSION = "0.16.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exercism_config
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Jeremy Walker