massimo 0.7.5 → 0.8.0

data/spec/spec_helper.rb

@@ -0,0 +1,65 @@
+lib = File.expand_path('../../lib', __FILE__)
+$:.unshift(lib) unless $:.include?(lib)
+
+require 'rubygems'
+require 'rspec'
+require 'rr'
+require 'construct'
+require 'rack/test'
+require 'unindent'
+require 'sass'
+require 'less'
+require 'coffee-script'
+require 'sprockets'
+require 'jsmin'
+require 'packr'
+require 'yui/compressor'
+require 'closure-compiler'
+require 'growl'
+require 'massimo'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+RSpec.configure do |config|
+  config.include Construct::Helpers
+  config.include Rack::Test::Methods
+  config.mock_with :rr
+  
+  config.before :each do
+    stub($stdout).puts
+    stub(Growl).notify
+  end
+  
+  config.after :each do
+    Massimo.site = nil
+  end
+  
+  # Builds a construct with a single file in it.
+  def with_file(filename, content = nil)
+    within_construct do |construct|
+      construct.file filename, content
+      yield
+    end
+  end
+  
+  # Captures the given stream and returns it:
+  #
+  #   stream = capture(:stdout) { puts "Cool" }
+  #   stream # => "Cool\n"
+  #
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
+  end
+  alias :silence :capture
+end

data/spec/support/matchers/be_a_directory_matcher.rb

@@ -0,0 +1,5 @@
+RSpec::Matchers.define :be_a_directory do
+  match do |path|
+    File.directory?(path.to_s)
+  end
+end

data/spec/support/matchers/be_a_file_matcher.rb

@@ -0,0 +1,26 @@
+RSpec::Matchers.define :be_a_file do
+  match do |path|
+    @path = path.to_s
+    file? && content_matches?
+  end
+  
+  def with_content(content)
+    @content = content
+    self
+  end
+
+  def file?
+    File.file?(@path)
+  end
+
+  def content_matches?
+    case @content
+    when String
+      File.read(@path).strip == @content.strip
+    when Regexp
+      File.read(@path) =~ @content
+    else
+      true
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 5
-  version: 0.7.5
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Pete Browne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -06:00
+date: 2011-01-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,9 +102,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 1
+        - 2
         - 0
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -132,9 +132,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
+        - 4
         - 0
-        - 0
-        version: 2.0.0
+        version: 2.4.0
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -288,9 +288,39 @@ dependencies:
   type: :development
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: growl
+  name: yui-compressor
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :development
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: closure-compiler
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  type: :development
+  version_requirements: *id020
+- !ruby/object:Gem::Dependency 
+  name: growl
+  prerelease: false
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -301,7 +331,7 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id019
+  version_requirements: *id021
 description: Massimo builds HTML, Javascript, and CSS Files from your source.
 email: me@petebrowne.com
 executables: 
@@ -311,29 +341,53 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .document
+- .gitignore
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.md
+- Rakefile
 - bin/massimo
-- lib/massimo/commands/base.rb
-- lib/massimo/commands/build.rb
-- lib/massimo/commands/generate.rb
-- lib/massimo/commands/help.rb
-- lib/massimo/commands/server.rb
-- lib/massimo/commands/version.rb
-- lib/massimo/commands/watch.rb
+- lib/massimo.rb
+- lib/massimo/cli.rb
 - lib/massimo/config.rb
 - lib/massimo/helpers.rb
 - lib/massimo/javascript.rb
 - lib/massimo/page.rb
+- lib/massimo/reloader.rb
 - lib/massimo/resource.rb
 - lib/massimo/server.rb
 - lib/massimo/site.rb
 - lib/massimo/stylesheet.rb
+- lib/massimo/templates/site/config.rb
+- lib/massimo/templates/site/javascripts/main.js
+- lib/massimo/templates/site/pages/index.erb
+- lib/massimo/templates/site/public/.empty_directory
+- lib/massimo/templates/site/stylesheets/main.scss
+- lib/massimo/templates/site/views/layouts/main.erb
 - lib/massimo/ui.rb
 - lib/massimo/version.rb
 - lib/massimo/view.rb
 - lib/massimo/watcher.rb
-- lib/massimo.rb
-- LICENSE
-- README.md
+- massimo.gemspec
+- spec/massimo/cli_spec.rb
+- spec/massimo/config_spec.rb
+- spec/massimo/helpers_spec.rb
+- spec/massimo/javascript_spec.rb
+- spec/massimo/massimo_spec.rb
+- spec/massimo/page_spec.rb
+- spec/massimo/reloader_spec.rb
+- spec/massimo/resource_spec.rb
+- spec/massimo/server_spec.rb
+- spec/massimo/site_spec.rb
+- spec/massimo/stylesheet_spec.rb
+- spec/massimo/ui_spec.rb
+- spec/massimo/view_spec.rb
+- spec/massimo/watcher_spec.rb
+- spec/spec_helper.rb
+- spec/support/matchers/be_a_directory_matcher.rb
+- spec/support/matchers/be_a_file_matcher.rb
 has_rdoc: true
 homepage: http://petebrowne.github.com/massimo/
 licenses: []

data/lib/massimo/commands/base.rb

@@ -1,85 +0,0 @@
-require 'optparse'
-require 'thor/actions'
-require 'thor/shell'
-
-module Massimo
-  module Commands
-    class Base
-      include Thor::Actions
-      include Thor::Shell
-      
-      attr_reader :options, :parser
-      
-      def self.run
-        command = self.new
-        command.parse
-        command.run
-      end
-      
-      def initialize
-        @options = {}
-        @parser  = OptionParser.new
-        
-        parser.banner = "#{banner}\n" if respond_to?(:banner)
-        common_options
-        add_options if respond_to?(:add_options)
-        
-        # needed for Thor::Actions to work
-        self.destination_root = nil
-      end
-      
-      def common_options
-        parser.on('-c', '--config FILE', 'Path to the config file') do |config|
-          options[:config] = config
-        end
-        
-        parser.on('-s', '--source-path PATH', 'Path to the source dir') do |path|
-          options[:source_path] = path
-        end
-        
-        parser.on('-o', '--output-path PATH', 'Path to the output dir') do |path|
-          options[:output_path] = path
-        end
-        
-        parser.on('-e', '--environment ENV', 'Sets the Site environment') do |env|
-          options[:environment] = env
-        end
-        
-        parser.on('-p', '--production', "Sets the Site environment to 'production'") do |production|
-          options[:environment] = 'production'
-        end
-      end
-      
-      def parse
-        begin
-          parser.parse(ARGV)
-        rescue
-          say parser
-          exit
-        end
-      end
-      
-      def run
-      end
-      
-      def site
-        @site ||= Massimo::Site.new(config_file(:yml)).tap do |site|
-          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)
-            site.instance_eval File.read(config_rb)
-          end
-        end
-      end
-      
-      def config_file(ext)
-        if options[:config] && File.extname(options[:config]) == ".#{ext}"
-          options[:config]
-        elsif File.exist?("config.#{ext}")
-          "config.#{ext}"
-        end
-      end
-    end
-  end
-end

data/lib/massimo/commands/build.rb

@@ -1,19 +0,0 @@
-module Massimo
-  module Commands
-    class Build < Base
-      def banner
-%{
-#{Massimo::UI.color('massimo build', :cyan)}
-Builds the site from the source files.
-}
-      end
-      
-      def run
-        exit Massimo::UI.report_errors {
-          site.process
-          Massimo::UI.say 'massimo has built your site', :growl => true
-        }
-      end
-    end
-  end
-end

data/lib/massimo/commands/generate.rb

