awestruct 0.0.5 → 0.0.6

data/bin/awestruct

@@ -87,7 +87,18 @@ def parse(args)
   options
 end
 
+def site_path
+  dir = (@profiles_data.nil? || @profile_data.nil? || @profile_data['output_dir'].nil?) ? '_site' : @profile_data['output_dir']
+  path = File.join( Dir.pwd, dir )
+end
+
 options = parse(ARGV)
+unless options.init
+  site_yaml_file = File.join( Dir.pwd, '_config', 'site.yml' )
+  site_yaml      = YAML.load( File.read( site_yaml_file ) )
+  @profiles_data  = site_yaml ? site_yaml['profiles'] : {}
+  @profile_data   = @profiles_data[options.profile]
+end
 
 if ( options.init )
   if ( options.generate || options.auto || options.server )
@@ -101,7 +112,7 @@ end
 
 if ( options.deploy )
   if ( options.auto || options.server )
-    $stderr.puts "--init may not be used with --generate, --auto or --server"
+    $stderr.puts "--deploy may not be used with --auto or --server"
     exit
   end
 
@@ -111,38 +122,29 @@ if ( options.deploy )
   end
 
 
-  site_dir = File.join( Dir.pwd, '_site' )
-  if ( ! File.exist?( site_dir ) )
-    $stderr.puts "No _site/ generated yet."
+  if ( @profiles_data.nil? )
+    $stderr.puts "_config/site.yml must define a 'profiles' section"
     exit
   end
 
-  site_yaml_file = File.join( Dir.pwd, '_config', 'site.yml' )
 
-  site_yaml = YAML.load( File.read( site_yaml_file ) )
-
-  profiles_data = site_yaml['profiles']
-
-  if ( profiles_data.nil? )
-    $stderr.puts "_config/site.yml must define a 'profiles' section"
+  if ( @profile_data.nil? )
+    $stderr.puts "Unknown profile '#{options.profile}'"
     exit
   end
 
-  profile_data = profiles_data[options.profile]
-
-  if ( profile_data.nil? )
-    $stderr.puts "Unknown profile '#{options.profile}'"
+  if ( ! File.exist?( site_path ) )
+    $stderr.puts "No #{site_path}/ generated yet."
     exit
   end
 
-  deploy_data = profile_data['deploy']
- 
+  deploy_data = @profile_data['deploy']
   if ( deploy_data.nil? )
     $stderr.puts "No configuration for 'deploy'"
     exit
   end
 
-  cmd = Awestruct::Commands::Deploy.new( site_dir, deploy_data )
+  cmd = Awestruct::Commands::Deploy.new( site_path, deploy_data )
 
   cmd.run
   exit
@@ -174,7 +176,8 @@ end
 
 if ( options.server )
   threads << Thread.new {
-    server_cmd = Awestruct::Commands::Server.new( File.join( Dir.pwd, '_site' ), options.bind_addr, options.port )
+    puts "Serving site at #{site_path}"
+    server_cmd = Awestruct::Commands::Server.new( site_path, options.bind_addr, options.port )
     server_cmd.run
   }
 end

data/lib/awestruct/commands/generate.rb

@@ -1,4 +1,4 @@
-require 'awestruct'
+require 'awestruct/engine'
 
 module Awestruct
   module Commands

data/lib/awestruct/commands/init.rb

@@ -26,6 +26,7 @@ module Awestruct
         if ( @scaffold )
           manifest.copy_file( '_layouts/base.html.haml', File.join( File.dirname(__FILE__), '/base_layout.html.haml' ) )
           manifest.copy_file( 'index.html.haml', File.join( File.dirname(__FILE__), '/base_index.html.haml' ) )
+          manifest.touch_file( '_config/site.yml' )
         end
         manifest.perform( @dir )
       end

data/lib/awestruct/commands/manifest.rb

@@ -1,16 +1,31 @@
 require 'compass/logger'
 require 'compass/actions'
 require 'compass/commands/base'
+require 'compass/commands/registry'
 require 'compass/commands/create_project'
-require 'compass/installers/stand_alone'
+require 'compass/installers/bare_installer'
 
-class Compass::Installers::StandAloneInstaller
-  def write_configuration_files(config_file=nil)
-    # skip it!
+module Compass::AppIntegration::StandAlone
+end
+
+class Compass::AppIntegration::StandAlone::Installer
+  def write_configuration_files(config_file = nil)
+    # no!
   end
+  def finalize(opts={})
+    puts <<-END.gsub(/^ {6}/, '')
+
+      Now you're awestruct!
+
+      To generate your site continuous during development, simply run:
 
-  def compilation_required?
-    false
+        awestruct -d
+
+      and visit your site at
+
+        http://localhost:4242/
+
+    END
   end
 end
 
@@ -34,6 +49,10 @@ module Awestruct
       def copy_file(path, input_path)
         steps << CopyFile.new( path, input_path )
       end
+      
+      def touch_file(path)
+        steps << TouchFile.new(path)
+      end
 
       def install_compass(framework)
         steps << InstallCompass.new(framework)
@@ -104,6 +123,20 @@ module Awestruct
           FileUtils.rmdir( p )
         end
       end
+      
+      class TouchFile
+        def initialize(path)
+          @path = path
+        end
+        
+        def perform(dir)
+          FileUtils.touch(File.join(dir, @path))
+        end
+        
+        def unperform(dir)
+          #nothing
+        end
+      end
 
       class CopyFile
         def initialize(path, input_path)
@@ -154,8 +187,8 @@ module Awestruct
           cmd = Compass::Commands::CreateProject.new( dir, {
                   :framework=>@framework,
                   :project_type=>:stand_alone,
-                  #:css_dir=>'_site/stylesheets',
-                  #:sass_dir=>'stylesheets',
+                  :css_dir=>'_site/stylesheets',
+                  :sass_dir=>'stylesheets',
                   :images_dir=>'images',
                   :javascripts_dir=>'javascripts',
                 } )

data/lib/awestruct/engine.rb

@@ -7,8 +7,11 @@ require 'time'
 require 'awestruct/config'
 require 'awestruct/site'
 require 'awestruct/haml_file'
+require 'awestruct/erb_file'
 require 'awestruct/maruku_file'
 require 'awestruct/sass_file'
+require 'awestruct/scss_file'
+require 'awestruct/org_mode_file'
 require 'awestruct/verbatim_file'
 
 require 'awestruct/context_helper'
@@ -86,10 +89,16 @@ module Awestruct
 
       if ( path =~ /\.haml$/ )
         page = HamlFile.new( site, path, fixed_relative_path )
+      elsif ( path =~ /\.erb$/ )
+        page = ErbFile.new( site, path, fixed_relative_path )
       elsif ( path =~ /\.md$/ )
         page = MarukuFile.new( site, path, fixed_relative_path )
       elsif ( path =~ /\.sass$/ )
         page = SassFile.new( site, path, fixed_relative_path )
+      elsif ( path =~ /\.scss$/ )
+        page = ScssFile.new( site, path, fixed_relative_path )
+      elsif ( path =~ /\.org$/ )
+        page = OrgModeFile.new( site, path, fixed_relative_path )
       elsif ( File.file?( path ) )
         page = VerbatimFile.new( site, path, fixed_relative_path )
       end
@@ -113,6 +122,9 @@ module Awestruct
           result = instance_eval( str )
           result
         end
+        def evaluate_erb(erb)
+          erb.result( binding ) 
+        end
       end
       context
     end
@@ -239,7 +251,7 @@ module Awestruct
           else
             site.send( "#{k}=", v )
           end
-        end
+        end if data
 
         profile_data.each do |k,v|
           site.send( "#{k}=", v )
@@ -267,6 +279,7 @@ module Awestruct
       dir_pathname = Pathname.new( dir )
       site.pages.clear
       Find.find( dir ) do |path|
+        next if path == dir
         basename = File.basename( path )
         if ( basename == '.htaccess' )
           #special case

data/lib/awestruct/erb_file.rb

@@ -0,0 +1,24 @@
+
+require 'haml'
+require 'awestruct/front_matter_file'
+require 'awestruct/erbable'
+
+module Awestruct
+  class ErbFile < FrontMatterFile
+
+    include Erbable
+
+    def initialize(site, source_path, relative_source_path)
+      super(site, source_path, relative_source_path)
+    end
+
+    def output_filename
+      File.basename( self.source_path, '.erb' )
+    end
+
+    def output_extension
+      File.extname( output_filename )
+    end
+
+  end
+end

data/lib/awestruct/erbable.rb

@@ -0,0 +1,19 @@
+require 'sass'
+
+require 'compass'
+
+module Awestruct
+  module Erbable
+
+    def render(context)
+      erb = ERB.new( raw_page_content )
+      context.evaluate_erb( erb )
+    end
+
+    def content
+      context = site.engine.create_context( self )
+      render( context )
+    end
+
+  end
+end

data/lib/awestruct/org_mode_file.rb

@@ -0,0 +1,24 @@
+
+require 'sass'
+require 'awestruct/front_matter_file'
+require 'awestruct/org_modeable'
+
+module Awestruct
+  class OrgModeFile < FrontMatterFile
+
+    include OrgModeable
+
+    def initialize(site, source_path, relative_source_path)
+      super( site, source_path, relative_source_path )
+    end
+
+    def output_filename
+      File.basename( self.source_path, '.org' ) + output_extension
+    end
+
+    def output_extension
+      '.html'
+    end
+
+  end
+end

data/lib/awestruct/org_modeable.rb

@@ -0,0 +1,16 @@
+
+require 'org-ruby'
+
+module Awestruct
+  module OrgModeable
+
+    def render(context)
+      Orgmode::Parser.new(raw_page_content).to_html
+    end
+
+    def output_extension
+      'html'
+    end
+
+  end
+end

data/lib/awestruct/scss_file.rb

@@ -0,0 +1,20 @@
+
+require 'sass'
+require 'awestruct/renderable_file'
+require 'awestruct/sassable'
+
+module Awestruct
+  class ScssFile < RenderableFile
+
+    include Sassable
+
+    def initialize(site, source_path, relative_source_path)
+      super( site, source_path, relative_source_path )
+    end
+ 
+    def output_filename
+      File.basename( source_path, '.scss' ) + '.css'
+    end
+
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awestruct
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Bob McWhirter
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -05:00
+date: 2010-06-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: haml
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: maruku
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -57,9 +64,11 @@ dependencies:
   name: compass
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -69,9 +78,11 @@ dependencies:
   name: mongrel
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -95,6 +106,8 @@ files:
 - lib/awestruct/config.rb
 - lib/awestruct/context_helper.rb
 - lib/awestruct/engine.rb
+- lib/awestruct/erb_file.rb
+- lib/awestruct/erbable.rb
 - lib/awestruct/extensions/atomizer.rb
 - lib/awestruct/extensions/google_analytics.rb
 - lib/awestruct/extensions/indexifier.rb
@@ -107,10 +120,13 @@ files:
 - lib/awestruct/hamlable.rb
 - lib/awestruct/maruku_file.rb
 - lib/awestruct/marukuable.rb
+- lib/awestruct/org_mode_file.rb
+- lib/awestruct/org_modeable.rb
 - lib/awestruct/renderable.rb
 - lib/awestruct/renderable_file.rb
 - lib/awestruct/sass_file.rb
 - lib/awestruct/sassable.rb
+- lib/awestruct/scss_file.rb
 - lib/awestruct/site.rb
 - lib/awestruct/util/default_inflections.rb
 - lib/awestruct/util/inflector.rb
@@ -119,6 +135,7 @@ files:
 - lib/awestruct/commands/base_index.html.haml
 - lib/awestruct/commands/base_layout.html.haml
 - lib/awestruct/extensions/template.atom.haml
+- bin/awestruct
 has_rdoc: true
 homepage: 
 licenses: []
@@ -129,23 +146,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Static site-baking utility