jekyll-plus 0.1.0 → 0.2.0

data/lib/patches/listen_windows_adapter.rb

@@ -0,0 +1,8 @@
+module Listen
+  module Adapter
+    class Windows < Base
+      def self.usable?
+      end
+    end
+  end
+end

data/lib/patches/mercenary_presenter.rb

@@ -0,0 +1,38 @@
+module Mercenary
+  class Presenter
+    attr_accessor :command
+
+    def options_presentation
+      return nil unless command_options_presentation || parent_command_options_presentation
+      [command_options_presentation.cyan, parent_command_options_presentation].join("\n\n").rstrip
+    end
+
+    def parent_command_options_presentation
+      return nil unless command.parent
+      Presenter.new(command.parent).command_options_presentation
+    end
+
+    # adapted from https://github.com/jekyll/mercenary/pull/44
+    def command_options_presentation
+      return nil if command.options.empty?
+      command_options = command.options
+      command_options -= command.parent.options unless command.parent.nil?
+      command_options.map(&:to_s).join("\n")
+    end
+
+    def command_header
+      header = "\n#{command.identity}"
+      header << " -- #{command.description}" if command.description
+      header
+    end
+  end
+
+  class Option
+    def formatted_switches
+      [
+        switches.first.rjust(10),
+        switches.last.ljust(20)
+      ].join(", ").gsub(/ , /, '   ').gsub(/,   /, '    ')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-plus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ashwin Maroli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,28 +16,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: jekyll-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.14.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.14.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,56 +73,44 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.1'
 description: 
 email:
 - ashmaroli@gmail.com
-executables: []
+executables:
+- jekyll+
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
+- exe/jekyll+
 - lib/jekyll-plus.rb
 - lib/jekyll-plus/version.rb
-- lib/jekyll/commands/new.rb
-- lib/jekyll/templates/classic_template/Gemfile.erb
-- lib/jekyll/templates/classic_template/_config.yml.erb
-- lib/jekyll/templates/classic_template/theme_folders/_includes/disqus_comments.html
-- lib/jekyll/templates/classic_template/theme_folders/_includes/footer.html
-- lib/jekyll/templates/classic_template/theme_folders/_includes/google-analytics.html
-- lib/jekyll/templates/classic_template/theme_folders/_includes/head.html
-- lib/jekyll/templates/classic_template/theme_folders/_includes/header.html
-- lib/jekyll/templates/classic_template/theme_folders/_includes/icon-github.html
-- lib/jekyll/templates/classic_template/theme_folders/_includes/icon-github.svg
-- lib/jekyll/templates/classic_template/theme_folders/_includes/icon-twitter.html
-- lib/jekyll/templates/classic_template/theme_folders/_includes/icon-twitter.svg
-- lib/jekyll/templates/classic_template/theme_folders/_layouts/default.html
-- lib/jekyll/templates/classic_template/theme_folders/_layouts/home.html
-- lib/jekyll/templates/classic_template/theme_folders/_layouts/page.html
-- lib/jekyll/templates/classic_template/theme_folders/_layouts/post.html
-- lib/jekyll/templates/classic_template/theme_folders/_sass/_base.scss
-- lib/jekyll/templates/classic_template/theme_folders/_sass/_layout.scss
-- lib/jekyll/templates/classic_template/theme_folders/_sass/_syntax-highlighting.scss
-- lib/jekyll/templates/classic_template/theme_folders/assets/main.scss
-- lib/jekyll/templates/site_template/.gitignore
-- lib/jekyll/templates/site_template/Gemfile.erb
-- lib/jekyll/templates/site_template/_config.yml.erb
-- lib/jekyll/templates/site_template/_posts/0000-00-00-welcome-to-jekyll.md.erb
-- lib/jekyll/templates/site_template/about.md
-- lib/jekyll/templates/site_template/index.md
+- lib/jekyll/commands/extract_theme.rb
+- lib/jekyll/commands/new_site.rb
+- lib/jekyll/site_template/.gitignore.erb
+- lib/jekyll/site_template/Gemfile.erb
+- lib/jekyll/site_template/_config.yml.erb
+- lib/jekyll/site_template/_posts/0000-00-00-welcome-to-jekyll.md.erb
+- lib/jekyll/site_template/about.md.erb
+- lib/jekyll/site_template/index.html.erb
+- lib/patches/idempotent_jekyll_config.rb
+- lib/patches/jekyll_watcher.rb
+- lib/patches/listen_windows_adapter.rb
+- lib/patches/mercenary_presenter.rb
 homepage: https://github.com/ashmaroli/jekyll-plus
 licenses:
 - MIT
