phantom_jasmine 0.0.6 → 0.0.7

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format Fuubar

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2

data/Gemfile

@@ -3,5 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in phantom_jasmine.gemspec
 gemspec
 
-gem 'jasmine', git: 'git://github.com/pivotal/jasmine-gem.git', ref: '479dccb62f9e6ffc7600b65d24df77ac1bdde403'
+gem 'jasmine', :git => 'git://github.com/pivotal/jasmine-gem.git', :ref => '479dccb62f9e6ffc7600b65d24df77ac1bdde403'
 

data/Rakefile

@@ -1 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new 'spec'
+
+task :default => :spec

data/lib/jasmine/runners/phantom.rb

@@ -1,6 +1,7 @@
 require 'facter'
+require 'jasmine'
 require 'tempfile'
-require 'phantomjs-mac' if RUBY_PLATFORM.downcase.include?('darwin')
+require 'phantomjs.rb'
 
 class Jasmine::Runners::Phantom
   attr_accessor :suites
@@ -9,6 +10,7 @@ class Jasmine::Runners::Phantom
     @port = port
     @results_processor = results_processor
     @result_batch_size = result_batch_size
+    @phantom = Phantomjs.send(:get_executable)
   end
 
   def run
@@ -20,7 +22,7 @@ class Jasmine::Runners::Phantom
 
   def load_suite_info
     tmpfile = Tempfile.new('count')
-    pid = Process.spawn "#{Phantomjs.executable_path} '#{File.join(File.dirname(__FILE__), 'phantom_jasmine_count.js')}' #{@port}", :out => tmpfile.path
+    pid = Process.spawn "#{@phantom} '#{File.join(File.dirname(__FILE__), 'phantom_jasmine_count.js')}' #{@port}", :out => tmpfile.path
     Process.wait pid
     json = JSON.parse(tmpfile.read, :max_nesting => 100).tap { tmpfile.close }
     @suites = json['suites']
@@ -30,7 +32,7 @@ class Jasmine::Runners::Phantom
   def run_suites(suites)
     tmpfile = Tempfile.new('run')
     commands = suites.map do |suite|
-      "#{Phantomjs.executable_path} '#{File.join(File.dirname(__FILE__), 'phantom_jasmine_run.js')}' #{@port} '#{suite['description']}'"
+      "#{@phantom} '#{File.join(File.dirname(__FILE__), 'phantom_jasmine_run.js')}' #{@port} '#{suite['description']}'"
     end.join(';echo ,;')
 
     pid = Process.spawn "echo [;#{commands};echo ]", :out => tmpfile.path
@@ -39,7 +41,6 @@ class Jasmine::Runners::Phantom
 
   def results_hash
     spec_results = {}
-
     @top_level_suites.group_by { |suite| suite['id'] % processor_count }.map { |(k, suites)| run_suites(suites) }.each do |pid, tmpfile|
       Process.wait pid
 
@@ -57,7 +58,7 @@ class Jasmine::Runners::Phantom
 
   def processor_count
     @processor_count ||= begin
-      ENV['JASMINE_PARALLEL_COUNT'] || [Facter.sp_number_processors.to_i, 4].min
+      ENV['JASMINE_PARALLEL_COUNT'] || Facter.processorcount
     end.to_i
   end
 end

data/lib/jasmine/runners/phantom_jasmine_count.js

@@ -1,14 +1,12 @@
 (function() {
-  var port = phantom.args[0];
-  var filter = phantom.args[1];
+  var port = phantom.args[0], filter = phantom.args[1];
 
   if (!parseInt(port, 10) || phantom.args.length > 2) {
     console.log('Usage: run-jasmine.js PORT [spec_name_filter]');
     phantom.exit(1);
   }
 
-  var page = require('webpage').create();
-  var fs = require('fs');
+  var page = require('webpage').create(), fs = require('fs');
 
   var url = 'http://localhost:' + port;
   if (filter) {
@@ -21,16 +19,18 @@
       phantom.exit(1);
     } else {
       var json = page.evaluate(function() {
-        var jasmineEnv = {
+        var topLevelSuites = [], suites = jasmine.getEnv().currentRunner().topLevelSuites();
+        for (var i = 0; i < suites.length; i++) {
+          var suite = suites[i];
+          topLevelSuites.push({
+            id: suite.id,
+            description: suite.description
+          });
+        }
+        return JSON.stringify({
           suites: jsApiReporter.suites(),
-          top_level_suites: jasmine.getEnv().currentRunner().topLevelSuites().map(function(suite) {
-            return {
-              id: suite.id,
-              description: suite.description
-            };
-          })
-        };
-        return JSON.stringify(jasmineEnv);
+          top_level_suites: topLevelSuites
+        });
       });
       fs.write('/dev/stdout', json, 'w');
       phantom.exit(0);

data/lib/jasmine/runners/phantom_jasmine_run.js

@@ -72,9 +72,10 @@
         });
       }, function() {
         var json = page.evaluate(function() {
-          var specIds = _(jasmine.getEnv().currentRunner().specs()).map(function(spec) {
-            return spec.id;
-          });
+          var specIds = [], specs = jasmine.getEnv().currentRunner().specs();
+          for (var i = 0; i < specs.length; i++) {
+            specIds.push(specs[i].id);
+          }
           return JSON.stringify(jsApiReporter.resultsForSpecs(specIds));
         });
         fs.write('/dev/stdout', json, 'w');

data/lib/phantom_jasmine/run_specs.rb

@@ -21,7 +21,7 @@ server = Jasmine::Server.new(port, Jasmine::Application.app(config))
 t = Thread.new do
   begin
     server.start
-  rescue ChildProcess::TimeoutError
+  rescue
   end
   # # ignore bad exits
 end

data/lib/phantom_jasmine/version.rb

@@ -1,3 +1,3 @@
 module PhantomJasmine
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/phantom_jasmine.rb

@@ -1,9 +1,13 @@
 require 'phantom_jasmine/version'
+require 'jasmine/runners/phantom'
 
 module PhantomJasmine
-  class Railtie < ::Rails::Railtie
-    rake_tasks do
-      load 'tasks/phantom_jasmine.rake'
+  begin
+    class Railtie < ::Rails::Railtie
+      rake_tasks do
+        load 'tasks/phantom_jasmine.rake'
+      end
     end
+  rescue LoadError, NameError
   end
 end

data/phantom_jasmine.gemspec

@@ -17,9 +17,18 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.extensions = ['ext/mkrf_conf.rb']
-
   gem.add_dependency %q{jasmine}, '>= 1.2'
   gem.add_dependency %q{facter}, '>= 1.6.17'
-  gem.add_dependency %q{phantomjs-mac}, '>= 0.0.3'
+  gem.add_dependency %q{phantomjs.rb}, '>= 0.0.5'
+
+  gem.add_development_dependency %q{json}
+  gem.add_development_dependency %q{rspec}, '>= 2.13.0'
+  gem.add_development_dependency %q{fuubar}
+  gem.add_development_dependency %q{rake}
+
+  if RUBY_PLATFORM =~ /linux/
+    gem.add_runtime_dependency 'phantomjs-linux'
+  elsif RUBY_PLATFORM =~ /darwin/
+    gem.add_runtime_dependency 'phantomjs-mac'
+  end
 end

data/spec/lib/runners/phantom_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe Jasmine::Runners::Phantom do
+  let!(:port) { 8888 }
+  let!(:results_processor) do
+    mock('results_processor').tap do |processor|
+      processor.stub :process
+    end
+  end
+  let!(:result_batch_size) { Object.new }
+
+  subject do
+    Jasmine::Runners::Phantom.new port, results_processor, result_batch_size
+  end
+
+  describe '#run' do
+    let(:messages) { {'messages' => [{'passed' => true, 'type' => 'expect', 'message' => 'Passed.', 'trace' => {}}]} }
+    let(:describe1) do
+      {'id' => 1, 'description' => 'foo'}
+    end
+
+    let(:describe2) do
+      {'id' => 2, 'description' => 'bar'}
+    end
+
+    let(:json) do
+      {
+        'top_level_suites' => [describe1],
+        'suites' => [describe1, describe2]
+      }
+    end
+
+    let(:tempfile) do
+      mock('tempfile').tap do |f|
+        f.should_receive(:read).and_return(describe1)
+        f.should_receive(:close)
+      end
+    end
+
+    before do
+      Process.should_receive :spawn
+      Process.should_receive :wait
+    end
+
+    describe '#load_suite_info' do
+      before do
+        JSON.should_receive(:parse).and_return json
+        subject.should_receive(:results_hash).and_return {}
+        subject.run
+      end
+      its(:suites) do
+        should == [describe1, describe2]
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'phantom_jasmine'
+
+ENV["RAILS_ENV"] ||= 'test'
+
+RSpec.configure do |config|
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phantom_jasmine
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jasmine
@@ -43,6 +43,86 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.17
+- !ruby/object:Gem::Dependency
+  name: phantomjs.rb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: json
+  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: 2.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  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: rake
+  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: phantomjs-mac
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +130,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,23 +138,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0'
 description: Adds a new rake task jasmine:phantom that runs specs in parallel using
   phantoms js.
 email:
 - ryan.dy@gmail.com
 executables: []
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- ext/mkrf_conf.rb
 - lib/jasmine/runners/phantom.rb
 - lib/jasmine/runners/phantom_jasmine_count.js
 - lib/jasmine/runners/phantom_jasmine_run.js
@@ -83,6 +163,8 @@ files:
 - lib/phantom_jasmine/version.rb
 - lib/tasks/phantom_jasmine.rake
 - phantom_jasmine.gemspec
+- spec/lib/runners/phantom_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/rdy/phantom_jasmine
 licenses: []
 post_install_message: 
@@ -95,16 +177,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 87089693277479132
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 87089693277479132
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: an extension for running jasmine with phantom js in parallel
-test_files: []
+test_files:
+- spec/lib/runners/phantom_spec.rb
+- spec/spec_helper.rb

data/ext/mkrf_conf.rb

@@ -1,22 +0,0 @@
-require 'rubygems'
-require 'rubygems/command.rb'
-require 'rubygems/dependency_installer.rb'
-
-begin
-  Gem::Command.build_args = ARGV
-rescue NoMethodError
-end
-inst = Gem::DependencyInstaller.new
-begin
-  if RUBY_PLATFORM.downcase.include? 'darwin'
-    inst.install 'phantomjs-mac', '>= 0.0.3'
-  end
-rescue
-  #Exit with a non-zero value to let rubygems know something went wrong
-  exit(1)
-end
-
-# create dummy rakefile to indicate success
-f = File.open(File.join(File.dirname(__FILE__), 'Rakefile'), 'w')
-f.write("task :default\n")
-f.close