octopress-ink 1.0.0.alpha.33 → 1.0.0.alpha.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46ae9894390869465465304356ec053b1ebe7f67
-  data.tar.gz: 2ecea5df41464986d594bd3823a44054d5be951a
+  metadata.gz: 0d1a4f5b802349cd448e8a704fca49677a8fa365
+  data.tar.gz: 2762503e84829b574d8763548c38c2b9fec56b2f
 SHA512:
-  metadata.gz: ef98087d515abd53e2161a59999de71b681a784cbb133a47c34cf61f68b3580cd413e47506056044ce1033ee6e21c421a1358752bd271a106ac375d3184f0a60
-  data.tar.gz: 0c104ce6c0f8078b8f86105993378fec9841f10ca875e6c005afd1a960044538298064bcbc6a4a5666cef22a9ce0001980d3625673452c6e40182ef8b56960aa
+  metadata.gz: 877d1fbd6cc33054a5fe2be3d966174b34fda93c35486c33a077a043c5594794c1b05d9feca6b1a84cd46dca70675b38afa10695e36935f40c62f21063a95528
+  data.tar.gz: c12a7d2635f8052c52e508eb57110d8f0f813f663ae9c84c06e7a3e423f80d21601db9f30d779cd1074a9f8c9b33ea5a21fa68d1e06593d1c7dcdc5c006a50b9

data/.travis.yml

@@ -2,5 +2,5 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
-script: cd test && ruby test.rb
+script: cd test && bundle exec ruby test.rb
 

data/lib/octopress-ink.rb

@@ -10,6 +10,8 @@ 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'
@@ -19,15 +21,14 @@ module Octopress
     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
@@ -38,58 +39,106 @@ module Octopress
       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
+      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
-      puts message
     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)
@@ -104,5 +153,9 @@ 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)
 

data/lib/octopress-ink/assets.rb

@@ -2,12 +2,17 @@ module Octopress
   module Ink
     module Assets
       autoload :Asset,                'octopress-ink/assets/asset'
+      autoload :LocalAsset,           'octopress-ink/assets/local_asset'
       autoload :Config,               'octopress-ink/assets/config'
-      autoload :RootAsset,            'octopress-ink/assets/root'
+      autoload :FileAsset,            'octopress-ink/assets/file'
       autoload :PageAsset,            'octopress-ink/assets/page'
+      autoload :DocPageAsset,         'octopress-ink/assets/doc_page'
       autoload :Javascript,           'octopress-ink/assets/javascript'
       autoload :Stylesheet,           'octopress-ink/assets/stylesheet'
+      autoload :LocalStylesheet,      'octopress-ink/assets/local_stylesheet'
+      autoload :LocalJavascript,      'octopress-ink/assets/local_javascript'
       autoload :Sass,                 'octopress-ink/assets/sass'
+      autoload :LocalSass,            'octopress-ink/assets/local_sass'
       autoload :Include,              'octopress-ink/assets/include'
       autoload :Layout,               'octopress-ink/assets/layout'
     end

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

@@ -2,93 +2,111 @@ module Octopress
   module Ink
     module Assets
       class Asset
+        attr_reader :plugin, :dir, :base, :root, :file
+        attr_accessor :exists
 
-        def initialize(plugin, type, file)
+        def initialize(plugin, base, file)
           @file = file
-          @type = type
+          @base = base
           @plugin = plugin
           @root = plugin.assets_path
-          @dir = File.join(plugin.slug, type)
+          @dir = File.join(plugin.slug, base)
           @exists = {}
           file_check
         end
 
         def info
-          message = filename.ljust(25)
-          if path.to_s == user_path
-            shortpath = File.join(Plugins.custom_dir, @dir)
-            message += "(local @ #{shortpath}/#{filename})"
+          message = filename.ljust(35)
+          if disabled?
+            message += "disabled"
+          elsif self.respond_to?(:url_info)
+            message += url_info
+          elsif path.to_s != plugin_path
+            shortpath = File.join(Plugins.custom_dir, dir)
+            message += "from: #{shortpath}/#{filename}"
           end
           message
         end
 
         def filename
-          @file
+          file
+        end
+
+        def disabled?
+          plugin.disabled?(base, filename)
         end
 
         def path
-          if @found_file and !@no_cache
+          if @found_file
             @found_file
           else
             files = []
             files << user_path
