awestruct 0.0.4 → 0.0.5

data/bin/awestruct

@@ -7,6 +7,7 @@ require 'optparse'
 require 'awestruct/commands/init'
 require 'awestruct/commands/generate'
 require 'awestruct/commands/server'
+require 'awestruct/commands/deploy'
 
 def parse(args)
   options = OpenStruct.new( {
@@ -20,6 +21,8 @@ def parse(args)
               :framework=>'compass',
               :scaffold=>true,
               :base_url=>nil,
+              :profile=>nil,
+              :deploy=>false,
             } )
 
   opts = OptionParser.new do |opts|
@@ -42,12 +45,21 @@ def parse(args)
     opts.on( '-u', '--url URL', 'Set site.base_url' ) do |url|
       options.base_url = url
     end
-    opts.on( '-d', '--dev',     'Run in development mode (--auto, --server and --url http://localhost:4242)' ) do |url|
-      options.base_url = 'http://localhost:4242'
+    opts.on( '-d', '--dev',     'Run in development mode (--auto, --server and -profile development)' ) do |url|
       options.server   = true
       options.auto     = true
       options.port     = 4242
+      options.profile  = 'development'
     end
+
+    opts.on( '-P', '--profile PROFILE', 'Specify a profile' ) do |profile|
+      options.profile = profile
+    end
+
+    opts.on( '--deploy', 'Deploy site' ) do |deploy|
+      options.deploy = deploy
+    end
+
     opts.on( '-a', '--auto', 'Auto-generate when changes are noticed' ) do |a|
       options.auto = a
     end
@@ -80,22 +92,79 @@ options = parse(ARGV)
 if ( options.init )
   if ( options.generate || options.auto || options.server )
     $stderr.puts "--init may not be used with --generate, --auto or --server"
+    exit
   end
   cmd = Awestruct::Commands::Init.new( Dir.pwd, options.framework, options.scaffold )
   cmd.run
   exit
 end
 
+if ( options.deploy )
+  if ( options.auto || options.server )
+    $stderr.puts "--init may not be used with --generate, --auto or --server"
+    exit
+  end
+
+  if ( ! options.profile )
+    $stderr.puts "You must specify a --profile when using --deploy"
+    exit
+  end
+
+
+  site_dir = File.join( Dir.pwd, '_site' )
+  if ( ! File.exist?( site_dir ) )
+    $stderr.puts "No _site/ generated yet."
+    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"
+    exit
+  end
+
+  profile_data = profiles_data[options.profile]
+
+  if ( profile_data.nil? )
+    $stderr.puts "Unknown profile '#{options.profile}'"
+    exit
+  end
+
+  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.run
+  exit
+end
+
 threads = []
 
+default_base_url = 'http://localhost:4242'
+
+if ( options.server )
+  hostname = ( options.bind_addr == '0.0.0.0' ? 'localhost' : options.bind_addr )
+  default_base_url = "http://#{hostname}:#{options.port}"
+end
+
 if ( options.generate )
-  cmd = Awestruct::Commands::Generate.new( Dir.pwd, options.base_url, options.force )
+  cmd = Awestruct::Commands::Generate.new( Dir.pwd, options.profile, options.base_url, default_base_url, options.force )
   cmd.run
 end
 
 if ( options.auto )
   threads << Thread.new {
-    generate_cmd = Awestruct::Commands::Generate.new( Dir.pwd, options.base_url )
+    generate_cmd = Awestruct::Commands::Generate.new( Dir.pwd, options.profile, options.base_url, default_base_url )
     while ( true )
       generate_cmd.run
       sleep(1)

data/lib/awestruct/commands/deploy.rb

@@ -0,0 +1,36 @@
+require 'open3'
+
+module Awestruct
+  module Commands
+
+    class Deploy
+      def initialize(site_path, opts)
+        @site_path = File.join( site_path, '/' )
+        @host      = opts['host']
+        @path      = File.join( opts['path'], '/' )
+      end
+
+      def run
+        cmd = "rsync -rv --delete #{@site_path} #{@host}:#{@path}"
+        puts "running #{cmd}"
+        Open3.popen3( cmd ) do |stdin, stdout, stderr| 
+          stdin.close
+          threads = []
+          threads << Thread.new(stdout) do |i|
+            while ( ! i.eof? )
+              line = i.readline 
+              puts line
+            end
+          end
+          threads << Thread.new(stderr) do |i|
+            while ( ! i.eof? )
+              line = i.readline 
+              puts line
+            end
+          end
+          threads.each{|t|t.join}
+        end
+      end
+    end
+  end
+end

data/lib/awestruct/commands/generate.rb

@@ -4,16 +4,18 @@ module Awestruct
   module Commands
     class Generate
 
-      def initialize(dir=Dir.pwd, base_url=nil, force=false)
-        @dir   = dir
-        @base_url = base_url
-        @force = force
-        @engine = Awestruct::Engine.new( @dir )
+      def initialize(dir=Dir.pwd, profile=nil, base_url=nil, default_base_url='http://localhost:4242', force=false)
+        @dir              = dir
+        @profile          = profile
+        @base_url         = base_url
+        @default_base_url = default_base_url
+        @force            = force
+        @engine           = Awestruct::Engine.new( @dir )
       end
 
       def run()
         begin
-          @engine.generate( @base_url, @force )
+          @engine.generate( @profile, @base_url, @default_base_url, @force )
         rescue =>e
           puts e
           puts e.backtrace

data/lib/awestruct/context_helper.rb

@@ -0,0 +1,34 @@
+require 'hpricot'
+
+module Awestruct
+  module ContextHelper
+    def html_to_text(str)
+      str.gsub( /<[^>]+>/, '' )
+    end
+  
+    def summarize(text, numwords=20)
+      text.split()[0, numwords].join(' ')
+    end
+  
+    def fully_qualify_urls(base_url, text)
+      doc = Hpricot( text )
+   
+      doc.search( "//a" ).each do |a|
+        a['href'] = fix_url( base_url, a['href'] )
+      end
+      doc.search( "//link" ).each do |link|
+        link['href'] = fix_url( base_url, link['href'] )
+      end
+      doc.search( "//img" ).each do |img|
+        img['src'] = fix_url( base_url, img['src'] )
+      end
+      return doc.to_s
+    end
+  
+    def fix_url(base_url, url)
+      return url unless ( url =~ /^\// )
+      "#{base_url}#{url}"
+    end
+  end
+
+end

data/lib/awestruct/engine.rb

@@ -11,13 +11,15 @@ require 'awestruct/maruku_file'
 require 'awestruct/sass_file'
 require 'awestruct/verbatim_file'
 
-require 'awestruct/haml_helpers'
+require 'awestruct/context_helper'
 
 require 'awestruct/extensions/pipeline'
 require 'awestruct/extensions/posts'
 require 'awestruct/extensions/indexifier'
 require 'awestruct/extensions/paginator'
 require 'awestruct/extensions/atomizer'
+require 'awestruct/extensions/intense_debate'
+require 'awestruct/extensions/google_analytics'
 
 require 'awestruct/util/inflector'
 require 'awestruct/util/default_inflections'
@@ -36,18 +38,24 @@ module Awestruct
       @site   = Site.new( @dir )
       @site.engine = self
       @site.tmp_dir = File.join( dir, '_tmp' )
+      @helpers = []
       FileUtils.mkdir_p( @site.tmp_dir )
       FileUtils.mkdir_p( @site.output_dir )
       @max_yaml_mtime = nil
     end
 
-    def generate(base_url=nil, force=false)
-      @base_url = base_url
-      load_layouts
+    def generate(profile=nil, base_url=nil, default_base_url=nil, force=false)
+      @base_url         = base_url
+      @default_base_url = default_base_url
+      @max_yaml_mtime = nil
+      load_site_yaml(profile)
       load_yamls
+      set_base_url
+      load_layouts
       load_pages
       load_extensions
       set_urls
+      configure_compass 
       generate_files(force)
     end
 
@@ -88,9 +96,54 @@ module Awestruct
       page
     end
 
+    def create_context(page, content='')
+      context = OpenStruct.new( :site=>site, :content=>content )
+      context.extend( Awestruct::ContextHelper )
+      @helpers.each do |h|
+        context.extend( h )
+      end
+      context.page = page
+      class << context
+        def interpolate_string(str)
+          str = str || ''
+          str = str.gsub( /\\/, '\\\\\\\\' )
+          str = str.gsub( /\\\\#/, '\\#' )
+          str = str.gsub( '@', '\@' )
+          str = "%@#{str}@"
+          result = instance_eval( str )
+          result
+        end
+      end
+      context
+    end
 
     private
 
+    def configure_compass
+      Compass.configuration.project_type    = :standalone
+      Compass.configuration.project_path    = dir
+      Compass.configuration.css_dir         = File.join( dir, config.output_dir, 'stylesheets' )
+      Compass.configuration.sass_dir        = File.join( dir, 'stylesheets' )
+      Compass.configuration.images_dir      = File.join( dir, 'images' )
+      Compass.configuration.javascripts_dir = File.join( dir, 'javascripts' )
+    end
+
+    def set_base_url
+      if ( @base_url )
+        site.base_url = @base_url
+      end
+
+      if ( site.base_url.nil? )
+        site.base_url = @default_base_url 
+      end
+
+      if ( site.base_url ) 
+        if ( site.base_url =~ /^(.*)\/$/ )
+          site.base_url = $1
+        end
+      end
+    end
+
     def set_urls
       site.pages.each do |page|
         page_path = page.output_path
@@ -145,20 +198,8 @@ module Awestruct
       false
     end
 
-    def self.create_context(site, page, content='')
-      context = OpenStruct.new( :site=>site, :content=>content )
-      context.page = page
-      class << context
-        def interpolate_string(str)
-          result = instance_eval("%@#{(str||'').gsub('@', '\@')}@")
-          result
-        end
-      end
-      context
-    end
-
     def render_page(page, with_layouts=true)
-      context = Engine.create_context( site, page )
+      context = create_context( page )
       rendered = page.render( context )
       if ( with_layouts )
         cur = page
@@ -183,26 +224,45 @@ module Awestruct
       end
     end
 
-    def load_yamls
-      @max_yaml_mtime = nil
-      Dir[ File.join( dir, config.config_dir, '*.yml' ) ].each do |yaml_path|
-        mtime = File.mtime( yaml_path )
+    def load_site_yaml(profile)
+      site_yaml = File.join( dir, config.config_dir, 'site.yml' )
+      if ( File.exist?( site_yaml ) )
+        mtime = File.mtime( site_yaml )
         if ( mtime > ( @max_yaml_mtime || Time.at(0) ) )
           @max_yaml_mtime = mtime
         end
-        data = YAML.load( File.read( yaml_path ) )
-        name = File.basename( yaml_path, '.yml' )
-        if ( name == 'site' )
-          data.each do |k,v|
+        data = YAML.load( File.read( site_yaml ) )
+        profile_data = {}
+        data.each do |k,v|
+          if ( ( k == 'profiles' ) && ( ! profile.nil? ) )
+            profile_data = ( v[profile] || {} )
+          else
             site.send( "#{k}=", v )
           end
-          ( site.base_url = @base_url ) if ( @base_url )
-        else
-          site.send( "#{name}=", massage_yaml( data ) )
+        end
+
+        profile_data.each do |k,v|
+          site.send( "#{k}=", v )
         end
       end
     end
 
+    def load_yamls
+      Dir[ File.join( dir, config.config_dir, '*.yml' ) ].each do |yaml_path|
+        load_yaml( yaml_path ) unless ( File.basename( yaml_path ) == 'site.yml' ) 
+      end
+    end
+
+    def load_yaml(yaml_path)
+      mtime = File.mtime( yaml_path )
+      if ( mtime > ( @max_yaml_mtime || Time.at(0) ) )
+        @max_yaml_mtime = mtime
+      end
+      data = YAML.load( File.read( yaml_path ) )
+      name = File.basename( yaml_path, '.yml' )
+      site.send( "#{name}=", massage_yaml( data ) )
+    end
+
     def load_pages()
       dir_pathname = Pathname.new( dir )
       site.pages.clear
@@ -251,25 +311,7 @@ module Awestruct
       end
       pipeline = eval File.read( pipeline_file )
       pipeline.execute( site )
-    end
-
-    def old_load_extensions
-      ext_dir_pathname = Pathname.new( File.join( dir, config.extension_dir ) )
-      Dir[ File.join( dir, config.extension_dir, '*.rb' ) ].each do |path|
-        ext_pathname = Pathname.new( path )
-        relative_path = ext_pathname.relative_path_from( ext_dir_pathname ).to_s
-        dir_name = File.dirname( relative_path )
-        if ( dir_name == '.' )
-          simple_path = File.basename( relative_path, '.rb' ) 
-        else
-          simple_path = File.join( dir_name, File.basename( relative_path, '.rb' ) )
-        end
-        ext_classname = camelize(simple_path)
-        require File.join( dir, config.extension_dir, simple_path )
-        ext_class = eval( ext_classname )
-        ext = ext_class.new
-        ext.execute( site )
-      end
+      @helpers = pipeline.helpers || []
     end
 
     def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)

data/lib/awestruct/extensions/google_analytics.rb

@@ -0,0 +1,22 @@
+
+module Awestruct
+  module Extensions
+    module GoogleAnalytics
+
+      def google_analytics()
+        html = ''
+        html += %Q(<script type="text/javascript">\n)
+        html += %Q(var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");\n)
+        html += %Q(document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));\n)
+        html += %Q(</script>\n)
+        html += %Q(<script type="text/javascript">\n)
+        html += %Q(try {\n)
+        html += %Q(var pageTracker = _gat._getTracker("#{site.google_analytics}");\n)
+        html += %Q(pageTracker._trackPageview();\n)
+        html += %Q(} catch(err) {}</script>\n)
+        html 
+      end
+    end
+  end
+
+end

data/lib/awestruct/extensions/intense_debate.rb

@@ -1,26 +1,19 @@
 
-#module Awestruct
-  #module Extension
-    #class IntenseDebate
-#
-      #def execute(site)
-      #end
-#
-    #end
-  #end
-#end
+module Awestruct
+  module Extensions
+    module IntenseDebate
 
-module Haml::Helpers
-
-  def intense_debate_comments()
-    html = %Q(<script>\n)
-    html += %Q(  var idcomments_acct='#{site.intense_debate_acct}';\n)
-    html += %Q(  var idcomments_post_id;\n)
-    html += %Q(  var idcomments_post_url;\n)
-    html += %Q(</script>\n)
-    html += %Q(<span id="IDCommentsPostTitle" style="display:none"></span>\n)
-    html += %Q(<script type='text/javascript' src='http://www.intensedebate.com/js/genericCommentWrapperV2.js'></script>\n)
-    html 
+      def intense_debate_comments()
+        html = %Q(<script>\n)
+        html += %Q(  var idcomments_acct='#{site.intense_debate_acct}';\n)
+        html += %Q(  var idcomments_post_id;\n)
+        html += %Q(  var idcomments_post_url;\n)
+        html += %Q(</script>\n)
+        html += %Q(<span id="IDCommentsPostTitle" style="display:none"></span>\n)
+        html += %Q(<script type='text/javascript' src='http://www.intensedebate.com/js/genericCommentWrapperV2.js'></script>\n)
+        html 
+      end
+    end
   end
 
 end

data/lib/awestruct/extensions/pipeline.rb

@@ -4,9 +4,11 @@ module Awestruct
     class Pipeline
 
       attr_reader :extensions
+      attr_reader :helpers
 
       def initialize(&block)
         @extensions = []
+        @helpers    = []
         instance_eval &block if block
       end
 
@@ -14,6 +16,10 @@ module Awestruct
         @extensions << ext
       end
 
+      def helper(helper)
+        @helpers << helper
+      end
+
       def execute(site)
         extensions.each do |ext|
           ext.execute( site )

data/lib/awestruct/extensions/posts.rb

@@ -3,7 +3,7 @@ module Awestruct
   module Extensions
     class Posts
 
-      def initialize(path_prefix, assign_to=:posts)
+      def initialize(path_prefix='', assign_to=:posts)
         @path_prefix = path_prefix
         @assign_to   = assign_to
       end
@@ -32,10 +32,11 @@ module Awestruct
         posts = posts.sort_by{|each| [each.date, File.mtime( each.source_path ), each.slug ] }.reverse
         
         last = nil
+        singular = @assign_to.to_s.singularize
         posts.each do |e|
           if ( last != nil )
-             e.next = last
-             last.previous = e
+             e.send( "next_#{singular}=", last )
+             last.send( "previous_#{singular}=", e )
           end
           last = e
         end

data/lib/awestruct/hamlable.rb

@@ -14,7 +14,7 @@ module Awestruct
     end
 
     def content
-      context = OpenStruct.new( :site=>site, :page=>self )
+      context = site.engine.create_context( self )
       render( context )
     end
   end

data/lib/awestruct/marukuable.rb

@@ -16,7 +16,7 @@ module Awestruct
     end
 
     def content
-      context = Awestruct::Engine.create_context( site, self )
+      context = site.engine.create_context( self )
       render( context )
     end
   end

data/lib/awestruct/sassable.rb

@@ -6,13 +6,17 @@ module Awestruct
   module Sassable
 
     def render(context)
-      sass_opts = {
-        :load_paths => [
-          File.dirname( self.source_path ),
-          Compass::Frameworks['compass'].stylesheets_directory,
-          Compass::Frameworks['blueprint'].stylesheets_directory,
-        ],
-      }
+      #sass_opts = {
+        #:load_paths => [
+          #File.dirname( self.source_path ),
+          #Compass::Frameworks['compass'].stylesheets_directory,
+          #Compass::Frameworks['blueprint'].stylesheets_directory,
+        #],
+      #}
+      sass_opts = Compass.sass_engine_options
+      sass_opts[:load_paths] ||= []
+      sass_opts[:load_paths] << File.dirname( self.source_path ) 
+
       sass_engine = Sass::Engine.new( raw_page_content, sass_opts )
       sass_engine.render
     end

data/lib/awestruct/site.rb

@@ -10,7 +10,7 @@ module Awestruct
     attr_accessor :pages
 
     def initialize(dir)
-      super({ :base_url=>'http://localhost:4242' })
+      super({})
 
       @dir = dir
       @output_dir = File.join( dir, '_site' )

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Bob McWhirter
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 -05:00
+date: 2010-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,13 +87,16 @@ extra_rdoc_files: []
 
 files: 
 - lib/awestruct/commands/base_pipeline.rb
+- lib/awestruct/commands/deploy.rb
 - lib/awestruct/commands/generate.rb
 - lib/awestruct/commands/init.rb
 - lib/awestruct/commands/manifest.rb
 - lib/awestruct/commands/server.rb
 - lib/awestruct/config.rb
+- lib/awestruct/context_helper.rb
 - lib/awestruct/engine.rb
 - lib/awestruct/extensions/atomizer.rb
+- lib/awestruct/extensions/google_analytics.rb
 - lib/awestruct/extensions/indexifier.rb
 - lib/awestruct/extensions/intense_debate.rb
 - lib/awestruct/extensions/paginator.rb
@@ -101,7 +104,6 @@ files:
 - lib/awestruct/extensions/posts.rb
 - lib/awestruct/front_matter_file.rb
 - lib/awestruct/haml_file.rb
-- lib/awestruct/haml_helpers.rb
 - lib/awestruct/hamlable.rb
 - lib/awestruct/maruku_file.rb
 - lib/awestruct/marukuable.rb

data/lib/awestruct/haml_helpers.rb

@@ -1,32 +0,0 @@
-require 'hpricot'
-
-module Haml::Helpers
-  def html_to_text(str)
-    str.gsub( /<[^>]+>/, '' )
-  end
-
-  def summarize(text, numwords=20)
-    text.split()[0, numwords].join(' ')
-  end
-
-  def fully_qualify_urls(base_url, text)
-    doc = Hpricot( text )
- 
-    doc.search( "//a" ).each do |a|
-      a['href'] = fix_url( base_url, a['href'] )
-    end
-    doc.search( "//link" ).each do |link|
-      link['href'] = fix_url( base_url, link['href'] )
-    end
-    doc.search( "//img" ).each do |img|
-      img['src'] = fix_url( base_url, img['src'] )
-    end
-    return doc.to_s
-  end
-
-  def fix_url(base_url, url)
-    return url unless ( url =~ /^\// )
-    "#{base_url}#{url}"
-  end
-
-end