elastic-beanstalk 0.1.6 → 0.1.7

data/lib/elastic/beanstalk/config.rb

@@ -168,7 +168,7 @@ module Elastic
         if defined?(Rails)
           Rails.root.join(relative_path)
         elsif defined?(Rake.original_dir)
-          Rake.original_dir.join(relative_path)
+          File.expand_path(relative_path, Rake.original_dir)
         else
           File.expand_path(relative_path, Dir.pwd)
         end

data/lib/elastic/beanstalk/tasks/eb.rake

@@ -19,8 +19,12 @@ namespace :eb do
     #env = ENV['RAILS_ENV'] || Rails.env || 'development'
     env = ENV['RAILS_ENV'] || 'development'
 
-    # load the configuration
-    EbConfig.load!(env)
+    # load the configuration from same dir (for standalone CI purposes) or from the rails config dir if within the rails project
+    filename = EbConfig.resolve_path('eb.yml')
+    unless File.exists? filename
+      filename = EbConfig.resolve_path('config/eb.yml')
+    end
+    EbConfig.load!(env, filename)
 
     # Let's be explicit regardless of 'production' being the eb's default shall we? Set RACK_ENV and RAILS_ENV based on the given environment
     EbConfig.set_option(:'aws:elasticbeanstalk:application:environment', 'RACK_ENV', "#{EbConfig.environment}")

data/lib/elastic/beanstalk/version.rb

@@ -1,5 +1,5 @@
 module Elastic
   module Beanstalk
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-beanstalk
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3297737622237847301
+      hash: -1158080329481301492
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3297737622237847301
+      hash: -1158080329481301492
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25