massimo 0.10.2 → 0.10.3

data/bin/massimo

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
 
-require 'bundler/setup' if File.exist?('./Gemfile')
 require 'massimo'
 Massimo::CLI.start

data/lib/massimo/site.rb

@@ -17,8 +17,6 @@ module Massimo
       @template_scope_extensions = []
       Massimo.site               = self
       
-      setup_bundle unless bundled?
-      
       Massimo::Reloader.reload(:config) do
         instance_eval File.read(config.config_path) if File.exist?(config.config_path)
         instance_eval(&block) if block_given?
@@ -73,15 +71,6 @@ module Massimo
     
     protected
     
-      def bundled?
-        !!@bundled
-      end
-      
-      def setup_bundle
-        Bundler.require(:default, config.environment.to_sym) if defined?(Bundler)
-        @bundled = true
-      end
-    
       def add_template_scope_blocks(scope)
         @template_scope_blocks.each do |block|
           scope.instance_eval(&block)

data/lib/massimo/templates/site/config.rb

@@ -1,3 +1,6 @@
+require "bundler"
+Bundler.require :default, config.environment.to_sym
+
 # This is an example configuration File
 # Look here for all the available options:
 # http://massimo.petebrowne.com/configuration/

data/lib/massimo/version.rb

@@ -1,3 +1,3 @@
 module Massimo
-  VERSION = '0.10.2'
+  VERSION = '0.10.3'
 end

data/spec/massimo/cli_spec.rb

@@ -173,6 +173,9 @@ describe Massimo::CLI do
       within_construct do |c|
         massimo 'new my_site'
         content = <<-EOS.unindent
+          require "bundler"
+          Bundler.require :default, config.environment.to_sym
+          
           # This is an example configuration File
           # Look here for all the available options:
           # http://massimo.petebrowne.com/configuration/

metadata

@@ -2,7 +2,7 @@
 name: massimo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors: 
 - Pete Browne
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 Z
+date: 2011-09-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport