benoit 0.1.3 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmE3NTA3MDk1ZDQxYTdjYjg3MGY3YjQ0NmQwYmU1M2ExOTlhZDU4Ng==
+    YWFhYmM1NDcwMDAyMjM3Nzg3M2UxYjU0YjYwZDAwN2E4ZmFmNTBmNw==
   data.tar.gz: !binary |-
-    YmUxY2JlZjJlMmQxM2M3YTMxZjEwMjBjZGEyMjQ4ZTU5NmZjNGFiYw==
+    NzQ3NmMyZTA4M2Q3ZmIyOGE5ODdmYmQ4OTZjMzQ3OTkwYjBjZmY0Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTU3M2NhYTdhMzMwOTZjZjIwNTAwMDdkZjMwYjQ2NGZhMWRiMTBkNWE5NzEx
-    ODBkOTFmNTVlOTAwNDMwZTI1MTRiOGMyOTFmY2QwY2ViNGMyYTYyYWJjNWY2
-    YTZkOWY0ZTAzZWQ4ZjI2NzljMmQxODUwODMyYjYzMDM3OTNkMzg=
+    OTZhZWNjZWI4ZTVmMmRmMDg5YzdkZWU2OTkyYzMwYzdiYzYwM2QwMTg3YmYy
+    ZjkyZGZhMDMzNDkwNWI1ZDU5MmJlY2RjMjExNzU3MGRhMDY0OWZjYTVkOGQz
+    YzllZjJjZmMzYTVhYzIxN2VmNWRiNDU3NzZiMmQ0MGUyN2VlZmM=
   data.tar.gz: !binary |-
-    MWUwNmE0ZWI5ODhiNTI5ZTIwYjVjMWU5MmRhOWNjODg4ODEzZGRhMDMyYmI1
-    MDBiZjdkYTQ3YTI3NmY3ZTJlNDc4OTFmOGFhMDlhNWE2ZWI2M2Q4MDIxNjFi
-    NzY2YWIzZGRkOWYzZWFkNmUzZmE4MGQwYTM0MmM3NjExNzQ0OTg=
+    NmYzZDQ2NjYwNzY3ZTQzMGZmNTE2YmM4ZjAzZjRmNDljMzZlNTZmZmUyYzMx
+    MThlZmZjMmMxYTM4ODkyZGIxY2I5YmIwM2IwZjQ1MTZiYTIzMGYwM2I0YTgy
+    M2I0YjM5MDI0YTRjYTlmMWE1MDEzZmJlZWQwZDcyYjIyNDYxNDg=

data/Assetfile

@@ -5,8 +5,20 @@ before_filter Benoit::Filters::MetadataCleaner
 input Dir.pwd do
 
   reject "_*"
-  reject ".git"
-  reject ".gitignore"
+  reject "_build/**/*"
+
+  default_ignores = %w(.git .gitignore Gemfile Gemfile.lock .bundle)
+
+  ignores =
+    if File.exist?(Benoit.config.ignorefile)
+      ignores = File.read(Benoit.config.ignorefile).split("\n")
+    else
+      []
+    end
+
+  ignores.concat(default_ignores).each  do |ignored|
+    reject ignored
+  end
 
   match "**/*{.markdown,.md,.mkdown,.mdown}" do
     filter Benoit::Filters::MarkdownFilter

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    benoit (0.1.2)
+    benoit (0.2.0)
       cadenza (~> 0.8.0)
       chunky_png (~> 1.2.0)
       compass (~> 0.13.alpha)

data/bin/benoit

@@ -36,6 +36,10 @@ command :build do |c|
   c.desc 'Clean up (delete) any existing build files for this site before building'
   c.switch :clean
 
+  c.desc 'Name of file containing files that should not be copied or processed to output directory'
+  c.default_value '.benoitignore'
+  c.flag [:g, :"ignorefile"]
+
   c.desc 'Describe a flag to build'
   c.default_value 'default'
   c.flag :f
@@ -49,6 +53,7 @@ command :build do |c|
     Dir.chdir(site_path) do
       Benoit.configure do |config|
         config.clean_before_build = options[:clean]
+        config.ignorefile = options[:"ignorefile"]
       end
       project = Benoit::PipelineProject.new(assetfile_path, Benoit.config.output_path, Benoit.config.cache_path)
       project.invoke

data/lib/benoit/compiler_error.rb

@@ -7,9 +7,15 @@
 #
 
 class StandardError
-  def to_json
-    { message: "Benoit has encountered an internal error. Please contact @benoitapp on Twitter to resolve this problem.", type: "error" }.to_json
+
+  def message
+    @message || "Staticly has encountered an internal error. Please contact @staticlyapp on Twitter to resolve this problem."
+  end
+
+  def type
+    "error"
   end
+
 end
 
 module Benoit

data/lib/benoit/configuration.rb

@@ -3,7 +3,7 @@ module Benoit
 
     class Config
 
-      attr_accessor :output_mode, :cache_path, :output_path, :site_path
+      attr_accessor :output_mode, :cache_path, :output_path, :site_path, :ignorefile
       attr_writer :clean_before_build
 
       def clean_before_build?

data/lib/benoit/site_context.rb

@@ -58,7 +58,9 @@ module Benoit
         elsif valid_page
           return resource_collection(name)
         else
-          super
+          # The key we are looking for has no content,
+          # therefore we can return an empty array
+          []
         end
 
       end

data/lib/benoit/version.rb

@@ -1,3 +1,3 @@
 module Benoit
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/spec/features/build_command.feature

@@ -24,6 +24,36 @@ Feature: benoit build
     And I build the site with the flag "--clean"
     Then that file should not exist in the output site
 
+  Scenario: Builds without any content pages
+    Given a file with an extension of ".html" with content:
+    """
+    before
+    {% for post in site.posts %}
+      blah
+    {% endfor %}
+    after
+    """
+    When I build the site
+    Then the output file should only have content:
+    """
+    before
+
+    after
+    """
+
+  Scenario: Does not copy any files in .benoitignore
+    Given a file named ".benoitignore" with content:
+    """
+    a.sh
+    """
+    And a file named "a.sh" with content:
+    """
+    testing
+    """
+    When I build the site
+    Then the file "a.sh" should not exist in the output site
+    And the file ".benoitignore" should not exist in the output site
+
   @backlog
   Scenario: Override default output path
     When I run `benoit build --output-path _compiled`

data/spec/features/frontmatter_metadata.feature

@@ -79,7 +79,7 @@ Feature: Site Context
 
   Scenario: Metadata contains rendered Markdown
     Given a site
-    And a file wih an extension of ".markdown" with content:
+    And a file with an extension of ".markdown" with content:
     """
     ---
     type: post

data/spec/steps/staticly_steps.rb

@@ -145,7 +145,7 @@ module BenoitSteps
     create_file_for_page @page
   end
 
-  step "a file wih an extension of :extname with content:" do |extname, content|
+  step "a file with an extension of :extname with content:" do |extname, content|
     @page = Page.new
     @page.generate_name(extname)
     @site.add_page @page
@@ -177,6 +177,11 @@ module BenoitSteps
     write_file("img.png", img_content)
   end
 
+  step "the file :named should not exist in the output site" do |filename|
+    path = File.join("_build", filename)
+    step 'a file named "%s" should not exist' % path
+  end
+
   step "that file should not exist in the output site" do
     path = File.join("_build", @page.name)
     step 'a file named "%s" should not exist' % path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benoit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Joe Fiorini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-27 00:00:00.000000000 Z
+date: 2013-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli