octopress-ink 1.0.0.rc.64 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93a3f6f855a23b9c4099964745280119b1ee4156
-  data.tar.gz: 9f4cae531d3031f96eee5dcae8b4316de3ef3718
+  metadata.gz: d332939b1e99df733a2015114dc931a31321a69c
+  data.tar.gz: 005708978626fc44397a64f46b459141ff87e6cc
 SHA512:
-  metadata.gz: a266441f0d498495fcfff12088759b07b897a2fdaf1f1b0960cc8749634767245671cb1fac78e2c73d4b580fb60268153fa9284636541e4f91463e2a598a4b73
-  data.tar.gz: d1373d2f316560872e6acde44cc909f1a066d395044ff07a24fa3a941a72bbec76aeb3fc783d8cc42d8b215159b1fbdb03db2223d8c298f55e3640e0b251b220
+  metadata.gz: ad20725197851910e57d4f1d3f929a947c8d122345969dffa50bb2559ad51e1fe6070d01a3cd98efc98e09e13c9ce581679f1c94cd2821bf7222c2710c6413e5
+  data.tar.gz: 0240e3c434ca6101c9b8ea35ebd6d85368ed188fcd40afb556d0c53abd34b41a4709377cd88adaf4f96eedc196d06a57643dd1f877a89615c0aa16433b1ae109

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.0 - 2015-05-02
+- Minor: Improved styling for Octopress Ink list command output.
+- Minor: Fixed issue where changelog couldn't be processed by Octopress Docs.
+
 ### 1.0.0 RC64 - 2015-04-28
 - Minor: Improved bundler integration
 - Minor: Added short flags for ink list and ink copy subcommands.
@@ -32,8 +36,8 @@
 - Fix: Tags and categories would throw errors if tags were used but plugin
   didn't have tag/category templates installed.
 - Change: tag names:
-  from {% tags %} -> {% tag_links %}
-  from {% categories %} -> {% category_links %}
+  from `{% tags %}` -> `{% tag_links %}`
+  from `{% categories %}` -> `{% category_links %}`
 
 ### 1.0.0 RC55 - 2015-03-14
 - Added `ink_watch` site configuration, allowing plugin authors to add their plugin assets directory to Jekyll's watch list.
@@ -232,7 +236,7 @@ If a user installs octopress-multilingual, all pages will be replicated and filt
 
 ### 1.0.0 RC10 - 2014-06-26
 
-- Render tag does a better job of preserving {% raw %} escaped content.
+- Render tag does a better job of preserving `{% raw %}` escaped content.
 
 ### 1.0.0 RC9 - 2014-06-21
 

data/lib/octopress-ink.rb

@@ -74,6 +74,7 @@ module Octopress
     # plugin - A subclass of Plugin
     #
     def register_plugin(plugin, options={})
+      options['type'] ||= 'plugin'
       Plugins.register_plugin(plugin, options)
     end
 

data/lib/octopress-ink/commands/helpers.rb

@@ -14,7 +14,7 @@ module Octopress
           c.option "javascripts", "-j", "--javascripts", "#{action} only Javascripts (.js and .coffee)"
           c.option "js", "--js", "#{action} only Javascript files (.js)"
           c.option "coffee", "--coffee", "#{action} only Coffeescript files (.coffee)"
-          c.option "images", "-img", "--images", "#{action} only images"
+          c.option "images", "-I", "--images", "#{action} only images"
           c.option "fonts", "--fonts", "#{action} only fonts"
           c.option "files", "--files", "#{action} only files"
         end

data/lib/octopress-ink/commands/new.rb

@@ -167,7 +167,11 @@ _site
         def self.add_simple_plugin(mod)
           mod  = "#{@settings[:require_version]}\n"
           mod += "require 'octopress-ink'\n"
-          mod += "\nOctopress::Ink.add_plugin({\n#{indent(plugin_config)}\n})\n"
+          if @settings[:type] == 'theme'
+            mod += "\nOctopress::Ink.add_theme({\n#{indent(plugin_config)}\n})\n"
+          else
+            mod += "\nOctopress::Ink.add_plugin({\n#{indent(plugin_config)}\n})\n"
+          end
         end
 
 
@@ -182,7 +186,6 @@ name:          "#{@settings[:module_name]}",
 slug:          "#{@settings[:type] == 'theme' ? 'theme' : @settings[:name]}",
 gem:           "#{@settings[:name]}",
 path:          File.expand_path(File.join(File.dirname(__FILE__), "..")),
-type:          "#{@settings[:type]}",
 version:       #{@settings[:version]},
 description:   "",                                # What does your theme/plugin do?
 source_url:    "https://github.com/user/project", # <- Update info

data/lib/octopress-ink/plugin.rb

@@ -296,16 +296,16 @@ module Octopress
 
           case name
           when 'pages'
-            header = "pages:".ljust(36) + "urls"
+            header = "pages:".ljust(36).bold + "urls"
             message << asset_list(assets.sort_by(&:file), header)
           when 'config-file'
-            message << " config:\n"
+            message << " config:\n".bold
             message << Ink::Utils.pretty_print_yaml(@config)
             message << "\n"
 
             lang_config_hash.keys.each do |lang|
               message << "\n"
-              message << " config_#{lang}:\n"
+              message << " config_#{lang}:\n".bold
               message << Ink::Utils.pretty_print_yaml(config(lang))
             end
 
@@ -325,7 +325,7 @@ module Octopress
       end
 
       def asset_list(assets, heading)
-        list = " #{heading}:\n"
+        list = " #{heading}:\n".bold
         assets.each do |asset|
           list << "#{asset.info.rstrip}\n"
         end
@@ -334,11 +334,11 @@ module Octopress
       end
 
       def minimal_list
-        message = " #{@name}"
-        message += " (#{slug})"
-        message += " - v#{@version}" if @version
+        message = "#{@name.bold}"
+        message += ", v#{@version}" if @version
+        message += " (slug: #{slug})"
         if @description && !@description.empty?
-          message = "#{message.ljust(30)}\n#{@description}"
+          message = %Q{\n  #{message.ljust(30)}\n    "#{@description}"}
         end
         message += "\n"
       end
@@ -347,21 +347,21 @@ module Octopress
         list = assets_list(options)
         return '' if list.empty?
 
-        name = "Plugin: #{@name}"
+        name = "Plugin: #{@name.bold}"
         name += " (theme)" if @type == 'theme'
         name += " - v#{@version}" if @version
         name  = name
         message = name
         message += "\nSlug: #{slug}"
 
-        if @description && !@description.empty?
-          message += "\n#{@description}"
-        end
-
         if @website && !@website.empty?
           message += "\n#{@website}"
         end
 
+        if @description && !@description.empty?
+          message += %Q{\n"#{@description}"}
+        end
+
         lines = ''
         80.times { lines += '=' }
 

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.rc.64"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.64
+  version: 1.0.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -279,9 +279,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6