awestruct 0.5.3 → 0.5.4.beta1

data/lib/awestruct/scm/git.rb

@@ -0,0 +1,14 @@
+require 'open3'
+
+module Awestruct
+  module Scm
+    class Git
+      def uncommitted_changes?(source_dir)
+        result = Open3.popen3('git status --porcelain', :chdir => source_dir) do |stdin, stdout, stderr, wait_thr|
+          stdout.read.chomp =~ /^\s*([AM?]+)/
+        end
+        !result.nil?
+      end
+    end
+  end
+end

data/lib/awestruct/version.rb

@@ -1,4 +1,4 @@
 
 module Awestruct
-  VERSION='0.5.3'
+  VERSION='0.5.4.beta1'
 end

data/man/awestruct.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: awestruct
 .\"    Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 03/29/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 07/30/2013
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "AWESTRUCT" "1" "03/29/2013" "\ \&" "\ \&"
+.TH "AWESTRUCT" "1" "07/30/2013" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -110,6 +110,17 @@ Serve the generated site from an embedded server\&.
 .RS 4
 Set the site\&.base_url property\&.
 .RE
+.PP
+\fB\-\-output\-dir\fR=\fIDIR\fR
+.RS 4
+The location of the output directory\&. Defaults to
+\fI\&./_site\fR\&. Must either be absolute or relative to the current directory\&.
+.RE
+.PP
+\fB\-\-source\-dir\fR=\fIDIR\fR
+.RS 4
+The location of the director containing (or will contain) site sources\&. Defaults to the current directory\&. Must either be absolute or relative to the current directory\&.
+.RE
 .SS "Site Deployment"
 .PP
 \fB\-\-deploy\fR

data/spec/asciidoc_handler_spec.rb

@@ -4,7 +4,7 @@ require 'rspec/matchers.rb'
 verify = lambda { |output|
   include EmmetMatchers
   # clean whitespace to make comparison easier
-  output.should have_structure("div#preamble>div.sectionbody>div.paragraph>p>strong")
+  output.should have_structure('div#preamble>div.sectionbody>div.paragraph>p>strong')
 }
 
 verify_front_matter = lambda { |output, page|
@@ -27,46 +27,49 @@ verify_headers = lambda { |output, page|
 }
 
 theories =
-  [
-    {
-      :page => "asciidoc-page.ad",
-      :simple_name => "asciidoc-page",
-      :syntax => :asciidoc,
-      :extension => '.html',
-      :matcher => verify
-    },
-    {
-      :page => "asciidoc-page.adoc",
-      :simple_name => "asciidoc-page",
-      :syntax => :asciidoc,
-      :extension => '.html',
-      :matcher => verify
-    },
-    {
-      :page => "asciidoc-page.asciidoc",
-      :simple_name => "asciidoc-page",
-      :syntax => :asciidoc,
-      :extension => '.html',
-      :matcher => verify
-    },
-    {
-      :page => "asciidoctor_with_front_matter.ad",
-      :simple_name => "asciidoctor_with_front_matter",
-      :syntax => :asciidoc,
-      :extension => '.html' ,
-      :matcher => verify_front_matter
-    },
-    {
-      :page => "asciidoctor_with_headers.ad",
-      :simple_name => "asciidoctor_with_headers",
-      :syntax => :asciidoc,
-      :extension => '.html',
-      :matcher => verify_headers
-    }
-  ]
+    [
+        {
+            :page => 'asciidoc-page.ad',
+            :simple_name => 'asciidoc-page',
+            :syntax => :asciidoc,
+            :extension => '.html',
+            :matcher => verify
+        },
+        {
+            :page => 'asciidoc-page.adoc',
+            :simple_name => 'asciidoc-page',
+            :syntax => :asciidoc,
+            :extension => '.html',
+            :matcher => verify
+        },
+        {
+            :page => 'asciidoc-page.asciidoc',
+            :simple_name => 'asciidoc-page',
+            :syntax => :asciidoc,
+            :extension => '.html',
+            :matcher => verify
+        },
+        {
+            :page => 'asciidoctor_with_front_matter.ad',
+            :simple_name => 'asciidoctor_with_front_matter',
+            :syntax => :asciidoc,
+            :extension => '.html',
+            :matcher => verify_front_matter
+        },
+        {
+            :page => 'asciidoctor_with_headers.ad',
+            :simple_name => 'asciidoctor_with_headers',
+            :syntax => :asciidoc,
+            :extension => '.html',
+            :matcher => verify_headers
+        }
+    ]
+
 
 describe Awestruct::Handlers::AsciidoctorHandler do
-  let(:additional_config_page) { {:name => 'Awestruct', :test => 10, :layout => 'empty-layout'} }
-  it_should_behave_like "a handler", theories
+  def additional_config_page
+    { :name => 'Awestruct', :test => 10, :layout => 'empty-layout' }
+  end
 
+  it_should_behave_like 'a handler', theories
 end

data/spec/awestruct/scm/git_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'awestruct/scm/git'
+
+describe Awestruct::Scm::Git do
+  specify 'should respond_to :uncommitted_changes?' do
+    expect(subject).to respond_to :uncommitted_changes?
+  end
+  context "#uncommitted_changes?('.')" do
+    specify 'when there are no changes, returns false' do
+      Open3.should_receive(:popen3).with('git status --porcelain', :chdir => '.').and_yield(nil, StringIO.new(''), StringIO.new(''), nil)
+      expect(subject.uncommitted_changes? '.').to be_false
+    end
+
+    specify 'when there are changes to untracked files, returns true' do
+      Open3.should_receive(:popen3).with('git status --porcelain', :chdir => '.').and_yield(nil, StringIO.new('?? test.rb'), StringIO.new(''), nil)
+      expect(subject.uncommitted_changes? '.').to be_true
+    end
+
+    specify 'when there are modifications, returns true' do
+      Open3.should_receive(:popen3).with('git status --porcelain', :chdir => '.').and_yield(nil, StringIO.new(' M test.rb'), StringIO.new(''), nil)
+      expect(subject.uncommitted_changes? '.').to be_true
+    end
+
+    specify 'when there are additions and modifications, returns true' do
+      Open3.should_receive(:popen3).with('git status --porcelain', :chdir => '.').and_yield(nil, StringIO.new('AM test.rb'), StringIO.new(''), nil)
+      expect(subject.uncommitted_changes? '.').to be_true
+    end
+  end
+end

data/spec/config_spec.rb

@@ -1,20 +1,26 @@
 require 'awestruct/config'
 require 'spec_helper'
 require 'awestruct/config'
+require 'awestruct/cli/options'
 
 describe Awestruct::Config do
 
   it "should accept a list of files in .awestruct_ignore to ignore on site generation" do
     site_dir = File.join(File.dirname(__FILE__), 'test-data')
-    config = Awestruct::Config.new(site_dir)
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = site_dir
+
+    config = Awestruct::Config.new(opts)
     config.ignore.should == ["Rakefile", "Gemfile"]
   end
 
   it "should handle an empty .awestruct_ignore file without barfing" do
     site_dir = File.join(File.dirname(__FILE__), 'test-data')
     config_file = File.join(site_dir, ".awestruct_ignore")
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = site_dir
     File.open(config_file, "w")
-    config = Awestruct::Config.new(site_dir)
+    config = Awestruct::Config.new(opts)
     config.ignore.should == []
     File.open(config_file, "w") { |f| f.write("Rakefile\nGemfile\n") }
   end

data/spec/engine_spec.rb

@@ -1,4 +1,4 @@
-
+require 'awestruct/cli/options'
 require 'awestruct/engine'
 
 require 'hashery/open_cascade'
@@ -6,7 +6,9 @@ require 'hashery/open_cascade'
 describe Awestruct::Engine do
 
   it "should be able to load default-site.yml" do
-    config = Awestruct::Config.new( File.dirname(__FILE__) + '/test-data/engine' )
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = File.dirname(__FILE__) + '/test-data/engine'
+    config = Awestruct::Config.new( opts )
 
     engine = Awestruct::Engine.new(config)
     engine.load_default_site_yaml
@@ -17,7 +19,9 @@ describe Awestruct::Engine do
   end
 
   it "should be able to override default with site" do
-    config = Awestruct::Config.new( File.dirname(__FILE__) + '/test-data/engine' )
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = File.dirname(__FILE__) + '/test-data/engine'
+    config = Awestruct::Config.new( opts )
 
     engine = Awestruct::Engine.new(config)
     engine.load_default_site_yaml
@@ -30,7 +34,9 @@ describe Awestruct::Engine do
   end
 
   it "should be able to load site.yml with the correct profile" do
-    config = Awestruct::Config.new( File.dirname(__FILE__) + '/test-data/engine' )
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = File.dirname(__FILE__) + '/test-data/engine'
+    config = Awestruct::Config.new( opts )
 
     engine = Awestruct::Engine.new(config)
     engine.load_default_site_yaml
@@ -48,7 +54,9 @@ describe Awestruct::Engine do
   end
 
   it "should be able to load arbitrary _config/*.yml files" do
-    config = Awestruct::Config.new( File.dirname(__FILE__) + '/test-data/engine' )
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = File.dirname(__FILE__) + '/test-data/engine'
+    config = Awestruct::Config.new( opts )
 
     engine = Awestruct::Engine.new(config)
     engine.load_yaml( File.join( config.dir,  '_config/arbitrary.yml' ) )
@@ -56,7 +64,9 @@ describe Awestruct::Engine do
   end
 
   it "should be able to load all arbitary yamls" do
-    config = Awestruct::Config.new( File.dirname(__FILE__) + '/test-data/engine' )
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = File.dirname(__FILE__) + '/test-data/engine'
+    config = Awestruct::Config.new( opts )
 
     engine = Awestruct::Engine.new(config)
     engine.load_yamls
@@ -67,7 +77,9 @@ describe Awestruct::Engine do
 
   it "should exclude line comments and minify in compass by default in production mode" do
     compass = compass_config
-    config = Awestruct::Config.new( File.dirname(__FILE__) + '/test-data/engine' )
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = File.dirname(__FILE__) + '/test-data/engine'
+    config = Awestruct::Config.new( opts )
     engine = Awestruct::Engine.new(config)
     engine.load_site_yaml( 'production' )
     Compass.stub(:configuration).and_return(compass)
@@ -75,6 +87,8 @@ describe Awestruct::Engine do
     compass.stub(:line_comments).and_return(false)
     compass.should_receive(:output_style=).with(:compressed)
     compass.stub(:output_style).and_return(:compressed)
+    compass.stub(:http_path=).with(nil)
+    compass.stub(:relative_assets=).with(false)
     engine.configure_compass
     engine.site.sass.line_numbers.should == false
     engine.site.sass.style.should == :compressed
@@ -84,7 +98,9 @@ describe Awestruct::Engine do
 
   it "should include line comments in compass by default in development mode" do
     compass = compass_config
-    config = Awestruct::Config.new( File.dirname(__FILE__) + '/test-data/engine' )
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = File.dirname(__FILE__) + '/test-data/engine'
+    config = Awestruct::Config.new( opts )
     engine = Awestruct::Engine.new(config)
     engine.load_site_yaml( 'development' )
     Compass.stub(:configuration).and_return(compass)
@@ -92,6 +108,8 @@ describe Awestruct::Engine do
     compass.stub(:line_comments).and_return(true)
     compass.should_receive(:output_style=).with(:expanded)
     compass.stub(:output_style).and_return(:expanded)
+    compass.stub(:http_path=).with(nil)
+    compass.stub(:relative_assets=).with(false)
     engine.configure_compass
     engine.site.sass.line_numbers.should == true
     engine.site.sass.style.should == :expanded
@@ -101,7 +119,9 @@ describe Awestruct::Engine do
 
   it "wip should accept site.compass_line_comments and site.compass_output_style to configure behavior" do
     compass = compass_config
-    config = Awestruct::Config.new( File.dirname(__FILE__) + '/test-data/engine' )
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = File.dirname(__FILE__) + '/test-data/engine'
+    config = Awestruct::Config.new( opts )
     engine = Awestruct::Engine.new(config)
     engine.load_site_yaml( 'staging' )
     Compass.stub(:configuration).and_return(compass)
@@ -109,6 +129,8 @@ describe Awestruct::Engine do
     compass.stub(:line_comments).and_return(false)
     compass.should_receive(:output_style=).with(:compact)
     compass.stub(:output_style).and_return(:compact)
+    compass.stub(:http_path=).with(nil)
+    compass.stub(:relative_assets=).with(false)
     engine.configure_compass
     engine.site.sass.line_numbers.should == false
     engine.site.sass.style.should == :compact

data/spec/erb_handler_spec.rb

@@ -3,17 +3,17 @@ require 'spec_helper'
 require 'rbconfig'
 
 verify = lambda { |output|
-   output.should =~ %r(<h1>This is an ERB page</h1>) 
-   output.should =~ %r(<h2>The fruit of the day is: apples</h2>) 
-   output.should =~ %r(<h3>bacon</h3>) ## interpolated
+  output.should =~ %r(<h1>This is an ERB page</h1>)
+  output.should =~ %r(<h2>The fruit of the day is: apples</h2>)
+  output.should =~ %r(<h3>bacon</h3>) ## interpolated
 }
 
 verify_with_xml = lambda { |output|
-   output.should =~ %r(<h>bacon</h>) ## interpolated
+  output.should =~ %r(<h>bacon</h>) ## interpolated
 }
 
 verify_with_utf8 = lambda { |output|
-  if(RbConfig::CONFIG['target_os'] !~ /mswin|mingw/)
+  if RbConfig::CONFIG['target_os'] !~ /mswin|mingw/
     output.should == "Besøg fra Danmark\n"
   else
     output.should == "\r\nBesøg fra Danmark\r\n"
@@ -21,32 +21,34 @@ verify_with_utf8 = lambda { |output|
 }
 
 theories =
-  [
-    {
-      :page => "erb-page.html.erb",
-      :simple_name => "erb-page",
-      :syntax => :erb,
-      :extension => '.html',
-      :matcher => verify
-    },
-    {
-      :page => "erb-page.xml.erb",
-      :simple_name => "erb-page",
-      :syntax => :erb,
-      :extension => '.xml',
-      :matcher => verify_with_xml
-    },
-    {
-      :page => "erb-utf-page.html.erb",
-      :simple_name => "erb-utf-page",
-      :syntax => :erb,
-      :extension => '.html',
-      :matcher => verify_with_utf8
-    }
-  ]
+    [
+        {
+            :page => 'erb-page.html.erb',
+            :simple_name => 'erb-page',
+            :syntax => :erb,
+            :extension => '.html',
+            :matcher => verify
+        },
+        {
+            :page => 'erb-page.xml.erb',
+            :simple_name => 'erb-page',
+            :syntax => :erb,
+            :extension => '.xml',
+            :matcher => verify_with_xml
+        },
+        {
+            :page => 'erb-utf-page.html.erb',
+            :simple_name => 'erb-utf-page',
+            :syntax => :erb,
+            :extension => '.html',
+            :matcher => verify_with_utf8
+        }
+    ]
 
-describe Awestruct::Handlers::TiltHandler.to_s + "-Erb" do
-  let(:additional_config) { {:crunchy => 'bacon'} }
-  it_should_behave_like "a handler", theories
+describe Awestruct::Handlers::TiltHandler.to_s + '-Erb' do
+  def additional_config
+    { :crunchy => 'bacon' }
+  end
+  it_should_behave_like 'a handler', theories
 
 end

data/spec/front_matter_handler_spec.rb

@@ -1,4 +1,7 @@
+# -*- coding: UTF-8 -*-
+
 require 'fileutils'
+require 'spec_helper'
 
 require 'awestruct/handlers/file_handler'
 require 'awestruct/handlers/front_matter_handler'
@@ -18,26 +21,34 @@ describe Awestruct::Handlers::FrontMatterHandler do
     Awestruct::Handlers::FileHandler.new( @site, filename )
   end
 
-  it "should be able to split front-matter from content" do 
-    handler = Awestruct::Handlers::FrontMatterHandler.new( @site, file_input( "front-matter-file.txt" ) )
+  it 'should be able to split front-matter from content' do
+    handler = Awestruct::Handlers::FrontMatterHandler.new( @site, file_input('front-matter-file.txt') )
     handler.front_matter.should_not be_nil
     handler.front_matter['foo'].should == 'bar'
     handler.raw_content.strip.should == 'This is some content'
   end
 
-  it "should be able to split front-matter from content for files without actual front-matter" do 
-    handler = Awestruct::Handlers::FrontMatterHandler.new( @site, file_input( "front-matter-file-no-front.txt" ) )
+  it 'should be able to split front-matter from content for files without actual front-matter' do
+    handler = Awestruct::Handlers::FrontMatterHandler.new( @site, file_input('front-matter-file-no-front.txt') )
     handler.front_matter.should_not be_nil
     handler.front_matter.should be_empty
     handler.raw_content.strip.should == 'This is some content'
   end
 
-  it "should be able to split front-matter from content for files without actual content" do 
-    handler = Awestruct::Handlers::FrontMatterHandler.new( @site, file_input( "front-matter-file-no-content.txt" ) )
+  it 'should be able to split front-matter from content for files without actual content' do
+    handler = Awestruct::Handlers::FrontMatterHandler.new( @site, file_input('front-matter-file-no-content.txt') )
     handler.front_matter.should_not be_nil
     handler.front_matter['foo'].should == 'bar'
     handler.raw_content.should be_nil
   end
 
+  it 'should be able to handle UTF-8 characters' do
+    handler = Awestruct::Handlers::FrontMatterHandler.new( @site, file_input('front-matter-file-utf8.txt') )
+    handler.front_matter.should_not be_nil
+    handler.front_matter['foo'].should == 'bar'
+    handler.front_matter['utf8-content'].should == 'Μεα ιυδισο μενθιτυμ ετ. Ιυς ευ ποπυλω'
+    handler.raw_content.should_not be_nil
+  end
+
 end