octopress-asset-pipeline 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6109318c08d99e5cf10c768d12a28ed723ad0119
-  data.tar.gz: bde4e372ce2d8f5624cbf5bff3952a1bd859b79d
+  metadata.gz: 7ed731c311f629bb538a58f8c51a10ec3bebff27
+  data.tar.gz: fe0e5496d05ed3830d80100c762fc47dff44abf1
 SHA512:
-  metadata.gz: 9be3958ab36d4761f49b00926a844d0cbed88e3bebf29cb288150c7d638e5455204ba51b52deb1208eb07e6e8b5d5804c9a305106f984d5562bb5afdfec038dc
-  data.tar.gz: 405f5be6958fdb36ec7806e2082065d2ef46abf5751e55dd5e41b2b32ba79bfba431ba05ae8faf8f353b6c1fc2897516ae46d239bf3c2304ecdcbd7379edee98
+  metadata.gz: 4213093d12803f32df1aa72c6cefd3ddea89d953104528a76fb8119d92a0df22f753fe2b69f04efc3334008f23261a7591bdf3ef2eedaa8e06d2850174af18ad
+  data.tar.gz: 0575497d3d8fa7019cea05b7f9316640f510f51ea1fd263b68dd0ddb2db5a1a089b581ed8357ccbde10491e039f101df44f34e9cf4cd74032de6114c8a58816e

data/.travis.yml

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

data/README.md

@@ -97,7 +97,7 @@ When your site is compiled, this file will be written separately and its `<link>
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/octopress-asset-pipeline/fork )
+1. Fork it ( https://github.com/octopress/asset-pipeline/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/octopress-asset-pipeline/version.rb

@@ -1,7 +1,7 @@
 module Octopress
   module Ink
     module LocalAssetPipeline
-      VERSION = "1.0.0"
+      VERSION = "1.0.1"
     end
   end
 end

data/lib/octopress-asset-pipeline.rb

@@ -25,7 +25,6 @@ module Octopress
         end
 
         def register
-          @config ||= Ink.config
           # Tell Jekyll to read static files and pages
           # This is necessary when Jekyll isn't being asked to build a site,
           # like when a user runs the list command to list assets
@@ -38,23 +37,27 @@ module Octopress
           add_javascripts
         end
 
+        def config
+          Ink.config
+        end
+
         # Return stylesheets to be combined in the asset pipeline
         def stylesheets
-          sort(@css.clone.concat(@sass), @config['order_css'] || [])
+          sort(@css.clone.concat(@sass), config['order_css'] || [])
         end
 
         def javascripts
-          sort(@js.clone.concat(@coffee), @config['order_js'] || [])
+          sort(@js.clone.concat(@coffee), config['order_js'] || [])
         end
 
         private
 
         def combine_js
-          @config['combine_js']
+          config['combine_js']
         end
 
         def combine_css
-          @config['combine_css']
+          config['combine_css']
         end
 
         def add_stylesheets

data/octopress-asset-pipeline.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "octopress-ink", "~> 1.0.0.rc.11"
+  
   spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "clash", "~> 1.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "octopress"
-  
-  spec.add_runtime_dependency "octopress-ink", "~> 1.0.0.rc.1"
 end

data/test/.clash.yml

@@ -0,0 +1,8 @@
+-
+  build: true
+  compare: expected site
+-
+  build: true
+  config:
+    octopress: _combine_false.yml
+  compare: combine_false site

data/test/Gemfile

@@ -2,7 +2,8 @@ source 'https://rubygems.org'
 
 group :octopress do
   gem 'octopress'
-  gem 'octopress-ink', path: '../../ink'
+  gem 'octopress-ink'
   gem 'octopress-asset-pipeline', path: '../'
   gem 'pry-debugger'
+  gem 'clash'
 end

data/test/site/blah.js

@@ -0,0 +1 @@
+console.log("Yo I'm a javascript")

data/test/site/foo.js

@@ -0,0 +1,6 @@
+(function() {
+  if (!false) {
+    console.log('hi');
+  }
+
+}).call(this);

data/test/site/index.html

@@ -1,2 +1,2 @@
-<script src='/javascripts/all-.js'></script>
-<link href='/stylesheets/all-.css' media='all' rel='stylesheet' type='text/css'>
+<script src='/foo.js'></script><script src='/blah.js'></script>
+<link href='/test.css' media='all' rel='stylesheet' type='text/css'><link href='/css-test.scss' media='all' rel='stylesheet' type='text/css'>

data/test/site/sass-test.css

@@ -0,0 +1,2 @@
+body {
+  background: black; }

data/test/site/test.css

@@ -0,0 +1,2 @@
+body {
+  color: #444; }

data/test/source/sass-test.scss

@@ -1,5 +1,4 @@
 ---
-file: partial
 ---
-@import "{{ page.file }}";
+@import "partial";
 body { background: $bg; }

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: octopress-asset-pipeline
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: octopress-ink
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc.11
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -25,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: clash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: octopress
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: octopress-ink
+  name: octopress
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.1
+        version: '0'
 description: Combine and compress CSS and Sass, Javascript and Coffeescript to a single
   fingerprinted file.
 email:
@@ -100,28 +114,29 @@ files:
 - lib/octopress-asset-pipeline/assets/sass.rb
 - lib/octopress-asset-pipeline/version.rb
 - octopress-asset-pipeline.gemspec
+- test/.clash.yml
 - test/Gemfile
-- test/_concat_false.yml
+- test/_combine_false.yml
 - test/_config.yml
-- test/concat_false/blah.js
-- test/concat_false/foo.js
-- test/concat_false/index.html
-- test/concat_false/sass-test.css
-- test/concat_false/test.css
+- test/combine_false/blah.js
+- test/combine_false/foo.js
+- test/combine_false/index.html
+- test/combine_false/sass-test.css
+- test/combine_false/test.css
 - test/expected/index.html
 - test/expected/javascripts/all-.js
 - test/expected/stylesheets/all-.css
+- test/site/blah.js
+- test/site/foo.js
 - test/site/index.html
-- test/site/javascripts/all-.js
-- test/site/stylesheets/all-.css
+- test/site/sass-test.css
+- test/site/test.css
 - test/source/_sass/_partial.sass
 - test/source/blah.js
 - test/source/foo.coffee
 - test/source/index.html
 - test/source/sass-test.scss
 - test/source/test.css
-- test/test.rb
-- test/test_suite.rb
 homepage: https://github.com/octopress/asset-pipeline
 licenses:
 - MIT
@@ -148,25 +163,26 @@ specification_version: 4
 summary: Combine and compress CSS and Sass, Javascript and Coffeescript to a single
   fingerprinted file.
 test_files:
+- test/.clash.yml
 - test/Gemfile
-- test/_concat_false.yml
+- test/_combine_false.yml
 - test/_config.yml
-- test/concat_false/blah.js
-- test/concat_false/foo.js
-- test/concat_false/index.html
-- test/concat_false/sass-test.css
-- test/concat_false/test.css
+- test/combine_false/blah.js
+- test/combine_false/foo.js
+- test/combine_false/index.html
+- test/combine_false/sass-test.css
+- test/combine_false/test.css
 - test/expected/index.html
 - test/expected/javascripts/all-.js
 - test/expected/stylesheets/all-.css
+- test/site/blah.js
+- test/site/foo.js
 - test/site/index.html
-- test/site/javascripts/all-.js
-- test/site/stylesheets/all-.css
+- test/site/sass-test.css
+- test/site/test.css
 - test/source/_sass/_partial.sass
 - test/source/blah.js
 - test/source/foo.coffee
 - test/source/index.html
 - test/source/sass-test.scss
 - test/source/test.css
-- test/test.rb
-- test/test_suite.rb

data/test/site/javascripts/all-.js

@@ -1 +0,0 @@
-console.log("Yo I'm a javascript")(function(){console.log("hi")}).call(this);

data/test/site/stylesheets/all-.css

@@ -1 +0,0 @@
-body{color:#444}body{background:black}

data/test/test.rb

@@ -1,14 +0,0 @@
-require './test_suite'
-ENV['JEKYLL_ENV'] = 'test'
-
-@failures = []
-
-build
-
-test_dirs('Site build', 'site', 'expected')
-
-#build({:octopress_config => '_concat_false.yml'})
-
-#test_dirs('Site build', 'site', 'concat_false')
-
-print_results

data/test/test_suite.rb

@@ -1,160 +0,0 @@
-require 'colorator'
-require 'find'
-
-# This is a makeshift integration test-suite.
-# It is unapologetically pragmatic.
-
-
-# Build Jekyll
-#
-def build(options={})
-  if options[:octopress_config]
-    FileUtils.cp options[:octopress_config], '_octopress.yml'
-  end
-
-  config = ['_config.yml'] << options[:config]
-  cmd = "rm -rf site && bundle exec jekyll build --config #{config.join(',')}"
-
-  `#{cmd}`
-  `rm _octopress.yml` if options[:octopress_config]
-end
-
-
-# Find all files in a given directory
-#
-def dir_files(dir)
-  Find.find(dir).to_a.reject!{|f| File.directory?(f) }
-end
-
-# Recursively diff two directories
-#
-# This will walk through dir1 and diff matching paths in dir2
-#
-def test_dirs(desc, dir1, dir2)
-
-  test_missing_files(desc, dir1, dir2)
-
-  dir_files(dir1).each do |file|
-    file2 = file.sub(dir1, dir2)
-    if File.exist?(file2)
-      if diff = diff_file(file, file2)
-        @failures << {
-          desc: "#{desc}\nDiff of file: #{file.sub(dir1+'/', '')}\n",
-          result: format_diff(diff)
-        }
-        pout 'F'.red
-      else
-        pout '.'.green
-      end
-    end
-  end
-end
-
-def format_diff(diff)
-  "#{diff.gsub(/\A.+?\n/,'').gsub(/^[^><].+/,'---').gsub(/^>.+/){|m| 
-    m.green
-  }.gsub(/^(<.+?)$/){ |m| 
-    m.red
-  }}"
-end
-
-# List differences between files in two directories
-#
-def test_missing_files(desc, dir1, dir2)
-  files1 = dir_files(dir1).map {|f| f.sub(dir1,'') }
-  files2 = dir_files(dir2).map {|f| f.sub(dir2,'') }
-
-  missing = []
-
-  (files2 - files1).each do |file|
-    missing << File.join(dir1, file)
-  end
-
-  (files1 - files2).each do |file|
-    missing << File.join(dir2, file)
-  end
-
-  if !missing.empty?
-    @failures << {
-      desc: "#{desc}\nMissing files:\n",
-      result: " - " + missing.join("\n - ")
-    }
-
-    pout 'F'.red
-  else
-    pout '.'.green
-  end
-end
-
-# Diff two files
-#
-def diff_file(file1, file2)
-  diff = `diff #{file1} #{file2}`
-  if diff.size > 0
-    diff
-  else
-    false
-  end
-end
-
-# Test command output
-#
-# Input: options hash, format:
-#   {
-#     desc:   description of task
-#     cmd:    system command to be run, (String or Array)
-#     expect: expected output from command
-#   } 
-#
-def test_cmd(options)
-  if cmd = options[:cmd]
-    cmd = [cmd] unless cmd.is_a? Array
-
-    # In debug mode command output is printed
-    #
-    if options[:debug]
-      system cmd.join('; ')
-    else
-      output = `#{cmd.join('; ')}`.gsub(/#{Dir.pwd}\/*/,'').strip
-
-      # Remove character color codes
-      output = output.gsub("\e",'').gsub(/\[\d+m/,'').gsub("\[0m",'')
-    end
-    if options[:expect] && options[:expect].strip == output
-      pout '.'.green
-    else
-      pout 'F'.red
-      @failures << {
-        desc: options[:desc]+"\n",
-        result: <<-HERE
-expected: #{(options[:expect] || '').strip.green}
-result: #{(output || '').strip.red}
-HERE
-      }
-    end
-  end
-end
-
-
-# Print a single character without a newline
-#
-def pout(str)
-  print str
-  $stdout.flush
-end
-
-# Ouptut nicely formatted failure messages
-#
-def print_results
-  if !@failures.empty?
-    @failures.each do |test|
-      pout "\nFailed: #{test[:desc]}"
-      puts test[:result]
-      # print a newline for easier reading
-      puts ""
-    end
-    abort
-  else
-    puts "All passed!".green
-  end
-end