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

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

@@ -0,0 +1,37 @@
+# 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 FileAsset < Asset
+
+        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 filename
+          @filename
+        end
+
+        def user_dir
+          File.join Plugins.site.source, Plugins.custom_dir, plugin.slug, base
+        end
+
+        def add
+          if !exists?(local_plugin_path) && !Ink.config['docs_mode']
+            Plugins.site.static_files << StaticFile.new(File.join(source_dir, file), destination)
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -3,7 +3,11 @@ module Octopress
     module Assets
       class Javascript < Asset
         def tag
-          "<script src='#{Filters.expand_url(File.join(@dir, @file))}'></script>"
+          "<script src='#{Filters.expand_url(File.join(dir, file))}'></script>"
+        end
+
+        def destination
+          File.join(base, plugin.slug, file)
         end
       end
     end

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

@@ -3,19 +3,22 @@ module Octopress
     module Assets
       class Layout < Asset
 
+        def initialize(plugin, base, file)
+          super
+          register
+        end
+
         def register
-          file = user_path
           dir = user_dir
-          if !exists?(file)
-            file = plugin_path 
+          if !exists?(File.join(dir, file))
             dir = plugin_dir
           end
 
-          Plugins.site.layouts[name] = Jekyll::Layout.new(Plugins.site, dir, @file)
+          Plugins.site.layouts[name] = Jekyll::Layout.new(Plugins.site, dir, file)
         end
 
         def name
-          name = "#{@plugin.slug}:#{@file}"
+          name = "#{plugin.slug}:#{file}"
           # remove extension
           name = name.split(".")[0..-2].join(".")
         end

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

@@ -0,0 +1,47 @@
+module Octopress
+  module Ink
+    module Assets
+      class LocalAsset < Asset
+        def initialize(plugin, base, file)
+          @plugin = plugin
+          @file = file
+          @base = base
+          @dir = base.sub(/^_/,'')
+          @root = Plugins.site.source
+        end
+
+        def info
+          message = filename.ljust(35)
+          message += "from: #{base}"
+        end
+
+        def path
+          Pathname.new File.join(root, base, file)
+        end
+
+        def destination
+          File.join(dir, file)
+        end
+
+        def add
+          Plugins.site.static_files << StaticFile.new(path, destination)
+        end
+
+        # Copy is unncessary with local assets
+        #
+        def copy(target_dir); 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
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Octopress
+  module Ink
+    module Assets
+      class LocalJavascript < LocalAsset
+        def tag
+          "<script src='#{Filters.expand_url(File.join(dir, file))}'></script>"
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,30 @@
+module Octopress
+  module Ink
+    module Assets
+      class LocalSass < LocalStylesheet
+        def initialize(plugin, base, file, media=nil)
+          @plugin = plugin
+          @file = file
+          @base = base
+          @root = Plugins.site.source
+          @dir = base.sub(/^_/,'')
+          @media = media || 'all'
+        end
+
+        def destination
+          File.join(dir, file.sub(/@(.+?)\./,'.').sub(/s.ss/, 'css'))
+        end
+
+        def compile
+          options = Plugins.sass_options
+          compiled = Plugins.compile_sass_file(path.to_s, options)
+        end
+
+        def add
+          Plugins.site.static_files << StaticFileContent.new(compile, destination)
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,33 @@
+module Octopress
+  module Ink
+    module Assets
+      class LocalStylesheet < LocalAsset
+        def initialize(plugin, base, file, media=nil)
+          @plugin = plugin
+          @file = file
+          @base = base
+          @root = Plugins.site.source
+          @dir = base.sub(/^_/,'')
+          @media = media || 'all'
+        end
+
+        def media
+          m = @media
+          if file =~ /@(.+?)\./
+            m = $1
+          end
+          m
+        end
+
+        def destination
+          File.join(dir, file.sub(/@(.+?)\./,'.'))
+        end
+
+        def tag
+          "<link href='#{Filters.expand_url(File.join(dir, file))}' media='#{media}' rel='stylesheet' type='text/css'>"
+        end
+      end
+    end
+  end
+end
+

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

@@ -5,11 +5,13 @@ module Octopress
   module Ink
     module Assets
       class PageAsset < Asset
+        attr_reader :filename
 
-        def initialize(plugin, type, file)
+        def initialize(plugin, base, file)
           @root = plugin.assets_path
           @plugin = plugin
-          @type = type
+          @base = base
+          @filename = file
           @dir  = File.dirname(file)
           @file = File.basename(file)
           @exists = {}
@@ -17,24 +19,32 @@ module Octopress
         end
 
         def page_dir
-          @dir == '.' ? '' : @dir
+          dir == '.' ? '' : dir
         end
 
         def plugin_path
-          File.join(plugin_dir, @dir, @file)
+          File.join(plugin_dir, dir, file)
+        end
+
+        def url_info
+          "path: #{page.url.sub(/^\//,'')}"
+        end
+
+        def user_dir
+          File.join Plugins.site.source, Plugins.custom_dir, plugin.slug, base
         end
 
         def page
-          @page ||= Page.new(Plugins.site, plugin_dir, page_dir, @file, @plugin.config)
+          @page ||= Page.new(Plugins.site, source_dir, page_dir, file, plugin.config)
         end
 
         # Add page to Jekyll pages if no other page has a conflicting destination
         #
-        def copy
-          return unless page.url
-          Plugins.site.pages << page unless Helpers::Path.find_page(page)
+        def add
+          if page.url && !Ink.config['docs_mode']
+            Plugins.site.pages << page unless Helpers::Path.find_page(page)
+          end
         end
-
       end
     end
   end

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

@@ -2,59 +2,64 @@ module Octopress
   module Ink
     module Assets
       class Sass < Stylesheet
-        def initialize(plugin, type, file, media)
+        def initialize(plugin, base, file, media)
           @plugin = plugin
-          @type = type
+          @base = base
           @file = file
           @media = media || 'all'
           @root = plugin.assets_path
-          @dir = File.join(plugin.slug, type)
+          @dir = File.join(plugin.slug, base)
           @exists = {}
           file_check
         end
 
         def tag
-          "<link href='#{Filters.expand_url(File.join(@dir, @file))}' media='#{media}' rel='stylesheet' type='text/css'>"
+          "<link href='#{Filters.expand_url(File.join(dir, file))}' media='#{@media}' rel='stylesheet' type='text/css'>"
         end
 
         # TODO: see if this is done TODO: choose user path before local path.
         def user_load_path
-          File.join(Plugins.site.source, Plugins.custom_dir, @dir, File.dirname(@file)).sub /\/\.$/, ''
+          File.join(Plugins.site.source, Plugins.custom_dir, dir, File.dirname(file)).sub /\/\.$/, ''
         end
 
         def theme_load_path
-          File.expand_path(File.join(@root, @type))
+          File.expand_path(File.join(root, base))
+        end
+
+        def disabled?
+          plugin.disabled?('sass', filename) ||
+          plugin.disabled?('stylesheets', filename)
         end
 
         def compile
           unless @compiled
             options = Plugins.sass_options
-            if @plugin.type == 'local_plugin'
-              @compiled = Plugins.compile_sass_file(path.to_s, options)
-            else
-              # If the plugin isn't a local plugin, add source paths to allow overrieds on @imports.
-              #
-              options[:load_paths] = [user_load_path, theme_load_path]
-              @compiled = Plugins.compile_sass(path.read, options)
-            end
+            options[:load_paths] = [user_load_path, theme_load_path]
+            @compiled = Plugins.compile_sass(path.read, options)
           end
           @compiled
         end
 
         def user_override_path
           # Allow Sass overrides to use either syntax
-          if @file =~ /s[ac]ss$/
-            [File.join(user_dir, @file), File.join(user_dir, alt_syntax_file)]
+          if file =~ /s[ac]ss$/
+            [File.join(user_dir, file), File.join(user_dir, alt_syntax_file)]
           else
-            File.join user_dir, @file
+            File.join user_dir, file
           end
         end
 
+        def alt_syntax_file
+          ext = File.extname(file)
+          alt_ext = (ext == '.scss' ? '.sass' : '.scss')
+          file.sub(ext, alt_ext)
+        end
+
         def destination
-          File.join(@dir, @file.sub(/s.ss/, 'css'))
+          File.join(base, plugin.slug, file.sub(/@(.+?)\./,'.').sub(/s.ss/, 'css'))
         end
 
-        def copy
+        def add
           Plugins.site.static_files << StaticFileContent.new(compile, destination)
         end
       end

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

@@ -2,31 +2,37 @@ module Octopress
   module Ink
     module Assets
       class Stylesheet < Asset
-        def initialize(plugin, type, file, media)
+
+        def initialize(plugin, base, file, media)
           @plugin = plugin
           @file = file
-          @type = type
+          @base = base
           @media = media || 'all'
           @root = plugin.assets_path
-          @dir = File.join(plugin.slug, type)
+          @dir = File.join(plugin.slug, 'stylesheets')
           @exists = {}
           file_check
         end
 
         def media
           m = @media
-          if @file =~ /@(.+?)\./
+          if file =~ /@(.+?)\./
             m = $1
           end
           m
         end
 
+        def disabled?
+          plugin.disabled?('css', filename) ||
+          plugin.disabled?('stylesheets', filename)
+        end
+
         def destination
-          File.join(@dir, @file.sub(/@(.+?)\./,'.'))
+          File.join(base, plugin.slug, file.sub(/@(.+?)\./,'.'))
         end
 
         def tag
-          "<link href='#{Filters.expand_url(File.join(@dir, @file))}' media='#{media}' rel='stylesheet' type='text/css'>"
+          "<link href='#{Filters.expand_url(File.join(dir, file))}' media='#{media}' rel='stylesheet' type='text/css'>"
         end
       end
     end

data/lib/octopress-ink/commands.rb

@@ -2,15 +2,18 @@ module Octopress
   module Ink
     module Commands
       require 'octopress-ink/commands/info'
+      require 'octopress-ink/commands/copy'
 
       class Ink < Octopress::Command
 
         def self.init_with_program(p)
           p.command(:ink) do |c|
-            c.syntax "octopress ink [options]"
-            c.description "Get about octopress ink plugins"
+            c.version Octopress::Ink::VERSION
+            c.description "Get informationa about and work with Octopress Ink plugins."
+            c.syntax "ink <subcommand>"
 
             Info.process_command(c)
+            Copy.process_command(c)
           end
         end
       end

data/lib/octopress-ink/commands/copy.rb

@@ -0,0 +1,29 @@
+module Octopress
+  module Ink
+    module Commands
+      class Copy
+        def self.process_command(p)
+          p.command(:copy) do |c|
+            c.syntax "copy <PLUGIN> [PATH] [options]"
+            c.description "Copy plugin assets to PATH (PATH defaults to _plugins/[plugin_name]/)"
+            c.option "all", "--all", "Copy all plugin assets"
+            c.option "force", "--force", "Overwrite files"
+            CommandHelpers.add_asset_options(c, 'Copy')
+
+            c.action do |args, options|
+              if args.empty?
+                puts "Error: Please pass a plugin to install assets from."
+                Octopress::Ink.list_plugins
+              else
+                name = args[0]
+                path = args[1]
+                Octopress::Ink.copy_plugin_assets(name, path, options)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+