middleman-jasmine 0.4.0 → 0.5.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWQxOTAxZmYwNjQ3NzU0MjgyYjg5OTJkZDBiYjM5MjMyMWIxNDZjNg==
-  data.tar.gz: !binary |-
-    ODE0MzllMzE1ZmNmYzBkOGM2ZmFhZjdlZjVmODFjNmYzNjNjZDEzYg==
+SHA1:
+  metadata.gz: 1158957eb31594548d7dcf52caa92ae8b27d9c95
+  data.tar.gz: 9cad60f7307f6d49cd1e1db0770e61c69da18632
 SHA512:
-  metadata.gz: !binary |-
-    ZWYxZWYxYzIyNGY3ODlmMGY0ZGYxNjI4MDQ5MDUyYmM0MjRhOTBmNmQ3Njdh
-    ZjlkYjJkZDJjMzNkZWZkODJlODVjYmI1ZTc3ZDlkNjFmMjFmODgwODc3ZmZk
-    NjA3YzE3ZDkzYTE1OTYxZGE2MDdmZjZkMWUyOTIwNDgwYjExZGQ=
-  data.tar.gz: !binary |-
-    ZTE3MWY5ZTg0ZTQ0OTNjYzQzYjJhNjcwMjFhNGE1YjAyZTU2NDUxNmJiMDgw
-    NzBlN2YwOTdmYTdiZTg3YjgyMGZhMzg3Mzc3N2Q1OGY5OTFiNDM0NDRkMWQ5
-    YTRjNzMzZTAxNzQyMTI3MzdhZTMxYWYxYWJjZTRlNmZmMjNkMWE=
+  metadata.gz: eedb260e654bd95fc9eb7d03025b8b9116f46c9f9015db6839f846951de19d7d7219a2c6139d02b516aefcd3bbdad2cad98dcf57064c2905a47894799e2d8fd2
+  data.tar.gz: e8d02b2663955e708bfd43df2849c67480519d600e9af538c2ca3f3f40ae3e3125a6ceb14884cb24631f8e96b122297bb7a91a6b4f7524e59389c1a0aa8ecfcf

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p392
+2.0.0-p195

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.5.0
+===
+* Upgrade from Jasmine 1.3 to Jasmine 2.0. [johanlunds]
+* Add Rake-task that runs the tests with PhantomJS. Use `rake middleman_jasmine:ci` [johanlunds, mrship]
+* Update to new Middleman extension format [mrship]
+
 0.4.0
 ===
 * Add debug_assets option to expand the assets into individual files. Defaults to false.
@@ -35,4 +41,4 @@ Yanked
 0.0.1
 ===
 
-* Initial support for Jasmime
+* Initial support for Jasmime

data/README.md

@@ -1,7 +1,9 @@
 # Middleman::Jasmine
 
-This gem adds the Jasmine runner into a middleman app under the /jasmine path. 
-It has (optional) support for sprockets.
+This gem adds the Jasmine runner into a middleman app under the `/jasmine` path.
+It has (optional) support for Sprockets.
+
+It uses Jasmine 2.0. For Jasmine 1.3 support use the [jasmine_1_3](https://github.com/mrship/middleman-jasmine/tree/jasmine_1_3) branch.
 
 ## Installation
 
@@ -17,22 +19,60 @@ And then execute:
 
 First run `bundle exec jasmine init` to setup Jasmine.
 
-Then, if you have sprockets installed through [middleman-sprockets](https://github.com/middleman/middleman-sprockets), you can create a spec.js file in spec/javascripts to include all your specs, i.e.
+Then, if you have Sprockets installed through [middleman-sprockets](https://github.com/middleman/middleman-sprockets), you can create a `spec.js` file in `spec/javascripts/` to include all your specs, i.e.
+
 ```
 //= require application
 //= require_tree .
 ```
 
 Add the following code to your `config.rb` file:
+
+```ruby
+activate :jasmine
+```
+
+Write a spec file under `spec/javascripts/` and hit `/jasmine` under your Middleman app, e.g. `http://localhost:4567/jasmine`.
+
+You should see the results of the spec pass/fail under Jasmine.
+
+
+## Rake
+You can also run the Jasmine-tests using PhantomJS with Rake:
+
+Add the following to the `Rakefile` generated from `bundle exec jasmine init`:
+
+```ruby
+require 'middleman'
+require 'middleman-jasmine'
+require 'middleman/jasmine/tasks'
+```
+
+Then use:
+
+```
+rake middleman_jasmine:ci
 ```
-  activate :jasmine
+
+## Configuration
+
+To configure the extension, use:
+
+```ruby
+activate :jasmine do |options|
+  options.fixtures_dir = "spec/javascripts/fixtures"
+  options.jasmine_url  = "/jasmine"
+  options.config_file  = "spec/config.yml"
+  options.debug_assets = false
+end
 ```
 
-Write a spec file under spec/javascripts and hit /jasmine under your Middleman app, e.g. http://localhost:4567/jasmine.
+NOTE: `debug_assets` can be used to extract any assets included in the spec files and serve them with `?body=t` to avoid Sprockets compiling them every time a spec re-runs.
+
+## Caveats
 
-You should see the results of the spec pass/fail under Jasmine. 
+If you add additional paths to Sprockets with `append_path` in your `after_configuration` block then you'll most likely need to append the same paths to the `Middleman::Jasmine` Sprockets instance. To do that use the helper `jasmine_sprockets`, i.e.:
 
-If you add additional paths to sprockets with `append_path` in your `after_configuration` block then you'll most likely need to append the same paths to the Middleman::Jasmine sprockets instance. To do that use the helper `jasmine_sprockets`, i.e.:
 ```ruby
 after_configuration do
   handlebars_path = File.expand_path('../', ::Handlebars::Source.bundled_path)
@@ -43,18 +83,6 @@ after_configuration do
 end
 ```
 
-To configure the extension, use:
-```
-  activate :jasmine do |options|
-    options.fixtures_dir = "spec/javascripts/fixtures"
-    options.jasmine_url  = "/jasmine"
-    options.config_file  = "spec/config.yml"
-    options.debug_assets = false
-  end
-```
-
-NOTE: `debug_assets` can be used to extract any assets included in the spec files and serve them with `?body=t` to avoid sprockets compiling them every time a spec re-runs.
-
 ## Contributing
 
 1. Fork it

data/lib/middleman-jasmine.rb

@@ -1,9 +1,6 @@
 require "middleman/jasmine/version"
-require "middleman/jasmine/extension"
 
 ::Middleman::Extensions.register(:jasmine) do
-  ::Middleman::Jasmine
+  require "middleman/jasmine/extension"
+  ::Middleman::JasmineExtension
 end
-
-
-

data/lib/middleman/jasmine/extension.rb

@@ -2,51 +2,42 @@ require 'middleman-core'
 require 'middleman/jasmine/jasmine_sprockets_proxy'
 
 module Middleman
-  module Jasmine
-    class << self
-      def registered(app, options_hash={}, &block)
-        app.send :include, InstanceMethods
-
-        options = OpenStruct.new(default_options.merge(options_hash))
-
-        yield options if block_given?
-
-        app.map(options.jasmine_url) { run ::JasmineSprocketsProxy.new }
-        jasmine_asset_folders.each do |item|
-          app.map("/#{item}") { run ::JasmineSprocketsProxy.new(item) }
-        end
-
-        app.map("/#{options.fixtures_dir}") { run Rack::Directory.new(options.fixtures_dir) }
-
-        app.after_configuration do
-          ::JasmineSprocketsProxy.configure(sprockets, options.config_file, options.debug_assets)
-        end
+  class JasmineExtension < Extension
+    option :jasmine_url,  "/jasmine"
+    option :fixtures_dir, "spec/javascripts/fixtures"
+    option :config_file,  nil
+    option :debug_assets, false
+
+    attr_reader :jasmine_url
+    def initialize(app, options_hash={}, &block)
+      super
+      _o = options
+
+      app.map(_o.jasmine_url) { run ::JasmineSprocketsProxy.new }
+      jasmine_asset_folders.each do |item|
+        app.map("/#{item}") { run ::JasmineSprocketsProxy.new(item) }
       end
 
-      private
+      app.map("/#{_o.fixtures_dir}") { run Rack::Directory.new(_o.fixtures_dir) }
 
-      def jasmine_asset_folders
-        [
-          "__jasmine__", "__boot__", "__spec__"
-        ]
+      app.after_configuration do
+        ::JasmineSprocketsProxy.configure(sprockets, _o.config_file, _o.debug_assets)
       end
-
-      def default_options
-        {
-          jasmine_url: "/jasmine",
-          fixtures_dir: "spec/javascripts/fixtures",
-          config_file: nil,
-          debug_assets: false
-        }        
-      end
-
-    alias :included :registered
+      @jasmine_url = _o.jasmine_url
     end
 
-    module InstanceMethods
+    helpers do
       def jasmine_sprockets
         ::JasmineSprocketsProxy.sprockets_app
       end
     end
+
+    private
+
+    def jasmine_asset_folders
+      [
+        "__jasmine__", "__boot__", "__spec__"
+      ]
+    end
   end
 end

data/lib/middleman/jasmine/tasks.rb

@@ -0,0 +1,42 @@
+require 'middleman/rack'
+
+require 'json'
+require 'jasmine'
+require 'jasmine/config'
+
+namespace :middleman_jasmine do
+  desc 'Run Jasmine-tests with PhantomJS and print result. Exit with code 1 or 0.'
+
+  task :ci do
+    config       = Jasmine.config
+    logger       = Logger.new($stdout)
+    logger.level = Logger::WARN
+    server       = Rack::Server.new(:app => Middleman.server, :Port => config.port(:ci), :AccessLog => [], :Logger => logger)
+
+    t = Thread.new do
+      begin
+        server.start
+      rescue ChildProcess::TimeoutError
+      end
+      # # ignore bad exits
+    end
+    t.abort_on_exception = true
+    Jasmine::wait_for_listener(config.port(:ci), 'jasmine server')
+    puts 'jasmine server started.'
+
+    formatters = config.formatters.map { |formatter_class| formatter_class.new }
+
+    exit_code_formatter = Jasmine::Formatters::ExitCode.new
+    formatters << exit_code_formatter
+
+    middleman_extensions = ::Middleman::Application.server.inst.extensions
+    throw "Middleman Jasmine extension not activated" unless middleman_extensions.has_key?(:jasmine)
+
+    path   = middleman_extensions[:jasmine].jasmine_url
+    url    = "#{config.host}:#{config.port(:ci)}#{path}"
+    runner = config.runner.call(Jasmine::Formatters::Multi.new(formatters), url)
+    runner.run
+
+    abort unless exit_code_formatter.succeeded?
+  end
+end

data/lib/middleman/jasmine/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Jasmine
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/middleman-jasmine.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'jasmine', "~> 1.3"
-  spec.add_dependency 'middleman-core'
+  spec.add_dependency 'jasmine', "~> 2.0.0"
+  spec.add_dependency 'middleman', '~> 3.3.2'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-jasmine
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Andy Shipman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jasmine
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: middleman-core
+  name: middleman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +56,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Jasmine testing framework support for Middleman
@@ -84,6 +84,7 @@ files:
 - lib/middleman-jasmine.rb
 - lib/middleman/jasmine/extension.rb
 - lib/middleman/jasmine/jasmine_sprockets_proxy.rb
+- lib/middleman/jasmine/tasks.rb
 - lib/middleman/jasmine/version.rb
 - lib/middleman_extension.rb
 - middleman-jasmine.gemspec
@@ -97,17 +98,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Integrates Jasmine into a Middleman app. Optional support for Sprockets.