diff --git a/src/SourcesList.json b/src/SourcesList.json deleted file mode 100644 index c00f84da..00000000 --- a/src/SourcesList.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - "base.js", - "util.js", - "Env.js", - "Reporter.js", - "Block.js" -] \ No newline at end of file diff --git a/src/core/base.js b/src/core/base.js old mode 100755 new mode 100644 diff --git a/src/core/mock-timeout.js b/src/core/mock-timeout.js old mode 100755 new mode 100644 diff --git a/src/version.js b/src/version.js index d0a28fea..f689fbe0 100644 --- a/src/version.js +++ b/src/version.js @@ -2,5 +2,5 @@ jasmine.version_= { "major": 1, "minor": 1, "build": 0, - "revision": 1333301588 + "revision": 1333304168 }; diff --git a/tasks/jasmine_dev.rb b/tasks/jasmine_dev.rb index af4a7154..8bcb886f 100644 --- a/tasks/jasmine_dev.rb +++ b/tasks/jasmine_dev.rb @@ -7,6 +7,7 @@ require 'ostruct' $:.unshift(File.join(File.dirname(__FILE__), "jasmine_dev")) require "base" +require "sources" require "js_hint" require "build_distribution" require "build_github_pages" diff --git a/tasks/jasmine_dev/build_distribution.rb b/tasks/jasmine_dev/build_distribution.rb index 6986e937..0ee98498 100644 --- a/tasks/jasmine_dev/build_distribution.rb +++ b/tasks/jasmine_dev/build_distribution.rb @@ -29,30 +29,17 @@ class JasmineDev < Thor no_tasks do def jasmine_js_paths - sources_list = File.read(File.join(JasmineDev.project_root, 'src', 'SourcesList.json')) - first_paths = JSON.parse(sources_list).collect do |f| + paths = JasmineDev::JASMINE_SOURCES[:core].collect do |f| File.join(JasmineDev.project_root, 'src', 'core', f) end - remaining_paths = Dir.glob(File.join(JasmineDev.project_root, 'src', 'core', '*.js')) - remaining_paths << File.join(JasmineDev.project_root, 'src', 'version.js') - - add_only_new_elements(first_paths, remaining_paths) + paths << File.join(JasmineDev.project_root, 'src', 'version.js') + paths end def jasmine_html_js_paths - first_paths = [] - first_paths << File.join(JasmineDev.project_root, 'src', 'html', 'HtmlReporterHelpers.js') - first_paths += Dir.glob(File.join('.', 'src', 'html', '*.js')) - - remaining_paths = Dir.glob(File.join(JasmineDev.project_root, 'src', 'html', '*.js')) - add_only_new_elements(first_paths, remaining_paths) - end - - def add_only_new_elements(first, remaining) - remaining.inject(first) do |result, element| - result << element unless result.include?(element) - result + JasmineDev::JASMINE_SOURCES[:html].collect do |f| + File.join(JasmineDev.project_root, 'src', 'html', f) end end diff --git a/tasks/jasmine_dev/sources.rb b/tasks/jasmine_dev/sources.rb new file mode 100644 index 00000000..a9f5abaa --- /dev/null +++ b/tasks/jasmine_dev/sources.rb @@ -0,0 +1,32 @@ +class JasmineDev < Thor + JASMINE_SOURCES = { + :core => [ + "base.js", + "util.js", + "Env.js", + "Reporter.js", + "Block.js", + "JsApiReporter.js", + "Matchers.js", + "mock-timeout.js", + "MultiReporter.js", + "NestedResults.js", + "PrettyPrinter.js", + "Queue.js", + "Runner.js", + "Spec.js", + "Suite.js", + "WaitsBlock.js", + "WaitsForBlock.js" + ], + + :html => [ + "HtmlReporterHelpers.js", + "HtmlReporter.js", + "ReporterView.js", + "SpecView.js", + "SuiteView.js", + "TrivialReporter.js" + ] + } +end