jasmine 1.1.0 → 1.1.2

data/Gemfile

@@ -1,2 +1,3 @@
 source "http://rubygems.org"
+gem "ci_reporter", :git => "git://github.com/nicksieger/ci_reporter.git", :ref => "af8674c7bddc338fad228c566a03e3b8188d8a22"
 gemspec

data/Rakefile

@@ -4,15 +4,8 @@ require "bundler"
 Bundler.setup
 Bundler::GemHelper.install_tasks
 
-def rspec2?
-  Gem.available? "rspec", ">= 2.0"
-end
-
-def rails3?
-  Gem.available? "rails", ">= 3.0"
-end
-
-if rspec2?
+require "jasmine"
+if Jasmine::Dependencies.rspec2?
   require 'rspec'
   require 'rspec/core/rake_task'
 else
@@ -22,7 +15,7 @@ end
 require 'ci/reporter/rake/rspec'
 
 desc "Run all examples"
-if rspec2?
+if Jasmine::Dependencies.rspec2?
   RSpec::Core::RakeTask.new(:spec) do |t|
     t.pattern = 'spec/**/*_spec.rb'
   end

data/generators/jasmine/templates/jasmine-example/SpecRunner.html

@@ -10,11 +10,11 @@
   <script type="text/javascript" src="lib/jasmine-1.1.0.rc1/jasmine.js"></script>
   <script type="text/javascript" src="lib/jasmine-1.1.0.rc1/jasmine-html.js"></script>
 
-  <!-- include source files here... -->
+  <!-- include spec files here... -->
   <script type="text/javascript" src="spec/SpecHelper.js"></script>
   <script type="text/javascript" src="spec/PlayerSpec.js"></script>
 
-  <!-- include spec files here... -->
+  <!-- include source files here... -->
   <script type="text/javascript" src="src/Player.js"></script>
   <script type="text/javascript" src="src/Song.js"></script>
 

data/generators/jasmine/templates/spec/javascripts/support/jasmine_runner.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'jasmine'
 jasmine_config_overrides = File.expand_path(File.join(File.dirname(__FILE__), 'jasmine_config.rb'))
 require jasmine_config_overrides if File.exist?(jasmine_config_overrides)
-if Jasmine::rspec2?
+if Jasmine::Dependencies.rspec2?
   require 'rspec'
 else
   require 'spec'
@@ -15,7 +15,7 @@ spec_builder = Jasmine::SpecBuilder.new(jasmine_config)
 
 should_stop = false
 
-if Jasmine::rspec2?
+if Jasmine::Dependencies.rspec2?
   RSpec.configuration.after(:suite) do
     spec_builder.stop if should_stop
   end
@@ -29,4 +29,4 @@ end
 
 spec_builder.start
 should_stop = true
-spec_builder.declare_suites
+spec_builder.declare_suites

data/jasmine.gemspec

@@ -29,7 +29,12 @@ Gem::Specification.new do |s|
     end
     s.add_development_dependency 'rake-tasks'
   elsif ENV['RAILS_VERSION'] == 'pojs-rspec2'
-    s.add_development_dependency 'rspec', '>= 2.5.0'
+    if ENV["RUBY_VERSION"] =~ /1\.8\.6/
+      #2.7.0 uses reduce vs inject, non 1.8.6 compatible
+      s.add_development_dependency 'rspec', '2.6.0'
+    else
+      s.add_development_dependency 'rspec', '>= 2.5.0'
+    end
     s.add_development_dependency 'rake-tasks'
     s.add_development_dependency 'rack', "1.1" if ENV["RUBY_VERSION"] =~ /1\.8\.6/
   elsif ENV['RAILS_VERSION'] == 'rails2'

data/lib/generators/jasmine/templates/spec/javascripts/support/jasmine_runner.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'jasmine'
 jasmine_config_overrides = File.expand_path(File.join(File.dirname(__FILE__), 'jasmine_config.rb'))
 require jasmine_config_overrides if File.exist?(jasmine_config_overrides)
-if Jasmine::rspec2?
+if Jasmine::Dependencies.rspec2?
   require 'rspec'
 else
   require 'spec'
@@ -15,7 +15,7 @@ spec_builder = Jasmine::SpecBuilder.new(jasmine_config)
 
 should_stop = false
 
-if Jasmine::rspec2?
+if Jasmine::Dependencies.rspec2?
   RSpec.configuration.after(:suite) do
     spec_builder.stop if should_stop
   end
@@ -29,4 +29,4 @@ end
 
 spec_builder.start
 should_stop = true
-spec_builder.declare_suites
+spec_builder.declare_suites

data/lib/jasmine.rb

@@ -1,4 +1,5 @@
 jasmine_files = ['base',
+                 'dependencies',
                  'config',
                  'server',
                  'selenium_driver',
@@ -9,6 +10,6 @@ jasmine_files.each do |file|
   require File.join('jasmine', file)
 end
 
-require File.join('jasmine', "railtie") if Jasmine.rails3?
+require File.join('jasmine', "railtie") if Jasmine::Dependencies.rails3?
 
 

data/lib/jasmine/base.rb

@@ -39,18 +39,4 @@ module Jasmine
     end
   end
 
-  def self.rspec2?
-    Gem::Specification::find_by_name "rspec", ">= 2.0"
-  rescue
-    Gem.available? "rspec", ">= 2.0"
-  end
-
-  def self.rails3?
-    return Rails.version.split(".").first.to_i == 3 if defined? Rails
-    begin
-      Gem::Specification::find_by_name "rails", ">= 3.0"
-    rescue
-      Gem.available? "rails", ">= 3.0"
-    end
-  end
 end

data/lib/jasmine/dependencies.rb

@@ -0,0 +1,30 @@
+module Jasmine
+  module Dependencies
+
+    class << self
+      def rspec2?
+        safe_gem_check("rspec", ">= 2.0")
+      end
+
+      def rails2?
+        safe_gem_check("rails", "~> 2.3")
+      end
+
+      def rails3?
+        safe_gem_check("rails", ">= 3.0")
+      end
+
+      private
+      def safe_gem_check(gem_name, version_string)
+        if Gem::Specification.respond_to?(:find_by_name)
+          Gem::Specification.find_by_name(gem_name, version_string)
+        elsif Gem.respond_to?(:available?)
+          Gem.available?(gem_name, version_string)
+        end
+      rescue Gem::LoadError
+        false
+      end
+
+    end
+  end
+end

data/lib/jasmine/spec_builder.rb

@@ -109,7 +109,7 @@ module Jasmine
       example_name = spec["name"]
       @spec_ids << spec["id"]
       backtrace = @example_locations[parent.description + " " + example_name]
-      if Jasmine::rspec2?
+      if Jasmine::Dependencies.rspec2?
         parent.it example_name, {} do
           me.report_spec(spec["id"])
         end

data/lib/jasmine/tasks/jasmine.rake

@@ -14,7 +14,7 @@ namespace :jasmine do
 
   desc "Run continuous integration tests"
   task :ci => ["jasmine:require_json", "jasmine:require"] do
-    if Jasmine::rspec2?
+    if Jasmine::Dependencies.rspec2?
       require "rspec"
       require "rspec/core/rake_task"
     else
@@ -22,7 +22,7 @@ namespace :jasmine do
       require 'spec/rake/spectask'
     end
 
-    if Jasmine::rspec2?
+    if Jasmine::Dependencies.rspec2?
       RSpec::Core::RakeTask.new(:jasmine_continuous_integration_runner) do |t|
         t.rspec_opts = ["--colour", "--format", ENV['JASMINE_SPEC_FORMAT'] || "progress"]
         t.verbose = true

data/lib/jasmine/version.rb

@@ -1,3 +1,3 @@
 module Jasmine
-  VERSION = "1.1.0"
+  VERSION = "1.1.2"
 end

data/spec/dependencies_spec.rb

@@ -0,0 +1,86 @@
+require 'spec_helper'
+
+#rspec 1 fails to stub respond_to
+if Jasmine::Dependencies.rspec2?
+  describe Jasmine::Dependencies do
+
+    context "with ruby gems > 1.8" do
+      before do
+        Gem::Specification.should_receive(:respond_to?).with(:find_by_name).and_return(true)
+      end
+
+      context "and rspec 2" do
+        before do
+          Gem::Specification.should_receive(:find_by_name).with("rspec", ">= 2.0").and_raise(Gem::LoadError)
+        end
+        it "should return the correct results" do
+          Jasmine::Dependencies.rspec2?.should be false
+        end
+
+        it "should not raise an error" do
+          lambda do
+            Jasmine::Dependencies.rspec2?
+          end.should_not raise_error(Gem::LoadError)
+        end
+      end
+
+      context "and rails 2" do
+        before do
+          Gem::Specification.should_receive(:find_by_name).with("rails", "~> 2.3").and_raise(Gem::LoadError)
+        end
+        it "should return the correct results" do
+          Jasmine::Dependencies.rails2?.should be false
+        end
+
+        it "should not raise an error" do
+          lambda do
+            Jasmine::Dependencies.rails2?
+          end.should_not raise_error(Gem::LoadError)
+        end
+      end
+
+      context "and rails 3" do
+        before do
+          Gem::Specification.should_receive(:find_by_name).with("rails", ">= 3.0").and_raise(Gem::LoadError)
+        end
+        it "should return the correct results" do
+          Jasmine::Dependencies.rails3?.should be false
+        end
+
+        it "should not raise an error" do
+          lambda do
+            Jasmine::Dependencies.rails3?
+          end.should_not raise_error(Gem::LoadError)
+        end
+      end
+    end
+
+    context "with ruby_gems < 1.8" do
+      before do
+        Gem::Specification.should_receive(:respond_to?).with(:find_by_name).and_return(false)
+      end
+      context "and rspec 2" do
+        it "should not break when it is not present" do
+          Gem.should_receive(:available?).with("rspec", ">= 2.0").and_return false
+          Jasmine::Dependencies.rspec2?.should be false
+        end
+      end
+
+      context "and rails 2" do
+        it "should not break when it is not present" do
+          Gem.should_receive(:available?).with("rails", "~> 2.3").and_return false
+          Jasmine::Dependencies.rails2?.should be false
+        end
+      end
+
+      context "and rails 3" do
+        it "should not break when it is not present" do
+          Gem.should_receive(:available?).with("rails", ">= 3.0").and_return false
+          Jasmine::Dependencies.rails3?.should be false
+        end
+      end
+    end
+
+  end
+
+end

data/spec/jasmine_rails2_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
-if rails2?
+if Jasmine::Dependencies.rails2?
 
   describe "A Rails 2 app" do
 

data/spec/jasmine_rails3_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
-if rails3?
+if Jasmine::Dependencies.rails3?
 
   describe "A Rails 3 app" do
 

data/spec/jasmine_self_test_spec.rb

@@ -6,7 +6,7 @@ spec_builder = Jasmine::SpecBuilder.new(jasmine_config)
 
 should_stop = false
 
-if rspec2?
+if Jasmine::Dependencies.rspec2?
   RSpec.configuration.after(:suite) do
     spec_builder.stop if should_stop
   end

data/spec/spec_helper.rb

@@ -5,30 +5,18 @@ require 'tmpdir'
 
 Bundler.setup(:default, :development)
 
-def rspec2?
-  Gem.available? "rspec", ">= 2.0"
-end
-
-def rails2?
-  Gem.available? "rails", "~> 2.3"
-end
-
-def rails3?
-  Gem.available? "rails", ">= 3.0"
-end
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "../lib")))
+require "jasmine"
 
