awestruct 0.5.4.rc3 → 0.5.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e5fd572c73f3b019598a5f63b741c5d0df96fcd0
+  data.tar.gz: 76e36c5b3f687e42c7d819f3a5e21b9ab938a027
+SHA512:
+  metadata.gz: d904e79ab4c23037895cd7b1a916b08c7e2d8b0d21abcf5de54fb2d2981427b2d5a354d26af7cfda9eab520d89ea3f3c60537ed5b8e7717751a68337a787635c
+  data.tar.gz: 1e3dd26392ccc0179eee5b29573a0a6b358e35eb8e12b758d5ab4cc10eb827c002352bc3934a38b2541d58b399c3024fbb12f2dc19941176397f847d9da0fd58

data/Gemfile

@@ -1,29 +1,33 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'spectator', '>= 1.2.5'
-  gem 'hashery', '>= 2.1.0'
-  gem 'rspec', '>= 2.9'
-  gem 'rake', '>= 0.9.2'
+  gem 'spectator', '~> 1.2.6'
+  gem 'hashery', '~> 2.1.1'
+  gem 'rspec', '~> 2.14.1'
+  gem 'rake', '~> 10.2.2'
+  gem 'guard-rspec', '~> 4.2.0', :require => false
+  gem 'pry', '~> 0.9.12', :require => false
+  gem 'pry-nav', '~> 0.2', :require => false
 end
 
 group :test do
-  gem 'rb-inotify', '>= 0.9.0'
-  gem 'rack-test'
-  gem 'tilt', '>= 1.3.5', '< 2.0'
-  gem 'coffee-script', '>= 2.2.0'
-  gem 'asciidoctor', '>= 0.1.3' # >= 0.1.1 is required for front matter integration
-  gem 'slim', '>= 1.3.6'
-  gem 'kramdown', '>= 0.14.2'
-  gem 'therubyracer', '0.10.0', :platforms => :ruby
-  gem 'therubyrhino', '~> 2.0.2', :platforms => :jruby
-  gem 'less', '>= 2.2.2' 
-  gem 'org-ruby', '>= 0.7'
-  gem 'RedCloth', '>= 4.2.9'
-  gem 'mustache', '>= 0.99.4'
-  gem 'uglifier', '>= 1.3.0'
-  gem 'htmlcompressor', '>= 0.0.7'
-  gem 'git', '~> 1.2.5'
+  gem 'rb-inotify', '~> 0.9.3'
+  gem 'rack-test', '~> 0.6.2'
+  gem 'tilt', '~> 2.0.1'
+  gem 'coffee-script', '~> 2.2.0'
+  gem 'asciidoctor', '~> 0.1.4'
+  gem 'slim', '~> 2.0.2'
+  gem 'kramdown', '~> 1.3.3'
+  gem 'therubyracer', '~> 0.10.0', :platforms => :ruby
+  gem 'therubyrhino', '~> 2.0.3', :platforms => :jruby
+  gem 'less', '~> 2.5.0'
+  gem 'org-ruby', '~> 0.9.3'
+  gem 'RedCloth', '~> 4.2.9'
+  gem 'mustache', '~> 0.99.5'
+  gem 'uglifier', '~> 2.5.0'
+  gem 'htmlcompressor', '~> 0.0.7'
+  gem 'haml-contrib', '~> 1.0.0'
+  gem "win32-open3-19", :platforms => :mingw # htmlcompressor depends on old yui compressor, that needs this on win32
 end
 
 gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Bob McWhirter and contributors (see git log)
+Copyright (c) 2010-2014 Bob McWhirter and contributors (see git log)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -6,13 +6,13 @@ deal in the Software without restriction, including without limitation the
 rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 sell copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
-  
+
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
-   
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -8,7 +8,7 @@ Please see the complete site at <http://awestruct.org/>.
 
 # License
 