@@ -124,8 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: Additional switches for jekyll new command.
+summary: A tool to simplify Jekyll experience with theme-gems.
 test_files: []

data/lib/jekyll/commands/new.rb

@@ -1,190 +0,0 @@
-require "erb"
-
-module Jekyll
-  class Commands::New < Command
-    class << self
-      def init_with_program(prog)
-      end
-
-      def process(args, options = {})
-        @verbose = options["verbose"]
-
-        raise ArgumentError, "You must specify a path." if args.empty?
-
-        # extract capitalized blog title from the argument(s) when a 'path'
-        # to the new site has been provided.
-        #   e.g.  jekyll new work/blogs/exploring ruby would install a blog
-        #   titled 'Exploring Ruby' at path ~/work/blogs/exploring ruby
-        blog_title = extract_title args
-        blog_path = File.expand_path(args.join(" "), Dir.pwd)
-        FileUtils.mkdir_p blog_path
-
-        if preserve_source_location?(blog_path, options)
-          Jekyll.logger.abort_with "Conflict:",
-                    "#{blog_path} exists and is not empty."
-        end
-
-        create_site blog_title, blog_path, options
-      end
-
-      #
-      # private methods
-      #
-
-      private
-
-      # join the arguments given, with a whitespace; replace backslashes, if any
-      # with a forward slash; split the string into an array again and select the
-      # last entry.
-      # Further split the entry along a single whitespace, and map to a new array
-      # after capitalizing the split-entries. Join them again with a whitespace
-      # to form the final title string.
-      def extract_title(args)
-        a = args.join(" ").tr("\\", "/").split("/").last
-        a.split.map(&:capitalize).join(" ")
-      end
-
-      def initialized_post_name
-        "_posts/#{Time.now.strftime("%Y-%m-%d")}-welcome-to-jekyll.md"
-      end
-
-      def initialize_git(path)
-        Jekyll.logger.info "Initialising:", File.join(path, ".git") if @verbose
-        Dir.chdir(path) { `git init` }
-      end
-
-      def user_name
-        name ||= `git config user.name`.chomp
-        name.empty? ? "Github User" : name
-      end
-
-      def user_email
-        email ||= `git config user.email`.chomp
-        email.empty? ? "your-email@domain.com" : email
-      end
-
-      def preserve_source_location?(path, options)
-        !options["force"] && !Dir["#{path}/**/*"].empty?
-      end
-
-      def create_site(title, path, options)
-        if options["blank"] && options["verbose"]
-          create_blank_site path
-        else
-          create_sample_files path
-          add_supporting_files title, path, options
-        end
-        after_install title, path, options
-      end
-
-      def create_blank_site(path)
-        Dir.chdir(path) do
-          FileUtils.mkdir(%w(_layouts _posts _drafts))
-          FileUtils.touch("index.html")
-        end
-      end
-
-      def create_sample_files(path)
-        Jekyll.logger.info "" if @verbose
-        initialize_git path
-        FileUtils.mkdir_p(File.expand_path("_posts", path))
-        source = site_template
-
-        static_files = %w(index.md about.md .gitignore)
-        static_files.each do |file|
-          write_file(file, template(file, source), path)
-        end
-        write_file(initialized_post_name, template(scaffold_path, source), path)
-      end
-
-      # adds Gemfile and _config.yml
-      # additionally creates (updated) SCAFFOLD DIRECTORIES of a Jekyll Theme at
-      # blog_path when the `--classic` switch is used.
-      def add_supporting_files(title, path, options)
-        if options["classic"]
-          source = classic_template
-          Jekyll.logger.info "Creating:", "Classic directories and files" if @verbose
-          FileUtils.cp_r "#{classic_directories}/.", path
-        else
-          source = site_template
-        end
-        create_config_file title, path, source
-        write_file("Gemfile", template("Gemfile.erb", source), path)
-        Jekyll.logger.info "" if @verbose
-      end
-
-      # create _config.yml pre-populated with blog-title, and author's name & email
-      # using information from the user's .gitconfig
-      def create_config_file(title, path, source)
-        @blog_title = title
-        @user_name = user_name
-        @user_email = user_email
-        config_template = File.expand_path("_config.yml.erb", source)
-        config_copy = ERB.new(File.read(config_template)).result(binding)
-
-        Jekyll.logger.info "Creating:", File.join(path, "_config.yml") if @verbose
-        File.open(File.expand_path("_config.yml", path), "w") do |f|
-          f.write(config_copy)
-        end
-      end
-
-      def write_file(filename, contents, path)
-        full_path = File.expand_path(filename, path)
-        Jekyll.logger.info "Creating:", full_path if @verbose
-        File.write(full_path, contents)
-      end
-
-      def template(filename, source)
-        erb ||= ThemeBuilder::ERBRenderer.new(self)
-        erb.render(File.read(File.expand_path(filename, source)))
-      end
-
-      def site_template
-        File.expand_path("../templates/site_template", File.dirname(__FILE__))
-      end
-
-      def classic_template
-        File.expand_path("../templates/classic_template", File.dirname(__FILE__))
-      end
-
-      def classic_directories
-        File.join(classic_template, "theme_folders")
-      end
-
-      def scaffold_path
-        "_posts/0000-00-00-welcome-to-jekyll.md.erb"
-      end
-
-      # After a new blog has been installed, print a success notification and then
-      # automatically execute bundle install from within the new blog dir unless
-      # the user opts to generate a classic Jekyll blog or a blank blog or skip
-      # 'bundle install' using the `--skip-bundle` switch
-      def after_install(title, path, options)
-        if options["classic"]
-          Jekyll.logger.info "New classic jekyll site installed in #{path.cyan}."
-        elsif options["blank"]
-          Jekyll.logger.info "New blank jekyll site installed in #{path.cyan}."
-        else
-          Jekyll.logger.info "New jekyll site #{title.cyan} installed in #{path.cyan}."
-        end
-
-        Jekyll.logger.info "Bundle install skipped." if options["skip-bundle"]
-        unless options["classic"] || options["blank"] || options["skip-bundle"]
-          bundle_install path
-        end
-      end
-
-      def bundle_install(path)
-        Jekyll::External.require_with_graceful_fail "bundler"
-        Jekyll.logger.info "Running bundle install in #{path.cyan}..."
-        Dir.chdir(path) do
-          if ENV["CI"]
-            system("bundle", "install", "--quiet")
-          else
-            system("bundle", "install")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/jekyll/templates/classic_template/_config.yml.erb