-if rspec2?
+if Jasmine::Dependencies.rspec2?
   require 'rspec'
 else
   require 'spec'
 end
 
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "../lib")))
-
-require "jasmine"
 
 def create_rails(name)
-  if rails3?
+  if Jasmine::Dependencies.rails3?
     `rails new #{name}`
   else
     `rails #{name}`

metadata

@@ -1,139 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jasmine
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.2
   prerelease: 
-  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Rajan Agaskar
 - Christian Williams
 - Davis Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-12 00:00:00 -04:00
+date: 2011-10-27 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70282392007960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70282392007960
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70282392004820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70282392004820
+- !ruby/object:Gem::Dependency
   name: rack
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70282392002860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70282392002860
+- !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70282392001920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70282392001920
+- !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70282392000880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70282392000880
+- !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70282391999500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70282391999500
+- !ruby/object:Gem::Dependency
   name: jasmine-core
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70282391997920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70282391997920
+- !ruby/object:Gem::Dependency
   name: rack
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70282391996620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.1"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70282391996620
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70282391995520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70282391995520
+- !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70282391994420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *id010
-description: Test your JavaScript without any framework dependencies, in any environment, and with a nice descriptive syntax.
+  version_requirements: *70282391994420
+description: Test your JavaScript without any framework dependencies, in any environment,
+  and with a nice descriptive syntax.
 email: jasmine-js@googlegroups.com
-executables: 
+executables:
 - jasmine
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - HOW_TO_TEST.markdown
@@ -178,6 +176,7 @@ files:
 - lib/jasmine/base.rb
 - lib/jasmine/command_line_tool.rb
 - lib/jasmine/config.rb
+- lib/jasmine/dependencies.rb
 - lib/jasmine/firebug/firebug-1.6.2.xpi
 - lib/jasmine/firebug/firebug-1.7.0.xpi
 - lib/jasmine/firebug/firebug-license.txt
@@ -190,6 +189,7 @@ files:
 - lib/jasmine/tasks/jasmine.rake
 - lib/jasmine/version.rb
 - spec/config_spec.rb
+- spec/dependencies_spec.rb
 - spec/fixture/Rakefile
 - spec/fixture/jasmine.erb.yml
 - spec/fixture/spec/example_spec.js
@@ -206,39 +206,38 @@ files:
 has_rdoc: true
 homepage: http://pivotal.github.com/jasmine
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 20948989
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2801835989228056808
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 20948989
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2801835989228056808
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: JavaScript BDD framework
-test_files: 
+test_files:
 - spec/config_spec.rb
+- spec/dependencies_spec.rb
 - spec/fixture/Rakefile
 - spec/fixture/jasmine.erb.yml
 - spec/fixture/spec/example_spec.js