Initial merger of jekyll3-assets and jekyll-assets.

This is an alpha piece of software that still needs old stuff from jekyll-assets imported which will happen over the next few hours. Fixes: #53 Fixes: #103 Fixes: #137 Fixes: #139 Fixes: #143 Fixes: #152 Fixes: #159 Fixes: #163
envygeeks · Jul 18, 2015 · 484880a · 484880a
1 parent ad9ba26
commit 484880a
Show file tree

Hide file tree

Showing 98 changed files with 1,197 additions and 2,790 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,27 +1,6 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-tags
-.sass-cache
-.ruby-version
-
-# Vim
-*.swp
-*.swo
-gemfiles/jekyll_2.gemfile.lock
-gemfiles/jekyll_3.gemfile.lock
+/spec/fixture/.*
+/spec/fixture/_site
+/Gemfile.lock
+/coverage
+/.bundle
 /vendor
diff --git a/.rspec b/.rspec
@@ -1 +1 @@
---color --format documentation
+--color
diff --git a/.rubocop.yml b/.rubocop.yml
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,10 @@
-language: ruby
-
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.6
-  - 2.2.2
-
-gemfile:
-  - gemfiles/jekyll_2.gemfile
-  - gemfiles/jekyll_3.gemfile
-
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      gemfile: gemfiles/jekyll_3.gemfile
+  - 2.0
+  - 2.1
+  - 2.2
+notifications:
+  recipients:
+    - jordon@envygeeks.io
+branches:
+  only:
+    - master
diff --git a/.yardopts b/.yardopts
diff --git a/Appraisals b/Appraisals
diff --git a/Gemfile b/Gemfile
@@ -1,16 +1,8 @@
 source "https://rubygems.org"
+gemspec
 
+gem "rake"
 group :development do
-  gem "rubocop", "~>0.29.1"
-  gem "rake"
-  gem "rspec"
-  gem "appraisal"
-
-  gem "guard-rspec"
-
-  gem "coveralls", :require => false
-  gem "simplecov", :require => false
+  gem "pry"
+  gem "therubyracer"
 end
-
-# Specify your gem's dependencies in jekyll-assets.gemspec
-gemspec
diff --git a/Guardfile b/Guardfile