massimo 0.10.2 → 0.10.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/bin/massimo +0 -1
- data/lib/massimo/site.rb +0 -11
- data/lib/massimo/templates/site/config.rb +3 -0
- data/lib/massimo/version.rb +1 -1
- data/spec/massimo/cli_spec.rb +3 -0
- metadata +2 -2
data/bin/massimo
CHANGED
data/lib/massimo/site.rb
CHANGED
@@ -17,8 +17,6 @@ module Massimo
|
|
17
17
|
@template_scope_extensions = []
|
18
18
|
Massimo.site = self
|
19
19
|
|
20
|
-
setup_bundle unless bundled?
|
21
|
-
|
22
20
|
Massimo::Reloader.reload(:config) do
|
23
21
|
instance_eval File.read(config.config_path) if File.exist?(config.config_path)
|
24
22
|
instance_eval(&block) if block_given?
|
@@ -73,15 +71,6 @@ module Massimo
|
|
73
71
|
|
74
72
|
protected
|
75
73
|
|
76
|
-
def bundled?
|
77
|
-
!!@bundled
|
78
|
-
end
|
79
|
-
|
80
|
-
def setup_bundle
|
81
|
-
Bundler.require(:default, config.environment.to_sym) if defined?(Bundler)
|
82
|
-
@bundled = true
|
83
|
-
end
|
84
|
-
|
85
74
|
def add_template_scope_blocks(scope)
|
86
75
|
@template_scope_blocks.each do |block|
|
87
76
|
scope.instance_eval(&block)
|
data/lib/massimo/version.rb
CHANGED
data/spec/massimo/cli_spec.rb
CHANGED
@@ -173,6 +173,9 @@ describe Massimo::CLI do
|
|
173
173
|
within_construct do |c|
|
174
174
|
massimo 'new my_site'
|
175
175
|
content = <<-EOS.unindent
|
176
|
+
require "bundler"
|
177
|
+
Bundler.require :default, config.environment.to_sym
|
178
|
+
|
176
179
|
# This is an example configuration File
|
177
180
|
# Look here for all the available options:
|
178
181
|
# http://massimo.petebrowne.com/configuration/
|
metadata
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
name: massimo
|
3
3
|
version: !ruby/object:Gem::Version
|
4
4
|
prerelease:
|
5
|
-
version: 0.10.
|
5
|
+
version: 0.10.3
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Pete Browne
|
@@ -10,7 +10,7 @@ autorequire:
|
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
12
|
|
13
|
-
date: 2011-09-
|
13
|
+
date: 2011-09-05 00:00:00 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: activesupport
|