jekyll-plus 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61d7047840f274b66bfbae1c9e987cb304ba6fb
-  data.tar.gz: c9bf197e497d800e3515a9d591e898cae0bf7b0f
+  metadata.gz: c81971827446233240473e8b39d503ed67d32c61
+  data.tar.gz: a1209f152c5aa9d54f2c4b5d398bd280c1059e3e
 SHA512:
-  metadata.gz: ee0170d39c872f61bcd51b7bc4b3b835d595aec9fa90b2fcc54bd02f7f57421a4f851b1725cdc9021b8bf80d037289879c1cef406c80454511b158579cdc497c
-  data.tar.gz: 15a4d19d35f2c921c33953ce77aee115515d76d6a44c2bf805de38fadc41f541705b393594a6bd56840c880a4afbabe275fe0c763c2c5025faf92c9e38e3d6b1
+  metadata.gz: 7d22a6ee2a5e95258cdec9cb0c11d9cbbeae831bed39b7c34dd859389188b38e8600908226f75e71aacfb398e75eba4373013a175617b8ddc27458d1e6b5f295
+  data.tar.gz: 6fcba5a1852e29870a6dbbf92dec32d6998de7932ea0972949e6230af7faf5a24766a45452ddfdeef7b9626fd4acd5984257b5c8099ffdc5fd1617849e3956c3

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Ashwin Maroli
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to 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 OR COPYRIGHT HOLDERS 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.
+The MIT License (MIT)
+
+Copyright (c) 2016-2017 Ashwin Maroli & Contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to 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 OR COPYRIGHT HOLDERS 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

@@ -1,77 +1,209 @@
-# Jekyll-Plus
-
-[![Gem Version](https://img.shields.io/gem/v/jekyll-plus.svg)](https://rubygems.org/gems/jekyll-plus)
-[![Build Status](https://img.shields.io/travis/ashmaroli/jekyll-plus/master.svg?label=Build%20Status)][travis]
-
-[travis]: https://travis-ci.org/ashmaroli/jekyll-plus
-
-A ruby gem that modifies `jekyll new` command to add new switches: `--plus`, `--classic`, `--verbose`.
-
-## Installation
-
-Simply run:
-
-    $ gem install jekyll-plus
-
-Currently, to use this gem as intended, Jekyll's native `~/commands/new.rb` file requires to be slightly modified as shown below:
-```diff
-# lib/jekyll/commands/new.rb
-
-def init_with_program(prog)
-  prog.command(:new) do |c|
-    c.syntax "new PATH"
-    c.description "Creates a new Jekyll site scaffold in PATH"
-
-    c.option "force", "--force", "Force creation even if PATH already exists"
-    c.option "blank", "--blank", "Creates scaffolding but with empty files"
-    c.option "skip-bundle", "--skip-bundle", "Skip 'bundle install'"
-+   c.option "plus", "--plus", "Plus features"
-+   c.option "classic", "--classic", "Classic Jekyll scaffolding"
-+   c.option "verbose", "--verbose", "Output messages while creating"
-
-    c.action do |args, options|
-+     if options["plus"] || options["classic"] || options["verbose"]
-+       External.require_with_graceful_fail "jekyll-plus"
-+     end
-      Jekyll::Commands::New.process(args, options)
-    end
-  end
-end
-```
-## Usage
-
-This gem provides three new switches to be used along with the `jekyll new` command.
-
-### `--plus`
-
-This switch creates a new Jekyll site using ERB templates for `_config.yml` and `Gemfile` and additionally initializes the directory as a git repository.  
-The config file in such sites will be **pre-populated** with information from the argument(s) passed to `jekyll new` and from the user's `.gitconfig` file. If the git-user-details have not been configured, placeholder text will be used instead.
-
-**Note:** `site.title` will be set with `capitalized` version of the project's directory-name.  
-This switch has no effect when used alongside the `--blank` switch.
-
-### `--classic`
-
-This switch creates a classic-style (pre-Jekyll-3.2) Jekyll site by including the `_layouts`, `_includes`, `_sass` at the root. The directory structure has been altered to be in sync with Jekyll v3.3 and hence you'll have a `Gemfile`, `css/main.scss` is now `assets/main.scss`, etc.
-
-A *Classic Site* will:
-  - have `Gemfile` and `_config.yml` with the line containing `minima` commented out.
-  - have `_layouts`, `_includes`, `_sass` and `assets` at root.
-  - the contents of these directories, in sync (to be manually updated with patch releases) with the latest `master` branch from Minima Repo.
-  - ***not*** have `site.email` and `site.author` pre-filled with info from user's `.gitconfig` or `site.title` pre-configured from the argument(s) passed.
-  - ***not*** run `bundle install` automatically.
-
-**Note:** `--classic` dominates `--plus` and will create a *Classic Site* when the two switches are used together.
-
-### `--verbose`
-
-This switch prints out messages as the new Jekyll site is being created. Can be used with `--blank`, `--plus` and `--classic`.
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/ashmaroli/jekyll-plus. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+# JekyllPlus
+
+[![Gem Version](https://img.shields.io/gem/v/jekyll-plus.svg)](https://rubygems.org/gems/jekyll-plus)
+[![Build Status](https://img.shields.io/travis/ashmaroli/jekyll-plus/master.svg?label=Build%20Status)][travis]
+
+[travis]: https://travis-ci.org/ashmaroli/jekyll-plus
+
+JekyllPlus is now a tool that simplifies the installation and usage of a Jekyll Site linked to a gem-based Jekyll Theme.
+*Disclaimer: This plugin works best with gem-based themes that are [serve-ready packages](#gem-recommendation).*
+
+
+## Installation
+
+Simply run:
+
+    $ gem install jekyll-plus
+
+
+## Usage
+
+This gem installs an executable `jekyll+` that takes a couple of new commands to enrich the Jekyll experience.<br>
+**Note:** Along with the following commands, all existing Jekyll Commands are available to be used with the executable.<br>
+The new additions are :
+
+
+### `new-site`
+
+```
+jekyll+ new-site -- Creates a custom Jekyll site scaffold in PATH
+
+Usage:
+
+  jekyll+ new-site PATH
+
+Options:
+          --classic          Classic Jekyll scaffolding
+          --theme GEM-NAME   Scaffold with a custom gem-based theme
+          --force            Force creation even if PATH already exists
+          --verbose          Output messages while creating
+
+```
+
+#### Overview
+
+`jekyll+ new-site` is very much like `jekyll new` in that it generates a static-site precursor to be processed into an HTML website. But its also very different in the sense that `new-site` **deviates from Jekyll's no-magic philosophy**
+
+A default site generated by `new-site` will have the site's `title` configured based on the `PATH` argument supplied.
+
+```sh
+
+$ jekyll+ new-site my blog
+# => New jekyll site (titled) My Blog installed in ~/my blog.
+
+```
+
+```sh
+
+$ jekyll+ new-site blogs/summer rain
+# => New jekyll site (titled) Summer Rain installed in ~/blogs/summer rain.
+
+```
+If the user has Git installed and configured on their system, another set of keys are automatically defined &mdash; `name:` and `email:`, both of which will now be populated with the corresponding Git credentials.
+
+This auto-populate feature extends to sites generated with `--classic` and `--theme` switches **if the theme-gem doesn't bundle a `_config.yml` within it**.
+
+--
+
+The `--theme` switch is for those who have decided what **theme-gem** to use with their site.<br>
+Simply provide the theme's `gem-name`.<br>
+  e.g. To install a site with the **gem-based version** of the popular theme [Minimal Mistakes](https://github.com/mmistakes/minimal-mistakes), (`minimal-mistakes-jekyll`), simply run
+
+    $ jekyll+ new-site awesome blog --theme minimal-mistakes-jekyll
+
+If you have an older version of the theme-gem already installed on your system, then though a new site will be immediately installed at `./awesome blog`, with the `_config.yml` and `Gemfile` already set to use this theme, the downside is that you'll still have to manually download the Minimal-Mistakes-config-file from the theme repo to be *serve-ready*
+
+But if you have installed the [**serve-ready**](#gem-recommendation) version of the theme-gem, then by simply running the command stated above, the new site installed at `./awesome blog` will have the minimum required elements to let you serve and preview the site immediately &mdash; a Minimal-Mistakes-config-file that has all the settings for your site and the associated template files.<br>
+The data files need not be copied over to the `source` unless they need to be customized. Data files within the theme-gem will be read like the remaining template files via the built-in [`jekyll-data`](https://github.com/ashmaroli/jekyll-data) plugin.
+
+If you dont have any version of the theme installed, then `new-site` will automatically run `bundle install` and install the latest version available if you're connected to the internet.
+
+--
+
+When the `--classic` switch is used, the generated site will contain all the directories expected in a Jekyll installation prior to Jekyll v3.2<br>
+The `--classic` and `--theme` switch can be used together to install a classic-style site with the template files and directories extracted to your `source` from the theme-gem.
+
+
+#### Key Points:
+
+  * `new-site` when passed without the `--classic` or the `--theme` switch doesn't run `bundle install` at the end.
+
+  * if either `--classic` or `--theme` is used, JekyllPlus will first check if the theme-gem (defaults to "minima") is installed in the system. If not found, then it'll initiate `bundle install` to install the theme-gem.
+
+  * the `--classic` switch will run the `extract-theme` command (described below) and copy the theme's template directories and files to the site's default `source` directory. Additionally, if the theme-gem has included a `_config.yml` within it, it will be copied over too, **replacing the one currently present at `source`.**
+
+  * the `--theme` switch will initialize a `Gemfile` and a `_config.yml` with the provided `GEM-NAME`. Additionally, this too will **replace the `_config.yml` at `source` if a namesake is present at the root of the theme-gem.**
+
+--
+
+### `extract-theme`
+
+```
+jekyll+ extract-theme -- Extract files and directories from theme-gem to source
+
+Alias: extract
+
+Usage:
+
+  jekyll+ extract-theme [DIR (or) FILE-PATH]
+  jekyll+ extract [DIR (or) FILE-PATH]
+
+Options:
+          --force     Force extraction even if file already exists
+          --list      List the contents of the specified [DIR]
+          --lax       Continue extraction process if a file doesn't exist
+          --quiet     Swallow info messages while extracting
+          --verbose   Additional info messages while extracting
+
+```
+`extract-theme` or `extract` does just one thing &mdash; ***copy** files or entire directories from the configured theme-gem to the site's `source` directory.* You can *extract* any combination of files and directories *within the theme-gem* as long as you know their path, relative to the theme-gem.
+
+**Example scenario: &mdash; Extracting the theme's layouts**
+
+  * Lets first inspect the contents of the `_layouts` directory.
+
+  ```sh
+  $ bundle exec jekyll+ extract-theme _layouts --list
+  # =>
+      Listing: Contents of '/_layouts' in theme gem...
+
+             * /_layouts/default.html
+             * /_layouts/home.html
+             * /_layouts/page.html
+             * /_layouts/post.html
+               ..done
+  ```
+
+  * Now I know what layouts are available. To *extract* the entire `_layouts` directory
+
+  ```sh
+  bundle exec jekyll+ extract-theme _layouts
+  ```
+
+  * Or, to simply *extract* the layouts for posts and pages:
+
+  ```sh
+  bundle exec jekyll+ extract-theme _layouts/page.html _layouts/post.html
+  ```
+
+  * To *extract* whatever is available under the `assets` directory and the `post.html` layout:
+
+  ```sh
+  bundle exec jekyll+ extract-theme assets _layouts/post.html
+  ```
+
+  * Any file within the theme-gem can be *extracted* to `source`.
+
+  ```sh
+  bundle exec jekyll+ extract-theme read-me.html
+  ```
+
+
+## Gem Recommendation
+
+The only functional difference between `jekyll new` and **`jekyll+ new-site`** is that the latter's `--theme` and `--classic` switches revolve around a jekyll theme-gem (either the default theme-gem "minima" or the string passed to `--theme`.)
+
+The following are a set of recommendations directed at theme-gem developers to make their themes **serve-ready**:
+
+  * **Serve-ready theme-gems contain all the minimum elements that are required to let the consumer easily preview their site by simply running `bundle exec jekyll+ serve`**
+
+  * If your theme is dependent on a custom **`_config.yml`** that declares necessary plugins and other settings, then please don't hesitate from bundling that file within your theme-gem. `jekyll+ new-site` will then automatically **replace** the **`_config.yml`** at `source` with your bundled file. **You just need to make sure that the `theme` key is properly defined.**
+
+  * If your theme-gem requires a set of data files that impart locale-configuration (they seldom require customization), bundle them into the gem. They will be *read-in* via the included [`jekyll-data`](https://github.com/ashmaroli/jekyll-data) plugin if the user decides to `build` their site locally using `jekyll+ build` or `jekyll+ serve`.
+
+  * If your theme-gem requires certain *customizable* `data files` to exist at `source`, again, pack in the `_data` directory. It can be easily sent to your user's `source` by having them simply run `jekyll+ extract-theme _data` or `jekyll+ extract _data`. Your theme's documentation may need to instruct the user to use that command.
+
+  * Except for `index.html`, files generated by `jekyll+ new-site` do not have the `layout:` key hard-coded in the FrontMatter and hence one can easily bootstrap a site with a theme-gem provided that the theme-gem's `_config.yml` has the **Front Matter Defaults** defined, for example:
+
+  ```yaml
+  defaults:
+    - scope:
+        path: ""
+        type: posts
+      values:
+        layout: post
+    - scope:
+        path: ""
+        type: pages
+      values:
+        layout: page
+  ```
+
+  * `index.html` will take on the values defined for `pages` and hence the `layout` is set to `home` by default.
+
+
+## Plugins & Patches
+
+  * Includes the [`jekyll-data`](https://github.com/ashmaroli/jekyll-data) plugin that enables reading of data files and `_config.yml` within the theme-gem.
+  * Includes patches to various modules and classes used by `Jekyll` adapted from certain existing pull-requests at their respective repos and will be altered / removed as required in future releases.  
+  For details, please [refer this file](https://github.com/ashmaroli/jekyll-plus/blob/master/lib/jekyll-plus.rb#L9-L28).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/ashmaroli/jekyll-plus.<br>
+This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/exe/jekyll+

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+STDOUT.sync = true
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require "jekyll-plus"
+require "mercenary"
+
+Jekyll::PluginManager.require_from_bundler
+
+Jekyll::Deprecator.process(ARGV)
+
+Mercenary.program(:"jekyll+") do |p|
+  p.version JekyllPlus::VERSION
+  p.description "JekyllPlus is a tool that simplifies the installation and usage" \
+                " of a Jekyll Site linked to a gem-based Jekyll Theme."
+  p.syntax "jekyll+ <subcommand> [options]"
+
+  p.option "source", "-s", "--source [DIR]", "Source directory (defaults to ./)"
+  p.option "destination", "-d", "--destination [DIR]",
+    "Destination directory (defaults to ./_site)"
+  p.option "safe", "--safe", "Safe mode (defaults to false)"
+  p.option "plugins_dir", "-p", "--plugins DIR1[,DIR2[,...]]", Array,
+    "Plugins directory (defaults to ./_plugins)"
+  p.option "layouts_dir", "--layouts DIR", String,
+    "Layouts directory (defaults to ./_layouts)"
+  p.option "profile", "--profile", "Generate a Liquid rendering profile"
+
+  Jekyll::External.require_if_present(Jekyll::External.blessed_gems) do |g|
+    cmd = g.split("-").last
+    p.command(cmd.to_sym) do |c|
+      c.syntax cmd
+      c.action do
+        Jekyll.logger.abort_with "You must install the '#{g}' gem" \
+          " to use the 'jekyll #{cmd}' command."
+      end
+    end
+  end
+
+  Jekyll::Command.subclasses.each { |c| c.init_with_program(p) }
+
+  p.action do |args, _|
+    if args.empty?
+      Jekyll.logger.error "A subcommand is required."
+      puts p
+      abort
+    else
+      subcommand = args.first
+      unless p.has_command? subcommand
+        Jekyll.logger.abort_with "FATAL: 'jekyll+ #{args.first}' could not" \
+          " be found. You may need to install the jekyll-#{args.first} gem" \
+          " or a related gem to be able to use this subcommand.".bold
+      end
+    end
+  end
+end

data/lib/jekyll-plus.rb

@@ -1,2 +1,28 @@
-require "jekyll-plus/version"
-require_relative "jekyll/commands/new"
+require "jekyll"
+require "jekyll-plus/version"
+require_relative "jekyll/commands/new_site"
+require_relative "jekyll/commands/extract_theme"
+
+# Plugins
+require "jekyll-data" # read "_config.yml" and data files within a theme-gem
+
+# ------------------------------ Temporary Patches ------------------------------
+# TODO:
+#   - remove patch to Jekyll Configuration after jekyll/jekyll/pull/5487 is merged.
+#   - modify patch to Mercenary after jekyll/mercenary/pull/44 and
+#     jekyll/mercenary/pull/48 are merged.
+#   - remove patch to Jekyll::Watcher after jekyll/jekyll-watch/pull/42 is merged.
+#   - remove patch to Listen Adapter only if any issues regarding that crop up.
+
+require_relative "patches/idempotent_jekyll_config"
+
+require "mercenary"
+require_relative "patches/mercenary_presenter"
+
+require "jekyll-watch"
+require_relative "patches/jekyll_watcher"
+
+require "listen"
+require_relative "patches/listen_windows_adapter"
+
+# --------------------------- End of Temporary Patches ---------------------------

data/lib/jekyll-plus/version.rb

@@ -1,3 +1,3 @@
-module JekyllPlus
-  VERSION = "0.1.0".freeze
-end
+module JekyllPlus
+  VERSION = "0.2.0".freeze
+end

data/lib/jekyll/commands/extract_theme.rb

@@ -0,0 +1,152 @@
+module Jekyll
+  class Commands::ExtractTheme < Command
+    class << self
+      def init_with_program(prog)
+        prog.command(:"extract-theme") do |c|
+          c.syntax      "extract-theme [DIR (or) FILE-PATH]"
+          c.description "Extract files and directories from theme-gem to Source"
+          c.alias :extract
+
+          c.option "force", "--force", "Force extraction even if file already exists"
+          c.option "list", "--list", "List the contents of the specified [DIR]"
+          c.option "lax", "--lax", "Continue extraction process if a file doesn't exist"
+          c.option "quiet", "--quiet", "Swallow info messages while extracting"
+          c.option "verbose", "--verbose", "Additional info messages while extracting"
+
+          c.action do |args, options|
+            if args.empty?
+              raise ArgumentError, "You must specify a theme directory or a file path."
+            end
+            process(args, options)
+          end
+        end
+      end
+
+      def process(args, options = {})
+        @quiet = options["quiet"]
+        @verbose = options["verbose"]
+
+        config = Jekyll.configuration(Configuration.new)
+        @source = config["source"]
+        @theme_dir = Site.new(config).theme.root
+
+        print "Source Directory:", @source
+        print "Theme Directory:", @theme_dir
+        verbose_print ""
+
+        # Substitute leading special-characters in an argument with an
+        # 'underscore' to disable extraction of files outside the theme-gem
+        # but allow extraction of theme directories with a leading underscore.
+        #
+        # Process each valid argument individually to enable extraction of
+        # multiple files or directories.
+        args.map { |i| i.sub(%r!\A\W!, "_") }.each do |arg|
+          initiate_extraction arg, options
+        end
+        Jekyll.logger.info "", "..done"
+      end
+
+      private
+
+      def initiate_extraction(path, options)
+        file_path = Jekyll.sanitized_path(@theme_dir, path)
+        if File.exist? file_path
+          extract_to_source file_path, options
+        else
+          error_msg = "'#{path}' could not be found at the root of your theme-gem."
+          if options["lax"]
+            Jekyll.logger.warn "", "#{error_msg} Proceeding anyways."
+            verbose_print ""
+          else
+            Jekyll.logger.abort_with "ERROR:", error_msg
+          end
+        end
+      end
+
+      def extract_to_source(path, options)
+        if File.directory?(path) && options["list"]
+          list_contents path
+        elsif File.directory? path
+          dir_path = File.expand_path(path.split("/").last, @source)
+          extract_directory dir_path, path, options
+        elsif !File.directory?(path) && options["list"]
+          Jekyll.logger.warn "Error:", relative_path(path)
+          Jekyll.logger.warn "", "The --list switch only works for directories"
+        else
+          dir_path = File.dirname(File.join(@source, relative_path(path)))
+          extract_file_with_directory dir_path, path, options
+        end
+      end
+
+      def list_contents(path)
+        print ""
+        print("Listing:",
+          "Contents of '#{relative_path(path)}' in theme gem...")
+        print ""
+        files_in(path).each do |file|
+          print "*", relative_path(file)
+        end
+      end
+
+      def extract_directory(dir_path, path, options)
+        if File.exist?(dir_path) && !options["force"]
+          already_exists_msg path
+        else
+          FileUtils.cp_r path, @source
+          directory = "#{relative_path(path).sub("/", "")} directory"
+          print "Extracting:", directory
+          verbose_print "", "-" * directory.length
+          files_in(path).each do |file|
+            verbose_print "", dir_content_path(path, file)
+          end
+          verbose_print ""
+        end
+      end
+
+      def extract_file_with_directory(dir_path, file_path, options)
+        FileUtils.mkdir_p dir_path unless File.directory? dir_path
+        file = file_path.split("/").last
+        if File.exist?(File.join(dir_path, file)) && !options["force"]
+          already_exists_msg file
+        else
+          FileUtils.cp_r file_path, dir_path
+          extraction_msg file_path
+        end
+      end
+
+      def files_in(dir_path)
+        Dir["#{dir_path}/**/*"].reject { |d| File.directory? d }
+      end
+
+      def relative_path(file)
+        file.sub(@theme_dir, "")
+      end
+
+      def dir_content_path(dir, file)
+        relative_path(file).sub("#{relative_path(dir)}/", " * ")
+      end
+
+      def extraction_msg(file)
+        print "Extracting:", relative_path(file)
+      end
+
+      def already_exists_msg(file)
+        Jekyll.logger.warn "Error:", "'#{relative_path(file)}' already exists " \
+                           "at destination. Use --force to overwrite."
+      end
+
+      def print(topic, message = "")
+        unless @quiet
+          Jekyll.logger.info topic, message
+        end
+      end
+
+      # only with --verbose switch
+      def verbose_print(topic, message = "")
+        if @verbose
+          Jekyll.logger.info topic, message
+        end
+      end
+    end
+  end
+end