awestruct 0.2.10 → 0.2.11

data/bin/awestruct

@@ -34,7 +34,7 @@ def parse(args)
       options.init     = init
       options.generate = false
     end
-    opts.on( '-f', '--framework FRAMEWORK', 'Specify a framework during initialization' ) do |framework|
+    opts.on( '-f', '--framework FRAMEWORK', 'Specify a compass framework during initialization (blueprint, 960)' ) do |framework|
       options.framework = framework
     end
     opts.on( '--[no-]scaffold', 'Create scaffolding during initialization (default: true)' ) do |s|
@@ -91,6 +91,7 @@ def parse(args)
     opts.on_tail("-v", "--version", "Display the version") do
       puts "Awestruct: #{Awestruct::VERSION}"
       puts "http://awestruct.org/"
+      exit
     end
 
 
@@ -212,37 +213,45 @@ if ( options.auto )
     monitor = FSSM::Monitor.new
 
     call_generate = lambda do |base, relative|
-      if !(relative =~ /.*~/)
-        puts "Triggered regeneration #{base} #{relative}"
-        generate_cmd.run
-        puts "Done"
-        if relative == '.'
-          # It's necessary to restart the monitor on individual files
-          # after a change is handled
-          monitor.file(base) do
-            update &call_generate
-            create &call_generate
-          end
-        end
+      # Convert to absolute path and append file separator if necessary.
+      base = File::expand_path(base)
+      if base[base.length - 1] != File::SEPARATOR
+        base += File::SEPARATOR
       end
-    end
 
-    Dir.entries(config.input_dir).each do |sub|
-      if !(sub =~ /^(_site|_tmp|\.git|\.gitignore|\.sass-cache|\.|\.\.).*/)
-        if File::directory? File.join(config.input_dir, sub)
-          monitor.path(sub) do
-            update &call_generate
-            create &call_generate
-          end
-        elsif
-          monitor.file(sub) do
-            update &call_generate
-            create &call_generate
-          end
+      # Filter out bad input just in case.
+      if base.length < config.input_dir.length or config.input_dir != base[0..config.input_dir.length]
+        return
+      end
+
+      path = base + relative
+      path = path[config.input_dir.length..path.length]
+
+      if path =~ /^(_site|_tmp|\.git|\.gitignore|\.sass-cache|\.|\.\.).*/
+        return
+      end
+      if path =~ /.*(~|\.(swp|bak|tmp))$/
+        return
+      end
+
+      puts "Triggered regeneration: #{path}"
+      generate_cmd.run
+      puts "Done"
+      if relative == '.'
+        # It's necessary to restart the monitor on individual files
+        # after a change is handled
+        monitor.file(base) do
+          update &call_generate
+          create &call_generate
         end
       end
     end
 
+    monitor.path(config.input_dir) do
+      update &call_generate
+      create &call_generate
+    end
+
     monitor.run
   }
 end

data/lib/awestruct/config.rb

@@ -20,7 +20,8 @@ module Awestruct
       @extension_dir  = File.join(dir, '_ext')
       @skin_dir       = File.join(dir, '_skin')
       @tmp_dir        = File.join(dir, '_tmp')
-      @ignore         = [ ]
+      @ignore         = File.exists?(ignore_file = File.join(dir, ".awestruct_ignore")) ? IO.read(ignore_file).each_line.map(&:strip) : []
+      @ignore         = Dir[*@ignore]
     end
 
   end

data/lib/awestruct/engine.rb

@@ -166,7 +166,7 @@ module Awestruct
     private
 
     def adjust_load_path
-      ext_dir = File.join( config.extension_dir ) 
+      ext_dir = File.join( config.extension_dir )
       if ( $LOAD_PATH.index( ext_dir ).nil? )
         $LOAD_PATH << ext_dir
       end
@@ -325,7 +325,7 @@ module Awestruct
 
     def load_yamls
       Dir[ File.join( config.config_dir, '*.yml' ) ].each do |yaml_path|
-        load_yaml( yaml_path ) unless ( File.basename( yaml_path ) == 'site.yml' ) 
+        load_yaml( yaml_path ) unless ( File.basename( yaml_path ) == 'site.yml' )
       end
     end
 
@@ -350,25 +350,27 @@ module Awestruct
     end
 
     def load_pages()
-      site.pages.clear
+      visited_pages = {}
       dir_pathname = Pathname.new( dir )
       Find.find( dir ) do |path|
         next if path == dir
         basename = File.basename( path )
         if ( basename == '.htaccess' )
           #special case
-        elsif ( config.ignore.include?( basename ) || ( basename =~ /^[_.]/ ) )
+        elsif ( basename =~ /^[_.]/ )
           Find.prune
           next
         end
-        unless ( site.has_page?( path ) )
-          file_pathname = Pathname.new( path )
-          relative_path = file_pathname.relative_path_from( dir_pathname ).to_s
-          page = load_page( path, :relative_path => relative_path )
-          if ( page )
-            inherit_front_matter( page )
-            site.pages << page
-          end
+        file_pathname = Pathname.new( path )
+        relative_path = file_pathname.relative_path_from( dir_pathname ).to_s
+        if config.ignore.include?(relative_path)
+          Find.prune
+          next
+        end
+        page = load_page( path, :relative_path => relative_path )
+        if ( page )
+          inherit_front_matter( page )
+          visited_pages[ path ] = page
         end
       end
 
