octopress-ink 1.0.0.rc.39 → 1.0.0.rc.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fefc72653c604f6032907e28920a720c14dac6d
-  data.tar.gz: 6948d4deaf142cbf2da3cf6d2aa3b9dce5cc01da
+  metadata.gz: a89f28e51ee7ad62be2b3b82f3eab970633d96e6
+  data.tar.gz: addb76d7efda7eaa527508d1ecc122d4fa2dbcd3
 SHA512:
-  metadata.gz: 2dd6f7519fefc7dbde61d38c1278676d573a8b687da792b9055fd0b0e0d18473529e8b2c26e31ca35ed461cf1463621af3c82380545883d51aaada8e02421ab6
-  data.tar.gz: c0c6f57fc24b1d99b4f33cc9696df24f8852b3259371f4859f93eb8453577d078ecf91a34ea4271c65ac9c5e3679c9d0058cddbc090c94c55c38fd55176ede64
+  metadata.gz: 0c27542401b8df9a907e1f45f0c2d209b3418771f694aec430d68bfa79c0897d39ca61f9070602538ddc4fee05ffb80ed95e1c5b1252a002bf65a8ab366ca886
+  data.tar.gz: c67e1a389461818bdf350b0541dbfc6b8f7abdbf455acf099ee665756b8ee3724f2786b63e568c12d462fa4c37605a10109191db3559b0677f99249344edf885

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.0 RC40 - 2015-02-08
+- Improvements to ink list command output.
+- Ensures plugins cannot be registered multiple times.
+
 ### 1.0.0 RC39 - 2015-02-07
 - New: Octopress Page assets have methods for accessing the plugin and asset that generated them.
 

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

@@ -60,7 +60,7 @@ module Octopress
         def info
           message = super
           name = permalink_name << page.ext
-          message.sub!(/#{filename}/, name.ljust(filename.size))
+          message.sub!(/#{filename}\s*/, name.ljust(35))
           message.ljust(25) << (permalink || page.permalink || '')
         end
 

data/lib/octopress-ink/plugin.rb

@@ -97,6 +97,7 @@ module Octopress
         copied = []
 
         select_assets(options).each do |name, assets|
+          next if name == 'user-lang-configs'
           assets.each { |a| copied << a.copy(path) }
         end
 
@@ -260,12 +261,18 @@ module Octopress
             message << asset_list(assets, header)
           when 'config-file'
             message << asset_list(assets, 'config')
-          when 'lang-configs'
+
             lang_config_hash.keys.each do |lang|
+              message << "\n"
               message << " config_#{lang}:\n"
               message << Ink::Utils.pretty_print_yaml(config(lang))
-              message << "\n"
             end
+
+          # Lang configs are listed above with the config hash, ensuring
+          # that user configured files can be listed even if the plugin 
+          # does not ship with alternate language config files
+          #
+          when 'lang-configs'; next
           else
             message << asset_list(assets, name)
           end

data/lib/octopress-ink/plugins.rb

@@ -1,32 +1,34 @@
 module Octopress
   module Ink
     module Plugins
+      extend self
 
       @static_files = []
       @plugins = []
       @user_plugins = []
       @css_tags = []
       @js_tags = []
+      @registered = false
 
-      def self.theme
+      def theme
         @theme
       end
 
-      def self.each(&block)
+      def each(&block)
         plugins.each(&block)
       end
 
       # Store static files to be written
       #
-      def self.static_files
+      def static_files
         @static_files
       end
 
-      def self.size
+      def size
         plugins.size
       end
 
-      def self.plugin(slug)
+      def plugin(slug)
         if slug == 'theme'
           @theme
         else
@@ -38,37 +40,38 @@ module Octopress
         end
       end
 
-      def self.plugins
+      def plugins
         [@theme].concat(@plugins).concat(@user_plugins).compact
       end
 
-      def self.register
-        plugins.each do |p| 
-          p.register
+      def register
+        unless @registered
+          @registered = true
+          plugins.each(&:register) 
         end
       end
 
-      def self.add_files
+      def add_files
         add_assets(%w{images pages files fonts docs})
         add_stylesheets
         add_javascripts
       end
 
-      def self.add_assets(assets)
+      def add_assets(assets)
         plugins.each do |p| 
           p.add_asset_files(assets)
         end
       end
 
-      def self.add_css_tag(tag)
+      def add_css_tag(tag)
         @css_tags << tag
       end
 
-      def self.add_js_tag(tag)
+      def add_js_tag(tag)
         @js_tags << tag
       end
 
-      def self.register_plugin(plugin, options=nil)
+      def register_plugin(plugin, options=nil)
         new_plugin = plugin.new(options)
 
         case new_plugin.type
@@ -83,12 +86,12 @@ module Octopress
         end
       end
 
-      def self.config(lang=nil)
+      def config(lang=nil)
         @configs ||= {}
         @configs[lang || 'default'] ||= get_config(lang)
       end
 
-      def self.get_config(lang=nil)
+      def get_config(lang=nil)
         config            = {}
         config['plugins'] = {}
 
@@ -105,20 +108,20 @@ module Octopress
 
       # Inclue partials from plugins
       #
-      def self.include(name, file)
+      def include(name, file)
         p = plugin(name)
         p.include(file)
       end
 
       # Read plugin dir from site configs
       #
-      def self.custom_dir
+      def custom_dir
         Octopress.site.plugin_manager.plugins_path.first
       end
 
       # Copy/Generate Stylesheets
       #
-      def self.add_stylesheets
+      def add_stylesheets
         if Ink.configuration['asset_pipeline']['combine_css']
           PluginAssetPipeline.write_combined_stylesheet
         else
@@ -128,7 +131,7 @@ module Octopress
       
       # Copy/Generate Javascripts
       #
-      def self.add_javascripts
+      def add_javascripts
         if Ink.configuration['asset_pipeline']['combine_js']
           PluginAssetPipeline.write_combined_javascript
         else
@@ -136,7 +139,7 @@ module Octopress
         end
       end
 
-      def self.css_tags
+      def css_tags
         if Ink.configuration['asset_pipeline']['combine_css']
           PluginAssetPipeline.combined_stylesheet_tag
         else
@@ -144,7 +147,7 @@ module Octopress
         end
       end
 
-      def self.js_tags
+      def js_tags
         if Ink.configuration['asset_pipeline']['combine_js']
           PluginAssetPipeline.combined_javascript_tag
         else

data/lib/octopress-ink/utils.rb

@@ -9,12 +9,13 @@ module Octopress
         # Use json pretty_print, but make it look like yaml
         #
         JSON.pretty_generate(yaml)
-          .sub(/\A{\n/,'')           # remove leading {
-          .sub(/}\z/,'')           # remove trailing }
-          .gsub(/^/,' ')           # indent
-          .gsub(/"(.+?)":/,'\1:')  # remove quotes around keys
-          .gsub(/,$/,'')        # remove commas from end of lines
-          .gsub(/\w+: {\s+}\n/,'')  # remove keys with empty hashes
+          .sub(/\A{\n/,'')          # remove leading {
+          .sub(/}\z/,'')            # remove trailing }
+          .gsub(/^/,' ')            # indent
+          .gsub(/"(.+?)":/,'\1:')   # remove quotes around keys
+          .gsub(/,$/,'')            # remove commas from end of lines
+          .gsub(/{\n/,"\n")         # remove keys with empty hashes
+          .gsub(/^\s+}\n/,'')       # remove keys with empty hashes
       end
     end
   end

data/lib/octopress-ink/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.39
+  version: 1.0.0.rc.40
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll