env_bang 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c6950075ca1b4ad501344c4add8c6c7e74d29e0
-  data.tar.gz: acc310530d8e8893ab49a708aceb326de2343bee
+  metadata.gz: bfdb5e43a5f35d5cea9f39f538f83504d4f77869
+  data.tar.gz: f11fd02adf4720dcec9a4f6161aa618bc259f877
 SHA512:
-  metadata.gz: 02b440a566c7ea4f9935e33e7da004cbcd7bf0d1edde2d8a5876a7e205d55d3827637aae3b2fabdbfa75f6dbe58250af7e187bc3bec96e0691e54e79d547db4d
-  data.tar.gz: 4ddc971eeee49292e4cb82edd514157947b1b78ac5646b3e8591def786293c85fd90bed7f620853b262af7abc862c8747e142785d4fc2915cc20f819195024c7
+  metadata.gz: 161419e599bed888d9f6177a3113685379d32710712c6d20a6953e16389d1ef8aaa291d9474a337b187c9e9b640a837cb0802e08827a1912365a802f547a6161
+  data.tar.gz: b90d49748dba09ae7633796290f31a2931dcb7478f58b95854eddfd0e0eeaf7a2b4225bd07678cac4792adeff1e97e79deb6f93c92e4c20a83c1361bd9fab6da

data/lib/env_bang/formatter.rb

@@ -0,0 +1,22 @@
+class ENV_BANG
+  module Formatter
+    class << self
+      def formatted_error(var, description)
+        indent 4, <<-EOS
+
+  Missing required environment variable: #{var}#{ description and "\n" <<
+  unindent(description) }
+        EOS
+      end
+
+      def unindent(string)
+        width = string.scan(/^ */).map(&:length).min
+        string.gsub(/^ {#{width}}/, '')
+      end
+
+      def indent(width, string)
+        string.gsub "\n", "\n#{' ' * width}"
+      end
+    end
+  end
+end

data/lib/env_bang/version.rb

@@ -1,3 +1,3 @@
 class ENV_BANG
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/env_bang.rb

@@ -1,4 +1,5 @@
 require "env_bang/version"
+require "env_bang/formatter"
 
 class ENV_BANG
   class << self
@@ -11,17 +12,14 @@ class ENV_BANG
       options = args.last.is_a?(Hash) ? args.pop : {}
 
       unless ENV.has_key?(var)
-        ENV[var] = options.fetch(:default) { formatted_error(var, description) }.to_s
+        ENV[var] = options.fetch(:default) { raise_formatted_error(var, description) }.to_s
       end
 
       vars[var] = options
     end
 
-    def formatted_error(var, description)
-      message = "Missing required environment variable: #{var}"
-      message << "\n#{description}" if description
-      indent = '    '
-      raise KeyError.new "\n#{indent}#{message.gsub "\n", "\n#{indent}"}\n"
+    def raise_formatted_error(var, description) 
+      raise KeyError.new Formatter.formatted_error(var, description)
     end
 
     def vars

data/test/env_bang_test.rb

@@ -16,17 +16,6 @@ describe ENV_BANG do
     }.must_raise KeyError
   end
 
-  it "Includes provided description in error message" do
-    ENV.delete('NOT_PRESENT')
-
-    e = proc {
-      ENV!.config do
-        use 'NOT_PRESENT', 'You need a NOT_PRESENT var in your ENV'
-      end
-    }.must_raise(KeyError)
-    e.message.must_include 'You need a NOT_PRESENT var in your ENV'
-  end
-
   it "Uses provided default value if ENV var not already present" do
     ENV.delete('WASNT_PRESENT')
 
@@ -124,4 +113,38 @@ describe ENV_BANG do
       ENV!['FALSE'].class.must_equal String
     end
   end
+
+  describe "Formatting" do
+    it "Includes provided description in error message" do
+      ENV.delete('NOT_PRESENT')
+
+      e = proc {
+        ENV!.config do
+          use 'NOT_PRESENT', 'You need a NOT_PRESENT var in your ENV'
+        end
+      }.must_raise(KeyError)
+      e.message.must_include 'You need a NOT_PRESENT var in your ENV'
+    end
+
+    it "Removes indentation from provided descriptions" do
+      ENV.delete('NOT_PRESENT')
+
+      e = proc {
+        ENV!.config do
+          use 'NOT_PRESENT', <<-DESC
+            This multiline description
+              has a lot of indentation
+                varying from line to line
+            like so
+          DESC
+        end
+      }.must_raise(KeyError)
+      e.message.must_include <<-UNINDENTED
+    This multiline description
+      has a lot of indentation
+        varying from line to line
+    like so
+      UNINDENTED
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: env_bang
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Jonathan Camenisch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -56,6 +56,7 @@ files:
 - env_bang.gemspec
 - lib/env_bang-rails.rb
 - lib/env_bang.rb
+- lib/env_bang/formatter.rb
 - lib/env_bang/version.rb
 - test/env_bang_test.rb
 - test/test_helper.rb