@@ -379,21 +381,25 @@ module Awestruct
           basename = File.basename( path )
           if ( basename == '.htaccess' )
             #special case
-          elsif ( config.ignore.include?( basename ) || ( basename =~ /^[_.]/ ) )
+          elsif ( basename =~ /^[_.]/ )
             Find.prune
             next
           end
-          unless ( site.has_page?( path ) )
-            file_pathname = Pathname.new( path )
-            relative_path = file_pathname.relative_path_from( skin_dir_pathname ).to_s
-            page = load_page( path, :relative_path => relative_path )
-            if ( page )
-              inherit_front_matter( page )
-              site.pages << page
-            end
+          file_pathname = Pathname.new( path )
+          relative_path = file_pathname.relative_path_from( skin_dir_pathname ).to_s
+          if config.ignore.include?(relative_path)
+            Find.prune
+            next
+          end
+          page = load_page( path, :relative_path => relative_path )
+          if ( page )
+            inherit_front_matter( page )
+            visited_pages[ path ] = page
           end
         end
       end
+
+      site.pages = visited_pages.values
     end
 
     def massage_yaml(obj)
@@ -419,43 +425,43 @@ module Awestruct
       pipeline = nil
       skin_pipeline = nil
 
-      ext_dir = File.join( config.extension_dir ) 
+      ext_dir = File.join( config.extension_dir )
       pipeline_file = File.join( ext_dir, 'pipeline.rb' )
       if ( File.exists?( pipeline_file ) )
-        pipeline = eval File.read( pipeline_file )
+        pipeline = eval(File.read( pipeline_file ), nil, pipeline_file, 1)
         @helpers = pipeline.helpers || []
         @transformers = pipeline.transformers || []
         watched_dirs << ext_dir.to_s
       end
 
       if ( skin_dir )
-        skin_ext_dir = File.join( skin_dir, config.extension_dir )
+        skin_ext_dir = File.join( skin_dir, config.extension_dir.sub(/^#{Dir.pwd}/, "") )
         if ( $LOAD_PATH.index( skin_ext_dir ).nil? )
           $LOAD_PATH << skin_ext_dir
         end
         skin_pipeline_file = File.join( skin_ext_dir, 'pipeline.rb' )
         if ( File.exists?( skin_pipeline_file ) )
-          skin_pipeline = eval File.read( skin_pipeline_file )
+          skin_pipeline = eval(File.read( skin_pipeline_file ), nil, skin_pipeline_file, 1)
           @helpers = ( @helpers + skin_pipeline.helpers || [] ).flatten
           @transformers = ( @transformers + skin_pipeline.transformers || [] ).flatten
           watched_dirs << skin_dir.to_s
         end
       end
-      
+
       #if _partials directory (from Partial helper) is present, watch
       partials = File.join( '_partials' )
       if ( File.exists?( partials ) )
         watched_dirs << partials
       end
-      
+
       pipeline.watch(watched_dirs) if pipeline
       skin_pipeline.watch(watched_dirs) if skin_pipeline
       check_dir_for_change(watched_dirs)
-      
+
       pipeline.execute( site ) if pipeline
       skin_pipeline.execute( site ) if skin_pipeline
     end
-    
+
     def check_dir_for_change(watched_dirs)
       watched_dirs.each do |dir|
         Dir.chdir(dir){check_dir_for_change_recursively()}

data/lib/awestruct/extensions/paginator.rb

@@ -52,7 +52,7 @@ module Awestruct
         @window_size  = opts[:window_size] || 2
         @remove_input = opts.has_key?( :remove_input ) ? opts[:remove_input] : true
         @output_prefix = opts[:output_prefix] || File.dirname( @input_path )
-        @collection    = opts[:collection] 
+        @collection    = opts[:collection]
       end
 
       def execute(site)
@@ -74,7 +74,7 @@ module Awestruct
           site.pages << page
           paginated_pages << page
           i = i + 1
-        end 
+        end
 
         if ( @remove_input )
           site.pages.reject!{|page|
@@ -84,10 +84,10 @@ module Awestruct
 
         prev_page = nil
         paginated_pages.each_with_index do |page,i|
-          page.posts.current_page       = page
-          page.posts.current_page_index = i
-          page.posts.pages              = paginated_pages
-          page.posts.window             = 1
+          page.send( @prop_name ).current_page       = page
+          page.send( @prop_name ).current_page_index = i
+          page.send( @prop_name ).pages              = paginated_pages
+          page.send( @prop_name ).window             = 1
 
           if ( prev_page != nil )
             prev_page.send( @prop_name ).next_page = page

data/lib/awestruct/site.rb

@@ -25,7 +25,7 @@ module Awestruct
     end
 
     def has_page?(path)
-      ! pages.find{|e| e.path == path}.nil?
+      ! pages.find{|e| e.source_path == path}.nil?
     end
 
     def output_path(path, ext=nil)

data/lib/awestruct/version.rb

@@ -1,4 +1,4 @@
 
 module Awestruct
-  VERSION='0.2.10'
+  VERSION='0.2.11'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 10
-  version: 0.2.10
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - Bob McWhirter
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-17 00:00:00 -05:00
+date: 2012-01-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency