awestruct 0.2.18 → 0.4.2.x1

data/lib/awestruct/{commands → cli}/generate.rb

@@ -1,11 +1,10 @@
 require 'awestruct/engine'
 
 module Awestruct
-  module Commands
+  module CLI
     class Generate
 
       def initialize(config, profile=nil, base_url=nil, default_base_url='http://localhost:4242', force=false)
-        @dir              = config.input_dir
         @profile          = profile
         @base_url         = base_url
         @default_base_url = default_base_url
@@ -15,7 +14,8 @@ module Awestruct
 
       def run()
         begin
-          @engine.generate( @profile, @base_url, @default_base_url, @force )
+          puts "Generating site"
+          @engine.run( @profile, @base_url, @default_base_url, @force )
         rescue =>e
           puts e
           puts e.backtrace

data/lib/awestruct/cli/invoker.rb

@@ -0,0 +1,120 @@
+require 'awestruct/cli/options'
+
+require 'awestruct/cli/generate'
+require 'awestruct/cli/auto'
+require 'awestruct/cli/server'
+require 'awestruct/cli/deploy'
+
+require 'pathname'
+
+module Awestruct
+  module CLI
+    class Invoker
+
+      attr_reader :options
+
+      attr_reader :config
+      attr_reader :profile
+
+      def initialize(*options)
+        options = options.flatten
+        if ( ( ! options.empty? ) && ( options.first === Awestruct::CLI::Options ) )
+          @options = options.first
+        else
+          @options = Awestruct::CLI::Options.parse! options
+        end
+        @threads = []
+        @profile = nil
+      end
+
+      def invoke!
+        load_profile() unless ( options.init )
+
+        setup_config()
+
+        invoke_init()      if ( options.init )
+        invoke_script()    if ( options.script )
+        invoke_force()     if ( options.force )
+        invoke_generate()  if ( options.generate )
+        invoke_deploy()    if ( options.deploy )
+        invoke_server()    if ( options.server )
+        invoke_auto()      if ( options.auto )
+
+        wait_for_completion()
+      end
+
+      def load_profile()
+        site_yaml_file = File.join( Dir.pwd, '_config', 'site.yml' )
+        if ( File.exist?( site_yaml_file ) )
+          site_yaml      = YAML.load( File.read( site_yaml_file ) )
+          if site_yaml
+            profiles_data  = site_yaml['profiles'] || {}
+            @profile = if profiles_data.nil?
+              nil
+            else
+              if options.profile
+                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 && v['deploy'] }.first
+              end
+            end
+          end
+        end
+      end
+
+      def setup_config()
+        @config = Awestruct::Config.new( Dir.pwd )
+        @config.track_dependencies = true if ( options.auto )
+      end
+
+      def invoke_init()
+      end
+
+      def invoke_script()
+      end
+
+      def invoke_force()
+        FileUtils.rm_rf( File.join( config.dir, '.awestruct', 'dependency-cache' ) )
+        FileUtils.rm_rf( config.output_dir )
+      end
+
+      def invoke_generate()
+        Awestruct::CLI::Generate.new( config, profile, options.base_url, 'http://localhost:4242', options.force ).run
+      end
+
+      def invoke_deploy()
+        deploy_config = profile[ 'deploy' ]
+
+        if ( deploy_config.nil? )
+          $stderr.puts "No configuration for 'deploy'"
+          return
+        end
+
+        Awestruct::CLI::Deploy.new( config, deploy_config ).run
+      end
+
+      def invoke_auto()
+        run_in_thread( Awestruct::CLI::Auto.new( config ) )
+      end
+
+      def invoke_server()
+        run_in_thread( Awestruct::CLI::Server.new( './_site', options.bind_addr, options.port ) )
+      end
+
+
+      private
+
+      def run_in_thread(command)
+        @threads << Thread.new(command){|c| c.run}
+      end
+
+      def wait_for_completion()
+        @threads.each do |thr|
+          thr.join
+        end
+      end
+
+    end
+  end
+end

data/lib/awestruct/cli/options.rb

@@ -0,0 +1,116 @@
+require 'optparse'
+
+require 'awestruct/version'
+
+module Awestruct
+  module CLI
+    class Options
+
+      attr_accessor :generate
+      attr_accessor :server
+      attr_accessor :port
+      attr_accessor :bind_addr
+      attr_accessor :auto
+      attr_accessor :force
+      attr_accessor :init
+      attr_accessor :framework
+      attr_accessor :scaffold
+      attr_accessor :base_url
+      attr_accessor :profile
+      attr_accessor :deploy
+      attr_accessor :script
+
+      def initialize()
+        @generate  = true
+        @server    = false
+        @port      = 4242
+        @bind_addr = '0.0.0.0'
+        @auto      = false
+        @force     = false
+        @init      = false
+        @framework = 'compass'
+        @scaffold  = true
+        @base_url  = nil
+        @profile   = nil
+        @deploy    = false
+        @script    = nil
+      end
+
+      def self.parse!(args)
+        Options.new.parse! args
+      end
+
+      def parse!(args)
+        opts = OptionParser.new do |opts|
+          opts.on( '-i', '--init', 'Initialize a new project in the current directory' ) do |init|
+            self.init     = init
+            self.generate = false
+          end
+          opts.on( '-f', '--framework FRAMEWORK', 'Specify a compass framework during initialization (bootstrap, blueprint, 960)' ) do |framework|
+            self.framework = framework
+          end
+          opts.on( '--[no-]scaffold', 'Create scaffolding during initialization (default: true)' ) do |s|
+            self.scaffold = s
+          end
+          opts.on( '--force', 'Force a regeneration' ) do |force|
+            self.force = force
+          end
+          opts.on( '-s', '--server', 'Serve generated site' ) do |s|
+            self.server = s
+          end
+          opts.on( '-u', '--url URL', 'Set site.base_url' ) do |url|
+            self.base_url = url
+          end
+          opts.on( '-d', '--dev',     'Run in development mode (--auto, --server and -profile development)' ) do |url|
+            self.server   = true
+            self.auto     = true
+            self.port     = 4242
+            self.profile  = 'development'
+          end
+
+          opts.on( '-P', '--profile PROFILE', 'Specify a profile' ) do |profile|
+            self.profile = profile
+          end
+      
+          opts.on( '--deploy', 'Deploy site' ) do |deploy|
+            self.deploy = deploy
+          end
+      
+          opts.on( '-a', '--auto', 'Auto-generate when changes are noticed' ) do |a|
+            self.auto = a
+          end
+          opts.on( '-p', '--port PORT', Integer, 'Server port (default: 4242)' ) do |port|
+            self.port = port
+          end
+          opts.on( '-b', '--bind ADDR', 'Server address (default: 0.0.0.0)' ) do |bind_addr|
+            self.bind_addr = bind_addr
+          end
+          opts.on( '-g', '--[no-]generate', 'Generated site' ) do |g|
+            self.generate = g
+          end
+          opts.on( '--run SCRIPT', 'Force a regeneration' ) do |script|
+            self.script = script
+          end
+      
+          opts.separator ''
+          opts.separator "Common options:"
+      
+          opts.on_tail("-h", "--help", "Show this message") do
+            puts opts
+            exit
+          end
+  
+          opts.on_tail("-v", "--version", "Display the version") do
+            puts "Awestruct: #{Awestruct::VERSION}"
+            puts "http://awestruct.org/"
+            exit
+          end
+        end
+
+        opts.parse!(args)
+        self
+      end # parse()
+
+    end
+  end
+end

data/lib/awestruct/{commands → cli}/server.rb

@@ -1,7 +1,7 @@
 require 'webrick'
 
 module Awestruct
-  module Commands
+  module CLI
 
     WEBrick::HTTPUtils::DefaultMimeTypes.store('atom', 'application/atom+xml')
     WEBrick::HTTPUtils::DefaultMimeTypes.store('appcache', 'text/cache-manifest')

data/lib/awestruct/config.rb

@@ -3,6 +3,7 @@ module Awestruct
 
   class Config
 
+    attr_accessor :dir
     attr_accessor :layouts_dir
     attr_accessor :config_dir
     attr_accessor :extension_dir
@@ -11,16 +12,27 @@ module Awestruct
     attr_accessor :skin_dir
     attr_accessor :tmp_dir
     attr_accessor :ignore
+    attr_accessor :track_dependencies
+
+    attr_accessor :images_dir
+    attr_accessor :stylesheets_dir
+
+    def initialize(dir = Dir.pwd)
+      @dir            = Pathname.new( dir ) 
+      @layouts_dir    = Pathname.new( File.join(dir, '_layouts') )
+      @config_dir     = Pathname.new( File.join(dir, '_config') )
+      @input_dir      = Pathname.new( File.join(dir, '') )
+      @output_dir     = Pathname.new( File.join(dir, '_site') )
+      @extension_dir  = Pathname.new( File.join(dir, '_ext') )
+      @skin_dir       = Pathname.new( File.join(dir, '_skin') )
+      @tmp_dir        = Pathname.new( File.join(dir, '_tmp') ) 
+
+      @images_dir      = Pathname.new( File.join(dir, 'images') ) 
+      @stylesheets_dir = Pathname.new( File.join(dir, 'stylesheets') ) 
 
-    def initialize(dir)
-      @layouts_dir    = File.join(dir, '_layouts')
-      @config_dir     = File.join(dir, '_config')
-      @input_dir      = File.join(dir, '')
-      @output_dir     = File.join(dir, '_site')
-      @extension_dir  = File.join(dir, '_ext')
-      @skin_dir       = File.join(dir, '_skin')
-      @tmp_dir        = File.join(dir, '_tmp')
       @ignore         = File.exists?(ignore_file = File.join(dir, ".awestruct_ignore")) ? Dir[*IO.read(ignore_file).each_line.map(&:strip)] : []
+
+      @track_dependencies = false
     end
 
   end

data/lib/awestruct/context.rb

@@ -0,0 +1,22 @@
+
+require 'awestruct/astruct'
+
+module Awestruct
+
+  class Context < Awestruct::AStruct
+    attr_accessor :site
+    attr_accessor :page
+
+    def initialize(hash)
+      super 
+      @page = hash[:page]
+      @site = hash[:site]
+     
+    end 
+
+    def inspect
+      "Awestruct::Context{:page=>#{self.page.inspect}}" 
+    end  
+  end
+
+end

data/lib/awestruct/dependencies.rb

@@ -0,0 +1,102 @@
+
+module Awestruct
+  class Dependencies
+
+    attr_reader :page
+    attr_reader :dependencies
+    attr_reader :dependents
+
+
+    def self.top_page
+      @pages ||= []
+      @pages.first
+    end
+
+    def self.push_page(page)
+      if ( top_page.nil? )
+        page.dependencies.clear
+      else
+        top_page.dependencies.add_dependency( page )
+      end
+      @pages.push( page )
+    end
+
+    def self.pop_page
+      page = @pages.pop
+      if ( @pages.empty? && ! page.nil? )
+        page.dependencies.persist!
+      end
+    end
+
+
+    def self.track_dependency(dep)
+      return if top_page.nil? 
+      return if top_page == dep
+      top_page.dependencies.add_dependency(dep)
+    end
+
+    def initialize(page)
+      @page = page
+      @dependencies = Set.new
+      @dependents   = Set.new
+    end
+
+    def <<(dep)
+      add_dependency( dep )
+    end
+
+    def add_dependency(dep)
+      return if @page.do_not_track_dependencies
+      return if @page.output_path.nil?
+      return if dep == @page
+      @dependencies << dep
+      dep.dependencies.add_dependent( page )
+    end
+
+    def add_dependent(dep)
+      @dependents << dep
+    end
+
+    def remove_dependent(dep)
+      @dependents.delete( dep )
+    end
+
+    def clear
+      @dependencies.clear
+      @dependents.each{|d| d.remove_dependent( page ) }
+    end
+
+    def persist!
+      return if  page.output_path.nil? || page.output_path == ''
+      file = File.join( @page.site.config.dir, '.awestruct', 'dependency-cache', page.output_path )
+      FileUtils.mkdir_p( File.dirname( file ) )
+      File.open( file, 'w' ) do |file|
+        @dependencies.collect{|e| e.relative_source_path }.uniq.each do |d|
+          file.puts d unless d.nil?
+        end
+      end
+    end
+
+    def load!
+      return if  page.output_path.nil? || page.output_path == ''
+      file = File.join( @page.site.config.dir, '.awestruct', 'dependency-cache', page.output_path )
+      #puts "load #{file}"
+      if ( File.exist?( file ) )
+        File.open( file, 'r' ) do |file|
+          file.lines.each do |line|
+            d = find_page_by_path( line.strip )
+            add_dependency( d ) unless d.nil?
+          end
+        end
+        return true
+      end
+      false
+    end
+
+    def find_page_by_path(path)
+      page.site.pages_by_relative_source_path[ path ]
+    end
+
+
+  end
+end

data/lib/awestruct/deploy/github_pages_deploy.rb

@@ -0,0 +1,61 @@
+require 'awestruct/deployers'
+
+module Awestruct
+  module Deploy
+
+    class GitHubPagesDeploy
+      def initialize( site_config, deploy_config )
+        @site_path = site_config.output_dir
+        @branch    = deploy_config[ 'branch' ] || 'gh-pages'
+      end
+
+      def run
+        git.status.changed.empty? ? publish_site : message_for(:existing_changes)
+      end
+
+      private
+      def git
+        @git ||= Git.open('.')
+      end
+
+      def publish_site
+        current_branch = git.branch
+        checkout_pages_branch
+        add_and_commit_site @site_path
+        push_and_restore current_branch
+      end
+
+      def checkout_pages_branch
+        git.branch( @branch ).checkout
+      end
+
+      def add_and_commit_site( path )
+        git.with_working( path ) do
+          git.add(".")
+          begin
+            git.commit("Published #{@branch} to GitHub pages.")
+          rescue Git::GitExecuteError => e
+            $stderr.puts "Can't commit. #{e}."
+          end
+        end
+      end
+
+      def push_and_restore( original_branch )
+        git.reset_hard
+        git.push( 'origin', @branch )
+        git.checkout( original_branch )
+      end
+
+      def message_for( key )
+        $stderr.puts case key
+        when :existing_changes 
+          "You have uncommitted changes in the working branch. Please commit or stash them."
+        else 
+          "An error occured."
+        end
+      end
+    end
+  end
+end
+
+Awestruct::Deployers.instance[ :github_pages ] = Awestruct::Deploy::GitHubPagesDeploy