evergreen 1.0.0 → 1.0.1

data/lib/jasmine/src/html/jasmine.css

@@ -1,166 +1,81 @@
-body {
-  font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif;
-}
-
-
-.jasmine_reporter a:visited, .jasmine_reporter a {
-  color: #303; 
-}
-
-.jasmine_reporter a:hover, .jasmine_reporter a:active {
-  color: blue; 
-}
-
-.run_spec {
-  float:right;
-  padding-right: 5px;
-  font-size: .8em;
-  text-decoration: none;
-}
-
-.jasmine_reporter {
-  margin: 0 5px;
-}
-
-.banner {
-  color: #303;
-  background-color: #fef;
-  padding: 5px;
-}
-
-.logo {
-  float: left;
-  font-size: 1.1em;
-  padding-left: 5px;
-}
-
-.logo .version {
-  font-size: .6em;
-  padding-left: 1em;
-}
-
-.runner.running {
-  background-color: yellow;
-}
-
-
-.options {
-  text-align: right;
-  font-size: .8em;
-}
-
-
-
-
-.suite {
-  border: 1px outset gray;
-  margin: 5px 0;
-  padding-left: 1em;
-}
-
-.suite .suite {
-  margin: 5px; 
-}
-
-.suite.passed {
-  background-color: #dfd;
-}
-
-.suite.failed {
-  background-color: #fdd;
-}
-
-.spec {
-  margin: 5px;
-  padding-left: 1em;
-  clear: both;
-}
-
-.spec.failed, .spec.passed, .spec.skipped {
-  padding-bottom: 5px;
-  border: 1px solid gray;
-}
-
-.spec.failed {
-  background-color: #fbb;
-  border-color: red;
-}
-
-.spec.passed {
-  background-color: #bfb;
-  border-color: green;
-}
-
-.spec.skipped {
-  background-color: #bbb;
-}
-
-.messages {
-  border-left: 1px dashed gray;
-  padding-left: 1em;
-  padding-right: 1em;
-}
-
-.passed {
-  background-color: #cfc;
-  display: none;
-}
-
-.failed {
-  background-color: #fbb;
-}
-
-.skipped {
-  color: #777;
-  background-color: #eee;
-  display: none;
-}
-
-
-/*.resultMessage {*/
-  /*white-space: pre;*/
-/*}*/
-
-.resultMessage span.result {
-  display: block;
-  line-height: 2em;
-  color: black;
-}
-
-.resultMessage .mismatch {
-  color: black;
-}
-
-.stackTrace {
-  white-space: pre;
-  font-size: .8em;
-  margin-left: 10px;
-  max-height: 5em;
-  overflow: auto;
-  border: 1px inset red;
-  padding: 1em;
-  background: #eef;
-}
-
-.finished-at {
-  padding-left: 1em;
-  font-size: .6em;
-}
-
-.show-passed .passed,
-.show-skipped .skipped {
-  display: block;
-}
-
-
-#jasmine_content {
-  position:fixed;
-  right: 100%;
-}
-
-.runner {
-  border: 1px solid gray;
-  display: block;
-  margin: 5px 0;
-  padding: 2px 0 2px 10px;
-}
+body { background-color: #eeeeee; padding: 0; margin: 5px; overflow-y: scroll; }
+
+#HTMLReporter { font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: #333333; }
+#HTMLReporter a { text-decoration: none; }
+#HTMLReporter a:hover { text-decoration: underline; }
+#HTMLReporter p, #HTMLReporter h1, #HTMLReporter h2, #HTMLReporter h3, #HTMLReporter h4, #HTMLReporter h5, #HTMLReporter h6 { margin: 0; line-height: 14px; }
+#HTMLReporter .banner, #HTMLReporter .symbolSummary, #HTMLReporter .summary, #HTMLReporter .resultMessage, #HTMLReporter .specDetail .description, #HTMLReporter .alert .bar, #HTMLReporter .stackTrace { padding-left: 9px; padding-right: 9px; }
+#HTMLReporter #jasmine_content { position: fixed; right: 100%; }
+#HTMLReporter .version { color: #aaaaaa; }
+#HTMLReporter .banner { margin-top: 14px; }
+#HTMLReporter .duration { color: #aaaaaa; float: right; }
+#HTMLReporter .symbolSummary { overflow: hidden; *zoom: 1; margin: 14px 0; }
+#HTMLReporter .symbolSummary li { display: block; float: left; height: 7px; width: 14px; margin-bottom: 7px; font-size: 16px; }
+#HTMLReporter .symbolSummary li.passed { font-size: 14px; }
+#HTMLReporter .symbolSummary li.passed:before { color: #5e7d00; content: "\02022"; }
+#HTMLReporter .symbolSummary li.failed { line-height: 9px; }
+#HTMLReporter .symbolSummary li.failed:before { color: #b03911; content: "x"; font-weight: bold; margin-left: -1px; }
+#HTMLReporter .symbolSummary li.skipped { font-size: 14px; }
+#HTMLReporter .symbolSummary li.skipped:before { color: #bababa; content: "\02022"; }
+#HTMLReporter .symbolSummary li.pending { line-height: 11px; }
+#HTMLReporter .symbolSummary li.pending:before { color: #aaaaaa; content: "-"; }
+#HTMLReporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; }
+#HTMLReporter .runningAlert { background-color: #666666; }
+#HTMLReporter .skippedAlert { background-color: #aaaaaa; }
+#HTMLReporter .skippedAlert:first-child { background-color: #333333; }
+#HTMLReporter .skippedAlert:hover { text-decoration: none; color: white; text-decoration: underline; }
+#HTMLReporter .passingAlert { background-color: #a6b779; }
+#HTMLReporter .passingAlert:first-child { background-color: #5e7d00; }
+#HTMLReporter .failingAlert { background-color: #cf867e; }
+#HTMLReporter .failingAlert:first-child { background-color: #b03911; }
+#HTMLReporter .results { margin-top: 14px; }
+#HTMLReporter #details { display: none; }
+#HTMLReporter .resultsMenu, #HTMLReporter .resultsMenu a { background-color: #fff; color: #333333; }
+#HTMLReporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; }
+#HTMLReporter.showDetails .summaryMenuItem:hover { text-decoration: underline; }
+#HTMLReporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; }
+#HTMLReporter.showDetails .summary { display: none; }
+#HTMLReporter.showDetails #details { display: block; }
+#HTMLReporter .summaryMenuItem { font-weight: bold; text-decoration: underline; }
+#HTMLReporter .summary { margin-top: 14px; }
+#HTMLReporter .summary .suite .suite, #HTMLReporter .summary .specSummary { margin-left: 14px; }
+#HTMLReporter .summary .specSummary.passed a { color: #5e7d00; }
+#HTMLReporter .summary .specSummary.failed a { color: #b03911; }
+#HTMLReporter .description + .suite { margin-top: 0; }
+#HTMLReporter .suite { margin-top: 14px; }
+#HTMLReporter .suite a { color: #333333; }
+#HTMLReporter #details .specDetail { margin-bottom: 28px; }
+#HTMLReporter #details .specDetail .description { display: block; color: white; background-color: #b03911; }
+#HTMLReporter .resultMessage { padding-top: 14px; color: #333333; }
+#HTMLReporter .resultMessage span.result { display: block; }
+#HTMLReporter .stackTrace { margin: 5px 0 0 0; max-height: 224px; overflow: auto; line-height: 18px; color: #666666; border: 1px solid #ddd; background: white; white-space: pre; }
+
+#TrivialReporter { padding: 8px 13px; position: absolute; top: 0; bottom: 0; left: 0; right: 0; overflow-y: scroll; background-color: white; font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; /*.resultMessage {*/ /*white-space: pre;*/ /*}*/ }
+#TrivialReporter a:visited, #TrivialReporter a { color: #303; }
+#TrivialReporter a:hover, #TrivialReporter a:active { color: blue; }
+#TrivialReporter .run_spec { float: right; padding-right: 5px; font-size: .8em; text-decoration: none; }
+#TrivialReporter .banner { color: #303; background-color: #fef; padding: 5px; }
+#TrivialReporter .logo { float: left; font-size: 1.1em; padding-left: 5px; }
+#TrivialReporter .logo .version { font-size: .6em; padding-left: 1em; }
+#TrivialReporter .runner.running { background-color: yellow; }
+#TrivialReporter .options { text-align: right; font-size: .8em; }
+#TrivialReporter .suite { border: 1px outset gray; margin: 5px 0; padding-left: 1em; }
+#TrivialReporter .suite .suite { margin: 5px; }
+#TrivialReporter .suite.passed { background-color: #dfd; }
+#TrivialReporter .suite.failed { background-color: #fdd; }
+#TrivialReporter .spec { margin: 5px; padding-left: 1em; clear: both; }
+#TrivialReporter .spec.failed, #TrivialReporter .spec.passed, #TrivialReporter .spec.skipped { padding-bottom: 5px; border: 1px solid gray; }
+#TrivialReporter .spec.failed { background-color: #fbb; border-color: red; }
+#TrivialReporter .spec.passed { background-color: #bfb; border-color: green; }
+#TrivialReporter .spec.skipped { background-color: #bbb; }
+#TrivialReporter .messages { border-left: 1px dashed gray; padding-left: 1em; padding-right: 1em; }
+#TrivialReporter .passed { background-color: #cfc; display: none; }
+#TrivialReporter .failed { background-color: #fbb; }
+#TrivialReporter .skipped { color: #777; background-color: #eee; display: none; }
+#TrivialReporter .resultMessage span.result { display: block; line-height: 2em; color: black; }
+#TrivialReporter .resultMessage .mismatch { color: black; }
+#TrivialReporter .stackTrace { white-space: pre; font-size: .8em; margin-left: 10px; max-height: 5em; overflow: auto; border: 1px inset red; padding: 1em; background: #eef; }
+#TrivialReporter .finished-at { padding-left: 1em; font-size: .6em; }
+#TrivialReporter.show-passed .passed, #TrivialReporter.show-skipped .skipped { display: block; }
+#TrivialReporter #jasmine_content { position: fixed; right: 100%; }
+#TrivialReporter .runner { border: 1px solid gray; display: block; margin: 5px 0; padding: 2px 0 2px 10px; }

data/lib/jasmine/src/html/jasmine.scss

@@ -0,0 +1,2 @@
+@import "HTMLReporter";
+@import "TrivialReporter";

data/lib/jasmine/src/templates/version.js.erb

@@ -1,3 +1,4 @@
+
 jasmine.version_= {
   "major": <%= major %>,
   "minor": <%= minor %>,

data/lib/jasmine/src/version.js

@@ -1,6 +1,7 @@
+
 jasmine.version_= {
   "major": 1,
-  "minor": 1,
+  "minor": 2,
   "build": 0,
-  "revision": 1315677058
+  "revision": 1337006083
 };

data/lib/jasmine/src/version.json

@@ -1,5 +1,5 @@
 {
   "major": 1,
-  "minor": 1,
+  "minor": 2,
   "build": 0
 }

data/lib/jasmine/tasks/jasmine_dev.rb

@@ -0,0 +1,18 @@
+require 'thor'
+require 'json'
+require 'tilt'
+require 'ostruct'
+
+$:.unshift(File.join(File.dirname(__FILE__), "jasmine_dev"))
+
+require "base"
+require "sources"
+require "js_hint"
+require "build_distribution"
+require "build_github_pages"
+require "build_standalone_distribution"
+require "build_standalone_runner"
+require "count_specs"
+require "execute_specs"
+require "release"
+require "version"

data/lib/jasmine/tasks/jasmine_dev/base.rb

@@ -0,0 +1,54 @@
+class JasmineDev < Thor
+  include Thor::Actions
+
+  def self.source_root
+    File.dirname(__FILE__)
+  end
+
+  def self.source_paths
+    [
+      File.join(JasmineDev.project_root, 'lib', 'jasmine-core'),
+      JasmineDev.project_root
+    ]
+  end
+
+  def self.project_root
+    File.join(JasmineDev.source_root, '..', '..')
+  end
+
+  def self.spacer
+    "\n--------------------"
+  end
+
+  no_tasks do
+    # allows merged stdout in test with low-harassment
+    def run_with_output(*run_args)
+      say run *run_args
+    end
+
+    def node_installed?
+      return true if has_node?
+
+      say "Node.js is required to develop Jasmine. Please visit http://nodejs.org to install.",
+          :red
+      false
+    end
+
+    def has_node?
+      run "which node", :verbose => false, :capture => true
+      $?.exitstatus == 0
+    end
+
+    def pages_submodule_installed?
+      return true if has_pages_submodule?
+
+      say "Submodule for Github Pages isn't present. Run git submodule update --init",
+          :red
+      false
+    end
+
+    def has_pages_submodule?
+      File.exist?(File.join(JasmineDev.project_root, 'pages', 'index.html'))
+    end
+  end
+end

data/lib/jasmine/tasks/jasmine_dev/build_distribution.rb

@@ -0,0 +1,53 @@
+class JasmineDev < Thor
+
+  desc "build_distribution", "Build Jasmine js & css files"
+  def build_distribution(directory = "./lib/jasmine-core")
+    invoke :js_hint
+
+    say JasmineDev.spacer
+
+    say "Building Jasmine distribution from source into #{directory}", :cyan
+
+    say 'Building JavaScript...', :yellow
+
+    inside directory do
+      create_file "jasmine.js",
+                  concat_contents_of(jasmine_js_paths),
+                  :force => true
+      create_file "jasmine-html.js",
+                  concat_contents_of(jasmine_html_js_paths),
+                  :force => true
+    end
+
+    say 'Building CSS...', :yellow
+
+    run "compass compile", :capture => true
+
+    copy_file File.join("#{JasmineDev.project_root}", 'src', 'html', 'jasmine.css'),
+              File.join(directory, 'jasmine.css')
+  end
+
+  no_tasks do
+    def jasmine_js_paths
+      paths = JasmineDev::JASMINE_SOURCES[:core].collect do |f|
+        File.join(JasmineDev.project_root, 'src', 'core', f)
+      end
+
+      paths << File.join(JasmineDev.project_root, 'src', 'version.js')
+      paths
+    end
+
+    def jasmine_html_js_paths
+      JasmineDev::JASMINE_SOURCES[:html].collect do |f|
+        File.join(JasmineDev.project_root, 'src', 'html', f)
+      end
+    end
+
+    def concat_contents_of(paths)
+      paths.inject("") do |string, path|
+        string << File.read(path)
+        string
+      end
+    end
+  end
+end

data/lib/jasmine/tasks/jasmine_dev/build_github_pages.rb

@@ -0,0 +1,31 @@
+class JasmineDev < Thor
+
+  desc "build_github_pages", "Build static pages for pivotal.github.com/jasmine"
+  def build_github_pages(pages_dir = File.expand_path(File.join('.', 'pages')))
+    say JasmineDev.spacer
+
+    say "Building Github Pages...", :cyan
+
+    return unless pages_submodule_installed?
+
+    pages_output = File.join(pages_dir, 'pages_output')
+    FileUtils.rm_r(pages_output) if File.exist?(pages_output)
+
+    inside File.join('pages', 'pages_source') do
+      run_with_output "frank export #{pages_output}", :capture => true
+    end
+
+    pages_files = Dir.chdir(pages_output) { Dir.glob('*') }
+
+    pages_files.each do |file|
+      source_path = File.join(pages_output, file)
+      destination_path = File.join(pages_dir, file)
+
+      if File.directory?(source_path)
+        directory source_path, destination_path
+      else
+        copy_file source_path, destination_path
+      end
+    end
+  end
+end

data/lib/jasmine/tasks/jasmine_dev/build_standalone_distribution.rb

@@ -0,0 +1,49 @@
+class JasmineDev < Thor
+  include Thor::Actions
+
+  desc "build_standalone_distribution", "Build Jasmine standalone distribution"
+  def build_standalone_distribution(download_dir = File.expand_path(File.join('.', 'pages', 'downloads')))
+    invoke :build_distribution
+
+    say JasmineDev.spacer
+
+    say "Building standalone distribution...", :cyan
+
+    say "Staging files...", :yellow
+
+    lib_files.each do |f|
+      copy_file f, File.join(standalone_temp_dir, 'lib', "jasmine-#{version_string}", f)
+    end
+
+    ['src', 'spec'].each do |dir|
+      directory File.join('lib', 'jasmine-core', 'example', dir),
+                File.join(standalone_temp_dir, dir)
+    end
+
+    invoke :build_standalone_runner
+
+    say "Zipping distribution...", :yellow
+
+    inside standalone_temp_dir do
+      run_with_output "zip -rq ../jasmine-standalone-#{version_string}.zip ."
+
+      say "Copying Zip file to downloads directory", :yellow
+      run "cp ../jasmine-standalone-#{version_string}.zip #{download_dir}"
+    end
+
+  end
+
+  no_tasks do
+    def standalone_temp_dir
+      @standalone_temp_dir ||= File.join(Dir.tmpdir, 'jasmine_standalone', "jasmine-standalone-#{version_string}")
+    end
+
+    def lib_files
+      %w{ jasmine.js jasmine-html.js jasmine.css MIT.LICENSE }
+    end
+
+    def example_path
+      File.join('lib', "jasmine-#{version_string}")
+    end
+  end
+end