awestruct 0.2.3 → 0.2.4

data/bin/awestruct

@@ -9,6 +9,7 @@ require 'awestruct/commands/generate'
 require 'awestruct/commands/server'
 require 'awestruct/commands/deploy'
 require 'yaml'
+require 'fssm'
 
 def parse(args)
   options = OpenStruct.new( {
@@ -111,7 +112,7 @@ unless options.init
         @profiles_data[options.profile]
       else
         # if no profile given, pick the first with deploy config
-        options.profile, profile_data = @profiles_data.select { |k,v| v['deploy'] }.first
+        options.profile, profile_data = @profiles_data.select { |k,v| v && v['deploy'] }.first
         profile_data
       end
     end
@@ -200,10 +201,34 @@ threads = []
 if ( options.auto )
   threads << Thread.new {
     generate_cmd = Awestruct::Commands::Generate.new( config, options.profile, options.base_url, default_base_url )
-    while ( true )
-      generate_cmd.run
-      sleep(1)
+
+    monitor = FSSM::Monitor.new
+
+    call_generate = lambda do |base, relative|
+      if !(relative =~ /.*~/)
+        puts "Triggered regeneration #{base} #{relative}"
+        generate_cmd.run
+        puts "Done"
+      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
+        end
+      end
+    end
+
+    monitor.run
   }
 end
 

data/lib/awestruct/engine.rb

@@ -1,3 +1,4 @@
+
 require 'ostruct'
 require 'find'
 require 'compass'
@@ -52,7 +53,7 @@ module Awestruct
       @site.engine = self
 
       @helpers = []
-      @max_yaml_mtime = nil
+      @max_site_mtime = nil
     end
 
     def skin_dir
@@ -62,7 +63,7 @@ module Awestruct
     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
+      @max_site_mtime = nil
       load_site_yaml(profile)
       load_yamls
       set_base_url
@@ -132,7 +133,7 @@ module Awestruct
             str = str || ''
             str = str.gsub( /\\/, '\\\\\\\\' )
             str = str.gsub( /\\\\#/, '\\#' )
-            str = str.gsub( '@', '\@' )
+            str = str.gsub( '@', '' ) #'\@' )
             str = "%@#{str}@"
             result = instance_eval( str )
             result
@@ -212,7 +213,7 @@ module Awestruct
       return true unless File.exist?( generated_path )
       now = Time.now
       generated_mtime = File.mtime( generated_path )
-      return true if ( ( @max_yaml_mtime || Time.at(0) ) > generated_mtime )
+      return true if ( ( @max_site_mtime || Time.at(0) ) > generated_mtime )
       source_mtime = File.mtime( page.source_path )
       return true if ( source_mtime > generated_mtime ) && ( source_mtime + 1 < now )
       ext = page.output_extension
@@ -276,8 +277,8 @@ module Awestruct
       site_yaml = File.join( 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
+        if ( mtime > ( @max_site_mtime || Time.at(0) ) )
+          @max_site_mtime = mtime
         end
         data = YAML.load( File.read( site_yaml ) )
         site.interpolate = true
@@ -304,8 +305,8 @@ module Awestruct
 
     def load_yaml(yaml_path)
       mtime = File.mtime( yaml_path )
-      if ( mtime > ( @max_yaml_mtime || Time.at(0) ) )
-        @max_yaml_mtime = mtime
+      if ( mtime > ( @max_site_mtime || Time.at(0) ) )
+        @max_site_mtime = mtime
       end
       data = YAML.load( File.read( yaml_path ) )
       name = File.basename( yaml_path, '.yml' )
@@ -376,7 +377,7 @@ module Awestruct
     end
 
     def load_extensions
-
+      watched_dirs = []
       pipeline = nil
       skin_pipeline = nil
 
@@ -389,6 +390,7 @@ module Awestruct
         pipeline = eval File.read( pipeline_file )
         @helpers = pipeline.helpers || []
         @transformers = pipeline.transformers || []
+        watched_dirs << ext_dir.to_s
       end
 
       if ( skin_dir )
@@ -401,12 +403,47 @@ module Awestruct
           skin_pipeline = eval File.read( skin_pipeline_file )
           @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()}
+      end
+    end
+
+    def check_dir_for_change_recursively()
+      directories=[]
+      Dir['*'].sort.each do |name|
+        if File.file?(name)
+          mtime = File.mtime(name)
+          if ( mtime > ( @max_site_mtime || Time.at(0) ) )
+            @max_site_mtime = mtime
+          end
+        elsif File.directory?(name)
+          directories << name
+        end
+      end
+      directories.each do |name|
+        #don't descend into . or .. on linux
+        Dir.chdir(name){check_dir_for_change_recursively()} if !Dir.pwd[File.expand_path(name)]
+      end
+    end
 
     def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
       if first_letter_in_uppercase

data/lib/awestruct/extensions/data_dir.rb

@@ -8,6 +8,9 @@ module Awestruct
         @data_dir = data_dir
       end
 
+      def watch(watched_dirs)
+          watched_dirs << @data_dir
+      end
 
       def execute(site)
     

data/lib/awestruct/extensions/pipeline.rb

@@ -18,6 +18,7 @@ module Awestruct
 
       def extension(ext)
         @extensions << ext
+        ext.transform(@transformers) if ext.respond_to?('transform')
       end
 
       def helper(helper)
@@ -33,8 +34,13 @@ module Awestruct
           ext.execute( site )
         end
       end
+
+      def watch(watched_dirs)
+        extensions.each do |ext|
+          ext.watch( watched_dirs ) if ext.respond_to?('watch')
+        end
+      end
     end
 
   end
 end
-    

data/lib/awestruct/extensions/posts.rb

@@ -12,26 +12,45 @@ module Awestruct
         posts = []
 
         site.pages.each do |page|
-          if ( page.relative_source_path =~ /^#{@path_prefix}\/(20[01][0-9])-([01][0-9])-([0123][0-9])-([^.]+)\..*$/ )
-            year  = $1
-            month = $2
-            day   = $3
-            slug  = $4
-            page.date = Time.utc( year.to_i, month.to_i, day.to_i )
-            page.slug = slug
-            context = OpenStruct.new({
-              :site=>site,
-              :page=>page,
-            })
-            #page.body = page.render( context )
-            page.output_path = "#{@path_prefix}/#{year}/#{month}/#{day}/#{slug}.html"
-            #page.layout = 'post'
-            posts << page
+          year, month, day, slug = nil
+
+          if ( page.relative_source_path =~ /^#{@path_prefix}\// )
+            if ( page.relative_source_path =~ /^#{@path_prefix}\/(20[01][0-9])-([01][0-9])-([0123][0-9])-([^.]+)\..*$/ )
+              year  = $1
+              month = $2
+              day   = $3
+              slug  = $4
+              page.date = Time.utc( year.to_i, month.to_i, day.to_i )
+            elsif (page.date)
+              page.relative_source_path =~ /^#{@path_prefix}\/(.*)\..*$/
+              date = page.date;
+              if date.kind_of? String
+                date = Time.parse page.date
+              end
+              year = date.year
+              month = date.month
+              day = date.day
+              page.date = Time.utc(year, month, day)
+              slug = $1
+            end
+
+            # if a date was found create a post
+            if( year and month and day)
+              page.slug = slug
+              context = OpenStruct.new({
+                :site=>site,
+                :page=>page,
+              })
+              #page.body = page.render( context )
+              page.output_path = "#{@path_prefix}/#{year}/#{month}/#{day}/#{slug}.html"
+              #page.layout = 'post'
+              posts << page
+            end
           end
         end
         
         posts = posts.sort_by{|each| [each.date, each.sequence || 0, File.mtime( each.source_path ), each.slug ] }.reverse
-        
+
         last = nil
         singular = @assign_to.to_s.singularize
         posts.each do |e|
@@ -41,7 +60,7 @@ module Awestruct
           end
           last = e
         end
-        
+
         site.send( "#{@assign_to}=", posts )
       end
     end

data/lib/awestruct/extensions/tagger.rb

@@ -60,11 +60,11 @@ module Awestruct
         span = max - min
         
         if span > 0
-          slice = span / 6
+          slice = span / 6.0
           ordered_tags.each do |tag|
             adjusted_size = tag.pages.size - min
             scaled_size = adjusted_size / slice
-            tag.group = ( tag.pages.size - min ) / slice
+            tag.group = (( tag.pages.size - min ) / slice).ceil
           end
         else
           ordered_tags.each do |tag|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Bob McWhirter
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-20 00:00:00 -04:00
+date: 2011-10-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,13 +104,13 @@ dependencies:
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
-    - - <=
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 10
-        - 6
-        version: 0.10.6
+        - 11
+        - 5
+        version: 0.11.5
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -141,6 +141,20 @@ dependencies:
         version: 0.5.3
   type: :runtime
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: fssm
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 7
+        version: 0.2.7
+  type: :runtime
+  version_requirements: *id010
 description: 
 email: bob@mcwhirter.org
 executables: