bunto 2.0.0.pre → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a35757459d1fb37d6fd83479cd61dd9ece4b5cf1
-  data.tar.gz: 914345bc95069ad5982a3141674b94b55a7bb011
+  metadata.gz: 9de6fb07519634f73190a49c592225c580a2a425
+  data.tar.gz: 664cbdea09c133ee304b92e081c692210cef9eca
 SHA512:
-  metadata.gz: 480427bb9fbb1a4dc7f5d3401375011083bf4866ed47138986a916476cdc7b75534236549639ecac598b7f529007115c7eea1df4583cf16dd2db36e8f64b5ab7
-  data.tar.gz: 959bb7e751224b8bfb9d164801f5b394e9440f401a28a74db5f267e7242909a5e30ec092accddcc7aca806ce977090b0acc08ef083168cfee37c8d91f249e9b4
+  metadata.gz: 50bf9c96a0002bbc1de8dd52e07265ea3f74e73589be1880b8e2e24363b752aedb2fcff624b17b7ab659311b1b847606edc6355c624293e7382fd25482936a80
+  data.tar.gz: 503f2595ad58b8fd63b9a11f4ec6ef03bd7d4f80d9d2de0804681f3de87dac4de8f04c4f8b19ee36bbee2d61acc85601db497561d8b9fd3b5db55fec507aec4a

data/.rubocop.yml

@@ -0,0 +1,80 @@
+Metrics/MethodLength: { Max:  24 }
+Metrics/ClassLength:  { Max: 240 }
+Metrics/ModuleLength: { Max: 240 }
+Metrics/LineLength:   { Max: 112 }
+Metrics/CyclomaticComplexity: { Max: 8 }
+Metrics/PerceivedComplexity: { Max: 8 }
+Metrics/ParameterLists: { Max: 4 }
+Metrics/MethodLength: { Max: 24 }
+Metrics/AbcSize: { Max: 20 }
+
+Style/IndentHash: { EnforcedStyle: consistent }
+Style/HashSyntax: { EnforcedStyle: hash_rockets }
+Style/SignalException: { EnforcedStyle: only_raise }
+Style/AlignParameters: { EnforcedStyle: with_fixed_indentation }
+Style/StringLiteralsInInterpolation: { EnforcedStyle: double_quotes }
+Style/MultilineMethodCallIndentation: { EnforcedStyle: indented }
+Style/MultilineOperationIndentation: { EnforcedStyle: indented }
+Style/FirstParameterIndentation: { EnforcedStyle: consistent }
+Style/StringLiterals: { EnforcedStyle: double_quotes }
+Style/RegexpLiteral: { EnforcedStyle: slashes }
+Style/IndentArray: { EnforcedStyle: consistent }
+Style/ExtraSpacing: { AllowForAlignment: true }
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%q': '{}'
+    '%Q': '{}'
+    '%r': '!!'
+    '%s': '()'
+    '%w': '()'
+    '%W': '()'
+    '%x': '()'
+
+Style/AlignArray:                     { Enabled: false }
+Style/StringLiterals:                 { Enabled: false }
+Style/Documentation:                  { Enabled: false }
+Style/DoubleNegation:                 { Enabled: false }
+Style/UnneededCapitalW:               { Enabled: false }
+Style/EmptyLinesAroundModuleBody:     { Enabled: false }
+Style/EmptyLinesAroundAccessModifier: { Enabled: false }
+Style/BracesAroundHashParameters:     { Enabled: false }
+Style/SpaceInsideBrackets:            { Enabled: false }
+Style/IfUnlessModifier:               { Enabled: false }
+Style/ModuleFunction:                 { Enabled: false }
+Style/RescueModifier:                 { Enabled: false }
+Style/GuardClause:                    { Enabled: false }
+Style/FileName:                       { Enabled: false }
+Lint/UselessAccessModifier:           { Enabled: false }
+Style/SpaceAroundOperators:           { Enabled: false }
+Style/RedundantReturn:                { Enabled: false }
+Style/SingleLineMethods:              { Enabled: false }
+
+AllCops:
+  TargetRubyVersion: 2.0
+  Include:
+  - lib/**/*.rb
+
+  Exclude:
+  - .rubocop.yml
+  - .codeclimate.yml
+  - .travis.yml
+  - .gitignore
+  - .rspec
+
+  - Gemfile.lock
+  - CHANGELOG.{md,markdown,txt,textile}
+  - CONTRIBUTING.{md,markdown,txt,textile}
+  - readme.{md,markdown,txt,textile}
+  - README.{md,markdown,txt,textile}
+  - Readme.{md,markdown,txt,textile}
+  - ReadMe.{md,markdown,txt,textile}
+  - COPYING
+  - LICENSE
+
+  - site/**/*
+  - test/**/*
+  - vendor/**/*
+  - features/**/*
+  - script/**/*
+  - spec/**/*

data/README.markdown

@@ -3,50 +3,46 @@
 
 [![Gem Version](https://img.shields.io/gem/v/bunto.svg)][ruby-gems]
 [![Build Status](https://travis-ci.org/bunto/bunto.svg?branch=ruby)][travis]
-[![Join the chat at https://gitter.im/bunto/bunto](https://badges.gitter.im/bunto/bunto.svg)](https://gitter.im/bunto/bunto?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-<!--
-[![Test Coverage](https://codeclimate.com/github/bunto/bunto/badges/coverage.svg)][coverage]
-[![Code Climate](https://codeclimate.com/github/bunto/bunto/badges/gpa.svg)][codeclimate]
-[![Dependency Status](https://gemnasium.com/bunto/bunto.svg)][gemnasium]
 [![Security](https://hakiri.io/github/bunto/bunto/ruby.svg)][hakiri]
--->
+[![Join the chat at https://gitter.im/bunto/bunto](https://badges.gitter.im/bunto/bunto.svg)](https://gitter.im/bunto/bunto?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![IRC - #bunto on freenode WebChat](https://img.shields.io/badge/freenode-bunto-yellowgreen.svg?style=flat)][freenode]
 
 [ruby-gems]: https://rubygems.org/gems/bunto
-<!--
-[gemnasium]: https://gemnasium.com/bunto/bunto
-[codeclimate]: https://codeclimate.com/github/bunto/bunto
-[coverage]: https://codeclimate.com/github/bunto/bunto/coverage
 [hakiri]: https://hakiri.io/github/bunto/bunto/ruby
--->
 [travis]: https://travis-ci.org/bunto/bunto
+[freenode]: http://webchat.freenode.net/?channels=bunto
+
+By Suriyaa Kudo, Tom Preston-Werner, Parker Moore and many [awesome contributors](https://github.com/bunto/bunto/graphs/contributors)!
+
+Bunto is a Web Application Framework and can be used as a static site generator perfect for personal, project, or organization sites. Think of it like a file-based CMS, without all the complexity. Bunto takes your content, renders HTML and CSS templates, and spits out a complete, static website ready to be served by Apache, hostSE, Nginx or another web server. Bunto is the engine behind [GitHub Pages](https://pages.github.com), which you can use to host sites right from your GitHub repositories.
 
-By Suriyaa Kudo, Tom Preston-Werner and many [awesome contributors](https://github.com/bunto/bunto/graphs/contributors)!
+## Philosophy
 
-Bunto is a Web Application Framework and can be used as a static site generator perfect for personal, project, or organization sites. Think of it like a file-based CMS, without all the complexity. Bunto takes your content, renders HTML and CSS templates, and spits out a complete, static website ready to be served by Apache, hostSE, Nginx or another web server. Bunto is the engine behind [GitHub Pages](http://pages.github.com), which you can use to host sites right from your GitHub repositories.
+Bunto does what you tell it to do — no more, no less. It doesn't try to outsmart users by making bold assumptions, nor does it burden them with needless complexity and configuration. Put simply, Bunto gets out of your way and allows you to concentrate on what truly matters: your content.
 
 ## Getting Started
 
-* [Install](https://bunto.github.io/bunto/docs/installation/) the gem
+* [Install](https://bunto.github.io/docs/installation/) the gem
 * Read up about its [Usage](https://bunto.github.io/docs/usage/) and [Configuration](https://bunto.github.io/docs/configuration/)
 * Take a gander at some existing [Sites](https://wiki.github.com/bunto/bunto/sites)
-* Fork and [Contribute](https://bunto.github.io/docs/contributing/) your own modifications
+* [Fork](https://github.com/bunto/bunto/fork) and [Contribute](https://bunto.github.io/docs/contributing/) your own modifications
 * Have questions? Check out our official forum community [Bunto Talk](https://bunto.github.io/talk/) or [`#bunto` on irc.freenode.net](https://botbot.me/freenode/bunto/)
 
 ## Code of Conduct
 
 In order to have a more open and welcoming community, Bunto adheres to a
-[code of conduct](CONDUCT.md) adapted from the Ruby on Rails code of
+[code of conduct](CONDUCT.markdown) adapted from the Ruby on Rails code of
 conduct.
 
 Please adhere to this code of conduct in any interactions you have in the
 Bunto community. It is strictly enforced on all official Bunto
 repositories, websites, and resources. If you encounter someone violating
-these terms, please let a maintainer (@SuriyaaKudoIsc) know
+these terms, please let a maintainer ([@SuriyaaKudoIsc](https://github.com/SuriyaaKudoIsc) know
 and we will address it as soon as possible.
 
 ## Diving In
 
-* [Migrate](http://bunto.github.io/import/docs/home/) from your previous system
+* [Migrate](https://bunto-import.tk/docs/home/) from your previous system
 * Learn how the [YAML Front Matter](https://bunto.github.io/docs/frontmatter/) works
 * Put information on your site with [Variables](https://bunto.github.io/docs/variables/)
 * Customize the [Permalinks](https://bunto.github.io/docs/permalinks/) your posts are generated with
@@ -55,4 +51,4 @@ and we will address it as soon as possible.
 
 ## License
 
-See the [LICENSE](https://github.com/bunto/bunto/blob/master/LICENSE) file. 
+See the [LICENSE](https://github.com/bunto/bunto/blob/master/LICENSE) file.

data/bin/bunto

@@ -12,7 +12,7 @@ Bunto::Deprecator.process(ARGV)
 
 Mercenary.program(:bunto) do |p|
   p.version Bunto::VERSION
-  p.description 'Bunto is a static site generator in Ruby'
+  p.description 'Bunto is a static site generator and web application framework in Ruby'
   p.syntax 'bunto <subcommand> [options]'
 
   p.option 'source', '-s', '--source [DIR]', 'Source directory (defaults to ./)'

data/lib/bunto.rb

@@ -45,7 +45,6 @@ module Bunto
   autoload :Errors,              'bunto/errors'
   autoload :Excerpt,             'bunto/excerpt'
   autoload :External,            'bunto/external'
-  autoload :Filters,             'bunto/filters'
   autoload :FrontmatterDefaults, 'bunto/frontmatter_defaults'
   autoload :Hooks,               'bunto/hooks'
   autoload :Layout,              'bunto/layout'
@@ -67,6 +66,7 @@ module Bunto
   autoload :Site,                'bunto/site'
   autoload :StaticFile,          'bunto/static_file'
   autoload :Stevenson,           'bunto/stevenson'
+  autoload :Theme,               'bunto/theme'
   autoload :URL,                 'bunto/url'
   autoload :Utils,               'bunto/utils'
   autoload :VERSION,             'bunto/version'
@@ -77,6 +77,7 @@ module Bunto
   require 'bunto/generator'
   require 'bunto/command'
   require 'bunto/liquid_extensions'
+  require "bunto/filters"
 
   class << self
     # Public: Tells you which Bunto environment you are building in so you can skip tasks
@@ -84,7 +85,7 @@ module Bunto
     # images and allows you to skip that when working in development.
 
     def env
-      ENV["BUNTO_ENV"] || "development"
+      ENV["JEKYLL_ENV"] || "development"
     end
 
     # Public: Generate a Bunto configuration Hash by merging the default
@@ -122,7 +123,7 @@ module Bunto
     #
     # Returns the LogAdapter instance.
     def logger
-      @logger ||= LogAdapter.new(Stevenson.new, (ENV["BUNTO_LOG_LEVEL"] || :info).to_sym)
+      @logger ||= LogAdapter.new(Stevenson.new, (ENV["JEKYLL_LOG_LEVEL"] || :info).to_sym)
     end
 
     # Public: Set the log writer.
@@ -133,7 +134,7 @@ module Bunto
     #
     # Returns the new logger.
     def logger=(writer)
-      @logger = LogAdapter.new(writer, (ENV["BUNTO_LOG_LEVEL"] || :info).to_sym)
+      @logger = LogAdapter.new(writer, (ENV["JEKYLL_LOG_LEVEL"] || :info).to_sym)
     end
 
     # Public: An array of sites
@@ -153,8 +154,9 @@ module Bunto
     def sanitized_path(base_directory, questionable_path)
       return base_directory if base_directory.eql?(questionable_path)
 
+      questionable_path.insert(0, '/') if questionable_path.start_with?('~')
       clean_path = File.expand_path(questionable_path, "/")
-      clean_path = clean_path.sub(/\A\w\:\//, '/')
+      clean_path.sub!(/\A\w\:\//, '/')
 
       if clean_path.start_with?(base_directory.sub(/\A\w\:\//, '/'))
         clean_path

data/lib/bunto/cleaner.rb

@@ -95,11 +95,12 @@ module Bunto
     # Private: Creates a regular expression from the config's keep_files array
     #
     # Examples
-    #   ['.git','.svn'] creates the following regex: /\/(\.git|\/.svn)/
+    #   ['.git','.svn'] with site.dest "/myblog/_site" creates 
+    #   the following regex: /\A\/myblog\/_site\/(\.git|\/.svn)/
     #
     # Returns the regular expression
     def keep_file_regex
-      Regexp.union(site.keep_files)
+      /\A#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.keep_files).source})/
     end
   end
 end

data/lib/bunto/collection.rb

@@ -78,7 +78,7 @@ module Bunto
     def entries
       return [] unless exists?
       @entries ||=
-        Utils.safe_glob(collection_dir, ["**", "*.*"]).map do |entry|
+        Utils.safe_glob(collection_dir, ["**", "*"]).map do |entry|
           entry["#{collection_dir}/"] = ''
           entry
         end
@@ -94,7 +94,7 @@ module Bunto
         Dir.chdir(directory) do
           entry_filter.filter(entries).reject do |f|
             path = collection_dir(f)
-            File.directory?(path) || (File.symlink?(f) && site.safe)
+            File.directory?(path) || entry_filter.symlink?(f)
           end
         end
     end
@@ -135,7 +135,7 @@ module Bunto
     # Returns false if the directory doesn't exist or if it's a symlink
     #   and we're in safe mode.
     def exists?
-      File.directory?(directory) && !(File.symlink?(directory) && site.safe)
+      File.directory?(directory) && !entry_filter.symlink?(directory)
     end
 
     # The entry filter for this collection.

data/lib/bunto/commands/clean.rb

@@ -19,21 +19,19 @@ module Bunto
           options = configuration_from_options(options)
           destination = options['destination']
           metadata_file = File.join(options['source'], '.bunto-metadata')
+          sass_cache = File.join(options['source'], '.sass-cache')
 
-          if File.directory? destination
-            Bunto.logger.info "Cleaning #{destination}..."
-            FileUtils.rm_rf(destination)
-            Bunto.logger.info "", "done."
-          else
-            Bunto.logger.info "Nothing to do for #{destination}."
-          end
+          remove(destination, checker_func: :directory?)
+          remove(metadata_file, checker_func: :file?)
+          remove(sass_cache, checker_func: :directory?)
+        end
 
-          if File.file? metadata_file
-            Bunto.logger.info "Removing #{metadata_file}..."
-            FileUtils.rm_rf(metadata_file)
-            Bunto.logger.info "", "done."
+        def remove(filename, checker_func: :file?)
+          if File.public_send(checker_func, filename)
+            Bunto.logger.info "Cleaner:", "Removing #{filename}..."
+            FileUtils.rm_rf(filename)
           else
-            Bunto.logger.info "Nothing to do for #{metadata_file}."
+            Bunto.logger.info "Cleaner:", "Nothing to do for #{filename}."
           end
         end
       end

data/lib/bunto/commands/doctor.rb

@@ -8,7 +8,7 @@ module Bunto
             c.description 'Search site and print specific deprecation warnings'
             c.alias(:hyde)
 
-            c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+            c.option 'config', '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
 
             c.action do |_, options|
               Bunto::Commands::Doctor.process(options)

data/lib/bunto/commands/new.rb

@@ -35,6 +35,10 @@ module Bunto
             File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f|
               f.write(scaffold_post_content)
             end
+            
+            File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f|
+              f.write(gemfile_contents)
+            end
           end
 
           Bunto.logger.info "New bunto site installed in #{new_blog_path}."
@@ -59,6 +63,31 @@ module Bunto
         end
 
         private
+        
+        def gemfile_contents
+          <<-RUBY
+source "https://rubygems.org"
+  
+# Hello! This is where you manage which Bunto version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Bunto with `bundle exec`, like so:
+#
+#     bundle exec bunto serve
+#
+# This will help ensure the proper Bunto version is running.
+# Happy Buntoing!
+gem "bunto", "#{Bunto::VERSION}"
+
+# If you want to use GitHub Pages, remove the "gem "bunto"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+# gem "github-pages", group: :bunto_plugins
+  
+# If you have any plugins, put them here!
+# group :bunto_plugins do
+#   gem "bunto-github-metadata", "~> 1.0"
+# end
+RUBY
+        end
 
         def preserve_source_location?(path, options)
           !options["force"] && !Dir["#{path}/**/*"].empty?

data/lib/bunto/commands/serve.rb

@@ -10,6 +10,8 @@ module Bunto
           "ssl_key"  => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
           "port"     => ["-P", "--port [PORT]", "Port to listen on"],
           "baseurl"  => ["-b", "--baseurl [URL]", "Base URL"],
+          "show_dir_listing" => ["--show-dir-listing",
+            "Show a directory listing instead of loading your index file."],
           "skip_initial_build" => ["skip_initial_build", "--skip-initial-build",
             "Skips the initial site build which occurs before the server is started."]
         }
@@ -91,6 +93,8 @@ module Bunto
             )
           }
 
+          opts[:DirectoryIndex] = [] if opts[:BuntoOptions]['show_dir_listing']
+
           enable_ssl(opts)
           enable_logging(opts)
           opts
@@ -112,26 +116,24 @@ module Bunto
 
         private
         def server_address(server, opts)
-          address = server.config[:BindAddress]
-          baseurl = "#{opts["baseurl"]}/" if opts["baseurl"]
-          port = server.config[:Port]
-
-          "http://#{address}:#{port}#{baseurl}"
+          "%{prefix}://%{address}:%{port}%{baseurl}" % {
+            :prefix => server.config[:SSLEnable] ? "https" : "http",
+            :baseurl => opts["baseurl"] ? "#{opts["baseurl"]}/" : "",
+            :address => server.config[:BindAddress],
+            :port => server.config[:Port]
+          }
         end
 
         #
 
         private
         def launch_browser(server, opts)
-          command =
-            if Utils::Platforms.windows?
-              "start"
-            elsif Utils::Platforms.osx?
-              "open"
-            else
-              "xdg-open"
-            end
-          system command, server_address(server, opts)
+          address = server_address(server, opts)
+          return system "start", address if Utils::Platforms.windows?
+          return system "xdg-open", address if Utils::Platforms.linux?
+          return system "open", address if Utils::Platforms.osx?
+          Bunto.logger.error "Refusing to launch browser; " \
+            "Platform launcher unknown."
         end
 
         # Keep in our area with a thread or detach the server as requested
@@ -181,7 +183,7 @@ module Bunto
           source_certificate = Bunto.sanitized_path(opts[:BuntoOptions]["source"], opts[:BuntoOptions]["ssl_cert"])
           opts[:SSLCertificate] = OpenSSL::X509::Certificate.new(File.read(source_certificate))
           opts[:SSLPrivateKey ] = OpenSSL::PKey::RSA.new(File.read(source_key))
-          opts[:EnableSSL] = true
+          opts[:SSLEnable] = true
         end
 
         private

data/lib/bunto/configuration.rb

@@ -44,6 +44,7 @@ module Bunto
       'port'          => '4000',
       'host'          => '127.0.0.1',
       'baseurl'       => '',
+      'show_dir_listing' => false,
 
       # Output Configuration
       'permalink'     => 'date',
@@ -148,7 +149,7 @@ module Bunto
       Bunto.logger.info "Configuration file:", file
       next_config
     rescue SystemCallError
-      if @default_config_file
+      if @default_config_file ||= nil
         Bunto.logger.warn "Configuration file:", "none"
         {}
       else
@@ -285,8 +286,8 @@ module Bunto
     def renamed_key(old, new, config, _ = nil)
       if config.key?(old)
         Bunto::Deprecator.deprecation_message "The '#{old}' configuration" \
-          "option has been renamed to '#{new}'. Please update your config " \
-          "file accordingly."
+          " option has been renamed to '#{new}'. Please update your config" \
+          " file accordingly."
         config[new] = config.delete(old)
       end
     end