jasmine-headless-webkit 0.7.2 → 0.7.3.1

data/lib/jasmine/headless/runner.rb

@@ -45,9 +45,13 @@ module Jasmine
       end
 
       def jasmine_config
-        raise JasmineConfigNotFound.new("Jasmine config not found. I tried #{@options[:jasmine_config]}.") if !File.file?(@options[:jasmine_config])
+        return @jasmine_config if @jasmine_config
 
-        @jasmine_config ||= JASMINE_DEFAULTS.dup.merge(YAML.load_file(@options[:jasmine_config]))
+        @jasmine_config = JASMINE_DEFAULTS.dup
+        jasmine_config_data.each do |key, value|
+          @jasmine_config[key] = value if value
+        end
+        @jasmine_config
       end
 
       def jasmine_command(*targets)
@@ -88,6 +92,13 @@ module Jasmine
           end
         end
       end
+
+      private
+      def jasmine_config_data
+        raise JasmineConfigNotFound.new("Jasmine config not found. I tried #{@options[:jasmine_config]}.") if !File.file?(@options[:jasmine_config])
+
+        YAML.load_file(@options[:jasmine_config])
+      end
     end
   end
 end

data/lib/jasmine/headless/version.rb

@@ -1,5 +1,5 @@
 module Jasmine
   module Headless
-    VERSION = "0.7.2"
+    VERSION = "0.7.3.1"
   end
 end

data/lib/qt/qmake.rb

@@ -2,12 +2,6 @@ require 'rbconfig'
 require 'rubygems'
 require 'rubygems/version'
 
-begin
-  require 'facter'
-rescue LoadError
-  warn 'Including Facter allows for detection of # of cpus, resulting in faster compilations.'
-end
-
 module Qt
   class NotInstalledError < StandardError; end
   class Qmake
@@ -49,7 +43,7 @@ module Qt
       end
 
       def make_options
-        "-j#{number_of_cpus}"
+        ""
       end
 
       #
@@ -103,14 +97,6 @@ module Qt
         end.compact.join(" ")
       end
 
-      def number_of_cpus
-        if defined?(Facter)
-          Facter.sp_number_processors rescue Facter.processorcount
-        else
-          1
-        end
-      end
-
       def get_exe_path(command)
         path = %x{which #{command}}.strip
         path = nil if path == ''

data/spec/lib/jasmine/headless/runner_spec.rb

@@ -155,4 +155,16 @@ describe Jasmine::Headless::Runner do
       end
     end
   end
+
+  describe '#jasmine_config' do
+    let(:opts) { {} }
+
+    before do
+      runner.stubs(:jasmine_config_data).returns('spec_files' => nil)
+    end
+
+    it 'should not merge in things with nil values' do
+      runner.jasmine_config['spec_files'].should == described_class::JASMINE_DEFAULTS['spec_files']
+    end
+  end
 end

data/spec/lib/qt/qmake_spec.rb

@@ -140,14 +140,9 @@ describe Qt::Qmake do
   end
 
   describe '.make_options' do
-    let(:cpu_count) { 3 }
     subject { Qt::Qmake.make_options }
 
-    before do
-      Qt::Qmake.stubs(:number_of_cpus).returns(cpu_count)
-    end
-
-    it { should == "-j#{cpu_count}" }
+    it { should == "" }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-headless-webkit
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-24 00:00:00.000000000Z
+date: 2011-11-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jasmine-core
-  requirement: &2160034300 !ruby/object:Gem::Requirement
+  requirement: &2155137140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 1.1.beta
   type: :runtime
   prerelease: false
-  version_requirements: *2160034300
+  version_requirements: *2155137140
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2160033760 !ruby/object:Gem::Requirement
+  requirement: &2155136360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2160033760
+  version_requirements: *2155136360
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &2160033360 !ruby/object:Gem::Requirement
+  requirement: &2155135840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160033360
+  version_requirements: *2155135840
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2160032900 !ruby/object:Gem::Requirement
+  requirement: &2155135380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,7 +56,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160032900
+  version_requirements: *2155135380
 description: Run Jasmine specs headlessly
 email:
 - john@coswellproductions.com