jekyll-stitch-plus 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTlmODRlYWZlMTk2YTY1MWI5Y2ExNDk1ZjI0NTM0ZWUwMjI4MDQwMw==
+    MTIzMmFiZTEwZGY3ZDQ5ZDM4ZTcyNjYwZGJkNDhjYzZiMjZkOGEwMg==
   data.tar.gz: !binary |-
-    ZjliNDAyZTE4YzhlMWNmYzRmM2VmNDE1M2Y1NTk1NmMyNWUwYWNiNg==
+    ZTMyZWE3ZDRlMzUyYjZlZDYwMWIyNGJmZDU2NzI1OTRkMGE4MjhhMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWU1Y2RhNzM5YjFmODU0MGNhY2JlMDcxNDU3NjMwNTJiNGQyNGE0YTRkNTg2
-    YzYyMjYzOTE1NDMzOGRmZjQzNGY4YTE4MzMxOGRkM2EzM2QyYWVjODliNTU3
-    NTUxMzRjMmNjOTVkNTUzZjg2Nzk2Y2MxZDMxNGE5YmI1NDdhYzU=
+    MmNhNmMxNWFkNWNjMTgwNDc4MzQyOGY2NjYxOTUzZWEwOWEwNDM1ZjQ3YThk
+    ZTUwOTg2ZTAxYWFkODVkNzM5Y2Y4YzllNTBlZDk1YWE0YTJmNTEwMWFlNTc2
+    OTI2ZmU4OGY0OWI4YjE0YTBkMzBmOWYxYmE0MjE4NjY3NmUyM2E=
   data.tar.gz: !binary |-
-    ZjdkNWE4ZGNiNzEwMzk1MmNiNTgzZTA1ZWFmOTU1NDBmMjM1NTZkY2FkNWQ5
-    MDRmNzczNjRmNjRiZGMyZDMwM2E3NzVmMDljZWRmYTZkODdjNTkwYzcyYmRi
-    ZTVlMTUwMGZiZWVjOGJiZTMzZjY0YmE3Y2UxNzI0YTM3ZTZiNzI=
+    MTM5Y2NlOTI3MGQ0ZTdmZGRiNGU2NGM4ZTI1ZjJiNGIwMGE4MGMyMjdlZmJh
+    ZGQ0MWZhZDg2NjA3MDQ5MTk1ZWRhMmUyMGEwNzJiNmRkMjU0MzRjMmUyOTc0
+    ZTczOWVkOGM2Y2IzYjViYWEzOGUzZGQ0ZTVhMTQ3YjM5MDI1Y2E=

data/CHANGELOG.md

@@ -1,12 +1,15 @@
 # Changelog
 
-## 1.0.0
-- Initial release
+## 1.0.3
+- Fix: no longer creates nested source directory when specfied in output path
+
+## 1.0.2
+- Works better with Guard Stitch Plus
+- Better handles non standard paths for source and javascripts
 
 ## 1.0.1
 - Fix: Uglifier works now.
 
-## 1.0.1
-- Works better with Guard Stitch Plus
-- Better handles non standard paths for source and javascripts
+## 1.0.0
+- Initial release
 

data/README.md

@@ -1,7 +1,13 @@
 # Jekyll Stitch Plus
 
+[![Gem Version](https://badge.fury.io/rb/jekyll-stitch-plus.png)](http://badge.fury.io/rb/jekyll-stitch-plus)
+
 Easily package javascripts into a single file, with support for fingerprinting, uglification and CommonJS wrapping for easy modularization. This plugin is powered by
-[Stitch Plus](https://github.com/imathis/stitch-plus) which is a fancy interface on top of [Stitch-rb](https://github.com/maccman/stitch-rb).
+[stitch-plus](https://github.com/imathis/stitch-plus) which is a fancy interface on top of [Stitch-rb](https://github.com/maccman/stitch-rb).
+
+If you want to fully understand what this is doing, you should probably read the [stitch-plus docs](https://github.com/imathis/stitch-plus), these docs are mostly focused on how to get stitch-plus to work with Jekyll.
+
+Also if you want to automatically build on changes you should look at [Guard Stitch Plus](https://github.com/imathis/guard-stitch-plus) and [Guard Jekyll Plus](https://github.com/imathis/guard-jekyll-plus) which work beautifully with this plugin.
 
 ### Install the Gem
 Add this line to your application's Gemfile:
@@ -16,6 +22,8 @@ Or install it yourself as:
 
     $ gem install jekyll-stitch-plus
 
+If you want to use Coffeescript, be sure you install the `coffee-script` gem, and if you want to uglify your javascripts, you'll need the `uglifier` gem.
+
 ### Install the plugin
 
 Add a ruby file (perhaps named `jekyll-stitch-plus.rb`) to your Jekyll plugins directory add add `require 'jekyll-stitch-plus'` to the top.

data/lib/jekyll-stitch-plus.rb

@@ -9,7 +9,8 @@ module Jekyll
 
       stitch = ::StitchPlus.new(config['stitch'])
       options = stitch.options
-      dir = File.dirname(options[:output])
+      output_file = output_path(site.source, options[:output])
+      dir = File.dirname(output_file)
 
       # If Guard Stitch Plus is running, let it handle the writes
       if ENV['GUARD_STITCH_PLUS']
@@ -28,7 +29,7 @@ module Jekyll
         rescue LoadError
         end
 
-        path = File.join site.source, options[:output]
+        path = File.join site.source, output_file
         stitch.set_options({output: path, uglify: config['stitch']['uglify']})
 
         puts '' # Because Jekyll doesn't give a newline for other output
@@ -64,6 +65,11 @@ module Jekyll
       end
     end
 
+    def output_path(dir, file)
+      source_dir = dir.split('/').last
+      file = file.sub /^#{source_dir}\//,''
+    end
+
 
   end
   class StitchPlusTag < Liquid::Tag

data/lib/jekyll-stitch-plus/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module StitchPlusVersion
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/test/_config.yml

@@ -1,17 +1,16 @@
 name: Your New Jekyll Site
 markdown: redcarpet
 pygments: true
-source: source
 plugins: plugins
 
 env: 'production'
 
 stitch:
   dependencies: 
-    - 'source/js/lib/jquery.js'
-    - 'source/js/lib/underscore.js'
-    - 'source/js/lib'        # globs the js/lib dir
-  paths: 'source/js/modules' # globs the js/modules dir
+    - 'assets/js/lib/jquery.js'
+    - 'assets/js/lib/underscore.js'
+    - 'assets/js/lib'        # globs the js/lib dir
+  paths: 'assets/js/modules' # globs the js/modules dir
   output: 'js/site.js'
   fingerprint: true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-stitch-plus
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stitch-plus
@@ -71,13 +71,13 @@ files:
 - test/.gitignore
 - test/Gemfile
 - test/_config.yml
+- test/_layouts/default.html
+- test/_layouts/post.html
+- test/assets/js/lib/foo.coffee
+- test/assets/js/lib/test.js
+- test/assets/js/modules/test-module.js
+- test/index.html
 - test/plugins/jekyll-stitch-plus.rb
-- test/source/_layouts/default.html
-- test/source/_layouts/post.html
-- test/source/index.html
-- test/source/js/lib/foo.coffee
-- test/source/js/lib/test.js
-- test/source/js/modules/test-module.js
 homepage: https://github.com/octopress/jekyll-stitch-plus
 licenses:
 - MIT