exercism_config 0.12.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd0b7e2733cf6504836725513ee9249452432e16744c87a498294c9bf607f565
-  data.tar.gz: a86ee6db78ade29db5385811b66785b8ab78e9dbd572d2eb063dcfc954c34e1c
+  metadata.gz: 9c094d61eb0003e49c33c3f1398167c15888c46824271fec7ad761747d31487c
+  data.tar.gz: 310a0343c3962799b65b6b52446fb2056ee7b1af54c904c4a7ba7bbe4093dbb5
 SHA512:
-  metadata.gz: 21890667a1426ec324fc6b32b8cfb07c7f38825313141ab92dfc4ed4800c90021f6dfcb95c2b212e99eea55dafa5e59be08845e5a5a11662f42689d781fc6add
-  data.tar.gz: fc540dfe23e6e75c6861f07c5bf0871954241836a5d81e88cc1dc8aa23540309fb074622ef9730fa21a4f764766255ca986ec6a8845de40bf8fa8ddfff5ae8bd
+  metadata.gz: 0f62ce107a3a34874b6d661e2930e68be15c502ac6264146485f593d4c274f6f33600e6da165efe1c1a67be742d7d17da05e85c66430b36696ea2a0b00a18199
+  data.tar.gz: 55abe5deff25311edab033ac5eb96ced241df33471839bc4f95b204b93dfaf84c7ada5965a4cbe70ab6e56b2c59a4fc0e503226f430e9346260c3477f7015b37

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    exercism_config (0.11.0)
+    exercism_config (0.16.0)
       aws-sdk-dynamodb (~> 1.0)
       mandate
       zeitwerk
@@ -10,7 +10,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.1.0)
-    aws-partitions (1.345.0)
+    aws-partitions (1.346.0)
     aws-sdk-core (3.104.3)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)

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

@@ -0,0 +1,16 @@
+module ExercismConfig
+  class DetermineEnvironment
+    include Mandate
+
+    def call
+      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/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,10 +19,10 @@ module ExercismConfig
 
     memoize
     def config_endpoint
-      case environment
+      case Exercism.environment
       when :development, :test
-        host = ENV["EXERCISM_DOCKER"] ? "dynamodb" : "localhost"
-        "http://#{host}: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.12.0"
+  VERSION = "0.17.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exercism_config
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-dynamodb
@@ -127,6 +127,7 @@ files:
 - exercism_config.gemspec
 - lib/exercism/config.rb
 - lib/exercism_config.rb
+- lib/exercism_config/determine_environment.rb
 - lib/exercism_config/generate_aws_settings.rb
 - lib/exercism_config/retrieve.rb
 - lib/exercism_config/setup_dynamodb_client.rb