@@ -1,37 +0,0 @@
-# Welcome to Jekyll!
-#
-# This config file is meant for settings that affect your whole blog, values
-# which you are expected to set up once and rarely edit after that. If you find
-# yourself editing this file very often, consider using Jekyll's data files
-# feature for the data you need to update frequently.
-#
-# For technical reasons, this file is *NOT* reloaded automatically when you use
-# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
-
-# Site settings
-# These are used to personalize your new site. If you look in the HTML files,
-# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
-# You can create any custom variable you would like, and they will be accessible
-# in the templates via {{ site.myvariable }}.
-
-title: your awesome title
-email: your-email@domain.com
-# the ">" below means to ignore newlines until "baseurl:"
-description: >
-  Write an awesome description for your new site here. You can edit this
-  line in _config.yml. It will appear in your document head meta (for
-  Google search results) and in your feed.xml site description.
-baseurl: "" # the subpath of your site, e.g. /blog
-url: "" # the base hostname & protocol for your site, e.g. http://example.com
-twitter_username: jekyllrb
-github_username:  jekyll
-
-# Build settings
-markdown: kramdown
-# uncomment (and edit) the line below when using a theme
-# theme: minima
-gems:
-  - jekyll-feed
-exclude:
-  - Gemfile
-  - Gemfile.lock

data/lib/jekyll/templates/classic_template/theme_folders/_includes/disqus_comments.html

@@ -1,20 +0,0 @@
-{% if page.comments != false and jekyll.environment == "production" %}
-
-  <div id="disqus_thread"></div>
-  <script>
-    var disqus_config = function () {
-      this.page.url = '{{ page.url | absolute_url }}';
-      this.page.identifier = '{{ page.url | absolute_url }}';
-    };
-
-    (function() {
-      var d = document, s = d.createElement('script');
-
-      s.src = 'https://{{ site.disqus.shortname }}.disqus.com/embed.js';
-
-      s.setAttribute('data-timestamp', +new Date());
-      (d.head || d.body).appendChild(s);
-    })();
-  </script>
-  <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
-{% endif %}