guard-jammit 1.0.1 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2755f985e8503aa08d8ddca3118928e74adf4ae0
+  data.tar.gz: 43c1bc032be296b04df2e4acc52a558f9ed7f98e
+SHA512:
+  metadata.gz: ccfcf8cbc766428aaa00958c1ad8355bcf013e073aae00606b9d5054b7f94276eac11efa50659272adfac5e87b7957996d1019b9460d1ff9b1df199bc97b4dc9
+  data.tar.gz: f2a80f7d9c29ea3de9553af04739998ed947ee6772e1b3c28bcb09faaea5bba9fa85567a70e882c19c2b881c65970b90b976b17aa05482ca9c5f684d76ff2ecc

data/README.md

@@ -2,7 +2,7 @@
 
 Guard::Jammit watches your assets to automatically package them using [Jammit](http://documentcloud.github.com/jammit/).
 
-Tested on MRI Ruby 1.8.7, 1.9.2, 1.9.3, REE and the latest versions of JRuby and Rubinius.
+Tested on MRI Ruby 1.9.3, 2.0.0, 2.0.1 and the latest versions of JRuby and Rubinius.
 
 If you have any questions please join us on our [Google group](http://groups.google.com/group/guard-dev) or on `#guard`
 (irc.freenode.net).

data/lib/guard/jammit.rb

@@ -1,24 +1,24 @@
-require 'guard'
-require 'guard/guard'
+# Do NOT require "guard/plugin"
+# It will either be required or a stub will be supplied by the test class
+
 require 'jammit'
+require 'guard/compat/plugin'
 
 module Guard
-
   # The Jammit Guard that gets notifications about the following
   # Guard events: `start`, `stop`, `reload`, `run_all` and `run_on_change`.
   #
-  class Jammit < Guard
-
+  class Jammit < Plugin
     DEFAULT_OPTIONS = {
-        :config_path      => ::Jammit::DEFAULT_CONFIG_PATH,
-        :output_folder    => nil,
-        :base_url         => nil,
-        :public_root      => nil,
-        :force            => false,
-        :package_names    => nil,
-        :package_on_start => true,
-        :notification     => true,
-        :hide_success     => false
+      config_path: ::Jammit::DEFAULT_CONFIG_PATH,
+      output_folder: nil,
+      base_url: nil,
+      public_root: nil,
+      force: false,
+      package_names: nil,
+      package_on_start: true,
+      notification: true,
+      hide_success: false
     }
 
     # Initialize Guard::Jammit.
@@ -34,9 +34,9 @@ module Guard
     # @option options [Boolean] :notification show notifications
     # @option options [Boolean] :hide_success hide success message notification
     #
-    def initialize(watchers = [], options = {})
+    def initialize(options = {})
       options = DEFAULT_OPTIONS.merge(options)
-      super(watchers, options)
+      super
     end
 
     # Gets called once when Guard starts.
@@ -46,7 +46,7 @@ module Guard
     def start
       ensure_rails_env!
 
-      ::Guard::UI.info "Using Jammit version #{::Jammit::VERSION}"
+      Compat::UI.info "Using Jammit version #{::Jammit::VERSION}"
 
       jammit if @options[:package_on_start]
     end
@@ -64,25 +64,23 @@ module Guard
     # @param [Array<String>] paths the changed paths and files
     # @raise [:task_has_failed] when run_on_change has failed
     #
-    def run_on_changes(paths)
+    def run_on_changes(_paths)
       jammit
     end
 
     # Runs Jammit to package the assets
     #
     def jammit
-      begin
-        Thread.current[:jammit_packager] = nil
+      Thread.current[:jammit_packager] = nil
 
-        ::Jammit.package! @options
+      ::Jammit.package! @options
 
-        ::Guard::UI.info 'Jammit successfully packaged the assets.'
-        ::Guard::Notifier.notify('Jammit successfully packaged the assets.', :title => 'Jammit') if @options[:notification] && !@options[:hide_success]
+      Compat::UI.info 'Jammit successfully packaged the assets.'
+      Compat::UI.notify('Jammit successfully packaged the assets.', title: 'Jammit') if @options[:notification] && !@options[:hide_success]
 
-      rescue Exception => e
-        ::Guard::UI.error("Jammit failed to package the assets: #{e.message}")
-        ::Guard::Notifier.notify('Jammit failed to package the assets.', :title => 'Jammit', :image => :failed) if @options[:notification]
-      end
+    rescue RuntimeError => e
+      Compat::UI.error("Jammit failed to package the assets: #{e.message}")
+      Compat::UI.notify('Jammit failed to package the assets.', title: 'Jammit', image: :failed) if @options[:notification]
     end
 
     private
@@ -90,10 +88,7 @@ module Guard
     # Ensures that Rails env is available when Rails is only partially loaded
     #
     def ensure_rails_env!
-      if defined?(::Rails) && !::Rails.respond_to?(:env)
-        require 'rails'
-      end
+      require 'rails' if defined?(::Rails) && !::Rails.respond_to?(:env)
     end
-
   end
 end

data/lib/guard/jammit.rb.orig

@@ -0,0 +1,103 @@
+require 'guard'
+require 'guard/plugin'
+require 'jammit'
+
+module Guard
+
+  # The Jammit Guard that gets notifications about the following
+  # Guard events: `start`, `stop`, `reload`, `run_all` and `run_on_change`.
+  #
+  class Jammit < Plugin
+
+    DEFAULT_OPTIONS = {
+        :config_path      => ::Jammit::DEFAULT_CONFIG_PATH,
+        :output_folder    => nil,
+        :base_url         => nil,
+        :public_root      => nil,
+        :force            => false,
+        :package_names    => nil,
+        :package_on_start => true,
+        :notification     => true,
+        :hide_success     => false
+    }
+
+    # Initialize Guard::Jammit.
+    #
+    # @param [Array<Guard::Watcher>] watchers the watchers in the Guard block
+    # @param [Hash] options the options for the Guard
+    # @option options [String] :output_folder the output folder
+    # @option options [String] :base_url the base URL for the MHTML stylesheet
+    # @option options [String] :public_root the public root folder
+    # @option options [Boolean] :force force packaging
+    # @option options [Array<String>] package_names the package names to package
+    # @option options [Boolean] :package_on_start package when Guard starts
+    # @option options [Boolean] :notification show notifications
+    # @option options [Boolean] :hide_success hide success message notification
+    #
+    def initialize(options = {})
+      options = DEFAULT_OPTIONS.merge(options)
+<<<<<<< HEAD
+      super(options)
+=======
+      super
+>>>>>>> dannysmith/master
+    end
+
+    # Gets called once when Guard starts.
+    #
+    # @raise [:task_has_failed] when run_on_change has failed
+    #
+    def start
+      ensure_rails_env!
+
+      ::Guard::UI.info "Using Jammit version #{::Jammit::VERSION}"
+
+      jammit if @options[:package_on_start]
+    end
+
+    # Gets called when all files should be packaged.
+    #
+    # @raise [:task_has_failed] when run_on_change has failed
+    #
+    def run_all
+      jammit
+    end
+
+    # Gets called when watched paths and files have changes.
+    #
+    # @param [Array<String>] paths the changed paths and files
+    # @raise [:task_has_failed] when run_on_change has failed
+    #
+    def run_on_changes(paths)
+      jammit
+    end
+
+    # Runs Jammit to package the assets
+    #
+    def jammit
+      begin
+        Thread.current[:jammit_packager] = nil
+
+        ::Jammit.package! @options
+
+        ::Guard::UI.info 'Jammit successfully packaged the assets.'
+        ::Guard::Notifier.notify('Jammit successfully packaged the assets.', :title => 'Jammit') if @options[:notification] && !@options[:hide_success]
+
+      rescue Exception => e
+        ::Guard::UI.error("Jammit failed to package the assets: #{e.message}")
+        ::Guard::Notifier.notify('Jammit failed to package the assets.', :title => 'Jammit', :image => :failed) if @options[:notification]
+      end
+    end
+
+    private
+
+    # Ensures that Rails env is available when Rails is only partially loaded
+    #
+    def ensure_rails_env!
+      if defined?(::Rails) && !::Rails.respond_to?(:env)
+        require 'rails'
+      end
+    end
+
+  end
+end

data/lib/guard/jammit/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module JammitVersion
-    VERSION = "1.0.1"
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jammit
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Pelle Braendgaard
@@ -10,191 +9,100 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.12'
 - !ruby/object:Gem::Dependency
-  name: jammit
+  name: guard-compat
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
+  name: jammit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Watches your assets to automatically package them using Jammit.
 email:
 - pelle@stakeventures.com
-- michi@netzpiraten.ch
+- michi@flinkfinger.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/guard/jammit/templates/Guardfile
-- lib/guard/jammit/version.rb
-- lib/guard/jammit.rb
 - LICENSE
 - README.md
+- lib/guard/jammit.rb
+- lib/guard/jammit.rb.orig
+- lib/guard/jammit/templates/Guardfile
+- lib/guard/jammit/version.rb
 homepage: http://github.com/guard/guard-jammit
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2599213843982422194
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-jammit
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Guard plugin for Jammit
 test_files: []
 has_rdoc: