staticmatic2 2.0.0 → 2.0.1

data/README.markdown

@@ -1,18 +1,21 @@
 # StaticMatic: Build and Deploy
 
-Build static websites using modern dynamic tools:
+1: Build static websites using modern dynamic tools:
 
 - [Haml](http://haml-lang.com/)
 - [Sass](http://sass-lang.com/)
 - [Coffeescript](http://jashkenas.github.com/coffee-script/)
 - [Compass](compass-style.org)
-- And more to come.
+- [Amazon S3 Websites](http://aws.typepad.com/aws/2011/02/host-your-static-website-on-amazon-s3.html)
+- And more to come
 
-And deploy to Amazon S3:
+2: Deploy to Amazon S3:
 
     $ staticmatic s3_deploy
 
-In other words:
+3: Profit (due to low hosting fees :P)
+
+## In other words:
 
                     StaticMatic build                   StaticMatic deploy
     src/                    ==>           build/                ==>           mywebsite.com/
@@ -23,6 +26,10 @@ In other words:
       img/                  ==>             img/                ==>             img/
         logo.png            ==>               logo.png          ==>               logo.png
 
+# Getting Started
+
+    $ gem install staticmatic2
+
 ## Quick Start
 
 Instantly setup a new project:
@@ -50,19 +57,29 @@ Preview your static website:
 
 Visit http://localhost:3000 to view your website in action.
 
-When you're ready to deploy, convert your haml/sass/whatever files into plain html, css, and javascript:
+To build & convert your haml/sass/whatever files into plain html, css, and javascript:
 
-    staticmatic build
+    $ staticmatic build
     
-This will convert everything into a freshly generated `build/` folder, all ready to deploy!
+This will convert everything into a freshly generated `build/` folder, 100% static.
+
+If you have an Amazon S3 account and want to deploy to your bucket, run the following command:
+
+    # NOTE: You must be in the root folder of your project
+    $ staticmatic s3_deploy
+
+If you haven't deployed your current project to Amazon yet, it will prompt you to create a config file. Edit this file to include your credentials, run the command again, and you're set.
 
 ## Special Folders
 
     <my-project>/
       src/
+        _helpers/
         _layouts/
         _partials/
 
+- The `_helpers` folder is where you place your custom Haml helpers
+
 - The `_layouts` folder is where layout files will be searched for. These files must contain a `yield` statement.
 
 - The `_partials` folder is the last place partial files will be searched for. Any partial in this folder should not be prefixed with an underscore _

data/Rakefile

@@ -1,4 +1,4 @@
-# require 'psych'
+require 'rubygems'
 require 'bundler'
 
 begin

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 2
 :minor: 0
-:patch: 0
+:patch: 1
 :build: !!null 

data/bin/staticmatic

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
-
 require 'rubygems'
 require 'thor'
+
 lib_dir = File.dirname(__FILE__) + '/../lib/staticmatic'
+
 require lib_dir
 Dir[File.join lib_dir,'deployers','*.rb'].each do |deployer|
   require deployer
@@ -18,11 +19,6 @@ class StaticExe < Thor
 
   # functions related to initializing a project
 
-  desc "one", "two"
-  def one_two
-    puts 'one two'
-  end
-
   desc "init", "Initialize a static directory structure"
   method_option :skeleton, :type => :string, :aliases => "-s"
   def init(target = ".")
@@ -82,6 +78,10 @@ private
   def site_path(directory,*paths)
     File.join(directory, 'build', *paths)
   end
+  
+  def build_files(directory)
+    Dir[site_path(directory,'**/*')].reject {|file| File.directory? file}
+  end
 
   def clone(source, target)
     if Dir["#{target}/*"].empty?

data/lib/staticmatic/compass/configuration_defaults.rb

@@ -11,19 +11,19 @@ module Compass
         end
         
         def sass_dir_without_default
-          "src/stylesheets"
+          "src"
         end
 
         def javascripts_dir_without_default
-          "site/javascripts"
+          "build"
         end
 
         def css_dir_without_default
-          "site/stylesheets"
+          "build"
         end
 
         def images_dir_without_default
-          "site/images"
+          "build"
         end
         
         def default_http_images_path

data/lib/staticmatic/deployers/aws-s3.rb

@@ -11,31 +11,19 @@ class StaticExe < Thor
     
     invoke :build, directory unless options[:skip_build]
     
-    if Dir[site_path(directory,'*')].empty?
+    if build_files(directory).empty?
       say 'Your build/ folder is empty', :red
       say 'Nothing to do.'
       return
     end
     
-    say 'Uploading to Amazon S3...', :cyan
-    say 'Establishing connection to Amazon S3...'
     amazon_config = YAML::load File.read(amazon_config_path directory)
-    AWS::S3::Base.establish_connection!(amazon_config['AccessKeys'])
-    
     env = options[:env] || 'development'
     bucket_name = amazon_config['Buckets'][env]
     
-    say "Grabbing #{env} bucket '#{bucket_name}'"
-    buckets = AWS::S3::Service.buckets
-    unless buckets.map {|b| b.name}.include? bucket_name
-      say 'The bucket ', :red
-      say "'#{bucket_name}' "
-      say 'does not exist!', :red
-      say 'Nothing to do.'
-      return
-    end
+    connect_to_amazon_s3(amazon_config,env,bucket_name)
 
-    Dir[site_path(directory,'*')].each do |file|
+    build_files(directory).each do |file|
       contents = File.read file
       s3path = file.sub(%r{^\./build/},'')
       
@@ -45,8 +33,57 @@ class StaticExe < Thor
     say 'Done.'
   end
   
+  desc "s3_upload FILE [FILE ...]", "Upload select files to your Amazon S3 bucket."
+  method_option :directory, :type => :string, :aliases => "-d", :default => '.'
+  method_option :env, :type => :string, :aliases => "-e"
+  method_option :skip_build, :type => :boolean, :aliases => "-k"
+  def s3_upload(*files)
+    return if needs_setup? options[:directory]
+    
+    if files.length == 0
+      say 'No files selected.', :red
+      say 'Nothing to do.'
+      return
+    end
+    
+    amazon_config = YAML::load File.read(amazon_config_path '.')
+    env = options[:env] || 'development'
+    bucket_name = amazon_config['Buckets'][env]
+    
+    connect_to_amazon_s3(amazon_config,env,bucket_name)
+    
+    files.each do |file|
+      
+      unless File.exists? file
+        say "      Does not exist ", :red; say file; next
+      end
+      
+      contents = File.read file
+      s3path = file.sub(%r{^(\./)?build/},'')
+    
+      say "      upload ", :cyan; say s3path
+      AWS::S3::S3Object.store(s3path, contents, bucket_name, :access => :public_read)
+    end
+  end
+  
   private
   
+  def connect_to_amazon_s3(config,env,bucket_name)
+    say 'Uploading to Amazon S3...', :cyan
+    say 'Establishing connection to Amazon S3...'
+    AWS::S3::Base.establish_connection!(config['AccessKeys'])
+    
+    say "Grabbing #{env} bucket '#{bucket_name}'"
+    buckets = AWS::S3::Service.buckets
+    unless buckets.map {|b| b.name}.include? bucket_name
+      say 'The bucket ', :red
+      say "'#{bucket_name}' "
+      say 'does not exist!', :red
+      say 'Nothing to do.'
+      return
+    end
+  end
+  
   def amazon_config_path(directory)
     File.join(directory, 'config','amazon.yml')
   end

data/lib/staticmatic/helpers/assets_helper.rb

@@ -9,7 +9,7 @@ module StaticMatic
       # = stylesheets :reset, :application
       # Can also pass options hash in at the end so you can specify :media => :print
       def stylesheets(*params)
-        options = if params.last.is_a? Hash; params.pop else {} end # clean up
+        options = (params.last.is_a? Hash) ? params.pop : {}
         
         options[:media] = 'all' unless options.has_key?(:media)
         options[:rel] = 'stylesheet'; options[:type] = 'text/css'
@@ -42,7 +42,7 @@ module StaticMatic
       # javascripts('test')   ->   <script language="javascript" src="javascripts/test.js"></script>
       #    
       def javascripts(*files)
-        options = if files.last.is_a? Hash; files.pop else {} end # clean up
+        options = (files.last.is_a? Hash) ? files.pop : {}
         
         options[:language] = 'javascript'
         options[:type] = 'text/javascript'
@@ -51,7 +51,6 @@ module StaticMatic
         output = ""
 
         files.each do |path|
-          puts "path: #{path}"
           if path.to_s.match %r{^https?://}
             output << format_output(:script,path,options)
           else
@@ -83,8 +82,8 @@ module StaticMatic
         else
           filename_without_extension = File.basename(path).chomp(File.extname(path))
       
-          path = path.gsub(/#{@staticmatic.src_dir}/, "").
-                      gsub(/#{@staticmatic.site_dir}/, "").
+          path = path.gsub(/^#{@staticmatic.src_dir}/, "").
+                      gsub(/^#{@staticmatic.site_dir}/, "").
                       gsub(/#{filename_without_extension}\.(sass|scss|css|js|coffee)/, "")
 
           src = File.join(current_page_relative_path, path, "#{filename_without_extension}")

data/lib/staticmatic/helpers/render_helper.rb

@@ -4,6 +4,18 @@ module StaticMatic
     module RenderHelper
       self.extend self
       
+      def content_hash
+        @content_hash ||= {}
+      end
+      
+      def yield_for(index)
+        self.content_hash[index.to_sym] || ""
+      end
+      
+      def content_for(index,&block)
+        content_hash[:sidebar] = capture_haml &block
+      end
+      
       # Include a partial template
       def partial(name, options = {})
         @staticmatic.generate_partial(name, options)

data/lib/staticmatic/mixins/build.rb

@@ -44,7 +44,7 @@ module StaticMatic::BuildMixin
   def copy_images
     src_file_paths(*%w{gif jpg jpef png tiff}).each do |path|
       file_dir, file_name = File.split(path.sub(/^#{@src_dir}/, ''))
-      copy_file(path, File.join(@site_dir, 'images', file_dir, file_name))
+      copy_file(path, File.join(@site_dir, file_dir, file_name))
     end
   end
 

data/lib/staticmatic/mixins/render.rb

@@ -49,19 +49,18 @@ module StaticMatic::RenderMixin
   end
 
   def generate_partial(name, options = {})
-    partial_dir, partial_name = File.dirname(self.current_file), name  # default relative to current file
-    partial_dir, partial_name = File.split(name) if name.index('/') # contains a path so it's absolute from src/pages dir
+    partial_dir, partial_name = '', name
+    partial_dir, partial_name = File.split(name) if name.index('/')
     partial_type = partial_name[/(\.haml|\.html)$/]
     
     partial_name = "_#{partial_name}"
     partial_name += ".haml" unless partial_type
 
-    partial_path = File.join(@src_dir, partial_dir, partial_name)
+    partial_path = File.join(@src_dir, File.dirname(self.current_file), partial_dir, partial_name)
     unless File.exists?(partial_path)
-      # couldn't find it in the pages subdirectory tree so try old way (ignoring the path)
-      partial_dir = '_partials'
-      partial_name = "#{File.basename(name)}"
-      partial_name += ".haml" unless partial_type
+      # couldn't find it in the pages subdirectory tree, so try the partials folder
+      partial_dir = File.join '_partials', partial_dir
+      partial_name.sub! /^_/, ''
       partial_path = File.join(@src_dir, partial_dir, partial_name)
     end
   

data/staticmatic2.gemspec

@@ -0,0 +1,172 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{staticmatic2}
+  s.version = "2.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Stephen Bartholomew", "Gilbert B Garza"]
+  s.date = %q{2011-03-14}
+  s.default_executable = %q{staticmatic}
+  s.description = %q{    StaticMatic helps you quickly create maintainable static websites using
+    tools such as Haml and Sass.
+    
+    Quickly deploy to services such as Amazon S3 in a single command.
+}
+  s.email = %q{gilbertbgarza@gmail.com}
+  s.executables = ["staticmatic"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.markdown"
+  ]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION.yml",
+    "bin/staticmatic",
+    "lib/staticmatic.rb",
+    "lib/staticmatic/base.rb",
+    "lib/staticmatic/compass.rb",
+    "lib/staticmatic/compass/app_integration.rb",
+    "lib/staticmatic/compass/configuration_defaults.rb",
+    "lib/staticmatic/compass/installer.rb",
+    "lib/staticmatic/configuration.rb",
+    "lib/staticmatic/deployers/aws-s3.rb",
+    "lib/staticmatic/deployers/config/amazon.yml",
+    "lib/staticmatic/error.rb",
+    "lib/staticmatic/helpers.rb",
+    "lib/staticmatic/helpers/assets_helper.rb",
+    "lib/staticmatic/helpers/current_path_helper.rb",
+    "lib/staticmatic/helpers/form_helper.rb",
+    "lib/staticmatic/helpers/render_helper.rb",
+    "lib/staticmatic/helpers/tag_helper.rb",
+    "lib/staticmatic/helpers/url_helper.rb",
+    "lib/staticmatic/mixins/build.rb",
+    "lib/staticmatic/mixins/helpers.rb",
+    "lib/staticmatic/mixins/render.rb",
+    "lib/staticmatic/mixins/rescue.rb",
+    "lib/staticmatic/mixins/server.rb",
+    "lib/staticmatic/mixins/setup.rb",
+    "lib/staticmatic/server.rb",
+    "lib/staticmatic/template_error.rb",
+    "lib/staticmatic/templates/rescues/default.haml",
+    "lib/staticmatic/templates/rescues/template.haml",
+    "spec/base_spec.rb",
+    "spec/compass_integration_spec.rb",
+    "spec/helpers/asset_helper_spec.rb",
+    "spec/helpers/custom_helper_spec.rb",
+    "spec/render_spec.rb",
+    "spec/rescue_spec.rb",
+    "spec/sandbox/test_site/config/compass.rb",
+    "spec/sandbox/test_site/config/site.rb",
+    "spec/sandbox/test_site/src/helpers/application_helper.rb",
+    "spec/sandbox/test_site/src/layouts/alternate_layout.haml",
+    "spec/sandbox/test_site/src/layouts/default.haml",
+    "spec/sandbox/test_site/src/layouts/projects.haml",
+    "spec/sandbox/test_site/src/pages/hello_world.erb",
+    "spec/sandbox/test_site/src/pages/index.haml",
+    "spec/sandbox/test_site/src/pages/layout_test.haml",
+    "spec/sandbox/test_site/src/pages/page_one.haml",
+    "spec/sandbox/test_site/src/pages/page_two.haml",
+    "spec/sandbox/test_site/src/pages/page_with_error.haml",
+    "spec/sandbox/test_site/src/pages/page_with_partial_error.haml",
+    "spec/sandbox/test_site/src/partials/menu.haml",
+    "spec/sandbox/test_site/src/partials/partial_with_error.haml",
+    "spec/sandbox/test_site/src/stylesheets/application.sass",
+    "spec/sandbox/test_site/src/stylesheets/css_with_error.sass",
+    "spec/sandbox/test_site/src/stylesheets/nested/a_nested_stylesheet.sass",
+    "spec/sandbox/test_site/src/stylesheets/partials/_forms.sass",
+    "spec/sandbox/test_site/src/stylesheets/sassy.scss",
+    "spec/server_spec.rb",
+    "spec/setup_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/template_error_spec.rb",
+    "staticmatic.gemspec",
+    "staticmatic2.gemspec",
+    "website/Gemfile",
+    "website/config/site.rb",
+    "website/site/docs/compass_integration.html",
+    "website/site/docs/getting_started.html",
+    "website/site/docs/helpers.html",
+    "website/site/images/bycurve21.gif",
+    "website/site/images/curve21.jpg",
+    "website/site/images/homepage-build.jpg",
+    "website/site/images/homepage-previewing.jpg",
+    "website/site/images/homepage-templating.jpg",
+    "website/site/stylesheets/ie.css",
+    "website/site/stylesheets/print.css",
+    "website/site/stylesheets/screen.css",
+    "website/src/helpers/content_helper.rb",
+    "website/src/layouts/default.haml",
+    "website/src/pages/development.haml",
+    "website/src/pages/docs/_menu.haml",
+    "website/src/pages/docs/_requires_prerelease.haml",
+    "website/src/pages/docs/compass_integration.haml",
+    "website/src/pages/docs/getting_started.haml",
+    "website/src/pages/docs/helpers.haml",
+    "website/src/pages/index.haml",
+    "website/src/stylesheets/_base.scss",
+    "website/src/stylesheets/_defaults.scss",
+    "website/src/stylesheets/ie.scss",
+    "website/src/stylesheets/print.scss",
+    "website/src/stylesheets/screen.scss"
+  ]
+  s.homepage = %q{http://github.com/mindeavor/staticmatic}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{staticmatic2}
+  s.rubygems_version = %q{1.6.1}
+  s.summary = %q{Build static websites using modern dynamic tools}
+  s.test_files = [
+    "spec/base_spec.rb",
+    "spec/compass_integration_spec.rb",
+    "spec/helpers/asset_helper_spec.rb",
+    "spec/helpers/custom_helper_spec.rb",
+    "spec/render_spec.rb",
+    "spec/rescue_spec.rb",
+    "spec/sandbox/test_site/config/compass.rb",
+    "spec/sandbox/test_site/config/site.rb",
+    "spec/sandbox/test_site/src/helpers/application_helper.rb",
+    "spec/server_spec.rb",
+    "spec/setup_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/template_error_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<haml>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<compass>, [">= 0"])
+      s.add_runtime_dependency(%q<rack>, [">= 1.0"])
+      s.add_runtime_dependency(%q<thor>, [">= 0.14.6"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.10"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
+    else
+      s.add_dependency(%q<haml>, [">= 2.0.0"])
+      s.add_dependency(%q<compass>, [">= 0"])
+      s.add_dependency(%q<rack>, [">= 1.0"])
+      s.add_dependency(%q<thor>, [">= 0.14.6"])
+      s.add_dependency(%q<bundler>, [">= 1.0.10"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+    end
+  else
+    s.add_dependency(%q<haml>, [">= 2.0.0"])
+    s.add_dependency(%q<compass>, [">= 0"])
+    s.add_dependency(%q<rack>, [">= 1.0"])
+    s.add_dependency(%q<thor>, [">= 0.14.6"])
+    s.add_dependency(%q<bundler>, [">= 1.0.10"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staticmatic2
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-06 00:00:00.000000000 -06:00
+date: 2011-03-14 00:00:00.000000000 -05:00
 default_executable: staticmatic
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2160125020 !ruby/object:Gem::Requirement
+  requirement: &2156608600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160125020
+  version_requirements: *2156608600
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &2160121640 !ruby/object:Gem::Requirement
+  requirement: &2156598400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160121640
+  version_requirements: *2156598400
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2160119100 !ruby/object:Gem::Requirement
+  requirement: &2156596380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160119100
+  version_requirements: *2156596380
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2160117440 !ruby/object:Gem::Requirement
+  requirement: &2156593520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2160117440
+  version_requirements: *2156593520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2160116000 !ruby/object:Gem::Requirement
+  requirement: &2156592140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *2160116000
+  version_requirements: *2156592140
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2160115020 !ruby/object:Gem::Requirement
+  requirement: &2156589980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2160115020
+  version_requirements: *2156589980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160113800 !ruby/object:Gem::Requirement
+  requirement: &2156587120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,7 +89,7 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2160113800
+  version_requirements: *2156587120
 description: ! "    StaticMatic helps you quickly create maintainable static websites
   using\n    tools such as Haml and Sass.\n    \n    Quickly deploy to services such
   as Amazon S3 in a single command.\n"
@@ -166,6 +166,7 @@ files:
 - spec/spec_helper.rb
 - spec/template_error_spec.rb
 - staticmatic.gemspec
+- staticmatic2.gemspec
 - website/Gemfile
 - website/config/site.rb
 - website/site/docs/compass_integration.html
@@ -209,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4411352117042165644
+      hash: -650957537592481647
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: