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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.33
+  version: 1.0.0.alpha.34
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: octopress
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0.alpha8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0.alpha8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +108,28 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- assets/docs/food.html
+- assets/docs/index.html
 - lib/octopress-ink.rb
 - lib/octopress-ink/assets.rb
 - lib/octopress-ink/assets/asset.rb
 - lib/octopress-ink/assets/config.rb
-- lib/octopress-ink/assets/include.rb
+- lib/octopress-ink/assets/doc_page.rb
+- lib/octopress-ink/assets/file.rb
 - lib/octopress-ink/assets/javascript.rb
 - lib/octopress-ink/assets/layout.rb
+- lib/octopress-ink/assets/local_asset.rb
+- lib/octopress-ink/assets/local_javascript.rb
+- lib/octopress-ink/assets/local_sass.rb
+- lib/octopress-ink/assets/local_stylesheet.rb
 - lib/octopress-ink/assets/page.rb
-- lib/octopress-ink/assets/root.rb
 - lib/octopress-ink/assets/sass.rb
 - lib/octopress-ink/assets/stylesheet.rb
 - lib/octopress-ink/commands.rb
+- lib/octopress-ink/commands/copy.rb
 - lib/octopress-ink/commands/helpers.rb
 - lib/octopress-ink/commands/info.rb
+- lib/octopress-ink/configuration.rb
 - lib/octopress-ink/filters.rb
 - lib/octopress-ink/generators/plugin_assets.rb
 - lib/octopress-ink/helpers.rb
@@ -122,7 +144,8 @@ files:
 - lib/octopress-ink/jekyll/static_file_content.rb
 - lib/octopress-ink/plugin.rb
 - lib/octopress-ink/plugins.rb
-- lib/octopress-ink/plugins/stylesheets.rb
+- lib/octopress-ink/plugins/asset_pipeline.rb
+- lib/octopress-ink/plugins/ink.rb
 - lib/octopress-ink/tags.rb
 - lib/octopress-ink/tags/abort.rb
 - lib/octopress-ink/tags/assign.rb
@@ -140,19 +163,51 @@ files:
 - lib/octopress-ink/version.rb
 - octopress-ink.gemspec
 - test/Gemfile
-- test/_concat_css_false.yml
+- test/_concat_false.yml
 - test/_config.yml
 - test/_sass_compact.yml
 - test/_sass_expanded.yml
 - test/concat_css/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
 - test/concat_css/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
-- test/concat_css_false/awesome-sauce/stylesheets/plugin-media-test.css
-- test/concat_css_false/awesome-sauce/stylesheets/plugin-test.css
+- test/concat_css_false/stylesheets/awesome-sauce/plugin-media-test.css
+- test/concat_css_false/stylesheets/awesome-sauce/plugin-test.css
 - test/concat_css_false/stylesheets/site.css
 - test/concat_css_false/stylesheets/test.css
-- test/concat_css_false/theme/stylesheets/theme-media-test.css
-- test/concat_css_false/theme/stylesheets/theme-test.css
-- test/concat_css_false/theme/stylesheets/theme-test2.css
+- test/concat_css_false/stylesheets/theme/theme-media-test.css
+- test/concat_css_false/stylesheets/theme/theme-test.css
+- test/concat_css_false/stylesheets/theme/theme-test2.css
+- test/concat_js/javascripts/all-d41d8cd98f00b204e9800998ecf8427e.js
+- test/concat_js_false/javascripts/site.js
+- test/concat_js_false/javascripts/theme/bar.js
+- test/concat_js_false/javascripts/theme/foo.js
+- test/copy_layouts_pages/_copy/layouts/default.html
+- test/copy_layouts_pages/_copy/layouts/test.html
+- test/copy_layouts_pages/_copy/pages/disable-test.html
+- test/copy_layouts_pages/_copy/pages/one.xml
+- test/copy_layouts_pages/_copy/pages/three.md
+- test/copy_layouts_pages/_copy/pages/two.md
+- test/copy_test/_copy/files/disabled-file.txt
+- test/copy_test/_copy/files/favicon.ico
+- test/copy_test/_copy/files/favicon.png
+- test/copy_test/_copy/fonts/font-one.otf
+- test/copy_test/_copy/fonts/font-two.ttf
+- test/copy_test/_copy/includes/bar.html
+- test/copy_test/_copy/includes/greet.html
+- test/copy_test/_copy/javascripts/bar.js
+- test/copy_test/_copy/javascripts/disable-this.js
+- test/copy_test/_copy/javascripts/foo.js
+- test/copy_test/_copy/layouts/default.html
+- test/copy_test/_copy/layouts/test.html
+- test/copy_test/_copy/pages/disable-test.html
+- test/copy_test/_copy/pages/one.xml
+- test/copy_test/_copy/pages/three.md
+- test/copy_test/_copy/pages/two.md
+- test/copy_test/_copy/stylesheets/disable-this.css
+- test/copy_test/_copy/stylesheets/disable.sass
+- test/copy_test/_copy/stylesheets/main.scss
+- test/copy_test/_copy/stylesheets/theme-media-test@print.css
+- test/copy_test/_copy/stylesheets/theme-test.css
+- test/copy_test/_copy/stylesheets/theme-test2.css
 - test/expected/2014/02/01/test-post.html
 - test/expected/favicon.ico
 - test/expected/favicon.png
@@ -178,6 +233,7 @@ files:
 - test/expected/test_tags/render.html
 - test/expected/test_tags/wrap.html
 - test/plugins/awesome-sauce/config.yml
+- test/plugins/awesome-sauce/docs/index.html
 - test/plugins/awesome-sauce/files/robots.txt
 - test/plugins/awesome-sauce/includes/some-include.html
 - test/plugins/awesome-sauce/layouts/test-layout.html
@@ -187,20 +243,28 @@ files:
 - test/plugins/awesome-sauce/stylesheets/plugin-media-test.css
 - test/plugins/awesome-sauce/stylesheets/plugin-test.css
 - test/plugins/test-theme/config.yml
+- test/plugins/test-theme/files/disabled-file.txt
 - test/plugins/test-theme/files/favicon.ico
 - test/plugins/test-theme/files/favicon.png
 - test/plugins/test-theme/files/test.html
+- test/plugins/test-theme/fonts/font-one.otf
+- test/plugins/test-theme/fonts/font-two.ttf
 - test/plugins/test-theme/includes/bar.html
 - test/plugins/test-theme/includes/greet.html
 - test/plugins/test-theme/javascripts/bar.js
+- test/plugins/test-theme/javascripts/disable-this.js
 - test/plugins/test-theme/javascripts/foo.js
 - test/plugins/test-theme/layouts/default.html
 - test/plugins/test-theme/layouts/test.html
+- test/plugins/test-theme/pages/disable-test.html
+- test/plugins/test-theme/pages/test_pages/disable-test.html
 - test/plugins/test-theme/pages/test_pages/one.xml
 - test/plugins/test-theme/pages/test_pages/three.md
 - test/plugins/test-theme/pages/test_pages/two.md
 - test/plugins/test-theme/plugin.rb
 - test/plugins/test-theme/stylesheets/_colors.scss
+- test/plugins/test-theme/stylesheets/disable-this.css
+- test/plugins/test-theme/stylesheets/disable.sass
 - test/plugins/test-theme/stylesheets/main.scss
 - test/plugins/test-theme/stylesheets/theme-media-test@print.css
 - test/plugins/test-theme/stylesheets/theme-test.css
@@ -211,6 +275,7 @@ files:
 - test/sass_expanded/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
 - test/source/.gitignore
 - test/source/_includes/foo.html
+- test/source/_javascripts/site.js
 - test/source/_layouts/head.html
 - test/source/_layouts/local.html
 - test/source/_plugins/awesome-sauce/config.yml
@@ -221,11 +286,11 @@ files:
 - test/source/_plugins/theme/stylesheets/_colors.sass
 - test/source/_plugins/theme/stylesheets/theme-test.css
 - test/source/_posts/2014-02-01-test-post.md
+- test/source/_stylesheets/_foo.scss
+- test/source/_stylesheets/site.sass
+- test/source/_stylesheets/test.css
 - test/source/favicon.png
 - test/source/index.md
-- test/source/stylesheets/_foo.scss
-- test/source/stylesheets/site.sass
-- test/source/stylesheets/test.css
 - test/source/test_config/plugin_config.html
 - test/source/test_config/theme_config.html
 - test/source/test_layouts/local.html
@@ -275,19 +340,51 @@ specification_version: 4
 summary: A starting point for creating gem-based Jekyll themes and plugins
 test_files:
 - test/Gemfile
-- test/_concat_css_false.yml
+- test/_concat_false.yml
 - test/_config.yml
 - test/_sass_compact.yml
 - test/_sass_expanded.yml
 - test/concat_css/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
 - test/concat_css/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
-- test/concat_css_false/awesome-sauce/stylesheets/plugin-media-test.css
-- test/concat_css_false/awesome-sauce/stylesheets/plugin-test.css
+- test/concat_css_false/stylesheets/awesome-sauce/plugin-media-test.css
+- test/concat_css_false/stylesheets/awesome-sauce/plugin-test.css
 - test/concat_css_false/stylesheets/site.css
 - test/concat_css_false/stylesheets/test.css
-- test/concat_css_false/theme/stylesheets/theme-media-test.css
-- test/concat_css_false/theme/stylesheets/theme-test.css
-- test/concat_css_false/theme/stylesheets/theme-test2.css
+- test/concat_css_false/stylesheets/theme/theme-media-test.css
+- test/concat_css_false/stylesheets/theme/theme-test.css
+- test/concat_css_false/stylesheets/theme/theme-test2.css
+- test/concat_js/javascripts/all-d41d8cd98f00b204e9800998ecf8427e.js
+- test/concat_js_false/javascripts/site.js
+- test/concat_js_false/javascripts/theme/bar.js
+- test/concat_js_false/javascripts/theme/foo.js
+- test/copy_layouts_pages/_copy/layouts/default.html
+- test/copy_layouts_pages/_copy/layouts/test.html
+- test/copy_layouts_pages/_copy/pages/disable-test.html
+- test/copy_layouts_pages/_copy/pages/one.xml
+- test/copy_layouts_pages/_copy/pages/three.md
+- test/copy_layouts_pages/_copy/pages/two.md
+- test/copy_test/_copy/files/disabled-file.txt
+- test/copy_test/_copy/files/favicon.ico
+- test/copy_test/_copy/files/favicon.png
+- test/copy_test/_copy/fonts/font-one.otf
+- test/copy_test/_copy/fonts/font-two.ttf
+- test/copy_test/_copy/includes/bar.html
+- test/copy_test/_copy/includes/greet.html
+- test/copy_test/_copy/javascripts/bar.js
+- test/copy_test/_copy/javascripts/disable-this.js
+- test/copy_test/_copy/javascripts/foo.js
+- test/copy_test/_copy/layouts/default.html
+- test/copy_test/_copy/layouts/test.html
+- test/copy_test/_copy/pages/disable-test.html
+- test/copy_test/_copy/pages/one.xml
+- test/copy_test/_copy/pages/three.md
+- test/copy_test/_copy/pages/two.md
+- test/copy_test/_copy/stylesheets/disable-this.css
+- test/copy_test/_copy/stylesheets/disable.sass
+- test/copy_test/_copy/stylesheets/main.scss
+- test/copy_test/_copy/stylesheets/theme-media-test@print.css
+- test/copy_test/_copy/stylesheets/theme-test.css
+- test/copy_test/_copy/stylesheets/theme-test2.css
 - test/expected/2014/02/01/test-post.html
 - test/expected/favicon.ico
 - test/expected/favicon.png
@@ -313,6 +410,7 @@ test_files:
 - test/expected/test_tags/render.html
 - test/expected/test_tags/wrap.html
 - test/plugins/awesome-sauce/config.yml
+- test/plugins/awesome-sauce/docs/index.html
 - test/plugins/awesome-sauce/files/robots.txt
 - test/plugins/awesome-sauce/includes/some-include.html
 - test/plugins/awesome-sauce/layouts/test-layout.html
@@ -322,20 +420,28 @@ test_files:
 - test/plugins/awesome-sauce/stylesheets/plugin-media-test.css
 - test/plugins/awesome-sauce/stylesheets/plugin-test.css
 - test/plugins/test-theme/config.yml
+- test/plugins/test-theme/files/disabled-file.txt
 - test/plugins/test-theme/files/favicon.ico
 - test/plugins/test-theme/files/favicon.png
 - test/plugins/test-theme/files/test.html
+- test/plugins/test-theme/fonts/font-one.otf
+- test/plugins/test-theme/fonts/font-two.ttf
 - test/plugins/test-theme/includes/bar.html
 - test/plugins/test-theme/includes/greet.html
 - test/plugins/test-theme/javascripts/bar.js
+- test/plugins/test-theme/javascripts/disable-this.js
 - test/plugins/test-theme/javascripts/foo.js
 - test/plugins/test-theme/layouts/default.html
 - test/plugins/test-theme/layouts/test.html
+- test/plugins/test-theme/pages/disable-test.html
+- test/plugins/test-theme/pages/test_pages/disable-test.html
 - test/plugins/test-theme/pages/test_pages/one.xml
 - test/plugins/test-theme/pages/test_pages/three.md
 - test/plugins/test-theme/pages/test_pages/two.md
 - test/plugins/test-theme/plugin.rb
 - test/plugins/test-theme/stylesheets/_colors.scss
+- test/plugins/test-theme/stylesheets/disable-this.css
+- test/plugins/test-theme/stylesheets/disable.sass
 - test/plugins/test-theme/stylesheets/main.scss
 - test/plugins/test-theme/stylesheets/theme-media-test@print.css
 - test/plugins/test-theme/stylesheets/theme-test.css
@@ -346,6 +452,7 @@ test_files:
 - test/sass_expanded/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
 - test/source/.gitignore
 - test/source/_includes/foo.html
+- test/source/_javascripts/site.js
 - test/source/_layouts/head.html
 - test/source/_layouts/local.html
 - test/source/_plugins/awesome-sauce/config.yml
@@ -356,11 +463,11 @@ test_files:
 - test/source/_plugins/theme/stylesheets/_colors.sass
 - test/source/_plugins/theme/stylesheets/theme-test.css
 - test/source/_posts/2014-02-01-test-post.md
+- test/source/_stylesheets/_foo.scss
+- test/source/_stylesheets/site.sass
+- test/source/_stylesheets/test.css
 - test/source/favicon.png
 - test/source/index.md
-- test/source/stylesheets/_foo.scss
-- test/source/stylesheets/site.sass
-- test/source/stylesheets/test.css
 - test/source/test_config/plugin_config.html
 - test/source/test_config/theme_config.html
 - test/source/test_layouts/local.html

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

@@ -1,18 +0,0 @@
-module Octopress
-  module Ink
-    module Assets
-      class Include < Asset
-
-        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
-end
-

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

@@ -1,29 +0,0 @@
-# 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 RootAsset < Asset
-
-        def initialize(plugin, type, file)
-          @root = plugin.assets_path
-          @plugin = plugin
-          @dir = ''
-          @type = type
-          @file = file
-          @exists = {}
-          file_check
-        end
-
-        def copy
-          unless exists? local_plugin_path
-            Plugins.site.static_files << StaticFile.new(plugin_path, destination)
-          end
-        end
-
-      end
-    end
-  end
-end
-

data/lib/octopress-ink/plugins/stylesheets.rb

@@ -1,56 +0,0 @@
-# The CSS assets for this plugin are populated at runtime by the add_static_files method of
-# the Plugins module.
-#
-module Octopress
-  module Ink
-    class StylesheetsPlugin < Octopress::Ink::Plugin
-      def add_files
-
-        add_stylesheets local_stylesheets
-
-        remove_jekyll_assets @sass
-
-        if Plugins.concat_css
-          remove_jekyll_assets @stylesheets
-        end
-      end
-
-      def add_stylesheets(files)
-        files = [files] unless files.is_a? Array
-        files.each do |file|
-          # accept ['file', 'media_type']
-          if file.is_a? Array
-            if file.first =~ /\.css/
-              add_stylesheet file.first, file.last
-            else
-              add_sass file.first, file.last
-            end
-          # accept 'file'
-          else
-            if file =~ /\.css/
-              add_stylesheet file
-            else
-              add_sass file
-            end
-          end
-        end
-        files
-      end
-
-      def local_stylesheets
-        config = Plugins.site.config
-        source = Plugins.site.source
-        if config['octopress'] && config['octopress']['stylesheets']
-          config['octopress']['stylesheets'] || []
-        else
-          dir = File.join(source, 'stylesheets/')
-          css = Dir.glob(File.join(dir, '**/*.css'))
-          sass = Dir.glob(File.join(dir, '**/*.s[ca]ss')).reject { |f| File.basename(f) =~ /^_.*?s[ac]ss/ }
-          files = css.concat sass
-          files.map { |f| f.split(dir).last }
-        end
-      end
-    end
-  end
-end
-

data/test/_concat_css_false.yml

@@ -1,3 +0,0 @@
-# Sass configurations 
-octopress:
-  concat_css: false