lib/octopress-ink.rb in octopress-ink-1.0.0.alpha.33 vs lib/octopress-ink.rb in octopress-ink-1.0.0.alpha.34

@@ -8,90 +8,139 @@
 require 'octopress-ink/version'
 require 'octopress-ink/helpers/titlecase'
 
 module Octopress
   module Ink
+
+    autoload :Configuration,        'octopress-ink/configuration'
     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'
 
     if defined? Octopress::Command
       require 'octopress-ink/commands/helpers'
       require 'octopress-ink/commands'
     end
 
-    def self.register_plugin(plugin, name, type='plugin')
-      Plugins.register_plugin(plugin, name, type)
+    def self.register_plugin(plugin, name, type='plugin', local=nil)
+      Plugins.register_plugin(plugin, name, type, local)
     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
+    def self.config
+      Configuration.config
+    end
+
+    def self.site(options={})
       log_level = Jekyll.logger.log_level
       Jekyll.logger.log_level = Jekyll::Stevenson::WARN
-      @site ||= Jekyll::Site.new(Jekyll.configuration({}))
+      @site ||= Jekyll::Site.new(Jekyll.configuration(options))
       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
+      Plugins.plugins
     end
 
     def self.plugin(name)
       begin
-        plugins.plugin(name)
+        Plugins.plugin(name)
       rescue
         return false
       end
     end
+    
+    # Prints a list of plugins and details
+    #
+    # options - a Hash of options from the Info command
+    #
+    #   Note: if options are empty, this will display a
+    #   list of plugin names, versions, and descriptions,
+    #   but no assets, i.e. 'minimal' info.
+    #
+    #
+    def self.info(options={})
+      Plugins.register site(options)
+      options = {'minimal'=>true} if options.empty?
+      message = "Octopress Ink - v#{VERSION}\n"
 
+      if plugins.size > 0
+        plugins.each do |plugin|
+          message += plugin.info(options)
+        end
+      else
+        message += "You have no plugins installed."
+      end
+      puts message
+    end
+
     def self.plugin_info(name, options)
+      Plugins.register site(options)
+      options.delete('config')
       if p = plugin(name)
-        p.info(options)
+        puts p.info(options)
+      else
+        not_found(name)
       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"
+
+    def self.copy_plugin_assets(name, path, options)
+      Plugins.register site(options)
+      if path
+        full_path = File.join(Plugins.site.source, path)
+        if !Dir["#{full_path}/*"].empty? && options['force'].nil?
+          abort "Error: directory #{path} is not empty. Use --force to overwrite files."
         end
       else
-        message += "Plugins: none"
+        full_path = File.join(Plugins.site.source, Plugins.custom_dir, name)
       end
-      puts message
+      if p = plugin(name)
+        copied = p.copy_asset_files(full_path, options)
+        if !copied.empty?
+          puts "Copied files:\n#{copied.join("\n")}"
+        else
+          puts "No files copied from #{name}."
+        end
+      else
+        not_found(name)
+      end
     end
+
+    def self.not_found(plugin)
+      puts "Plugin '#{plugin}' not found."
+      list_plugins
+    end
+
+    def self.list_plugins(options={})
+      Plugins.register site(options)
+      puts "\nCurrently installed plugins:"
+      if plugins.size > 0
+        plugins.each { |plugin| puts plugin.name }
+      else
+        puts "You have no plugins installed."
+      end
+    end
   end
 end
 
 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)
@@ -102,7 +151,11 @@
 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')
+require 'octopress-ink/plugins/ink'
+require 'octopress-ink/plugins/asset_pipeline'
+
+Octopress::Ink.register_plugin(Ink, 'ink', 'plugin')
+Octopress::Ink.register_plugin(Octopress::Ink::AssetPipelinePlugin, 'asset-pipeline', 'plugin', true)