newjs 1.3.0 → 1.3.1

data/History.txt

@@ -1,3 +1,7 @@
+== 1.3.1 2008-02-18
+
+* rails/javascript_test: unpacks rstakeout/js_autotest too
+
 == 1.3.0 2008-02-18
 
 * rails: javascript_test generator - creates HTML test, plus installs assets + rake tasks

data/Manifest.txt

@@ -14,6 +14,7 @@ app_generators/newjs/templates/lib/jstest.rb
 app_generators/newjs/templates/lib/protodoc.rb
 app_generators/newjs/templates/script/js_autotest
 app_generators/newjs/templates/script/rstakeout
+app_generators/newjs/templates/script/win_script.cmd
 app_generators/newjs/templates/src/HEADER.erb
 app_generators/newjs/templates/src/library.js.erb
 app_generators/newjs/templates/tasks/deploy.rake
@@ -58,9 +59,17 @@ rails_generators/javascript_test/USAGE
 rails_generators/javascript_test/javascript_test_generator.rb
 rails_generators/javascript_test/templates/assets/jsunittest.js
 rails_generators/javascript_test/templates/assets/unittest.css
+rails_generators/javascript_test/templates/config/javascript_test_autotest.yml.sample
 rails_generators/javascript_test/templates/plugins/javascript_unittest/README
+rails_generators/javascript_test/templates/plugins/javascript_unittest/lib/autotest/javascript_test_autotest.rb
+rails_generators/javascript_test/templates/plugins/javascript_unittest/lib/autotest/javascript_test_autotest/config.rb
+rails_generators/javascript_test/templates/plugins/javascript_unittest/lib/autotest/javascript_test_ext.rb
 rails_generators/javascript_test/templates/plugins/javascript_unittest/lib/jstest.rb
+rails_generators/javascript_test/templates/plugins/javascript_unittest/tasks/autotest.rake
 rails_generators/javascript_test/templates/plugins/javascript_unittest/tasks/runner.rake
+rails_generators/javascript_test/templates/script/js_autotest
+rails_generators/javascript_test/templates/script/rstakeout
+rails_generators/javascript_test/templates/script/win_script.cmd
 rails_generators/javascript_test/templates/test.html.erb
 script/destroy
 script/generate

data/app_generators/newjs/newjs_generator.rb

@@ -33,9 +33,6 @@ class NewjsGenerator < RubiGen::Base
       m.directory ''
       BASEDIRS.each { |path| m.directory path }
 
-      # Create stubs
-      # m.template "template.rb",  "some_file_after_erb.rb"
-      # m.file     "file",         "some_file_copied"
       m.file_copy_each %w[unittest.css jsunittest.js], "test/assets"
       m.file_copy_each %w[javascript_test_autotest_tasks.rake environment.rake deploy.rake], "tasks"
       m.file_copy_each %w[javascript_test_autotest.yml.sample], "config"

data/app_generators/newjs/templates/script/win_script.cmd

@@ -0,0 +1 @@
+@ruby <%= File.join("script", filename) %> %*

data/app_generators/newjs/templates/tasks/javascript_test_autotest_tasks.rake

@@ -24,9 +24,10 @@ namespace :test do
         end
         file = "#{APP_ROOT}/#{file}"
         unless File.exists?(file)
-          puts "Notice: Test file does not exist: #{file}"
+          # puts "Notice: Test file does not exist: #{file}"
           next
         end
+        puts "Launching test: #{file}"
         browsers = JavascriptTestAutotest::Config.get :browsers
         if browsers.blank?
           puts "WARNING: No browsers setup in config/javascript_test_autotest.yml"

data/lib/newjs/version.rb

@@ -2,7 +2,7 @@ module Newjs #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 3
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rails_generators/javascript_test/javascript_test_generator.rb

@@ -1,4 +1,6 @@
 class JavascriptTestGenerator < Rails::Generator::Base
+  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
+                              Config::CONFIG['ruby_install_name'])
   
   default_options :author => nil
   
@@ -13,8 +15,13 @@ class JavascriptTestGenerator < Rails::Generator::Base
   end
 
   def manifest
+    script_options = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
+    windows        = (RUBY_PLATFORM =~ /dos|win32|cygwin/i) || (RUBY_PLATFORM =~ /(:?mswin|mingw)/)
+
     record do |m|
       # Ensure appropriate folder(s) exists
+      m.directory 'config'
+      m.directory 'script'
       m.directory 'test/javascript/assets'
       m.directory 'vendor/plugins/javascript_unittest/lib'
       m.directory 'vendor/plugins/javascript_unittest/tasks'
@@ -22,13 +29,25 @@ class JavascriptTestGenerator < Rails::Generator::Base
       # Create stubs
       m.file     "assets/jsunittest.js", "test/javascript/assets/jsunittest.js"
       m.file     "assets/unittest.css",  "test/javascript/assets/unittest.css"
+      
+      m.file     "config/javascript_test_autotest.yml.sample",
+                  "config/javascript_test_autotest.yml.sample"
+
       m.file     "plugins/javascript_unittest/lib/jstest.rb",
                   "vendor/plugins/javascript_unittest/lib/jstest.rb"
       m.file     "plugins/javascript_unittest/tasks/runner.rake", 
                   "vendor/plugins/javascript_unittest/tasks/runner.rake"
+      m.file     "plugins/javascript_unittest/tasks/autotest.rake", 
+                  "vendor/plugins/javascript_unittest/tasks/autotest.rake"
       m.file     "plugins/javascript_unittest/README", 
                   "vendor/plugins/javascript_unittest/README"
       m.template "test.html.erb",  "test/javascript/#{name}_test.html"
+
+      %w[rstakeout js_autotest].each do |file|
+        m.template "script/#{file}",        "script/#{file}", script_options
+        m.template "script/win_script.cmd", "script/#{file}.cmd", 
+          :assigns => { :filename => file } if windows
+      end
     end
   end
 

data/rails_generators/javascript_test/templates/config/javascript_test_autotest.yml.sample

@@ -0,0 +1,15 @@
+# This file has been copied here by the javascript_test_autotest plugin.
+# Comment/uncomment the browsers you wish to autotest with.
+# Same schema as per selenium-on-rails plugin, which is nice.
+browsers:
+  # Windows
+  # firefox: 'c:\Program Files\Mozilla Firefox\firefox.exe'
+  # ie: 'c:\Program Files\Internet Explorer\iexplore.exe'
+
+  # Mac OS X
+  # firefox: '/Applications/Firefox.app/Contents/MacOS/firefox-bin'
+  safari: '/Applications/Safari.app/Contents/MacOS/Safari'
+
+  # Unix
+  # ?
+  # ?

data/rails_generators/javascript_test/templates/plugins/javascript_unittest/lib/autotest/javascript_test_autotest.rb

@@ -0,0 +1,22 @@
+module JavascriptTestAutotest
+  class Browser
+    class << self
+      def browser(browser, path)
+        case(browser.to_sym)
+          when :firefox
+            JavaScriptTest::FirefoxBrowser.new(path)
+          when :safari
+            JavaScriptTest::SafariBrowser.new(path)
+          when :ie
+            JavaScriptTest::IEBrowser.new(path)
+          when :konqueror
+            JavaScriptTest::KonquerorBrowser.new(path)
+          else
+            browser
+        end
+      end
+    end
+  end
+end
+
+require "javascript_test_autotest/config"

data/rails_generators/javascript_test/templates/plugins/javascript_unittest/lib/autotest/javascript_test_autotest/config.rb

@@ -0,0 +1,20 @@
+require 'yaml'
+
+class JavascriptTestAutotest::Config
+  def self.get var, default = nil
+    value = configs[var.to_s]
+    value ||= default
+    value ||= yield if block_given?
+    value
+  end
+
+  private
+    def self.configs
+      unless defined? @@configs
+        file = File.expand_path("#{RAILS_ROOT}/config/javascript_test_autotest.yml")
+        @@configs = File.exist?(file) ? YAML.load_file(file) : {}
+      end
+      @@configs
+    end
+
+end

data/rails_generators/javascript_test/templates/plugins/javascript_unittest/lib/autotest/javascript_test_ext.rb

@@ -0,0 +1,16 @@
+class JavaScriptTest::Browser
+  def initialize(path)
+    @path = path
+  end
+end
+
+if JavaScriptTest::Browser.new('').macos?
+  class JavaScriptTest::SafariBrowser
+    def setup; end # no need to create new Browser, as open command automates this
+    def visit(file)
+      @path ||= 'Safari.app'
+      `open #{file} -a #{@path} -g`
+    end
+    def setup; end # no need to destroy Browser
+  end
+end

data/rails_generators/javascript_test/templates/plugins/javascript_unittest/tasks/autotest.rake

@@ -0,0 +1,40 @@
+namespace :test do
+  namespace :recent do
+    desc "Open recently modified files into browser"
+    task :javascript => :environment do
+      APP_ROOT = RAILS_ROOT unless Object.const_defined?("APP_ROOT")
+      since = TEST_CHANGES_SINCE
+      touched = FileList[
+        'test/javascript/*_test.html', 
+        'public/javascripts/*.js'].select { |path| File.mtime(path) > since }
+      next if touched.blank?
+      
+      gem 'newjs'
+      require 'newjs'
+      require 'newjs/autotest'
+      
+      touched.each do |file|
+        if file =~ /\/([^\/]+)\.js$/
+          file = "test/unit/#{$1}_test.html"
+        end
+        file = "#{RAILS_ROOT}/#{file}"
+        unless File.exists?(file)
+          # puts "Notice: Test file does not exist: #{file}"
+          next
+        end
+        puts "Launching test: #{file}"
+        browsers = JavascriptTestAutotest::Config.get :browsers
+        if browsers.blank?
+          puts "WARNING: No browsers setup in config/javascript_test_autotest.yml"
+          next
+        end
+        browsers.each_pair do |name, path|
+          browser = JavascriptTestAutotest::Browser.browser(name, path)
+          browser.setup
+          browser.visit(file)
+          browser.teardown          
+        end
+      end
+    end
+  end
+end

data/rails_generators/javascript_test/templates/script/js_autotest

@@ -0,0 +1 @@
+script/rstakeout "rake test:recent:javascript" test/javascript/*_test.html public/javascripts/*.js

data/rails_generators/javascript_test/templates/script/rstakeout

@@ -0,0 +1,98 @@
+#!/usr/local/bin/ruby -w
+
+
+config = File.dirname(__FILE__) + "/../config/javascript_test_autotest.yml"
+unless File.exists?(config)
+  puts <<-EOS
+Edit config/javascript_test_autotest.yml for the browser(s) to use for autotesting.
+See config/javascript_test_autotest.yml.sample for examples.
+EOS
+  exit
+end
+
+##
+# Originally by Mike Clark.
+#
+# From http://www.pragmaticautomation.com/cgi-bin/pragauto.cgi/Monitor/StakingOutFileChanges.rdoc
+#
+# Runs a user-defined command when files are modified.
+#
+# Like autotest, but more customizable. This is useful when you want to do
+# something other than run tests. For example, generate a PDF book, run
+# a single test, or run a legacy Test::Unit suite in an app that also
+# has an rSpec suite.
+#
+# Can use Ruby's Dir[] to get file glob. Quote your args to take advantage of this.
+#
+#  rstakeout 'rake test:recent' **/*.rb
+#  => Only watches Ruby files one directory down (no quotes)
+#
+#  rstakeout 'rake test:recent' '**/*.rb'
+#  => Watches all Ruby files in all directories and subdirectories
+#
+# Modified (with permission) by Geoffrey Grosenbach to call growlnotify for
+# rspec and Test::Unit output.
+#
+# See the PeepCode screencast on rSpec or other blog articles for instructions on
+# setting up growlnotify.
+
+def growl(title, msg, img, pri=0, sticky="")
+  system "growlnotify -n autotest --image ~/.autotest_images/#{img} -p #{pri} -m #{msg.inspect} #{title} #{sticky}"
+end
+
+def self.growl_fail(output)
+  growl "FAIL", "#{output}", "fail.png", 2
+end
+
+def self.growl_pass(output)
+  growl "Pass", "#{output}", "pass.png"
+end
+
+command = ARGV.shift
+files = {}
+
+ARGV.each do |arg|
+  Dir[arg].each { |file|
+    files[file] = File.mtime(file)
+  }
+end
+
+puts "Watching #{files.keys.join(', ')}\n\nFiles: #{files.keys.length}"
+
+trap('INT') do
+  puts "\nQuitting..."
+  exit
+end
+
+
+loop do
+
+  sleep 1
+
+  changed_file, last_changed = files.find { |file, last_changed|
+    File.mtime(file) > last_changed
+  }
+
+  if changed_file
+    files[changed_file] = File.mtime(changed_file)
+    puts "=> #{changed_file} changed, running #{command}"
+    results = `#{command}`
+    puts results
+
+    if results.include? 'tests'
+      output = results.slice(/(\d+)\s+tests?,\s*(\d+)\s+assertions?,\s*(\d+)\s+failures?(,\s*(\d+)\s+errors)?/)
+      if output
+        $~[3].to_i + $~[5].to_i > 0 ? growl_fail(output) : growl_pass(output)
+      end
+    else
+      output = results.slice(/(\d+)\s+examples?,\s*(\d+)\s+failures?(,\s*(\d+)\s+not implemented)?/)
+      if output
+        $~[2].to_i > 0 ? growl_fail(output) : growl_pass(output)
+      end
+    end
+    # TODO Generic growl notification for other actions
+
+    puts "=> done"
+  end
+
+end

data/rails_generators/javascript_test/templates/script/win_script.cmd

@@ -0,0 +1 @@
+@ruby <%= File.join("script", filename) %> %*

data/test/test_javascript_test_generator.rb

@@ -37,14 +37,19 @@ class TestJavascriptTestGenerator < Test::Unit::TestCase
     run_generator('javascript_test', [name], sources)
     assert_directory_exists "test/javascript/assets"
     assert_directory_exists "vendor/plugins/javascript_unittest"
+    assert_directory_exists "script"
     assert_generated_file "test/javascript/assets/jsunittest.js"
     assert_generated_file "test/javascript/assets/unittest.css"
     assert_generated_file "test/javascript/#{name}_test.html" do |body|
       expected = %Q{src="assets/jsunittest.js"}
       assert_match(expected, body)
     end
+    assert_generated_file "script/rstakeout"
+    assert_generated_file "script/js_autotest"
+    assert_generated_file "config/javascript_test_autotest.yml.sample"
     assert_generated_file "vendor/plugins/javascript_unittest/lib/jstest.rb"
     assert_generated_file "vendor/plugins/javascript_unittest/tasks/runner.rake"
+    assert_generated_file "vendor/plugins/javascript_unittest/tasks/autotest.rake"
     assert_generated_file "vendor/plugins/javascript_unittest/README"
   end
   

data/website/index.html

@@ -31,7 +31,7 @@
     <h1>JavaScript Project Generator</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/newjs"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/newjs" class="numbers">1.3.0</a>
+      <a href="http://rubyforge.org/projects/newjs" class="numbers">1.3.1</a>
     </div>
     <h1>&#x2192; &#8216;newjs&#8217;</h1>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newjs
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -79,6 +79,7 @@ files:
 - app_generators/newjs/templates/lib/protodoc.rb
 - app_generators/newjs/templates/script/js_autotest
 - app_generators/newjs/templates/script/rstakeout
+- app_generators/newjs/templates/script/win_script.cmd
 - app_generators/newjs/templates/src/HEADER.erb
 - app_generators/newjs/templates/src/library.js.erb
 - app_generators/newjs/templates/tasks/deploy.rake
@@ -123,9 +124,17 @@ files:
 - rails_generators/javascript_test/javascript_test_generator.rb
 - rails_generators/javascript_test/templates/assets/jsunittest.js
 - rails_generators/javascript_test/templates/assets/unittest.css
+- rails_generators/javascript_test/templates/config/javascript_test_autotest.yml.sample
 - rails_generators/javascript_test/templates/plugins/javascript_unittest/README
+- rails_generators/javascript_test/templates/plugins/javascript_unittest/lib/autotest/javascript_test_autotest.rb
+- rails_generators/javascript_test/templates/plugins/javascript_unittest/lib/autotest/javascript_test_autotest/config.rb
+- rails_generators/javascript_test/templates/plugins/javascript_unittest/lib/autotest/javascript_test_ext.rb
 - rails_generators/javascript_test/templates/plugins/javascript_unittest/lib/jstest.rb
+- rails_generators/javascript_test/templates/plugins/javascript_unittest/tasks/autotest.rake
 - rails_generators/javascript_test/templates/plugins/javascript_unittest/tasks/runner.rake
+- rails_generators/javascript_test/templates/script/js_autotest
+- rails_generators/javascript_test/templates/script/rstakeout
+- rails_generators/javascript_test/templates/script/win_script.cmd
 - rails_generators/javascript_test/templates/test.html.erb
 - script/destroy
 - script/generate