exportr 0.2.1 → 0.2.2

data/lib/exportr/command.rb

@@ -7,8 +7,8 @@ module Exportr
 
   module Command
     
-    extend Exportr::Config
     extend Exportr::Helpers
+    extend Exportr::Config
 
     def self.global_options
       @global_options ||= []
@@ -24,7 +24,7 @@ module Exportr
     global_option :list, '-l', '--list', 'List all environment variables'
 
     def self.run *argv
-      error NOT_ROOT unless at_root?
+      error NOT_RAILS unless in_rails_application?
       parser.parse! argv
     end
 
@@ -60,13 +60,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
       log "Done."

data/lib/exportr/config.rb

@@ -6,7 +6,7 @@ module Exportr
     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.'
+    NOT_RAILS       = 'Could not detect rails application.'
     
     # Default error message if there is no config file present.
     NO_CONFIG_FILE  = 'You must run `rails generate exportr` first.'

data/lib/exportr/helpers.rb

@@ -1,7 +1,11 @@
+require 'exportr/config'
+
 module Exportr
 	
   module Helpers
-    
+
+    extend Exportr::Config
+
     def log msg
       STDOUT.puts " | #{msg}"
     end
@@ -11,8 +15,23 @@ module Exportr
       exit 1
     end
 
-    def at_root?
-      !!Dir.new(Dir.pwd).collect.detect { |f| f == 'Gemfile' }
+    def in_rails_application?
+      !!rails_root
+    end
+
+    def rails_root
+      begin
+        return Dir.pwd if File.exists?('script/rails')
+        raise
+      rescue
+        Dir.chdir '..'
+        retry unless Dir.pwd == '/'
+        return false
+      end      
+    end
+
+    def config_file
+      File.expand_path(CONFIG_FILE, rails_root)
     end
 
   end

data/lib/exportr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exportr
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies: []
 description: Helps manage rails application specific environment variables for multiple
   apps in development.