@@ -1,62 +0,0 @@
-require 'active_support/core_ext/string/starts_ends_with'
-require 'active_support/inflector'
-
-module Massimo
-  module Commands
-    class Generate < Base
-      def banner
-%{
-#{Massimo::UI.color('massimo generate SITE_OR_RESOURCE [FILE]', :cyan)}
-Generates a new site:
-  massimo generate myblog
-Within a massimo project, you can generate a new resource file:
-  massimo generate page contact.haml
-}
-      end
-      
-      def add_options
-        @site_or_resource = ARGV.shift
-        
-        if ARGV.first && !ARGV.first.starts_with?('-')
-          @file = ARGV.shift
-        end
-        
-        options.merge!(
-          :page_ext       => 'haml',
-          :javascript_ext => 'js',
-          :stylesheet_ext => 'sass'
-        )
-        
-        parser.on('--page', '--page-ext EXT', 'The extension used for generated Pages and Views') do |ext|
-          options[:page_ext] = ext
-        end
-        
-        parser.on('--js', '--javascript-ext EXT', 'The extension used for generated Javascripts') do |ext|
-          options[:javascript_ext] = ext
-        end
-        
-        parser.on('--css', '--stylesheet-ext EXT', 'The extension used for generated Stylesheets') do |ext|
-          options[:stylesheet_ext] = ext
-        end
-      end
-      
-      def run
-        if @file
-          create_file File.join(site.config.path_for(@site_or_resource.pluralize), @file)
-        else
-          empty_directory @site_or_resource
-          inside @site_or_resource do
-            site.resources.each do |resource|
-              empty_directory(resource.path)
-            end
-            create_file     File.join(Massimo::Page.path,       "index.#{options[:page_ext]}")
-            create_file     File.join(Massimo::Javascript.path, "main.#{options[:javascript_ext]}")
-            create_file     File.join(Massimo::Stylesheet.path, "main.#{options[:stylesheet_ext]}")
-            create_file     File.join(Massimo::View.path,       "layouts/main.#{options[:page_ext]}")
-            empty_directory site.config.output_path
-          end
-        end
-      end
-    end
-  end
-end

data/lib/massimo/commands/help.rb

@@ -1,34 +0,0 @@
-require 'active_support/core_ext/string/conversions'
-
-module Massimo
-  module Commands
-    class Help < Base
-      def add_options
-        command_name = ARGV.shift
-        unless command_name.nil? or %w( help version ).include?(command_name)
-          @command = "Massimo::Commands::#{command_name.camelize}".constantize rescue nil
-        end
-      end
-      
-      def run
-        if @command
-          puts @command.new.parser
-        else
-          puts %{
-#{Massimo::UI.color('massimo', :cyan)}
-a static website builder
-
-Commands:
-  massimo build                             # Builds the site
-  massimo generate SITE_OR_RESOURCE [FILE]  # Generates a new site
-                                              Optionally generates a resource file
-  massimo help [COMMAND]                    # Shows info about a specific command
-  massimo server [PORT]                     # Runs a local web server
-  massimo version                           # Displays current version
-  massimo watch                             # Watches your files for changes
-}
-        end
-      end
-    end
-  end
-end

data/lib/massimo/commands/server.rb

@@ -1,24 +0,0 @@
-require 'active_support/core_ext/string/starts_ends_with'
-
-module Massimo
-  module Commands
-    class Server < Base
-      def banner
-%{
-#{Massimo::UI.color('massimo server [PORT]', :cyan)}
-Runs a local Rack based web server on the given port.
-}
-      end
-      
-      def add_options
-        if ARGV.first && !ARGV.first.starts_with?('-')
-          @port = ARGV.shift
-        end
-      end
-      
-      def run
-        Massimo::Server.start(site, (@port || 3000).to_i)
-      end
-    end
-  end
-end

data/lib/massimo/commands/version.rb

@@ -1,9 +0,0 @@
-module Massimo
-  module Commands
-    class Version < Base
-      def run
-        puts Massimo::VERSION
-      end
-    end
-  end
-end

data/lib/massimo/commands/watch.rb

@@ -1,16 +0,0 @@
-module Massimo
-  module Commands
-    class Watch < Base
-      def banner
-%{
-#{Massimo::UI.color('massimo watch', :cyan)}
-Watches your files for changes and automatically builds the site.
-}
-      end
-      
-      def run
-        Massimo::Watcher.start(site)
-      end
-    end
-  end
-end