exportr 0.2.2 → 0.2.4

data/lib/exportr/command.rb

@@ -1,5 +1,6 @@
 require 'exportr/config'
 require 'exportr/helpers'
+require 'exportr/version'
 require 'optparse'
 require 'yaml'
 
@@ -18,10 +19,11 @@ module Exportr
       global_options << { :name => name, :args => args }
     end
 
-    global_option :add, '-a', '--add VAR', 'Add environment variable'
-    global_option :remove, '-r', '--remove VAR', 'Remove environment variable'
+    global_option :add, '-a', '--add KEY=VALUE', 'Add environment variable'
+    global_option :remove, '-r', '--remove KEY', 'Remove environment variable'
     global_option :clear, '-c', '--clear', 'Clear out all environment variables'
     global_option :list, '-l', '--list', 'List all environment variables'
+    global_option :version, '-v', '--version', 'Get exportr version number'
 
     def self.run *argv
       error NOT_RAILS unless in_rails_application?
@@ -29,26 +31,37 @@ module Exportr
     end
 
     def self.add val
+      log
       log "Adding #{val.to_a[0][0]}=#{val.to_a[0][1]} to your environment..."
       write_config load_config.merge(val)
     end
 
     def self.remove val
+      log
       log "Removing #{val.to_a[0][0]} from your environment..."
       write_config load_config.reject { |k,v| k == val.to_a[0][0] }
     end
 
     def self.clear val=nil
+      log
       log "Clearing environment variables..."
       write_config Hash.new
     end
 
     def self.list val=nil
+      log
       log "Exportr Environment Variables"
       log "--------------------------------------------------"
       vars = load_config.to_a
       vars.each { |var| log "#{var[0]}=#{var[1]}" }
       log("none.") unless vars.any?
+      log
+    end
+
+    def self.version val=nil
+      log
+      log "Version #{Exportr::VERSION}"
+      log
     end
 
     def self.parser
@@ -70,6 +83,7 @@ module Exportr
         f.write cm << "\n" << dump_config(vars)
       end
       log "Done."
+      log
     end
 
     def self.load_config

data/lib/exportr/helpers.rb

@@ -6,8 +6,8 @@ module Exportr
 
     extend Exportr::Config
 
-    def log msg
-      STDOUT.puts " | #{msg}"
+    def log msg=nil
+      STDOUT.puts msg ? " | #{msg}" : ""
     end
 
     def error msg

data/lib/exportr/railtie.rb

@@ -1,12 +1,14 @@
-require "exportr/config"
+require 'exportr/helpers'
 
 module Exportr
   
   class Railtie < Rails::Railtie
 
+    extend Exportr::Helpers
+
     config.before_initialize do
-      if File.exists? "#{Rails.root}/#{Exportr::Config::CONFIG_FILE}"
-        config = YAML.load(File.open("#{Rails.root}/#{Exportr::Config::CONFIG_FILE}"))
+      if File.exists? config_file
+        config = YAML.load(File.open(config_file)
         config.each_pair { |key,value| ENV[key] = value } if config
       end
     end

data/lib/exportr/version.rb

@@ -1,3 +1,3 @@
 module Exportr
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

data/lib/generators/exportr/exportr_generator.rb

@@ -4,21 +4,11 @@ class ExportrGenerator < Rails::Generators::Base
 
   def generate_initializer
     copy_file 'exportr.yml', 'config/exportr.yml'
-
-    # Decrecation warning
-    if File.exists?("#{Rails.root}/config/initializers/exportr.rb")
-      puts
-      puts 'Deprecation Warning: Exportr no longer uses config/initialzers/exportr.rb to load environment variables.'
-      puts 'Please remove before restarting your server.'
-      puts
-    end
-
   end
 
   def mod_gitignore
     return if File.read("#{Rails.root}/.gitignore").match(/config\/exportr.yml/)
     File.open("#{Rails.root}/.gitignore", 'a+') do |f|
-      f.puts 
       f.puts 
       f.puts '# Ignoring local env export'
       f.puts 'config/exportr.yml'

data/lib/generators/exportr/templates/exportr.yml

@@ -1,4 +1,4 @@
-# This file is loaded at app initialization to set app specific environment variables
+# This file is loaded before app initialization to set app specific environment variables
 # set environment variables in the format [KEY]: [VALUE], each separated by a newline
 # 
 # FACEBOOK_APP_KEY: '234443366312034'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exportr
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors: