morning_glory 0.0.2 → 0.0.3

data/lib/morning_glory.rb

@@ -8,17 +8,16 @@ module MorningGlory
 end
 
 begin         
-#  puts "hello"
- # directory = FILE.dirname(__FILE__)
- # puts "directory = #{directory} "
-  MORNING_GLORY_CONFIG = YAML.load_file("#{Rails.root}/config/morning_glory.yml") if !defined? MORNING_GLORY_CONFIG
+#  MORNING_GLORY_CONFIG = YAML.load_file("#{Rails.root}/config/morning_glory.yml") if !defined? MORNING_GLORY_CONFIG
+  MORNING_GLORY_CONFIG = YAML.load_file("config/morning_glory.yml") if !defined? MORNING_GLORY_CONFIG
 #rescue
   raise "Error loading MorningGlory configuration files. Please check config/morning_glory.yml is configured correctly."
 end
 
 begin
   if (!ENV['S3_KEY'] && !ENV['S3_SECRET'])   
-    S3_CONFIG = YAML.load_file("#{Rails.root}/config/s3.yml")[Rails.env] if !defined? S3_CONFIG
+#    S3_CONFIG = YAML.load_file("#{Rails.root}/config/s3.yml")[Rails.env] if !defined? S3_CONFIG
+    S3_CONFIG = YAML.load_file("config/s3.yml")[Rails.env] if !defined? S3_CONFIG
   end
   
 rescue

data/lib/morning_glory/version.rb

@@ -1,3 +1,3 @@
 module MorningGlory
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/tasks/morning_glory.rake

@@ -7,11 +7,8 @@ namespace :morning_glory do
     @@scm_commit_required = false
     
     begin                                
-#      puts "path = #{path}"  
-#      directory = FILE.dirname(__FILE__)
-#      puts "directory = #{directory} "
-      MORNING_GLORY_CONFIG = YAML.load_file("#{Rails.root}/config/morning_glory.yml") if !defined? MORNING_GLORY_CONFIG
-#      puts "morning glory loaded"
+#      MORNING_GLORY_CONFIG = YAML.load_file("#{Rails.root}/config/morning_glory.yml") if !defined? MORNING_GLORY_CONFIG
+      MORNING_GLORY_CONFIG = YAML.load_file("config/morning_glory.yml") if !defined? MORNING_GLORY_CONFIG
     rescue
     end
   

metadata

@@ -2,7 +2,7 @@
 name: morning_glory
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Adam Burmister