newjs 1.4.0 → 1.4.1

data/History.txt

@@ -1,3 +1,8 @@
+== 1.4.1 2008-06-21
+
+* rstakeout: fixed !# ruby
+* newjs: creates src/proj_name.js.erb to show its a template, not a js file
+
 == 1.4.0 2008-05-03
 
 * javascript_test: nested folders for tests; e.g. javascript_test models/game -> test/javascript/models/game_test.html

data/app_generators/newjs/newjs_generator.rb

@@ -1,18 +1,18 @@
 class NewjsGenerator < RubiGen::Base
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
-  
+
   default_options :shebang => DEFAULT_SHEBANG,
                   :author => nil,
                   :email       => nil,
                   :version     => '0.0.1'
-  
-  
+
+
   attr_reader :name, :module_name
   attr_reader :version, :version_str, :author, :email
   attr_reader :title, :url
-  
-  
+
+
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
@@ -27,7 +27,7 @@ class NewjsGenerator < RubiGen::Base
   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 ''
@@ -39,16 +39,16 @@ class NewjsGenerator < RubiGen::Base
       m.file_copy_each %w[protodoc.rb jstest.rb], "lib"
       m.template_copy_each %w[Rakefile.erb README.txt.erb History.txt.erb License.txt.erb]
       m.template_copy_each %w[HEADER.erb], "src"
-      m.template "src/library.js.erb", "src/#{name}.js"
-      
+      m.template "src/library.js.erb", "src/#{name}.js.erb"
+
       %w[rstakeout js_autotest].each do |file|
         m.template "script/#{file}",        "script/#{file}", script_options
-        m.template "script/win_script.cmd", "script/#{file}.cmd", 
+        m.template "script/win_script.cmd", "script/#{file}.cmd",
           :assigns => { :filename => file } if windows
       end
-      
-      m.dependency "install_rubigen_scripts", 
-        [destination_root, 'javascript', 'javascript_test', 'newjs', 'newjs_theme'], 
+
+      m.dependency "install_rubigen_scripts",
+        [destination_root, 'javascript', 'javascript_test', 'newjs', 'newjs_theme'],
         :shebang => options[:shebang], :collision => :force
     end
   end
@@ -82,7 +82,7 @@ EOS
               "Initial version of the project you are creating.",
               "Default: 0.0.1") { |x| options[:version] = x }
     end
-    
+
     def extract_options
       @version           = options[:version].to_s.split(/\./)
       @version_str       = @version.join('.')

data/app_generators/newjs/templates/Rakefile.erb

@@ -15,6 +15,7 @@ $:.unshift File.dirname(__FILE__) + "/lib"
 APP_VERSION  = '<%= version_str %>'
 APP_NAME     = '<%= name %>'
 RUBYFORGE_PROJECT = APP_NAME
+APP_TEMPLATE = "#{APP_NAME}.js.erb"
 APP_FILE_NAME= "#{APP_NAME}.js"
 
 APP_ROOT     = File.expand_path(File.dirname(__FILE__))
@@ -36,7 +37,7 @@ task :dist do
 
   Dir.chdir(APP_SRC_DIR) do
     File.open(File.join(APP_DIST_DIR, APP_FILE_NAME), 'w+') do |dist|
-      dist << Protodoc::Preprocessor.new(APP_FILE_NAME)
+      dist << Protodoc::Preprocessor.new(APP_TEMPLATE)
     end
   end
   Dir.chdir(APP_DIST_DIR) do

data/app_generators/newjs/templates/script/rstakeout

@@ -1,5 +1,4 @@
-#!/usr/local/bin/ruby -w
-
+#!/usr/bin/env ruby
 
 config = File.dirname(__FILE__) + "/../config/javascript_test_autotest.yml"
 unless File.exists?(config)

data/lib/newjs/version.rb

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

data/rails_generators/javascript_test/templates/script/rstakeout

@@ -1,5 +1,4 @@
-#!/usr/local/bin/ruby -w
-
+#!/usr/bin/env ruby
 
 config = File.dirname(__FILE__) + "/../config/javascript_test_autotest.yml"
 unless File.exists?(config)

data/test/test_newjs_generator.rb

@@ -6,11 +6,11 @@ class TestNewjsGenerator < Test::Unit::TestCase
   def setup
     bare_setup
   end
-  
+
   def teardown
     bare_teardown
   end
-  
+
   # Some generator-related assertions:
   #   assert_generated_file(name, &block) # block passed the file contents
   #   assert_directory_exists(name)
@@ -24,7 +24,7 @@ class TestNewjsGenerator < Test::Unit::TestCase
   #   app_root_files - put this in teardown to show files generated by the test method (e.g. p app_root_files)
   #   bare_setup - place this in setup method to create the APP_ROOT folder for each test
   #   bare_teardown - place this in teardown method to destroy the TMP_ROOT or APP_ROOT folder after each test
-  
+
   def test_generator_without_options
     run_generator('newjs', [APP_ROOT], sources)
     assert_directory_exists "lib"
@@ -45,18 +45,18 @@ class TestNewjsGenerator < Test::Unit::TestCase
     assert_generated_file   "tasks/environment.rake"
     assert_generated_file   "tasks/deploy.rake"
     assert_generated_file   "config/javascript_test_autotest.yml.sample"
-    assert_generated_file   "src/myproject.js"
+    assert_generated_file   "src/myproject.js.erb"
     assert_generated_file   "src/HEADER"
     assert_generated_file   "lib/protodoc.rb"
     assert_generated_file   "lib/jstest.rb"
   end
-  
+
   private
   def sources
     [RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", generator_path))
     ]
   end
-  
+
   def generator_path
     "app_generators"
   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.4.0</a>
+      <a href="http://rubyforge.org/projects/newjs" class="numbers">1.4.1</a>
     </div>
     <h1>&#x2192; &#8216;newjs&#8217;</h1>
 
@@ -144,7 +144,7 @@ test file(s). By default you&#8217;d call it <code>test/some_lib_test.html</code
 	<h3>Generating test <span class="caps">HTML</span> files</h3>
 
 
-	<p>And then what? Personally, I can never remember what basic <span class="caps">HTML</span> + JavaScript
+	<p>And then what? Personally, I can never remember what basic <span class="caps">HTML </span>+ JavaScript
 goes in the test <span class="caps">HTML</span> files. I quite like the <a href="http://drnicwilliams.com/2008/01/04/autotesting-javascript-in-rails/">javascript_test plugin</a> for <a href="http://www.rubyonrails.org/">Ruby 
 on Rails</a>, which allows you to generate a
 test <span class="caps">HTML</span> stub. So I&#8217;ve included a version of it
@@ -415,7 +415,7 @@ and you&#8217;ll love every minute of it.</p>
 
 	<p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a> via the <a href="http://groups.google.com/group/javascript-project-generator">forum</a></p>
     <p class="coda">
-      <a href="drnicwilliams@gmail.com">Dr Nic Williams</a>, 17th February 2008<br>
+      <a href="drnicwilliams@gmail.com">Dr Nic Williams</a>, 21st June 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newjs
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-03 00:00:00 +10:00
+date: 2008-07-08 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: syntax
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubigen
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -48,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
 description: = New JavaScript Generator - newjs  * http://newjs.rubyforge.org  == Description
 email: 
 - drnicwilliams@gmail.com
@@ -182,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: newjs
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: = New JavaScript Generator - newjs