jasmine 2.0.0.rc2 → 2.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 829cb8b7df0ab6b49277bd1ff57726df9def1ad5
-  data.tar.gz: 8b35c826f0dce1001cfb2f572139b104f1d0cfa8
+  metadata.gz: 5805b801f003eafc553273cb7ee5c5719e390f11
+  data.tar.gz: 6b1872c956711198c0c80f6398ed57ab99e99520
 SHA512:
-  metadata.gz: c88cd5229bba530394d60d17a6221812e71623b9f44f88ff4d480280a7c0a92ca29942635bbb02b5c89b0eb386bfd79ba01f4a7b053d8f3628be13cab48dd9f1
-  data.tar.gz: ca5e0e70008293b2c96f142df85aa0d7a014a7dfea1a71c93151d13115c81f746210e6698b1da7dacbdab2d2b72bf400546b33822ce700ea4880c137dbff65cc
+  metadata.gz: fe9d0640516dfe16120a9540c6b1e40eb1ba5e2b7955b4173fdb1cba5fa05954e1a881df606dff69f190a01575cc4448ec47eabbfe60e418917f42c33b978576
+  data.tar.gz: 5eed88cc462358bd3d8d36eadcb2ca84e1b4e272717969eb244b1a847a473cf89ae1b27341435d9c570ba94281e6e7d9e906021a44ca762cfaca7cdd69cd1d37

data/.travis.yml

@@ -1,6 +1,4 @@
-before_script:
-  - "sh -e /etc/init.d/xvfb start"
-script: "DISPLAY=:99.0 bundle exec rake"
+script: "if [ $PERFORMANCE_SPECS ];then bundle exec rake performance_specs --trace; else bundle exec rake --trace; fi"
 
 rvm:
   - "1.9.3"
@@ -11,14 +9,14 @@ rvm:
 env:
  - "RAILS_VERSION=rails3"
  - "RAILS_VERSION=rails4"
- - "RAILS_VERSION=pojs-rspec2"
+ - "RAILS_VERSION=pojs"
 
 matrix:
+  include:
+    - rvm: "2.0.0"
+      env: "PERFORMANCE_SPECS=true"
   exclude:
-    - rvm: rbx
-      env: RAILS_VERSION=pojs-rspec2
-    - rvm: jruby
-      env: RAILS_VERSION=pojs-rspec2
-  allow_failures:
-    - rvm: rbx
-    - rvm: jruby
+    - rvm: "rbx"
+      env: "RAILS_VERSION=pojs"
+    - rvm: "jruby"
+      env: "RAILS_VERSION=pojs"

data/Gemfile

@@ -4,14 +4,16 @@ gemspec
 
 unless ENV['TRAVIS']
   group :debug do
-    gem 'debugger'
+    gem 'debugger', :platform => :mri
+    gem 'ruby-debug', :platform => :jruby
   end
 end
 
-
+gem 'anchorman', :platform => :mri
 # during development, do not release
 if ENV['TRAVIS']
   gem 'jasmine-core', :git => 'http://github.com/pivotal/jasmine.git'
 else
   gem 'jasmine-core', :path => '../jasmine'
 end
+

data/HOW_TO_TEST.markdown

@@ -1,6 +1,6 @@
 To test changes to the jasmine-gem:
 
-* Export RAILS_VERSION as either "pojs-rspec2", or "rails3" to test environments other than Rails 4.
+* Export RAILS_VERSION as either "pojs" (Plain Old JavaScript -- IE, no rails bindings), or "rails3" to test environments other than Rails 4.
 * Delete `Gemfile.lock`
 * Clear out your current gemset
 * exec a `bundle install`

data/README.markdown

@@ -34,36 +34,45 @@ Start the Jasmine server:
 
 `rake jasmine`
 
-Point your browser to `localhost:8888`. The suite will run every time this page is re-loaded.  
-
-Start Jasmine on a different port:
-
-`rake jasmine JASMINE_PORT=1337`
-
-Point your browser to `localhost:1337`. 
+Point your browser to `localhost:8888`. The suite will run every time this page is re-loaded.
 
 For Continuous Integration environments, add this task to the project build steps:
 
 `rake jasmine:ci`
 
-This uses Selenium to launch a browser and run the Jasmine suite. Then it uses RSpec to extract the results from the Jasmine reporter and write them to your build log. The browser used by selenium can be changed by configuration in spec_helper file (this might require additional webdriver dependencies).
+This uses PhantomJS to load and run the Jasmine suite.
 
 ## Configuration
 
 Customize `spec/javascripts/support/jasmine.yml` to enumerate the source files, stylesheets, and spec files you would like the Jasmine runner to include.
 You may use dir glob strings.
 
-## Note about the CI task and RSpec
+Alternatively, you may specify the path to your `jasmine.yml` by setting an environment variable:
+
+`rake jasmine:ci JASMINE_CONFIG_PATH=relative/path/to/your/jasmine.yml`
+
+In addition, the `spec_helper` key in your jasmine.yml specifies the path to a ruby file that can do programmatic configuration.
+After running `jasmine init` or `rails g jasmine:init` it will point to `spec/javascripts/support/jasmine_helper.rb` which you can modify to fit your needs.
+
+### Running Jasmine on a different port
+
+The ports that `rake jasmine` (or `rake jasmine:server`) and `rake jasmine:ci` run on are configured independently, so they can both run at the same time.
+
+To change the port that `rake jasmine` uses:
 
-This gem requires RSpec for the `jasmine:ci` rake task to work. But this gem does not explicitly *depend* on any version of the RSpec gem.
+In your jasmine_helper.rb:
 
-If you're writing a Rails application then as long as you've installed RSpec before you install Jasmine and attempt a `rake jasmine:ci`, then you will be fine.
+    Jasmine.configure do |config|
+       config.server_port = 5555
+    end
 
-If you're using another Ruby framework, or don't care about Ruby, then run
+By default `rake jasmine:ci` will attempt to find a random open port, to set the port that `rake jasmine:ci` uses:
 
-`gem install rspec`
+In your jasmine_helper.rb:
 
-before you attempt the CI task.
+    Jasmine.configure do |config|
+       config.ci_port = 1234
+    end
 
 ## Support
 

data/RELEASE.markdown

@@ -4,19 +4,12 @@ Add release notes to gh-pages branch /release-notes.html.markdown
 
 ## Jasmine core
 
-* update version.json with new version
-* rake jasmine:dist
-* add pages/downloads/*.zip
-* commit, tag, and push both jasmine/pages and jasmine
-* * git push
-* * git tag -a x.x.x-release
-* * git push --tags
+See release docs in jasmine-core
 
 ## Jasmine Gem
 
-* update version in version.rb
-  * for release candidates, add "rc" + number to the end of the appropriate version part,
-  e.g. we should have tagged the 1.0 RC's as 1.0.0rc1, not 1.0.0.rc1. Likewise 1.0.0.1rc1.
-* rake jeweler:install and try stuff out
-* * (jasmine init and script/generate jasmine)
-* rake site
+1. update version in version.rb
+  * for release candidates, add ".rc" + number to the end of the appropriate version part
+1. commit and push the version update to github
+1. `rake release` - tags the repo with the version, builds the `jasmine` gem, pushes the gem to Rubygems.org. In order to release you will have to ensure you have rubygems creds locally.
+

data/Rakefile

@@ -10,42 +10,40 @@ require 'rspec/core/rake_task'
 desc 'Run all examples'
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = 'spec/**/*_spec.rb'
+  t.rspec_opts = '-t ~performance'
+end
+
+desc 'Run performance build'
+RSpec::Core::RakeTask.new(:performance_specs) do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.rspec_opts = '-t performance'
 end
 
 task :spec => %w(jasmine:copy_examples_to_gem)
+task :performance_specs => %w(jasmine:copy_examples_to_gem)
 
 task :default => :spec
 
 namespace :jasmine do
   require 'jasmine-core'
-  task :server do
-    Jasmine.configure do |config|
-      root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-      config.src_dir = File.join(root, 'src')
-      config.spec_dir = Jasmine::Core.path
-      config.spec_files = lambda { (Jasmine::Core.html_spec_files + Jasmine::Core.core_spec_files).map {|f| File.join(config.spec_dir, f) } }
-      config.jasmine_port = ENV['JASMINE_PORT'] || 8888
-    end
-
-    config = Jasmine.config
-
-    server = Jasmine::Server.new(config.jasmine_port, Jasmine::Application.app(config))
-    server.start
-
-    puts 'your tests are here:'
-    puts "  http://localhost:#{config.jasmine_port}/"
-  end
 
   desc 'Copy examples from Jasmine JS to the gem'
   task :copy_examples_to_gem do
     require 'fileutils'
 