-            files << plugin_path unless @plugin.type == 'local_plugin'
+            files << plugin_path
             files = files.flatten.reject { |f| !exists? f }
 
             if files.empty?
-              raise IOError.new "Could not find #{File.basename(@file)} at #{@file}"
+              raise IOError.new "Could not find #{File.basename(file)} at #{file}"
             end
             @found_file = Pathname.new files[0]
           end
         end
 
-        def file(file)
-          @file = file
-          path
+        def source_dir
+          if exists? user_override_path
+            user_dir
+          else
+            plugin_dir
+          end
         end
 
         def destination
-          File.join(@dir, @file)
+          File.join(dir, file)
         end
 
-        def copy
+        def add
           Plugins.site.static_files << StaticFile.new(path, destination)
         end
 
+        # Copy asset to user override directory
+        #
+        def copy(target_dir)
+          if target_dir
+            target_dir = File.join(target_dir, base)
+          else
+            target_dir = user_dir
+          end
+          FileUtils.mkdir_p target_dir
+          FileUtils.cp plugin_path, target_dir
+          target_dir.sub!(Dir.pwd+'/', '')
+          "+ ".green + "#{File.join(target_dir, filename)}"
+        end
+
+
         def plugin_dir
-          File.join @root, @type
+          File.join root, base
         end
 
         def plugin_path
-          File.join plugin_dir, @file
+          File.join plugin_dir, file
         end
 
         def user_dir
-          File.join Plugins.site.source, Plugins.custom_dir, @dir
+          File.join Plugins.site.source, Plugins.custom_dir, dir
         end
 
         def local_plugin_path
-          File.join Plugins.site.source, @dir, @file
+          File.join Plugins.site.source, dir, file
         end
 
         def user_override_path
-          File.join user_dir, @file
+          File.join user_dir, filename
         end
 
         def user_path
-          if @plugin.type == 'local_plugin'
-            local_plugin_path
-          else
-            user_override_path
-          end
+          user_override_path
         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. 
         #
@@ -101,14 +119,14 @@ module Octopress
         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
+          if !exists? plugin_path
+            raise "\nPlugin: #{plugin.name}: Could not find #{File.basename(file)} at #{plugin_path}".red
           end
         end
 
         def exists?(file)
-          @exists[file] ||= File.exists?(file)
-          @exists[file]
+          exists[file] ||= File.exists?(file)
+          exists[file]
         end
       end
     end

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

@@ -7,31 +7,30 @@ module Octopress
           @root = plugin.assets_path
           @plugin = plugin
           @dir = plugin.slug
-          @type = ''
+          @base = ''
           @exists = {}
           @file = path
         end
 
         def user_dir
-          File.join Plugins.site.source, Plugins.custom_dir, @dir
+          File.join Plugins.site.source, Plugins.custom_dir, dir
         end
 
         def local_plugin_path
-          File.join Plugins.site.source, @dir, @file
+          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))
-            end
+          default = plugin_path
+          if exists? default
+            config = YAML.safe_load(File.open(default))
           end
-          override = user_path
-          if exists? override
-            config = config.deep_merge YAML.safe_load(File.open(override))
+
+          if exists? user_path
+            config = config.deep_merge YAML.safe_load(File.open(user_path))
           end
+
           config
         end
       end

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

@@ -0,0 +1,53 @@
+# These are files which need to be in added to the root of the site directory
+# Use root assets for files like robots.text or favicon.ico
+
+module Octopress
+  module Ink
+    module Assets
+      class DocPageAsset < Asset
+        attr_reader :filename
+
+        def initialize(plugin, base, file)
+          @root = plugin.assets_path
+          @plugin = plugin
+          @base = base
+          @filename = file
+          @dir  = File.dirname(file)
+          @file = File.basename(file)
+          @exists = {}
+          file_check
+        end
+
+        def page_dir
+          dir == '.' ? '' : dir
+        end
+
+        def plugin_path
+          File.join(plugin_dir, dir, file)
+        end
+
+        def source_dir
+          File.join root, base
+        end
+
+        def path
+          File.join(plugin_dir, page_dir, file)
+        end
+
+        def page
+          @page ||= Page.new(Plugins.site, source_dir, page_dir, file, {'path'=>plugin.docs_base_path})
+        end
+
+        # Add doc page to Jekyll pages
+        #
+        def add
+          if Ink.config['docs_mode']
+            page.data['layout'] = 'docs'
+            Plugins.site.pages << page
+          end
+        end
+      end
+    end
+  end
+end
+