octopress-ink 1.0.0.alpha.31 → 1.0.0.alpha.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 151c2e157990b6006902c5f324f688c5178e3f3c
-  data.tar.gz: 4b3c2fce8765c43f16c0e300f68ba1456359b709
+  metadata.gz: 570c16b74cd6960b5a55b864dd381ef8f85236d6
+  data.tar.gz: 6ad07b9a5b3090d14e014a7448cc0bdf83c4e122
 SHA512:
-  metadata.gz: ad9ea816fbf836ed9922b1f74f187bc13d37a6cea25856b76d15567f27f995a1bbe7d2c83af90369383f385ff8fa8b9e19e75d44ea9cecdfb9fdfd066e541270
-  data.tar.gz: e5d04078d3ed1160d6c16a5301d074aa9e3c3d669808cd58d5faac5d9963673a37a0e4fc5814c41255dd86bedada18ee57549c6597e6bb5da71b092f0575cd54
+  metadata.gz: 51bb0d6b67ee4a32400282091e211c296f15aa46e5077eb111c88212658188b3a2733b9d5b7a60839ca28d98390291c1a4c5ef2b8d813d4b293932278cee39ec
+  data.tar.gz: 246395f034cd90b6e60ec509899c81239cda05f69085ef4c605bcfd91a012358f10a05bd22b1f24616fbf802e124adc2e8a1938c35f3d6a97fc18cf70f80f9ab

data/lib/octopress-ink.rb

@@ -1,6 +1,7 @@
 require 'jekyll'
 require 'sass'
 require 'digest/md5'
+require 'pry-debugger'
 
 require 'octopress-ink/version'
 require 'octopress-ink/generators/plugin_assets'
@@ -9,46 +10,100 @@ require 'octopress-ink/version'
 require 'octopress-ink/helpers/titlecase'
 
 module Octopress
-  autoload :Helpers,              'octopress-ink/helpers'
-  autoload :Filters,              'octopress-ink/filters'
-  autoload :Assets,               'octopress-ink/assets'
-  autoload :Page,                 'octopress-ink/jekyll/page'
-  autoload :StaticFile,           'octopress-ink/jekyll/static_file'
-  autoload :StaticFileContent,    'octopress-ink/jekyll/static_file_content'
-  autoload :Plugins,              'octopress-ink/plugins'
-  autoload :Plugin,               'octopress-ink/plugin'
-  autoload :Tags,                 'octopress-ink/tags'
-  autoload :StylesheetsPlugin,    'octopress-ink/plugins/stylesheets'
-
-  def self.register_plugin(plugin, name, type='plugin')
-    Plugins.register_plugin(plugin, name, type)
-  end
+  module Ink
+    autoload :Helpers,              'octopress-ink/helpers'
+    autoload :Filters,              'octopress-ink/filters'
+    autoload :Assets,               'octopress-ink/assets'
+    autoload :Page,                 'octopress-ink/jekyll/page'
+    autoload :StaticFile,           'octopress-ink/jekyll/static_file'
+    autoload :StaticFileContent,    'octopress-ink/jekyll/static_file_content'
+    autoload :Plugins,              'octopress-ink/plugins'
+    autoload :Plugin,               'octopress-ink/plugin'
+    autoload :Tags,                 'octopress-ink/tags'
+    autoload :StylesheetsPlugin,    'octopress-ink/plugins/stylesheets'
 
-  def self.version
-    version = "Jekyll v#{Jekyll::VERSION}, "
-    if defined? Octopress::VERSION
-      version << "Octopress v#{Octopress::VERSION} "
+    if defined? Octopress::Command
+      require 'octopress-ink/commands/helpers'
+      require 'octopress-ink/commands'
     end
-    version << "Octopress Ink v#{Octopress::Ink::VERSION}"
-  end
 
+    def self.register_plugin(plugin, name, type='plugin')
+      Plugins.register_plugin(plugin, name, type)
+    end
+
+    def self.version
+      version = "Jekyll v#{Jekyll::VERSION}, "
+      if defined? Octopress::VERSION
+        version << "Octopress v#{Octopress::VERSION} "
+      end
+      version << "Octopress Ink v#{Octopress::Ink::VERSION}"
+    end
+
+    def self.site
+      log_level = Jekyll.logger.log_level
+      Jekyll.logger.log_level = Jekyll::Stevenson::WARN
+      @site ||= Jekyll::Site.new(Jekyll.configuration({}))
+      Jekyll.logger.log_level = log_level
+      @site
+    end
+
+    def self.plugins
+      return @plugins if @plugins
+      s = site #spin up Jekyll to load all plugins
+      @plugins = Plugins
+      @plugins.site = s
+      @plugins
+    end
+
+    def self.plugin(name)
+      begin
+        plugins.plugin(name)
+      rescue
+        return false
+      end
+    end
+
+    def self.plugin_info(name, options)
+      if p = plugin(name)
+        p.info(options)
+      end
+    end
+    
+    def self.info
+      message = "Octopress Ink - v#{VERSION}\n"
+      if plugins.size > 0
+        message += "Plugins:\n"
+        plugins.each do |plugin| 
+          name = plugin.name
+          name += ' (theme)' if plugin.type == 'theme' 
+          message += "- #{name} ".ljust(30)
+          message += "v#{plugin.version} - " if plugin.version
+          message += plugin.description if plugin.description
+          message += "\n"
+        end
+      else
+        message += "Plugins: none"
+      end
+      puts message
+    end
+  end
 end
 
-Liquid::Template.register_filter Octopress::Filters
-
-Liquid::Template.register_tag('include', Octopress::Tags::IncludeTag)
-Liquid::Template.register_tag('assign', Octopress::Tags::AssignTag)
-Liquid::Template.register_tag('capture', Octopress::Tags::CaptureTag)
-Liquid::Template.register_tag('return', Octopress::Tags::ReturnTag)
-Liquid::Template.register_tag('filter', Octopress::Tags::FilterTag)
-Liquid::Template.register_tag('render', Octopress::Tags::RenderTag)
-Liquid::Template.register_tag('octopress_js', Octopress::Tags::JavascriptTag)
-Liquid::Template.register_tag('octopress_css', Octopress::Tags::StylesheetTag)
-Liquid::Template.register_tag('content_for', Octopress::Tags::ContentForTag)
-Liquid::Template.register_tag('yield', Octopress::Tags::YieldTag)
-Liquid::Template.register_tag('wrap', Octopress::Tags::WrapTag)
-Liquid::Template.register_tag('abort', Octopress::Tags::AbortTag)
-Liquid::Template.register_tag('_', Octopress::Tags::LineCommentTag)
-
-Octopress.register_plugin(Octopress::StylesheetsPlugin, 'user stylesheets', 'local_plugin')
+Liquid::Template.register_filter Octopress::Ink::Filters
+
+Liquid::Template.register_tag('include', Octopress::Ink::Tags::IncludeTag)
+Liquid::Template.register_tag('assign', Octopress::Ink::Tags::AssignTag)
+Liquid::Template.register_tag('capture', Octopress::Ink::Tags::CaptureTag)
+Liquid::Template.register_tag('return', Octopress::Ink::Tags::ReturnTag)
+Liquid::Template.register_tag('filter', Octopress::Ink::Tags::FilterTag)
+Liquid::Template.register_tag('render', Octopress::Ink::Tags::RenderTag)
+Liquid::Template.register_tag('octopress_js', Octopress::Ink::Tags::JavascriptTag)
+Liquid::Template.register_tag('octopress_css', Octopress::Ink::Tags::StylesheetTag)
+Liquid::Template.register_tag('content_for', Octopress::Ink::Tags::ContentForTag)
+Liquid::Template.register_tag('yield', Octopress::Ink::Tags::YieldTag)
+Liquid::Template.register_tag('wrap', Octopress::Ink::Tags::WrapTag)
+Liquid::Template.register_tag('abort', Octopress::Ink::Tags::AbortTag)
+Liquid::Template.register_tag('_', Octopress::Ink::Tags::LineCommentTag)
+
+Octopress::Ink.register_plugin(Octopress::Ink::StylesheetsPlugin, 'user stylesheets', 'local_plugin')
 

data/lib/octopress-ink/assets.rb

@@ -1,13 +1,15 @@
 module Octopress
-  module Assets
-    autoload :Asset,                'octopress-ink/assets/asset'
-    autoload :Config,               'octopress-ink/assets/config'
-    autoload :RootAsset,            'octopress-ink/assets/root'
-    autoload :PageAsset,            'octopress-ink/assets/page'
-    autoload :Javascript,           'octopress-ink/assets/javascript'
-    autoload :Stylesheet,           'octopress-ink/assets/stylesheet'
-    autoload :Sass,                 'octopress-ink/assets/sass'
-    autoload :Include,              'octopress-ink/assets/include'
-    autoload :Layout,               'octopress-ink/assets/layout'
+  module Ink
+    module Assets
+      autoload :Asset,                'octopress-ink/assets/asset'
+      autoload :Config,               'octopress-ink/assets/config'
+      autoload :RootAsset,            'octopress-ink/assets/root'
+      autoload :PageAsset,            'octopress-ink/assets/page'
+      autoload :Javascript,           'octopress-ink/assets/javascript'
+      autoload :Stylesheet,           'octopress-ink/assets/stylesheet'
+      autoload :Sass,                 'octopress-ink/assets/sass'
+      autoload :Include,              'octopress-ink/assets/include'
+      autoload :Layout,               'octopress-ink/assets/layout'
+    end
   end
 end

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

@@ -1,104 +1,115 @@
 module Octopress
-  module Assets
-    class Asset
-
-      def initialize(plugin, type, file)
-        @file = file
-        @type = type
-        @plugin = plugin
-        @root = plugin.assets_path
-        @dir = File.join(plugin.namespace, type)
-        @exists = {}
-        file_check
-      end
+  module Ink
+    module Assets
+      class Asset
+
+        def initialize(plugin, type, file)
+          @file = file
+          @type = type
+          @plugin = plugin
+          @root = plugin.assets_path
+          @dir = File.join(plugin.slug, type)
+          @exists = {}
+          file_check
+        end
 
-      def file
-        @file
-      end
+        def info
+          message = filename.ljust(25)
+          if path.to_s == user_path
+            shortpath = File.join(Plugins.custom_dir, @dir)
+            message += "(local @ #{shortpath}/#{filename})"
+          end
+          message
+        end
+
+        def filename
+          @file
+        end
 
-      def path
-        if @found_file and !@no_cache
-          @found_file
-        else
-          files = []
-          files << user_path
-          files << plugin_path unless @plugin.type == 'local_plugin'
-          files = files.flatten.reject { |f| !exists? f }
-
-          if files.empty?
-            raise IOError.new "Could not find #{File.basename(@file)} at #{@file}"
+        def path
+          if @found_file and !@no_cache
+            @found_file
+          else
+            files = []
+            files << user_path
+            files << plugin_path unless @plugin.type == 'local_plugin'
+            files = files.flatten.reject { |f| !exists? f }
+
+            if files.empty?
+              raise IOError.new "Could not find #{File.basename(@file)} at #{@file}"
+            end
+            @found_file = Pathname.new files[0]
           end
-          @found_file = Pathname.new files[0]
         end
-      end
 
-      def file(file)
-        @file = file
-        path
-      end
+        def file(file)
+          @file = file
+          path
+        end
 
-      def destination
-        File.join(@dir, @file)
-      end
+        def destination
+          File.join(@dir, @file)
+        end
 
-      def copy
-        Plugins.site.static_files << StaticFile.new(path, destination)
-      end
+        def copy
+          Plugins.site.static_files << StaticFile.new(path, destination)
+        end
 
-      def plugin_dir
-        File.join @root, @type
-      end
+        def plugin_dir
+          File.join @root, @type
+        end
 
-      def plugin_path
-        File.join plugin_dir, @file
-      end
+        def plugin_path
+          File.join plugin_dir, @file
+        end
 
-      def user_dir
-        File.join Plugins.site.source, Plugins.custom_dir, @dir
-      end
+        def user_dir
+          File.join Plugins.site.source, Plugins.custom_dir, @dir
+        end
 
-      def local_plugin_path
-        File.join Plugins.site.source, @dir, @file
-      end
+        def local_plugin_path
+          File.join Plugins.site.source, @dir, @file
+        end
 
-      def user_override_path
-        File.join user_dir, @file
-      end
+        def user_override_path
+          File.join user_dir, @file
+        end
 
-      def user_path
-        if @plugin.type == 'local_plugin'
-          local_plugin_path
-        else
-          user_override_path
+        def user_path
+          if @plugin.type == 'local_plugin'
+            local_plugin_path
+          else
+            user_override_path
+          end
         end
