octopress-ink 1.0.0.alpha.44 → 1.0.0.alpha.45

data/test/copy_layouts_pages/_copy/pages/two.md

@@ -1,6 +1,5 @@
 ---
 layout: theme:default
-permalink_config: page_two
 ---
 
 Testing pages. **strong** *emphasized* [a link](http://example.com)

data/test/copy_test/_copy/pages/two.md

@@ -1,6 +1,5 @@
 ---
 layout: theme:default
-permalink: /test_pages/theme_page.html
 ---
 
 Testing pages. **strong** *emphasized* [a link](http://example.com)

data/test/copy_test/_copy/stylesheets/main.scss

@@ -1,2 +1,5 @@
-@import 'colors';
+---
+import: colors
+---
+@import '{{ page.import }}';
 body { background: $bg; }

data/test/expected/index.html

@@ -23,8 +23,8 @@
 <ul>
 <li>sass compression</li>
 <li>sass line numbers</li>
-<li>concat_css</li>
-<li>concat_js</li>
+<li>combine_css</li>
+<li>combine_js</li>
 </ul>
 </div>
 

data/test/plugins/awesome-sauce/pages/b.html

@@ -1,4 +1,3 @@
 ---
-permalink: /test_pages/plugin_page.html
 ---
 Page two from plugin

data/test/plugins/awesome-sauce/plugin.rb

@@ -1,6 +1,6 @@
 require 'octopress-ink'
 
-Octopress::Ink.new_plugin({
+Octopress::Ink.add_plugin({
   name:        'Awesome Sauce',
   slug:        'awesome-sauce',
   assets_path: File.expand_path(File.dirname(__FILE__)),

data/test/plugins/test-theme/javascripts/blah.coffee

@@ -0,0 +1 @@
+console.log 'dang'

data/test/plugins/test-theme/plugin.rb

@@ -1,6 +1,6 @@
 require 'octopress-ink'
 
-Octopress::Ink.new_plugin({
+Octopress::Ink.add_plugin({
   name:        "Classic Theme",
   type:        "theme",
   description: "Test theme y'all",

data/test/plugins/test-theme/stylesheets/main.scss

@@ -1,2 +1,5 @@
-@import 'colors';
+---
+import: colors
+---
+@import '{{ page.import }}';
 body { background: $bg; }

data/test/source/_plugins/awesome-sauce/config.yml

@@ -1,4 +1,4 @@
 test_override: config from plugin override
-page_permalinks:
+permalinks:
   a: test_pages/plugin_page_override.html
   b: test_pages/plugin_page.html

data/test/source/_plugins/theme/config.yml

@@ -1,5 +1,5 @@
 test_override: config from theme override
-page_permalinks:
+permalinks:
   two: test_pages/theme_page.html
   feed: test_pages/feed/
 

data/test/source/_posts/2014-02-01-test-post.md

@@ -1,5 +1,6 @@
 ---
 layout: theme:test
+external-url: http://timecube.com
 ---
 
 Test post **strong** *emphasized* [some link](http://example.com)

data/test/source/index.md

@@ -16,8 +16,8 @@ Test configurations
 
 - sass compression
 - sass line numbers
-- concat_css
-- concat_js
+- combine_css
+- combine_js
 
 {% assign separator = ' <span class='separator'></b> ' %}
 {% capture foo | join_lines:separator %}

data/test/test.rb

@@ -49,11 +49,11 @@ end
 
 def diff_file(file, target_dir='expected', source_dir='site')
   diff = `diff #{target_dir}/#{file} #{source_dir}/#{file}`
-  if diff =~ /(<.+?\n)?(---\n)?(>.+)/
+  if diff.size > 0
     @failures << <<-DIFF
 Failure in #{file}
 ---------
-#{($1||'').red + $3.green}
+#{diff.gsub(/\A.+?\n/,'').gsub(/^(<.+?)$/){|m| m.red}.gsub(/>.+/){|m| m.green}}
 ---------
 DIFF
   else
@@ -89,14 +89,11 @@ def test_configs(dir)
   configs.each { |file| test("test_config/#{file}.html", dir) }
 end
 
-def test_stylesheets(dir, concat=true)
-  if concat
+def test_stylesheets(dir, combine=true)
+  if combine
     stylesheets = %w{all-* print-*}
     stylesheets.each { |file| test("stylesheets/#{file}.css", dir) }
   else
-    local_stylesheets = %w{site test}
-    local_stylesheets.each { |file| test("stylesheets/#{file}.css", dir) }
-
     plugin_stylesheets = %w{plugin-media-test plugin-test}
     plugin_stylesheets.each { |file| test("stylesheets/awesome-sauce/#{file}.css", dir) }
 
@@ -105,14 +102,12 @@ def test_stylesheets(dir, concat=true)
   end
 end
 
-def test_javascripts(dir, concat=true)
-  if concat
+def test_javascripts(dir, combine=true)
+  if combine
     javascripts = %w{all-*}
     javascripts.each { |file| test("javascripts/#{file}.js", dir) }
   else
-    javascripts = %w{bar foo}
-    javascripts.each { |file| test("javascripts/theme/#{file}.js", dir) }
-    test("javascripts/site.js", dir)
+    %w{bar foo}.each { |file| test("javascripts/theme/#{file}.js", dir) }
   end
 end
 
@@ -161,27 +156,20 @@ test_post('expected')
 test_tags('expected')
 test_pages('expected')
 test_layouts('expected')
-test_stylesheets('concat_css')
-test_javascripts('concat_js')
+test_stylesheets('combine_css')
+test_javascripts('combine_js')
 test_configs('expected')
 test_root_assets('expected')
+test_disabled('site')
 
-Octopress::Ink.copy_plugin_assets('theme', {'path' => '_copy', 'force'=> true})
+system "octopress ink copy theme --path _copy --force"
 test_copy_assets('copy_test')
 
-Octopress::Ink.copy_plugin_assets('theme', {'path' => '_copy', 'force'=> true, 'layouts' => true, 'pages' => true})
+system "octopress ink copy theme --layouts --pages --path _copy --force"
 test_copy_assets('copy_layouts_pages')
 
-build octopress_config: '_concat_false.yml'
-test_stylesheets('concat_css_false', false)
-test_javascripts('concat_js_false', false)
-test_disabled('site')
-
-build config: '_sass_compact.yml'
-test_stylesheets('sass_compact')
-
-build config: '_sass_expanded.yml'
-test_stylesheets('sass_expanded')
+build octopress_config: '_combine_false.yml'
+test_stylesheets('combine_css_false', false)
+test_javascripts('combine_js_false', false)
 
 print_failures
-

metadata

@@ -1,103 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.44
+  version: 1.0.0.alpha.45
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.20140403
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 1.1.20140403
 - !ruby/object:Gem::Dependency
   name: octopress
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A starting point for creating gem-based Jekyll themes and plugins
@@ -107,8 +107,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -122,21 +122,19 @@ files:
 - lib/octopress-ink.rb
 - lib/octopress-ink/assets.rb
 - lib/octopress-ink/assets/asset.rb
+- lib/octopress-ink/assets/coffeescript.rb
 - lib/octopress-ink/assets/config.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/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/init.rb
 - lib/octopress-ink/commands/list.rb
 - lib/octopress-ink/commands/new.rb
 - lib/octopress-ink/configuration.rb
@@ -146,15 +144,14 @@ files:
 - lib/octopress-ink/helpers/conditional.rb
 - lib/octopress-ink/helpers/content_for.rb
 - lib/octopress-ink/helpers/path.rb
-- lib/octopress-ink/helpers/titlecase.rb
 - lib/octopress-ink/helpers/var.rb
 - lib/octopress-ink/jekyll/hooks.rb
 - lib/octopress-ink/jekyll/page.rb
 - lib/octopress-ink/jekyll/static_file.rb
 - lib/octopress-ink/jekyll/static_file_content.rb
 - lib/octopress-ink/plugin.rb
+- lib/octopress-ink/plugin_asset_pipeline.rb
 - lib/octopress-ink/plugins.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
@@ -171,26 +168,26 @@ files:
 - lib/octopress-ink/tags/stylesheet.rb
 - lib/octopress-ink/tags/wrap.rb
 - lib/octopress-ink/tags/yield.rb
+- lib/octopress-ink/utils.rb
 - lib/octopress-ink/version.rb
 - octopress-ink.gemspec
 - test/Gemfile
-- test/_concat_false.yml
+- test/_combine_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/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/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/combine_css/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
+- test/combine_css/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
+- test/combine_css_false/stylesheets/awesome-sauce/plugin-media-test.css
+- test/combine_css_false/stylesheets/awesome-sauce/plugin-test.css
+- test/combine_css_false/stylesheets/site.css
+- test/combine_css_false/stylesheets/test.css
+- test/combine_css_false/stylesheets/theme/theme-media-test.css
+- test/combine_css_false/stylesheets/theme/theme-test.css
+- test/combine_css_false/stylesheets/theme/theme-test2.css
+- test/combine_js/javascripts/all-d41d8cd98f00b204e9800998ecf8427e.js
+- test/combine_js_false/javascripts/site.js
+- test/combine_js_false/javascripts/test.js
+- test/combine_js_false/javascripts/theme/bar.js
+- test/combine_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
@@ -266,6 +263,7 @@ files:
 - 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/blah.coffee
 - test/plugins/test-theme/javascripts/disable-this.js
 - test/plugins/test-theme/javascripts/foo.js
 - test/plugins/test-theme/layouts/default.html
@@ -283,13 +281,8 @@ files:
 - test/plugins/test-theme/stylesheets/theme-media-test@print.css
 - test/plugins/test-theme/stylesheets/theme-test.css
 - test/plugins/test-theme/stylesheets/theme-test2.css
-- test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
-- test/sass_compact/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
-- test/sass_expanded/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
-- 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
@@ -300,9 +293,6 @@ 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/test_config/plugin_config.html
@@ -338,39 +328,38 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A starting point for creating gem-based Jekyll themes and plugins
 test_files:
 - test/Gemfile
-- test/_concat_false.yml
+- test/_combine_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/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/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/combine_css/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
+- test/combine_css/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
+- test/combine_css_false/stylesheets/awesome-sauce/plugin-media-test.css
+- test/combine_css_false/stylesheets/awesome-sauce/plugin-test.css
+- test/combine_css_false/stylesheets/site.css
+- test/combine_css_false/stylesheets/test.css
+- test/combine_css_false/stylesheets/theme/theme-media-test.css
+- test/combine_css_false/stylesheets/theme/theme-test.css
+- test/combine_css_false/stylesheets/theme/theme-test2.css
+- test/combine_js/javascripts/all-d41d8cd98f00b204e9800998ecf8427e.js
+- test/combine_js_false/javascripts/site.js
+- test/combine_js_false/javascripts/test.js
+- test/combine_js_false/javascripts/theme/bar.js
+- test/combine_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
@@ -446,6 +435,7 @@ test_files:
 - 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/blah.coffee
 - test/plugins/test-theme/javascripts/disable-this.js
 - test/plugins/test-theme/javascripts/foo.js
 - test/plugins/test-theme/layouts/default.html
@@ -463,13 +453,8 @@ test_files:
 - test/plugins/test-theme/stylesheets/theme-media-test@print.css
 - test/plugins/test-theme/stylesheets/theme-test.css
 - test/plugins/test-theme/stylesheets/theme-test2.css
-- test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
-- test/sass_compact/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
-- test/sass_expanded/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
-- 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
@@ -480,9 +465,6 @@ 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/test_config/plugin_config.html

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

@@ -1,47 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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

@@ -1,33 +0,0 @@
-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
-