octopress-ink 1.0.0.rc.46 → 1.0.0.rc.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c06bc8cc89eb550204b2b126b8bc9e0be46d7243
-  data.tar.gz: 8abd0edc93bc79e482782b7b8b086da351490b39
+  metadata.gz: d075621a56e4d38e3735c8dbaa8b259b5bc4ee93
+  data.tar.gz: 2dc41ad349757a091197f4e176214486a7bdac18
 SHA512:
-  metadata.gz: 9c9ab16dd4750d607c2cf91547997039454c0ef1dde942fa2c14789ef7befb9214914ce2cba3c46aae73db53c86904ba192dfc40409c09da20db016deb3f2451
-  data.tar.gz: 402ebad5ee47d2ae3203168a5b4d924bafc6a680149d29b556f6630085de85af0119056da935613e23c510fb60b0fc49bb96d0645b98c82247c71ea7e970bdd8
+  metadata.gz: de395d7da6ff5d5111621eca7cd8d23b35a82b9b66e2e5359bb02e4962e514a1bc0e8ce3dff437df5e1a58b089d730ecb81bcb6e07cbfb55b88df50c6dcb7dcc
+  data.tar.gz: 2172b621bd97bd1ac90b21025981224b57c4647157e1484b98d7dc641cf5d5bb136c66d63fba89f3deeec54db26bd6364603499d43d7dbf85e824328d7ad8b5a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.0 RC47 - 2015-02-18
+- Fix: `octopress ink list [plugin]` triggers site read to ensure all plugins are ready to present info.
+- Fix: Template page info improvements
+
 ### 1.0.0 RC46 - 2015-02-18
 - Fix: Site reset triggers reset method on each plugin.
 

data/lib/octopress-ink.rb

@@ -131,6 +131,7 @@ module Octopress
     def self.plugin_list(name, options)
       config = options.delete('config') # Jekyll conflicts with this option
       Octopress.site(options)
+      Octopress.site.read
       Plugins.register
       options['config'] = config if config
 

data/lib/octopress-ink/assets/template.rb

@@ -2,27 +2,34 @@ module Octopress
   module Ink
     module Assets
       class Template < Asset
-        attr_accessor :pages
+        attr_reader :pages
+
+        def initialize(*args)
+          super(*args)
+          @pages = []
+        end
 
         def add; end
 
         def info
           message = filename.ljust(35)
+
           if disabled?
             message += "-disabled-"
           elsif path.to_s != plugin_path
             shortpath = File.join(Plugins.custom_dir.sub(Dir.pwd,''), dir).sub('/','')
             message += "from: #{shortpath}/#{filename}"
           end
-          message = "  #{message}\n"
+
+          message = "   #{message}\n"
+
           self.pages.each do |page|
-            message << "   - #{page.path.sub('index.html', '')}\n"
+            message << "    - /#{page.path.sub('index.html', '')}\n"
           end
           message
         end
 
         def new_page(permalink, data={})
-          @pages ||= []
           return if disabled?
 
           dir = File.dirname(permalink)
@@ -36,6 +43,8 @@ module Octopress
           page.name = name
           page.process(name)
 
+          self.pages << page
+
           page
         end
 

data/lib/octopress-ink/plugin.rb

@@ -96,8 +96,6 @@ module Octopress
           next if name == 'config-file'
           assets.each {|file| file.add unless file.disabled? }
         end
-
-        add_template_pages
       end
 
       # Plugin authors override with template page adding
@@ -449,6 +447,7 @@ module Octopress
 
       def add_templates
         @templates = add_new_assets(@templates_dir, Assets::Template)
+        add_template_pages
       end
 
       def add_template_page(template, permalink, data={})
@@ -456,7 +455,6 @@ module Octopress
 
         unless template.nil? || template.disabled?
           page = template.new_page(permalink, data)
-          template.pages << page
           Octopress.site.pages << page
           page
         end

data/lib/octopress-ink/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.46
+  version: 1.0.0.rc.47
 platform: ruby
 authors:
 - Brandon Mathis