-      end
 
-      def alt_syntax_file
-        ext = File.extname(@file)
-        alt_ext = ext == 'scss' ? 'sass' : 'scss'
-        @file.sub(/\.#{ext}/, ".#{alt_ext}")
-      end
-      
-      # Remove files from Jekyll's static_files array so it doesn't end up in the
-      # compiled site directory. 
-      #
-      def remove_jekyll_asset
-        Plugins.site.static_files.clone.each do |sf|
-          if sf.kind_of?(Jekyll::StaticFile) && sf.path == path.to_s
-            Plugins.site.static_files.delete(sf)
+        def alt_syntax_file
+          ext = File.extname(@file)
+          alt_ext = ext == 'scss' ? 'sass' : 'scss'
+          @file.sub(/\.#{ext}/, ".#{alt_ext}")
+        end
+        
+        # Remove files from Jekyll's static_files array so it doesn't end up in the
+        # compiled site directory. 
+        #
+        def remove_jekyll_asset
+          Plugins.site.static_files.clone.each do |sf|
+            if sf.kind_of?(Jekyll::StaticFile) && sf.path == path.to_s
+              Plugins.site.static_files.delete(sf)
+            end
           end
         end
-      end
 
-      def file_check
-        if @plugin.type != 'local_plugin' and !exists? plugin_path
-          raise "\nPlugin: #{@plugin.name}: Could not find #{File.basename(@file)} at #{plugin_path}".red
+        def file_check
+          if @plugin.type != 'local_plugin' and !exists? plugin_path
+            raise "\nPlugin: #{@plugin.name}: Could not find #{File.basename(@file)} at #{plugin_path}".red
+          end
         end
-      end
 
-      def exists?(file)
-        @exists[file] ||= File.exists?(file)
-        @exists[file]
+        def exists?(file)
+          @exists[file] ||= File.exists?(file)
+          @exists[file]
+        end
       end
     end
   end

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

@@ -1,37 +1,39 @@
 module Octopress
-  module Assets
-    class Config < Asset
+  module Ink
+    module Assets
+      class Config < Asset
 
-      def initialize(plugin, path)
-        @root = plugin.assets_path
-        @plugin = plugin
-        @dir = plugin.namespace
-        @type = ''
-        @exists = {}
-        @file = path
-      end
+        def initialize(plugin, path)
+          @root = plugin.assets_path
+          @plugin = plugin
+          @dir = plugin.slug
+          @type = ''
+          @exists = {}
+          @file = path
+        end
 
-      def user_dir
-        File.join Plugins.site.source, Plugins.custom_dir, @dir
-      end
+        def user_dir
+          File.join Plugins.site.source, Plugins.custom_dir, @dir
+        end
 
-      def local_plugin_path
-        File.join Plugins.site.source, @dir, @file
-      end
+        def local_plugin_path
+          File.join Plugins.site.source, @dir, @file
+        end
 
-      def read
-        config = {}
-        if @plugin.type != 'local_plugin'
-          default = plugin_path
-          if exists? default
-            config = YAML.safe_load(File.open(default))
+        def read
+          config = {}
+          if @plugin.type != 'local_plugin'
+            default = plugin_path
+            if exists? default
+              config = YAML.safe_load(File.open(default))
+            end
           end
+          override = user_path
+          if exists? override
+            config = config.deep_merge YAML.safe_load(File.open(override))
+          end
+          config
         end
-        override = user_path
-        if exists? override
-          config = config.deep_merge YAML.safe_load(File.open(override))
-        end
-        config
       end
     end
   end

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

@@ -1,14 +1,16 @@
 module Octopress
-  module Assets
-    class Include < Asset
+  module Ink
+    module Assets
+      class Include < Asset
 
-      def initialize(plugin, type)
-        @root = plugin.assets_path
-        @type = type
-        @plugin = plugin
-        @dir = File.join(plugin.namespace, type)
-        @no_cache = true
-        @exists = {}
+        def initialize(plugin, type)
+          @root = plugin.assets_path
+          @type = type
+          @plugin = plugin
+          @dir = File.join(plugin.slug, type)
+          @no_cache = true
+          @exists = {}
+        end
       end
     end
   end