envied 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f7249d9e47e9fb7837322ca6d5c4c13da3a0b71
-  data.tar.gz: 5d7946abccb41ae923c3730fddef68c4e7dde5be
+  metadata.gz: 89f6ebe3012653a783d97fb3c1df78c4b747ec6b
+  data.tar.gz: 1fdc04401cd1a5d1dad6aa710e157e1bc0d4108e
 SHA512:
-  metadata.gz: e3174fce263d5f6b1580e5fba893c9c690ed07091b1ab859b389ae6e9f2f8201b7004b8d283ce690376a7fefca3833576811b9c72cdaab3c1192473b59f9f4a5
-  data.tar.gz: f5be4b540310a362c9c19558049745b851eed7b8757bb0e3af016bd1d4cc11075b9d6dd55919e0277b723a25273f01c125f027605ac71b8b23251158bf32bccd
+  metadata.gz: e72742c30e2590982a229849d225ae669bc9468e802155a1e9703fe409796b4209fd2d6fdc9faf6831a69a6c9c4f81f0af30d105008ca105b0c80f4935f4b210
+  data.tar.gz: 4a361ee32e03924384526ced8c4c22162a8060387831dd9c1cbd954efd7538c4d4aa1a13d93ff3eac27871e709ddcf32349619c12f8751885e8dde267f946932

data/.rspec

@@ -0,0 +1 @@
+--warnings

data/CHANGELOG.md

@@ -1,6 +1,16 @@
+# 0.6.2 / unreleased
+
+* Add `envied check:heroku` to do a check on your Heroku app.
+
+* Add `envied check:heroku:binstub` to generate script for convenient 'check:heroku'
+
+# 0.6.1 / 2014-08-13
+
+* Add `envied check` to check whether defined variables are present and valid.
+
 # 0.6.0 / 2014-08-13
 
-* Configuration should now be put in `Envfile`
+* The configuration now lives in `Envfile` by default.
 
 # 0.5.0 / 2014-07-02
 

data/README.md

@@ -159,9 +159,11 @@ ENVied.require(:default, ENV['RACK_ENV'], (ENV['CI'] ? :ci : :not_ci))
 ```bash
 $ envied help
 Commands:
-  envied check           # Checks whether all ENV-variables are present and valid
-  envied help [COMMAND]  # Describe available commands or one specific command
-  envied init            # Generates a default Envfile in the current working directory
+  envied check                 # Checks whether you environment contains the defined variables
+  envied check:heroku          # Checks whether a Heroku config contains the defined variables
+  envied check:heroku:binstub  # Generates a shell script for the check:heroku-task
+  envied help [COMMAND]        # Describe available commands or one specific command
+  envied init                  # Generates a default Envfile in the current working directory
 ```
 
 ## Installation

data/Rakefile

@@ -1,7 +1,9 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |s|
+  s.ruby_opts = %w(-w)
+end
 
 desc "Run the specs"
 task default: :spec

data/lib/envied.rb

@@ -33,7 +33,7 @@ class ENVied
     end
 
     def self.enable_defaults
-      @enable_defaults.respond_to?(:call) ?
+      (@enable_defaults ||= false).respond_to?(:call) ?
         @enable_defaults.call :
         @enable_defaults
     end
@@ -46,7 +46,7 @@ class ENVied
     class << self
       alias_method :defaults_enabled?, :enable_defaults
       alias_method :enable_defaults=, :enable_defaults!
-      attr_accessor :current_group
+      attr_writer :current_group
     end
 
     def self.current_group
@@ -101,15 +101,15 @@ class ENVied
 
   def self.ensure_configured!
     # Backward compat: load Envfile only when it's present
-    configure_via_envfile if envfile_exists?
+    configure_via_envfile if envfile_exist?
   end
 
   def self.envfile
     File.expand_path('Envfile')
   end
 
-  def self.envfile_exists?
-    File.exists?(envfile)
+  def self.envfile_exist?
+    File.exist?(envfile)
   end
 
   def self.configure_via_envfile
@@ -158,7 +158,7 @@ class ENVied
   # A list of all configured variable names.
   #
   # @example
-  #   ENVied.configured_variable_names
+  #   ENVied.required_variable_names
   #   # => [:DATABASE_URL]
   #
   # @return [Array<Symbol>] the list of variable names

data/lib/envied/cli.rb

@@ -11,9 +11,9 @@ class ENVied
       template("Envfile.tt")
     end
 
-    desc "check", "Checks whether all ENV-variables are present and valid"
+    desc "check", "Checks whether you environment contains the defined variables"
     long_desc <<-LONG
