exercism-config 0.35.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 401b3183f0a461e800f197b80dc749b27f5b510dd2c5d0d5dbd4db5b05fd43b8
-  data.tar.gz: 966a7406de8ab62637608ee07001d22bc085170f183202919d655f8f5c3b3d3b
+  metadata.gz: 97a6e5acb4ba0d52a4c9ace53896415a63c223bad24b8efc9b0390f0740d7307
+  data.tar.gz: b5b66fdec816ae029fa2f4db3e1db28f538f29f74a4b71473e007e0991845565
 SHA512:
-  metadata.gz: 6085bfd7a01d9470a55efd75d9bce1ec11f2855651eabcc20becbd974776298cb38c6b110742e5769c40e906b44954c84e3e74c9221c4644673b91126d591168
-  data.tar.gz: 5ae15d20611d6a2b225a004efd57308c4fe5dfa41a49ea3e4c0d5b64662fc785808e7f635eb41d5a496c13bd483099f26b285c2c3ec5a5b91b8f30dde6ffcdd3
+  metadata.gz: a210de31c00337cfa8d713fa4fde4854a3ddd8ea08a8057179bd8996d829e6968a31b349e5a11e5e082a6c406f19192203321e6062670d9aa14e88da2c12017d
+  data.tar.gz: c623fa955cdeaa244540ecc5785d5dd862321aa06f0a004a2cc7cbe5ecd6d067415e02c5dc0db79f2fe052148847cdc7b81c462d05e31f9edce679eb10362a7e

data/bin/setup_exercism_local_aws

@@ -3,7 +3,7 @@ require "bundler/setup"
 require "exercism-config"
 
 # Only allow this to run in development
-return unless Exercism.environment == :development
+return unless Exercism.env.development?
 
 puts "Create AWS/DynamoDB tables..."
 

data/lib/exercism-config.rb

@@ -3,6 +3,7 @@ require 'mandate'
 require 'ostruct'
 require 'json'
 
+require_relative 'exercism_config/environment'
 require_relative 'exercism_config/determine_environment'
 require_relative 'exercism_config/generate_aws_settings'
 require_relative 'exercism_config/setup_dynamodb_client'
@@ -14,11 +15,15 @@ require_relative 'exercism_config/version'
 require_relative 'exercism/config'
 
 module Exercism
-  class ConfigError < RuntimeError
+  class ConfigError < RuntimeError; end
+
+  def self.env
+    @environment ||= ExercismConfig::DetermineEnvironment.()
   end
 
   def self.environment
-    @environment ||= ExercismConfig::DetermineEnvironment.()
+    puts "Exercism.environment is deprecated. Use Exercism.env"
+    env
   end
 
   def self.config

data/lib/exercism_config/determine_environment.rb

@@ -6,11 +6,7 @@ module ExercismConfig
       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, "environment must be one of development, test or production. Got #{env}."
-      end
-
-      env.to_sym
+      Environment.new(env)
     end
   end
 end

data/lib/exercism_config/environment.rb

@@ -0,0 +1,49 @@
+module ExercismConfig
+  class Environment
+    ALLOWED_ENVS = %{development test production}
+    private_constant :ALLOWED_ENVS
+
+    def initialize(raw_env)
+      @env = raw_env.to_s
+
+      unless ALLOWED_ENVS.include?(env)
+        raise Exercism::ConfigError, "environment must be one of development, test or production. Got #{env}."
+      end
+    end
+
+    def ==(other)
+      env == other.to_s
+    end
+
+    def eql?(other)
+      env == other.to_s
+    end
+
+    def hash
+      env.hash
+    end
+
+    def to_s
+      env
+    end
+
+    def inspect
+      env
+    end
+
+    def development?
+      env == "development"
+    end
+
+    def test?
+      env == "test"
+    end
+
+    def production?
+      env == "production"
+    end
+
+    private
+    attr_reader :env
+  end
+end

data/lib/exercism_config/generate_aws_settings.rb

@@ -13,26 +13,17 @@ module ExercismConfig
 
     memoize
     def aws_access_key_id
-      case Exercism.environment
-      when :development, :test
-        'FAKE'
-      end
+      Exercism.env.production? ? nil : 'FAKE'
     end
 
     memoize
     def aws_secret_access_key
-      case Exercism.environment
-      when :development, :test
-        'FAKE'
-      end
+      Exercism.env.production? ? nil : 'FAKE'
     end
 
     memoize
     def profile
-      case Exercism.environment
-      when :production
-        'exercism_staging'
-      end
+      Exercism.env.production? ? nil : 'exercism_staging'
     end
   end
 end

data/lib/exercism_config/retrieve.rb

@@ -3,7 +3,7 @@ module ExercismConfig
     include Mandate
 
     def call
-      return generate_mock if Exercism.environment == :test
+      return generate_mock if Exercism.env.test?
 
       retrieve_from_dynamodb
     end
@@ -37,7 +37,7 @@ module ExercismConfig
       end
 
       # Tweak things for dynamodb when we're running in test mode
-      if Exercism.environment == :test
+      if Exercism.env.test?
         %w[dynamodb_tooling_jobs_table].each do |key|
           data[key] = "#{data[key]}-test"
         end

data/lib/exercism_config/setup_dynamodb_client.rb

@@ -15,14 +15,11 @@ module ExercismConfig
     end
 
     private
-    attr_reader :environment
 
     memoize
     def config_endpoint
-      return nil unless %i[development test].include?(Exercism.environment)
-      if Exercism.environment == :test && ENV['EXERCISM_CI']
-        return "http://127.0.0.1:#{ENV['DYNAMODB_PORT']}"
-      end
+      return nil if Exercism.env.production?
+      return "http://127.0.0.1:#{ENV['DYNAMODB_PORT']}" if Exercism.env.test? && ENV['EXERCISM_CI']
 
       host = ENV['EXERCISM_DOCKER'] ? 'dynamodb:8000' : 'localhost:3040'
       "http://#{host}"

data/lib/exercism_config/setup_s3_client.rb

@@ -18,11 +18,10 @@ module ExercismConfig
     end
 
     private
-    attr_reader :environment
 
     memoize
     def config_endpoint
-      return nil unless %i[development test].include?(Exercism.environment)
+      return nil if Exercism.env.production?
       return "http://127.0.0.1:#{ENV['S3_PORT']}" if ENV['EXERCISM_CI']
 
       host = ENV['EXERCISM_DOCKER'] ? 's3:9090' : 'localhost:3041'

data/lib/exercism_config/version.rb

@@ -1,3 +1,3 @@
 module ExercismConfig
-  VERSION = '0.35.0'.freeze
+  VERSION = '0.36.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exercism-config
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.36.0
 platform: ruby
 authors:
 - Jeremy Walker
@@ -150,6 +150,7 @@ files:
 - lib/exercism-config.rb
 - lib/exercism/config.rb
 - lib/exercism_config/determine_environment.rb
+- lib/exercism_config/environment.rb
 - lib/exercism_config/generate_aws_settings.rb
 - lib/exercism_config/retrieve.rb
 - lib/exercism_config/setup_dynamodb_client.rb