-    # copy jasmine's example tree into our generator templates dir
-    FileUtils.rm_r('generators/jasmine/templates/jasmine-example', :force => true)
-    FileUtils.cp_r(File.join(Jasmine::Core.path, 'example'), 'generators/jasmine/templates/jasmine-example', :preserve => true)
+    destination_root = File.expand_path(File.join('..', 'lib', 'generators', 'jasmine', 'examples', 'templates'), __FILE__)
+    spec_path = File.join(destination_root, 'spec', 'javascripts', 'jasmine_examples')
+    helpers_path = File.join(destination_root, 'spec', 'javascripts', 'helpers', 'jasmine_examples')
+    source_code_path = File.join(destination_root, 'app', 'assets', 'javascripts', 'jasmine_examples')
+
+    FileUtils.rm Dir.glob(File.join(spec_path, '*'))
+    FileUtils.cp(Dir.glob(File.join(Jasmine::Core.path, 'example', 'spec', '*Spec.js')), spec_path, :preserve => true)
+
+    FileUtils.rm Dir.glob(File.join(helpers_path, '*'))
+    FileUtils.cp(Dir.glob(File.join(Jasmine::Core.path, 'example', 'spec', 'SpecHelper.js')), helpers_path, :preserve => true)
+
+    FileUtils.rm Dir.glob(File.join(source_code_path, '*'))
+    FileUtils.cp(Dir.glob(File.join(Jasmine::Core.path, 'example', 'src', '*')), source_code_path, :preserve => true)
   end
 end
 
-desc 'Run specs via server'
-task :jasmine => %w(jasmine:server)
-

data/jasmine.gemspec

@@ -20,27 +20,20 @@ Gem::Specification.new do |s|
   s.require_paths      = ["lib"]
   s.rdoc_options       = ["--charset=UTF-8"]
 
-  if ENV['RAILS_VERSION'] == 'pojs-rspec2'
-    s.add_development_dependency 'rspec', '>= 2.5.0'
-    s.add_development_dependency 'rake-tasks'
-  elsif ENV['RAILS_VERSION'] == 'rails3'
-    # for development & test of Rails 3 Generators
-    s.add_development_dependency 'rspec', '>= 2.5.0'
+  case ENV['RAILS_VERSION']
+  when 'rails3'
     s.add_development_dependency 'rails', '>= 3.0.0', '< 4.0.0'
-    s.add_development_dependency 'sqlite3'
-  else
-    s.add_development_dependency 'rspec', '>= 2.5.0'
+  when 'pojs'
+  else #default to rails 4
     s.add_development_dependency 'rails', '>= 4'
   end
 
   s.add_development_dependency 'rack-test'
-  s.add_development_dependency 'json_pure'
+  s.add_development_dependency 'multi_json'
+  s.add_development_dependency 'rspec', '>= 2.5.0'
 
-  s.add_development_dependency 'anchorman'
-
-  s.add_dependency 'jasmine-core', '~> 2.0.0.alpha'
+  s.add_dependency 'jasmine-core', '~> 2.0.0.rc3'
   s.add_dependency 'rack'
-  s.add_dependency 'rspec', '>= 1.3.1'
-  s.add_dependency 'selenium-webdriver', '>= 0.1.3'
-  s.add_dependency 'nokogiri'
+  s.add_dependency 'rake'
+  s.add_dependency 'phantomjs'
 end

data/lib/generators/jasmine/examples/templates/spec/javascripts/jasmine_examples/PlayerSpec.js

@@ -55,4 +55,4 @@ describe("Player", function() {
       }).toThrowError("song is already playing");
     });
   });
-});
+});

data/lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine.yml

@@ -38,7 +38,7 @@ stylesheets:
 #   - helpers/**/*.js
 #
 helpers:
-  - helpers/**/*.js
+  - 'helpers/**/*.js'
 
 # spec_files
 #
@@ -73,4 +73,17 @@ src_dir:
 #
 # spec_dir: spec/javascripts
 #
-spec_dir: spec/javascripts
+spec_dir:
+
+# spec_helper
+#
+# Ruby file that Jasmine server will require before starting.
+# Returned relative to your root path
+# Default spec/javascripts/support/jasmine_helper.rb
+#
+# EXAMPLE:
+#
+# spec_helper: spec/javascripts/support/jasmine_helper.rb
+#
+spec_helper: spec/javascripts/support/jasmine_helper.rb
+

data/lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine_helper.rb

@@ -4,8 +4,8 @@
 #
 #Example: using a different boot file.
 #Jasmine.configure do |config|
-#   @config.boot_dir = '/absolute/path/to/boot_dir'
-#   @config.boot_files = lambda { ['/absolute/path/to/boot_dir/file.js'] }
+#   config.boot_dir = '/absolute/path/to/boot_dir'
+#   config.boot_files = lambda { ['/absolute/path/to/boot_dir/file.js'] }
 #end
 #
 

data/lib/jasmine.rb

@@ -5,22 +5,20 @@ jasmine_files = ['base',
                  'config',
                  'application',
                  'server',
-                 'selenium_driver',
                  'command_line_tool',
                  'page',
                  'path_mapper',
                  'asset_bundle',
                  'asset_pipeline_mapper',
                  'asset_expander',
-                 'results_processor',
-                 'results',
+                 'result',
                  'path_expander',
                  'yaml_config_parser',
-                 File.join('formatters', 'base'),
+                 File.join('formatters', 'exit_code'),
                  File.join('formatters', 'console'),
-                 File.join('formatters', 'junit_xml'),
-                 File.join('runners', 'http'),
-                 File.join('reporters', 'api_reporter')]
+                 File.join('formatters', 'multi'),
+                 File.join('runners', 'phantom_js'),
+                ]
 
 
 jasmine_files.each do |file|

data/lib/jasmine/asset_bundle.rb

@@ -24,7 +24,7 @@ module Jasmine
 
       def assets
         context = get_asset_context
-        context.asset_paths.asset_for(pathname, 'js').to_a.map do |path|
+        context.asset_paths.asset_for(pathname, nil).to_a.map do |path|
           context.asset_path(path)
         end
       end
@@ -37,26 +37,25 @@ module Jasmine
       end
     end
 
-    class Rails4AssetBundle
-
-      def initialize(pathname)
-        @pathname = pathname
-      end
+    class Rails4AssetBundle < RailsAssetBundle
 
       def assets
         context.get_original_assets(pathname)
       end
 
       private
-      attr_reader :pathname
-
       def context
         return @context if @context
         @context = ActionView::Base.new
         @context.instance_eval do
           def get_original_assets(pathname)
-            lookup_asset_for_path(pathname, :type => :javascript).to_a.map do |processed_asset|
-              path_to_javascript(processed_asset.logical_path)
+            assets_environment.find_asset(pathname).to_a.map do |processed_asset|
+              case processed_asset.content_type
+              when "text/css"
+                path_to_stylesheet(processed_asset.logical_path)
+              when "application/javascript"
+                path_to_javascript(processed_asset.logical_path)
+              end
             end
           end
         end

data/lib/jasmine/command_line_install.txt

@@ -0,0 +1,13 @@
+Jasmine has been installed.
+
+To run the server:
+
+rake jasmine
+
+To run the automated CI task with PhantomJS:
+
+rake jasmine:ci
+
+To install some example javascripts and specs:
+
+jasmine examples

data/lib/jasmine/command_line_tool.rb

@@ -1,82 +1,124 @@
+require 'fileutils'
+
 module Jasmine
   class CommandLineTool
-    def cwd
-      File.expand_path(File.join(File.dirname(__FILE__), '../..'))
-    end
+    def process(argv)
+      @argv = argv
 
-    def expand(*paths)
-      File.expand_path(File.join(*paths))
+      if respond_to?(@argv[0])
+        public_send(@argv[0])
+      else
+        print_help
+      end
     end
 
-    def template_path(filepath)
-      expand(cwd, File.join("generators", "jasmine" ,"templates", filepath))
+    def init
+      ensure_not_rails!
+
+      copy_file_structure('install')
+
+      update_rakefile
+
+      install_path = File.join(jasmine_gem_path, "lib", "jasmine", "command_line_install.txt")
+      puts File.read(install_path)
     end
 
-    def dest_path(filepath)
-      expand(Dir.pwd, filepath)
+    def examples
+      copy_file_structure('examples')
+
+      puts "Jasmine has installed some examples."
     end
 
-    def copy_unless_exists(relative_path, dest_path = nil)
-      unless File.exist?(dest_path(relative_path))
-        FileUtils.copy(template_path(relative_path), dest_path(dest_path || relative_path))
+    def copy_boot_js
+      destination_path = File.join('spec', 'javascripts', 'support', 'boot.js')
+      if File.exists?(destination_path)
+        puts "#{destination_path} already exists"
+      else
+        require 'jasmine-core'
+        source = File.join(Jasmine::Core.path, 'boot.js')
+        FileUtils.mkdir_p(File.dirname(destination_path))
+        FileUtils.cp(source, destination_path)
+
+        puts 'Jasmine has copied an example boot.js to spec/javascripts/support'
+        puts 'To use it set the boot_dir and boot_files keys in jasmine.yml'
+        puts ' to point to your custom boot.js'
       end
     end
 
-    def process(argv)
-      if argv[0] == 'init'
-        require 'fileutils'
+    def license
+      puts File.read(File.join(jasmine_gem_path, "MIT.LICENSE"))
+    end
 
-        force = false
+    def print_help
+      puts "unknown command #{@argv.join(' ')}"
+      puts "Usage: jasmine init"
+      puts "               examples"
+      puts "               copy_boot_js"
+      puts "               license"
+    end
 
-        if argv.size > 1 && argv[1] == "--force"
-          force = true
-        end
+    private
 
-        if File.exist?("Gemfile") && open("Gemfile", 'r').read.include?('rails') && !force
-          puts <<-EOF
+    def jasmine_gem_path
+      File.expand_path('../../..', __FILE__)
+    end
 
-  You're attempting to run jasmine init in a Rails project. You probably want to use the Rails generator like so:
-      rails g jasmine:init
+    def copy_file_structure(generator)
+      source_dir = File.join(jasmine_gem_path, 'lib', 'generators', 'jasmine', generator, 'templates')
+      dest_dir = Dir.pwd
 
-  If you're not actually in a Rails application, just run this command again with --force
-      jasmine init --force
-          EOF
-          exit 1
+      globber = File.join(source_dir, '**', '{*,.*}')
+      source_files = Dir.glob(globber).reject { |path| File.directory?(path) }
+      source_files.each do |source_path|
+        relative_path = source_path.sub(source_dir, '')
+        dest_path = File.join(dest_dir, relative_path).sub(/app[\/\\]assets/, 'public')
+        unless File.exist?(dest_path)
+          FileUtils.mkdir_p(File.dirname(dest_path))
+          FileUtils.copy(source_path, dest_path)
+          if File.basename(dest_path) == 'jasmine.yml'
+            replaced = File.read(dest_path).gsub("assets/application.js", "public/javascripts/**/*.js")
+            File.open(dest_path, 'w') do |file|
+              file.write(replaced)
+            end
+          end
         end
+      end
+    end
 
-        FileUtils.makedirs('public/javascripts')
-        FileUtils.makedirs('spec/javascripts')
-        FileUtils.makedirs('spec/javascripts/support')
-        FileUtils.makedirs('spec/javascripts/helpers')
-
-        copy_unless_exists('jasmine-example/src/Player.js', 'public/javascripts/Player.js')
-        copy_unless_exists('jasmine-example/src/Song.js', 'public/javascripts/Song.js')
-        copy_unless_exists('jasmine-example/spec/PlayerSpec.js', 'spec/javascripts/PlayerSpec.js')
-        copy_unless_exists('jasmine-example/spec/SpecHelper.js', 'spec/javascripts/helpers/SpecHelper.js')
-
-        copy_unless_exists('spec/javascripts/support/jasmine.yml')
-        copy_unless_exists('spec/javascripts/support/jasmine_helper.rb')
-        require 'rake'
-        write_mode = 'w'
-        if File.exist?(dest_path('Rakefile'))
-          load dest_path('Rakefile')
-          write_mode = 'a'
-        end
+    def force?
+      @argv.size > 1 && @argv[1] == "--force"
+    end
 
-        unless Rake::Task.task_defined?('jasmine')
-          File.open(dest_path('Rakefile'), write_mode) do |f|
-            f.write("\n" + File.read(template_path('lib/tasks/jasmine.rake')))
-          end
-        end
-        File.open(template_path('INSTALL'), 'r').each_line do |line|
-          puts line
+    def ensure_not_rails!
+      if File.exist?("Gemfile") && open("Gemfile", 'r').read.include?('rails') && !force?
+        puts <<-EOF
+
+You're attempting to run jasmine init in a Rails project. You probably want to use the Rails generator like so:
+    rails g jasmine:init
+
+If you're not actually in a Rails application, just run this command again with --force
+    jasmine init --force
+EOF
+        exit 1
+      end
+    end
+
+    def update_rakefile
+      require 'rake'
+      write_mode = 'w'
+      rakefile_path = File.join(Dir.pwd, 'Rakefile')
+      if File.exist?(rakefile_path)
+        load rakefile_path
+        write_mode = 'a'
+      end
+
+      unless Rake::Task.task_defined?('jasmine')
+        File.open(rakefile_path, write_mode) do |f|
+          f.write(<<-JASMINE_RAKE)
+require 'jasmine'
+load 'jasmine/tasks/jasmine.rake'
+JASMINE_RAKE
         end
-      elsif argv[0] == "license"
-        puts File.new(expand(cwd, "MIT.LICENSE")).read
-      else
-        puts "unknown command #{argv}"
-        puts "Usage: jasmine init"
-        puts "               license"
       end
     end
   end