exportr 0.1.3 → 0.1.5

data/LICENSE

@@ -1,8 +1,18 @@
 Copyright (C) 2012 Richard Calahan, All Day Everyday
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the "Software"), 
+to deal in the Software without restriction, including without limitation 
+the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the Software 
+is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,3 @@
-
 # Exportr: Environment manager for Rails development
 
 ## Description
@@ -27,7 +26,6 @@ Run the generator.
 
     $ rails generate exportr
     
-
 The generator creates a yaml file in your config directory. It will store key:value pairs to be loaded as environment variables when your app launches. You can edit it manually, or use the command line utility.
 
 ### CLI
@@ -41,3 +39,9 @@ or
     $ exportr --remove KEY
     
 ### FYI
+
+You'll need to restart your webserver for the changes to take effect. 
+    
+### License
+
+Exportr is copyright 2012 by Richard Calahan and contributors at All Day Everyday. It is licensed under the MIT license. See the include LICENSE file for details.

data/lib/exportr/command.rb

@@ -1,7 +1,6 @@
-require 'optparse'
 require 'exportr/config'
-require 'exportr/error_messages'
 require 'exportr/helpers'
+require 'optparse'
 require 'yaml'
 
 module Exportr
@@ -9,26 +8,30 @@ module Exportr
   module Command
     
     extend Exportr::Config
-    extend Exportr::ErrorMessages
     extend Exportr::Helpers
 
+    def self.global_options
+      @global_options ||= []
+    end
+
+    def self.global_option name, *args
+      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'
 
     def self.run *argv
-      error not_root unless at_root?
+      error NOT_ROOT unless at_root?
       parser.parse! argv
     end
 
     def self.add val
-      vars = load_config
-      vars.merge! val
-      write_config vars
+      write_config load_config.merge(val)
     end
 
     def self.remove val
-      vars = load_config
-      write_config vars.reject { |k,v| k == val.to_a[0][0] }
+      write_config load_config.reject { |k,v| k == val.to_a[0][0] }
     end
 
     def self.parser
@@ -42,13 +45,13 @@ module Exportr
     end
 
     def self.read_config
-      error no_config_file unless File.exists?(config_file)
-      File.read config_file
+      error NO_CONFIG_FILE unless File.exists?(CONFIG_FILE)
+      File.read CONFIG_FILE
     end
 
     def self.write_config vars
       cm = comments
-      File.open config_file, 'w+' do |f|
+      File.open CONFIG_FILE, 'w+' do |f|
         f.write cm << "\n" << dump_config(vars)
       end 
     end

data/lib/exportr/config.rb

@@ -2,16 +2,19 @@ module Exportr
   
   module Config
 
-    def global_options
-      @global_options ||= []
-    end
-
-    def global_option name, *args
-      global_options << { :name => name, :args => args }
-    end
+    # Default config file location. 
+    CONFIG_FILE     = 'config/exportr.yml'
+    
+    # Default error message if CLI is run from anywhere but the root
+    NOT_ROOT        = 'You must run exportr from the root of your application.'
+    
+    # Default error message if there is no config file present.
+    NO_CONFIG_FILE  = 'You must run `rails generate exportr` first.'
 
-    def config_file
-      "config/exportr.yml"
+    def self.extended base
+      constants.each do |const| 
+        base.const_set const, const_get(const)
+      end
     end
 
   end

data/lib/exportr/helpers.rb

@@ -2,8 +2,12 @@ module Exportr
 	
   module Helpers
     
+    def log msg
+      STDOUT.puts msg
+    end
+
     def error msg
-      puts "ERROR: " << msg
+      STDERR.puts "ERROR: #{msg}"
       exit 1
     end
 

data/lib/exportr/version.rb

@@ -1,3 +1,3 @@
 module Exportr
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/lib/generators/exportr/templates/exportr.rb

@@ -1,6 +1,7 @@
-# Loads export.yml and sets key=value to the local environment
+require 'exportr/config'
 
-if File.exists? "#{Rails.root}/config/exportr.yml"
-  config = YAML.load(File.open("#{Rails.root}/config/exportr.yml"))
+# Loads export.yml and sets key=value to the local environment
+if File.exists? "#{Rails.root}/#{Exportr::Config::CONFIG_FILE}"
+  config = YAML.load(File.open("#{Rails.root}/#{Exportr::Config::CONFIG_FILE}"))
   config.each_pair { |key,value| ENV[key] = value } if config
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exportr
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -30,7 +30,6 @@ files:
 - lib/exportr.rb
 - lib/exportr/command.rb
 - lib/exportr/config.rb
-- lib/exportr/error_messages.rb
 - lib/exportr/helpers.rb
 - lib/exportr/version.rb
 - lib/generators/exportr/exportr_generator.rb

data/lib/exportr/error_messages.rb

@@ -1,15 +0,0 @@
-module Exportr
-
-  module ErrorMessages
-    
-    def not_root
-      "You must run exportr from the root of your application."
-    end
-
-    def no_config_file
-      "You must run `rails generate exportr` first. "
-    end
-
-  end
-
-end