massimo 0.6.3 → 0.6.4

data/lib/massimo/cli.rb

@@ -5,10 +5,11 @@ module Massimo
     include Thor::Actions
     
     default_task :build
-    class_option 'config',      :desc => 'Path to the config file',   :aliases => '-c'
-    class_option 'source_path', :desc => 'Path to the source dir',    :aliases => '-s'
-    class_option 'output_path', :desc => 'Path to the output dir',    :aliases => '-o'
-    class_option 'production',  :desc => 'Sets the Site environment', :aliases => '-p', :type => :boolean
+    class_option 'config',      :desc => 'Path to the config file',                   :aliases => '-c'
+    class_option 'source_path', :desc => 'Path to the source dir',                    :aliases => '-s'
+    class_option 'output_path', :desc => 'Path to the output dir',                    :aliases => '-o'
+    class_option 'environment', :desc => 'Sets the Site environment',                 :aliases => '-e'
+    class_option 'production',  :desc => "Sets the Site environment to 'production'", :aliases => '-p', :type => :boolean
     
     desc 'build', 'Builds the site'
     def build
@@ -76,7 +77,8 @@ module Massimo
       def site
         @site ||= begin
           site = Massimo::Site.new config_file(:yml)
-          site.config.production  = options[:production]
+          site.config.environment = 'production'          if options[:production] 
+          site.config.environment = options[:environment] if options[:environment]
           site.config.source_path = options[:source_path] if options[:source_path]
           site.config.output_path = options[:output_path] if options[:output_path]
           if config_rb = config_file(:rb)

data/lib/massimo/config.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/hash/keys'
+require 'active_support/string_inquirer'
 require 'ostruct'
 require 'yaml'
 
@@ -7,6 +8,7 @@ module Massimo
     DEFAULT_OPTIONS = {
       :source_path     => '.',
       :output_path     => 'public',
+      :environment     => 'development',
       :resources_path  => '.',
       :base_url        => '/',
       :resources_url   => '/',
@@ -35,6 +37,12 @@ module Massimo
       File.expand_path super
     end
     
+    # Return the enviornment option wrapped by a StringInquirer, so you can
+    # query the environment like this: `config.environment.production?`
+    def environment
+      ActiveSupport::StringInquirer.new(super)
+    end
+    
     # Get a full, expanded path for the given resource name. This is either set
     # in the configuration or determined dynamically based on the name.
     def path_for(resource_name)
@@ -61,11 +69,5 @@ module Massimo
     def options_for(lib_name)
       send(lib_name) || {}
     end
-    
-    # Wether or not the Site's environment is in production mode. Usually you would
-    # want to set this to compress and concat assets.
-    def production?
-      !!self.production
-    end
   end
 end

data/lib/massimo.rb

@@ -12,7 +12,7 @@ module Massimo
   autoload :View,       'massimo/view'
   autoload :Watcher,    'massimo/watcher'
   
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
   
   class << self
     def site

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Pete Browne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -05:00
+date: 2010-05-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency