jekyll-stitch-plus 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjA1Y2EwYjliNTAwM2UyMjBjODkzMTM4Yzk3Y2ExMjFhZjIxZjAzZg==
+    ZTlmODRlYWZlMTk2YTY1MWI5Y2ExNDk1ZjI0NTM0ZWUwMjI4MDQwMw==
   data.tar.gz: !binary |-
-    YmI1N2VlOWEzZmE1ODMzZWM0NDc5YzY4ODRlNmM5NzEwMWFkNTQ2Mg==
+    ZjliNDAyZTE4YzhlMWNmYzRmM2VmNDE1M2Y1NTk1NmMyNWUwYWNiNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmVkNWE3M2ZlYTM1MWY4MWJhY2U5ZGVmMjRmYWE3YzNkYzAyNDllNjUyMjM2
-    NDJhODk5NDU1YWQ0NDEzMGRlYmJjNGQyZDc4ODZhMGEyYjc0MDRkZmFmZTlm
-    NzMzOTRhOGMyMWQzZTdmZmQ3ZWY2NTkwYzVkMzAyMDIwODY4NmI=
+    ZWU1Y2RhNzM5YjFmODU0MGNhY2JlMDcxNDU3NjMwNTJiNGQyNGE0YTRkNTg2
+    YzYyMjYzOTE1NDMzOGRmZjQzNGY4YTE4MzMxOGRkM2EzM2QyYWVjODliNTU3
+    NTUxMzRjMmNjOTVkNTUzZjg2Nzk2Y2MxZDMxNGE5YmI1NDdhYzU=
   data.tar.gz: !binary |-
-    ODNiMDRkODA4YTdiNDBiMmFhODcxMTg4NDM4N2I2N2RjNDdkNmRlNjc2YzVh
-    MzI3ODJmOWY1YzBlNThkZDUyZTllZTBmODViODM5MWMzNjc1ODE3NTcyNmFk
-    MGQyNDZlMWVhOTcwMzkxNzhhNjdkMzE5YjYyNDNmZWU4Zjc4OWE=
+    ZjdkNWE4ZGNiNzEwMzk1MmNiNTgzZTA1ZWFmOTU1NDBmMjM1NTZkY2FkNWQ5
+    MDRmNzczNjRmNjRiZGMyZDMwM2E3NzVmMDljZWRmYTZkODdjNTkwYzcyYmRi
+    ZTVlMTUwMGZiZWVjOGJiZTMzZjY0YmE3Y2UxNzI0YTM3ZTZiNzI=

data/CHANGELOG.md

@@ -5,3 +5,8 @@
 
 ## 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
+

data/README.md

@@ -24,15 +24,15 @@ Next add `{% stitch_js_tag %}` to a template to render `<script src='/javascript
 
 ## Configuration
 
-| Config           | Description                                                                | Default     |
-|:-----------------|:---------------------------------------------------------------------------|:------------|
-| `dependencies`   | Array of files/directories to be added first as global javascripts         | nil         |
-| `paths`          | Array of directories where javascripts will be wrapped as CommonJS modules | nil         |
-| `output`         | A path to write the compiled javascript                                    | 'all.js'    |
-| `fingerprint`    | Add a fingerprint to the file name for super cache busting power           | false       |
-| `cleanup`        | Automatically remove previously compiled files                             | true        |
-| `uglify`         | Smash javascript using the Uglifier gem                                    | false       |
-| `uglify_options` | Options for the Uglifier gem. See [the docs](https://github.com/lautis/uglifier#usage) for details. | {}       |
+| Config           | Description                                                                                          | Default     |
+|:-----------------|:-----------------------------------------------------------------------------------------------------|:------------|
+| `dependencies`   | Array of files/directories to be added first as global javascripts (relative to Jekyll's pwd)        | nil         |
+| `paths`          | Array of directories where javascripts will be wrapped as CommonJS modules (reltive to Jekyll's pwd) | nil         |
+| `output`         | A path to write the compiled javascript, (relative to Jekyll's source directory)                     | 'all.js'    |
+| `fingerprint`    | Add a fingerprint to the file name for super cache busting power                                     | false       |
+| `cleanup`        | Automatically remove previously compiled files                                                       | true        |
+| `uglify`         | Smash javascript using the Uglifier gem                                                              | false       |
+| `uglify_options` | Options for the Uglifier gem. See [the docs](https://github.com/lautis/uglifier#usage) for details.  | {}          |
 
 To configure this plugin add Jekyll's YAML configuration file. Here's an example.
 
@@ -50,6 +50,10 @@ stitch:
   fingerprint: true
 ```
 