-      Checks whether all ENV-variables are present and valid.
+      Checks whether defined variables are present and valid in your shell.
 
       On success the process will exit with status 0.
       Else the missing/invalid variables will be shown, and the process will exit with status 1.
@@ -21,7 +21,59 @@ class ENVied
     option :groups, type: :array, default: %w(default), banner: 'default production'
     def check
       ENVied.require(*options[:groups])
-      puts "All ENV-variables for group(s) #{options[:groups]} are ok!"
+      puts "All variables for group(s) #{options[:groups]} are present and valid"
+    end
+
+    desc "check:heroku", "Checks whether a Heroku config contains the defined variables"
+
+    long_desc <<-LONG
+      Checks the config of your Heroku app against the local Envfile.
+
+      The Heroku config should be piped to this task:
+
+      heroku config | bundle exec envied check:heroku
+
+      It's more convenient to generate a shell script using the check:heroku:binstub-task.
+
+      On success the process will exit with status 0.
+      Else the missing/invalid variables will be shown, and the process will exit with status 1.
+    LONG
+    option :groups, type: :array, default: %w(default production), banner: 'default production'
+    define_method "check:heroku" do
+      if STDIN.tty?
+        error <<-ERR
+Please pipe the contents of `heroku config` to this task.
+I.e. `heroku config | bundle exec envied check:heroku`"
+ERR
+        exit 1
+      end
+      config = STDIN.read
+      heroku_env = Hash[config.split("\n")[1..-1].each_with_object([]) do |i, res|
+        res << i.split(":", 2).map(&:strip)
+      end]
+      ENV.replace({}).update(heroku_env)
+      ENVied.require(*options[:groups])
+      puts "All variables for group(s) #{options[:groups]} are present and valid in your Heroku app"
+    end
+
+    desc "check:heroku:binstub", "Generates a shell script for the check:heroku-task"
+    long_desc <<-LONG
+      Generates a shell script to check the Heroku config against the local Envfile.
+
+      The same as the check:heroku-task, but all in one script (no need to pipe `heroku config` to it etc.).
+
+    LONG
+    option :dest, banner: "where to put the script", default: 'bin/heroku-env-check'
+    option :app, banner: "name of Heroku app"
+    option :groups, type: :array, default: %w(default production), banner: 'default production'
+    define_method "check:heroku:binstub" do
+      require 'fileutils'
+      @app = options[:app]
+      @dest = @app ? File.join(*%W(bin #{@app}-env-check)) : options[:dest]
+      @groups = options[:groups]
+      full_dest = File.expand_path(@dest)
+      template("heroku-env-check.tt", full_dest)
+      FileUtils.chmod 0755, full_dest
     end
   end
 end

data/lib/envied/templates/heroku-env-check.tt

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Check the config of a Heroku app against the defined variables in `Envfile`
+
+<%- if @app %>
+HEROKU_APP=<%= @app %> exec heroku config | bundle exec envied check:heroku --groups <%= @groups.join(",") %>
+<%- else %>
+exec heroku config | bundle exec envied check:heroku --groups <%= @groups.join(",") %>
+<%- end %>

data/lib/envied/version.rb

@@ -1,3 +1,3 @@
 class ENVied
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/spec/envied_spec.rb

@@ -69,7 +69,7 @@ describe ENVied do
       specify do
         expect {
           ENVied.require
-        }.to raise_error /set the following ENV-variables: a/
+        }.to raise_error(/set the following ENV-variables: a/)
       end
     end
 
@@ -79,7 +79,7 @@ describe ENVied do
       specify do
         expect {
           ENVied.require
-        }.to raise_error /ENV\['A'\] \('NaN' can't be coerced to Integer/
+        }.to raise_error(/ENV\['A'\] \('NaN' can't be coerced to Integer/)
       end
     end
 
@@ -175,7 +175,7 @@ describe ENVied do
         it 'is required when requiring the group' do
           expect {
             described_class.require(:foo)
-          }.to raise_error /bar/
+          }.to raise_error(/bar/)
         end
 
         it 'is not required when requiring another group' do
@@ -197,7 +197,7 @@ describe ENVied do
           [:default, 'default'].each do |groups|
             expect {
               described_class.require(*groups)
-            }.to raise_error /moar/
+            }.to raise_error(/moar/)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envied
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Gert Goet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -103,6 +103,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -114,6 +115,7 @@ files:
 - lib/envied.rb
 - lib/envied/cli.rb
 - lib/envied/templates/Envfile.tt
+- lib/envied/templates/heroku-env-check.tt
 - lib/envied/version.rb
 - spec/envied_spec.rb
 - spec/spec_helper.rb