0
@@ -67,13 +67,13 @@
0
       Halcyon.logger = Halcyon::Logger.setup(Halcyon.config[:logging])
0
       
0
       # Run initializers
0
-      Dir.glob(Halcyon.paths[:init]/'{requires.rb,hooks.rb,routes.rb,*}').each do |initializer|
0
+      Dir.glob(Halcyon.paths[:init]/'{requires,hooks,routes,environment,*}.rb').each do |initializer|
0
         self.logger.debug "Init: #{File.basename(initializer).chomp('.rb').camel_case}" if
0
         require initializer.chomp('.rb')
0
       end
0
       
0
       # Setup autoloads for Controllers found in Halcyon.root/'app'
0
-      Dir.glob(Halcyon.paths[:controller]/'{application.rb,*}').each do |controller|
0
+      Dir.glob(Halcyon.paths[:controller]/'{application,*}.rb').each do |controller|
0
         self.logger.debug "Load: #{File.basename(controller).chomp('.rb').camel_case} Controller" if
0
         require controller.chomp('.rb')
0
       end

0
@@ -18,6 +18,11 @@
0
     Halcyon.config.is_a?(Hash).should.be.true?
0
   end
0
   
0
+  it "should provide environment label" do
0
+    Halcyon.environment.should == :development
0
+    Halcyon.environment.should == Halcyon.config[:environment]
0
+  end
0
+  
0
   it "should provide universal access to a logger" do
0
     # We assume Logger here because, you know, we're gods of the test
0
     Halcyon.logger.is_a?(Logger).should.be.true?

0
@@ -6,6 +6,7 @@
0
 
0
 $config = {
0
   :allow_from => :all,
0
+  :environment => :development,
0
   :logger => nil,
0
   :logging => {
0
     :level => 'debug'
0
@@ -63,6 +64,10 @@
0
 class Model
0
   attr_accessor :id
0
 end
0
+
0
+# Environment
0
+
0
+Halcyon.configurable_attr(:environment)
0
 
0
 # Testing routes
0
 

0
@@ -6,6 +6,13 @@
0
 # * <tt>halcyon_clients</tt>: only Halcyon clients (tests the User-Agent only)
0
 allow_from: all
0
 
0
+# = Environment
0
+# 
0
+# Uncomment to manually specify the environment to run the application in.
0
+# Defaults to <tt>:development</tt>.
0
+# 
0
+# environment: production
0
+
0
 # = Logging
0
 # 
0
 # Configures the logging client in the framework, including destination,

0
@@ -1 +1,12 @@
0
+# = Environment
0
+# 
0
+# Sets the environment unless already set.
0
+# 
0
+# Creates the <tt>Halcyon.environment</tt> configurable attribute. Since this
0
+# is mapped to <tt>Halcyon.config[:environment]</tt>, environment can be set
0
+# by setting the <tt>environment:</tt> configuration value in the
0
+# <tt>config/config.yml</tt> file.
0
+
0
+Halcyon.configurable_attr(:environment)
0
+Halcyon.environment = :development unless Halcyon.environment

0
@@ -14,6 +14,12 @@
0
   }
0
 }.to_mash
0
 
0
+# = Environment
0
+# Set the environment if not set above; create the <tt>Halcyon.environment</tt>
0
+# configurable attribute. Maps to <tt>Halcyon.config[:environment]</tt>.
0
+Halcyon.configurable_attr(:environment)
0
+Halcyon.environment = :development unless Halcyon.environment
0
+
0
 # = Routes
0
 Halcyon::Application.route do |r|
0
   r.match('/time').to(:controller => 'application', :action => 'time')