+Note: javascripts don't have to be kept in the source directory to be compiled by stitch-plus. The configuration paths for `dependencies` and `paths` should point to your javascripts relative to Jekyll's current working directory and they can be anywhere on your file system. Keep in mind though that the ouput path is relative to Jekyll's source directory since the file must be written to the source directory to be managed by Jekyll.
+
+### To Uglify Output
+
 To uglify javascript output you must first install [the uglifier gem](https://github.com/lautis/uglifier) then set your Jekyll environment to production. There are two ways to do this;
 either set `env: production` in your Jekyll config, or set your shell JEKYLL_ENV to 'production' (case does not matter).
 

data/jekyll-stitch-plus.gemspec

@@ -16,9 +16,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files`.split($/)
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "jekyll", "~> 1.0.0"
-  spec.add_runtime_dependency "jekyll-page-hooks", "~> 1.0.2"
-  spec.add_runtime_dependency "stitch-plus", "~> 1.0.8"
+  spec.add_runtime_dependency "stitch-plus", "~> 1.0.9"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/jekyll-stitch-plus.rb

@@ -5,45 +5,56 @@ module Jekyll
   class StitchPlus < Generator
     def generate(site)
       config = site.config
-
-      begin
-        require 'uglifier'
-        @uglifier = Uglifier.new config['stitch']['uglify_options'] || {}
-        if (ENV['JEKYLL_ENV'] || config['env']).downcase == 'production'
-          config['stitch']['uglify'] ||= true
-        end
-      rescue LoadError
-      end
+      filename = ''
 
       stitch = ::StitchPlus.new(config['stitch'])
       options = stitch.options
+      dir = File.dirname(options[:output])
 
-      # Prepend source directory to file output config
-      path = File.join config['source'], options[:output]
-      stitch.set_options({output: path})
+      # If Guard Stitch Plus is running, let it handle the writes
+      if ENV['GUARD_STITCH_PLUS']
+        # Guard may have a different hash and therefore a different output file
+        # Reading the written filename from an ENV allows us to avoid unnecessary writes
+        #
+        filename = File.basename ENV['GUARD_STITCH_PLUS_OUTPUT']
+      else
 
-      puts '' # Because Jekyll doesn't give a newline for other output
-      stitch.write
+        begin
+          require 'uglifier'
+          @uglifier = Uglifier.new config['stitch']['uglify_options'] || {}
+          if (ENV['JEKYLL_ENV'] || config['env']).downcase == 'production'
+            config['stitch']['uglify'] ||= true
+          end
+        rescue LoadError
+        end
 
-      dir = File.dirname(options[:output])
-      filename = File.basename(stitch.last_write)
+        path = File.join site.source, options[:output]
+        stitch.set_options({output: path, uglify: config['stitch']['uglify']})
 
-      # Ensure the compiled file is written to the destination directory
-      site.static_files << StaticFile.new(site, site.source, dir, filename)
+        puts '' # Because Jekyll doesn't give a newline for other output
+        stitch.write
 
-      # Store the javascript tag for the liquid tag to retrieve
-      url = File.join (config['root'] || '/'), dir, filename
-      site.config['stitch']['js_tag'] = "<script src='#{url}'></script>"
+        filename = File.basename stitch.last_write
+
+        # Ensure the compiled file is written to the destination directory
+        site.static_files << StaticFile.new(site, site.source, dir, filename)
+
+      end
 
       # Don't copy static source files or deleted files to the destination directory
-      remove = stitch.all_files.map{ |f| File.join(site.source, f)}
-      remove.concat stitch.deleted
-      cleanup site, remove
+      cleanup site, stitch
 
+      # Store the javascript tag for the liquid tag to retrieve
+      url = File.join (config['root'] || '/'), dir, filename
+      site.config['stitch']['js_tag'] = "<script src='#{url}'></script>"
     end
 
     # Remove files from Jekyll's static_files array
-    def cleanup(site, files)
+    def cleanup(site, stitch)
+
+      files = stitch.all_files.map{ |f| File.absolute_path(f)}
+      files.concat stitch.deleted
+
       if files.size > 0
         site.static_files.clone.each do |sf|
           if sf.kind_of?(Jekyll::StaticFile) and files.include? sf.path

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

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

data/test/_config.yml

@@ -1,15 +1,17 @@
 name: Your New Jekyll Site
 markdown: redcarpet
 pygments: true
+source: source
+plugins: plugins
 
 env: 'production'
 
 stitch:
   dependencies: 
-    - 'js/lib/jquery.js'
-    - 'js/lib/underscore.js'
-    - 'js/lib'        # globs the js/lib dir
-  paths: 'js/modules' # globs the js/modules dir
+    - '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
   output: 'js/site.js'
   fingerprint: true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-stitch-plus
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Brandon Mathis
@@ -10,48 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2013-08-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.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: jekyll-page-hooks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: stitch-plus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -99,13 +71,13 @@ files:
 - test/.gitignore
 - test/Gemfile
 - test/_config.yml
-- test/_layouts/default.html
-- test/_layouts/post.html
-- test/_plugins/jekyll-stitch-plus.rb
-- test/index.html
-- test/js/lib/foo.coffee
-- test/js/lib/test.js
-- test/js/modules/test-module.js
+- 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