exercism_config 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac25eddfab6f5189cbeeace2f871ed2e5f3e3c7f8604c29b3acd7075374c5f9b
-  data.tar.gz: 2ffb5ae56efa786c3b7726774250a24e3058cfc94827841d5fb2ba2c7c1b487a
+  metadata.gz: 35f4b596c7b39b71b98bcb4b7527c8e24123a1394cc4be0534e43327f687a424
+  data.tar.gz: 584ca75bfcce88f47f376fb0170a21fccaa7077d3267a98fc7476637a0d33993
 SHA512:
-  metadata.gz: 25f501c4b986003944faf82fdf7bf760cb54235d5e7ffdaf2820e22d0c4620ffe6c51439dbc16bcff62e4b91a136c8fd886556daf5d4c1ad83da16bd6ff4a4f1
-  data.tar.gz: 27b2e746e4f226d86f9bbc285bb8191cd5388dacb990265879a052c5d617d0f4996f7cf3db553f6a6b0b192eda97cfa2068a783b450916662ceba6ded0603774
+  metadata.gz: 2b2329c0819e6eed73f9a7aa07e3faf17c7dc2892bd232ce0557f527f920e76bd67143415646107c3503a9782d4ebd7afd6f7969cb448c97836ce4e56d2d4739
+  data.tar.gz: cc76afee5a592ff5d6867e0558eaae30c0be245701712ff3f386ef8ceeb5c6ffd8a759a001ab5dd850a60d4dd08e0c552ef86f19eb641aff636c8391ee70aafc

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]
@@ -16,13 +12,13 @@ module ExercismConfig
       end
 
       # Tweak things for dynamodb when we're running in test mode
-      if environment == :test
+      if Exercism.environment == :test
         %w{dynamodb_tooling_jobs_table}.each do |key|
           data[key] = "#{data[key]}-test"
         end
       end
 
-      aws_settings = GenerateAwsSettings.(environment)
+      aws_settings = GenerateAwsSettings.()
       Exercism::Config.new(data, aws_settings)
     rescue Exercism::ConfigError
       raise
@@ -43,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

@@ -2,12 +2,8 @@ module ExercismConfig
   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,7 +19,7 @@ module ExercismConfig
 
     memoize
     def config_endpoint
-      case environment
+      case Exercism.environment
       when :development, :test
         host = ENV["EXERCISM_DOCKER"] ? "dynamodb:8000" : "localhost:3039"
         "http://#{host}"

data/lib/exercism_config/version.rb

@@ -1,3 +1,3 @@
 module ExercismConfig
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

metadata

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