-    Copyright (c) 2010-2011 Bob McWhirter and contributors (see git log)
+    Copyright (c) 2010-2014 Bob McWhirter and contributors (see git log)
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to
@@ -16,16 +16,16 @@ Please see the complete site at <http://awestruct.org/>.
     rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
     sell copies of the Software, and to permit persons to whom the Software is
     furnished to do so, subject to the following conditions:
-      
+
     The above copyright notice and this permission notice shall be included in
     all copies or substantial portions of the Software.
-       
+
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-    THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+    THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
     IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
     CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-It also uses code from the Sequel project under the same license. 
+It also uses code from the Sequel project under the same license.
 

data/awestruct.gemspec

@@ -4,7 +4,7 @@ require 'awestruct/version'
 spec = Gem::Specification.new do |s|
   s.name          = 'awestruct'
   s.version       = Awestruct::VERSION
-  s.date          = '2013-12-03'
+  s.date          = '2014-04-07'
 
   s.authors       = ['Bob McWhirter', 'Jason Porter', 'Lance Ball', 'Dan Allen', 'Torsten Curdt', 'other contributors']
   s.email         = ['bob@mcwhirter.org', 'lightguard.jp@gmail.com', 'lball@redhat.com', 'dan.j.allen@gmail.com', 'tcurdt@vafer.org']
@@ -32,17 +32,20 @@ Any markup languages you are using and its dependencies.
 Haml and Markdown filters are touchy things. Redcarpet or Rdiscount work well if you're running on MRI. JRuby should be using haml 4.0.0+ with Kramdown.'
   EOS
 
-  s.add_dependency 'haml', '~> 4.0.1'
-  s.add_dependency 'nokogiri', '1.5.10'
-  s.add_dependency 'tilt', '>= 1.3.5', '< 2.0'
-  s.add_dependency 'compass', '>= 0.12.1'
+  s.add_dependency 'haml', '~> 4.0.5'
+  s.add_dependency 'asciidoctor' # we're pretty good about backwards compat
+  s.add_dependency 'nokogiri', '~> 1.5.10'
+  s.add_dependency 'tilt', '~> 2.0.1'
+  s.add_dependency 'compass', '~> 0.12.4'
   s.add_dependency 'compass-960-plugin', '~> 0.10.4'
-  s.add_dependency 'bootstrap-sass', '>= 2.3.1.0'
-  s.add_dependency 'zurb-foundation', '>= 4.0.9', '< 5.0'
-  s.add_dependency 'mime-types', '1.25'
-  s.add_dependency 'rest-client', '>= 1.6.7'
+  s.add_dependency 'bootstrap-sass', '~> 3.1.1.0'
+  s.add_dependency 'zurb-foundation', '~> 4.3.2'
+  s.add_dependency 'mime-types', '~> 2.1'
+  s.add_dependency 'rest-client', '~> 1.6.7'
   s.add_dependency 'ruby-s3cmd', '~> 0.1.5'
-
-  s.add_dependency 'listen', '~> 1.0'
+  s.add_dependency 'listen', '~> 2.7.1'
   s.add_dependency 'rack', '~> 1.5.2'
+  s.add_dependency 'git', '~> 1.2.6'
+  s.add_dependency 'guard-livereload', '~> 2.1.2'
+  s.add_dependency 'colorize', '~> 0.7.1'
 end

data/lib/awestruct/astruct_mixin.rb

@@ -1,4 +1,3 @@
-
 require 'awestruct/dependencies'
 
 module Awestruct

data/lib/awestruct/cli/auto.rb

@@ -1,28 +1,34 @@
-#require 'guard/awestruct'
 require 'awestruct/util/exception_helper'
 
 require 'listen'
+require 'guard/livereload'
 
 module Awestruct
   module CLI
     class Auto
 
-      def initialize(config)
+      def initialize(config, base_url)
         @config = config
+        @base_url = base_url
       end
 
       def run()
         generate_thread = nil
         current_path = nil
 
+        guard = if ( @config.options.livereload )
+          guard = Guard::LiveReload.new
+          guard.start
+          guard
+        else
+          nil
+        end
+
         force_polling = ( RUBY_PLATFORM =~ /mingw/ ? true : false )
-        listener = Listen.to( @config.dir, :relative_paths=>true, :latency=>0.5, :force_polling=>force_polling )
-        listener.ignore( %r(\.awestruct) )
-        listener.ignore( %r(^#{File.basename( @config.tmp_dir )}) )
-        listener.ignore( %r(^#{File.basename( @config.output_dir )}) )
-        listener.change do |modified, added, removed|
-          modified.each do |path|
+        listener = Listen.to( @config.dir, :latency=>0.5, :force_polling=>force_polling ) do |modified, added, removed|
+          modified.each do |path| # path is absolute path
             engine = ::Awestruct::Engine.instance
+
             unless ( path =~ %r(#{File.basename( engine.config.output_dir) }) || path =~ /.awestruct/ )
               begin
                 if path.eql? current_path
@@ -37,8 +43,26 @@ module Awestruct
 
                 generate_thread = Thread.new {
                   begin
-                    engine.generate_page_by_output_path( path )
-                    $LOG.info "Generating.... done!" if $LOG.info?
+
+                    page = engine.page_by_output_path(path)
+                    if ( page )
+
+                      pages = engine.generate_page_and_dependencies( page )
+
+                      if ( guard )
+                        urls = pages.map do |p|
+                          @base_url + p.url.to_s
+                        end
+
+                        guard.run_on_modifications(urls)
+                      end
+
+                      $LOG.info "Regeneration finished." if $LOG.info?
+
+                    else
+                      $LOG.error "Failed to find page from path #{path}"
+                    end
+
                   rescue => e
                     ExceptionHelper.log_building_error e, path
                   end
@@ -49,7 +73,10 @@ module Awestruct
             end
           end
         end
-        listener.start(false)
+        listener.ignore( %r(\.awestruct) )
+        listener.ignore( %r(^#{File.basename( @config.tmp_dir )}) )
+        listener.ignore( %r(^#{File.basename( @config.output_dir )}) )
+        listener.start
       end
 
     end

data/lib/awestruct/cli/invoker.rb

@@ -2,6 +2,7 @@ require 'pathname'
 require 'logger'
 require 'awestruct/logger'
 require 'awestruct/cli/options'
+require 'awestruct/util/exception_helper'
 
 module Awestruct
   module CLI
@@ -37,58 +38,72 @@ module Awestruct
       end
 
       def invoke!
-        load_profile() unless ( options.init )
+        begin
+          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()
+          @success = false if ExceptionHelper.build_failed?
+        rescue
+          @success = false
+          false
+        end
+      end
 
-        setup_config()
+      def load_profile()
+        site_yaml_file = File.join( @options.source_dir, '_config', 'site.yml' )
 
-        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 )
+        if ( !File.exist?( site_yaml_file ) )
+          abort( "No config file at #{site_yaml_file}" )
+        end
 
-        wait_for_completion()
-        success
-      end
+        site_yaml = YAML.load( File.read( site_yaml_file ) )
 
-      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
-                profile_data
-              end
-            end
-          end
+        if ( !site_yaml )
+          abort( "Failed to parse #{site_yaml_file}" )
+        end
+
+        profiles = site_yaml['profiles'] || {}
+
+        profile_name = options.profile
+
+        # use the one specified
+        profile = profiles[profile_name]
+        if ( !profile )
+          profile_name, profile = if ( options.deploy )
+            # or the first one having a deploy section
+            profiles.select { |k,v| v && v['deploy'] }
+          else
+            # or the first one having no deploy section
+            profiles.select { |k,v| v && !v['deploy'] }
+          end.first
         end
- 
-        unless @profile
-          $LOG.error "Unable to locate profile: #{options.profile}" if options.profile && $LOG.error?
-          options.profile = 'NONE'
-          @profile = {}
-        end 
-        $LOG.info "Using profile: #{options.profile}" if $LOG.info?
+
+        if profile
+          $LOG.info "Using profile: #{profile_name}" if $LOG.info?
+        end
+
+        @profile = profile || {}
       end
 
       def setup_config()
         @config = Awestruct::Config.new( @options )
         @config.track_dependencies = true if ( @options.auto )
         @config.verbose = true if ( @options.verbose )
+        @config.quiet = true if ( @options.quiet )
       end
 
       def invoke_init()
-        Awestruct::CLI::Init.new( Dir.pwd, @options.framework, @options.scaffold ).run
+        Awestruct::CLI::Init.new( @options.source_dir, @options.framework, @options.scaffold ).run
       end
 
       def invoke_script()
@@ -118,7 +133,8 @@ module Awestruct
       end
 
       def invoke_auto()
-        Awestruct::CLI::Auto.new( config ).run
+        base_url = profile['base_url'] || options.base_url
+        Awestruct::CLI::Auto.new( config, base_url ).run
       end
 
       def invoke_server()

data/lib/awestruct/cli/options.rb

@@ -31,24 +31,28 @@ module Awestruct
       attr_accessor :deploy
       attr_accessor :script
       attr_accessor :verbose
+      attr_accessor :quiet
       attr_accessor :source_dir
       attr_accessor :output_dir
+      attr_accessor :livereload
 
       def initialize()
-        @generate  = nil
-        @server    = false
-        @port      = DEFAULT_PORT
-        @bind_addr = DEFAULT_BIND_ADDR
-        @auto      = false
-        @force     = false
-        @init      = false
-        @framework = 'compass'
-        @scaffold  = true
-        @base_url  = nil
-        @profile   = nil
-        @deploy    = false
-        @script    = nil
-        @verbose   = false
+        @generate   = nil
+        @server     = false
+        @port       = DEFAULT_PORT
+        @bind_addr  = DEFAULT_BIND_ADDR
+        @auto       = false
+        @force      = false
+        @init       = false
+        @framework  = 'compass'
+        @scaffold   = true
+        @base_url   = nil
+        @profile    = nil
+        @deploy     = false
+        @script     = nil
+        @verbose    = false
+        @quiet      = false
+        @livereload = false
         @source_dir = Dir.pwd
         @output_dir = File.expand_path '_site'
       end
@@ -62,6 +66,9 @@ module Awestruct
           opts.on('-w', '--verbose', 'Enable verbose mode') do |verbose|
             self.verbose = true
           end
+          opts.on('-q', '--quiet', 'Only display warnings and errors') do |quiet|
+            self.quiet = true
+          end
           opts.on( '-i', '--init', 'Initialize a new project in the current directory' ) do |init|
             self.init     = init
             self.generate = false
@@ -87,19 +94,22 @@ module Awestruct
             self.port     = DEFAULT_PORT
             self.profile  = 'development'
           end
+          opts.on( '-a', '--auto', 'Auto-generate when changes are noticed' ) do |a|
+            self.auto = a
+          end
+          opts.on( '--livereload', 'Support for browser livereload' ) do |livereload|
+            self.livereload = livereload
+          end
 
           opts.on( '-P', '--profile PROFILE', 'Activate a configuration profile' ) do |profile|
             self.profile = profile
           end
-      
+
           opts.on( '--deploy', 'Deploy site' ) do |deploy|
             self.deploy = deploy
             self.generate = false if self.generate.nil?
           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: #{DEFAULT_PORT})" ) do |port|
             self.port = port
           end
@@ -119,15 +129,15 @@ module Awestruct
           opts.on( '--output-dir DIR', 'Location to output generated site (default: _site' ) do |output_dir|
             self.output_dir = File.expand_path output_dir
           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/"