newjs 1.0.0 → 1.0.1

data/History.txt

@@ -1,4 +1,11 @@
-== 0.0.1 2008-02-14
+== 1.0.1 2008-02-15
+
+* 1 major bugfix:
+  * install_website: 
+    * website_upload now works
+    * uses config/website.yml
+
+== 1.0.0 2008-02-14
 
 * 1 major enhancement:
   * Initial release

data/Manifest.txt

@@ -37,6 +37,7 @@ lib/newjs/version.rb
 log/debug.log
 newjs_generators/install_website/USAGE
 newjs_generators/install_website/install_website_generator.rb
+newjs_generators/install_website/templates/config/website.yml.sample.erb
 newjs_generators/install_website/templates/script/txt2html
 newjs_generators/install_website/templates/script/win_script.cmd
 newjs_generators/install_website/templates/tasks/website.rake

data/app_generators/newjs/templates/Rakefile.erb

@@ -18,6 +18,9 @@ APP_DIST_DIR = File.join(APP_ROOT, 'dist')
 APP_PKG_DIR  = File.join(APP_ROOT, 'pkg')
 APP_VERSION  = '<%= version_str %>'
 
+
+unless ENV['rakefile_just_config']
+
 task :default => [:dist, :package, :clean_package_source]
 
 desc "Builds the distribution"
@@ -80,3 +83,5 @@ task :clean_package_source do
 end
 
 Dir['tasks/**/*.rake'].each { |rake| load rake }
+
+end

data/lib/newjs/version.rb

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

data/newjs_generators/install_website/install_website_generator.rb

@@ -11,6 +11,7 @@ class InstallWebsiteGenerator < RubiGen::Base
   
   attr_reader :name, :module_name
   attr_reader :author, :email
+  attr_reader :username, :rubyforge_path
   
   def initialize(runtime_args, runtime_options = {})
     super
@@ -29,11 +30,15 @@ class InstallWebsiteGenerator < RubiGen::Base
       # Ensure appropriate folder(s) exists
       m.directory 'website/javascripts'
       m.directory 'website/stylesheets'
+      m.directory 'config'
       m.directory 'script'
       m.directory 'tasks'
 
       # Website
       m.template_copy_each %w( index.txt index.html ), "website"
+      m.template "config/website.yml.sample.erb", "config/website.yml.sample"
+      
+      m.file_copy_each %w( website.rake ), "tasks"
       
       %w( txt2html ).each do |file|
         m.template "script/#{file}",        "script/#{file}", script_options
@@ -41,7 +46,6 @@ class InstallWebsiteGenerator < RubiGen::Base
           :assigns => { :filename => file } if windows
       end
       
-      m.file_copy_each %w[ website.rake ], "tasks"
       
       m.dependency "plain_theme", [], :destination => destination_root
     end
@@ -63,10 +67,15 @@ EOS
       # at the top of the file next to "default_options"
       opts.on("-a", "--author=\"Your Name\"", String,
               "You. The author of this RubyGem. You name goes in in the website.",
-              "Default: 'TODO'") { |options[:author]| }
+              "Default: 'TODO'") { |x| options[:author] = x }
       opts.on("-e", "--email=your@email.com", String,
               "Your email for people to contact you.",
-              "Default: nil") { |options[:author]| }
+              "Default: nil") { |x| options[:email] = x}
+      opts.on("-u", "--username=rubyforge_username", String,
+              "RubyForge username (if required)",
+              "Default: nil") { |x| options[:username] = x }
+      opts.on("--rubyforge_path=project_name", String,
+              "Default: nil") { |x| options[:rubyforge_path] = x }
     end
     
     def extract_options
@@ -75,5 +84,7 @@ EOS
       # raw instance variable value.
       @author = options[:author]
       @email  = options[:email]
+      @username = options[:username] || "your_username"
+      @rubyforge_path   = options[:rubyforge_path] || name
     end
 end

data/newjs_generators/install_website/templates/config/website.yml.sample.erb

@@ -0,0 +1,2 @@
+host: <%= username %>@rubyforge.org
+remote_dir: /var/www/gforge-projects/<%= rubyforge_path %>

data/newjs_generators/install_website/templates/script/txt2html

@@ -11,6 +11,7 @@ end
 require 'redcloth'
 require 'syntax/convertors/html'
 require 'erb'
+ENV['rakefile_just_config'] = "true"
 load File.dirname(__FILE__) + '/../Rakefile'
 
 version  = APP_VERSION

data/newjs_generators/install_website/templates/tasks/website.rake

@@ -1,3 +1,21 @@
+require 'yaml'
+
+def website_config
+  unless @website_config
+    begin
+      @website_config = YAML.load(File.read(File.expand_path(File.dirname(__FILE__) + "/../config/website.yml")))
+    rescue
+      puts <<-EOS
+To upload your website to a host, you need to configure
+config/website.yml. See config/website.yml.sample for 
+an example.
+EOS
+      exit
+    end
+  end
+  @website_config
+end
+
 desc 'Generate website files'
 task :website_generate => :ruby_env do
   (Dir['website/**/*.txt'] - Dir['website/version*.txt']).each do |txt|
@@ -7,9 +25,9 @@ end
 
 desc 'Upload website files to rubyforge'
 task :website_upload do
-  host = "#{rubyforge_username}@rubyforge.org"
-  remote_dir = "/var/www/gforge-projects/#{PATH}/"
-  local_dir = 'website'
+  host        = website_config["host"] # "#{rubyforge_username}@rubyforge.org"
+  remote_dir  = website_config["remote_dir"] # "/var/www/gforge-projects/#{PATH}/"
+  local_dir   = 'website'
   sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
 end
 

data/test/test_install_website_generator.rb

@@ -20,6 +20,7 @@ class TestInstallWebsiteGenerator < Test::Unit::TestCase
     end
     assert_generated_file("script/txt2html")
     assert_generated_file("tasks/website.rake")
+    assert_generated_file("config/website.yml.sample")
   end
   
   private

data/website/index.html

@@ -33,7 +33,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.0.0</a>
+      <a href="http://rubyforge.org/projects/newjs" class="numbers">1.0.1</a>
     </div>
     <h1>&#x2192; &#8216;newjs&#8217;</h1>
 
@@ -220,7 +220,14 @@ The project&#8217;s version number is automatically inserted into the page
 (change version numbers via <code>APP_VERSION</code> in <code>Rakefile</code>).</p>
 
 
-	<p>To upload the website (and its <span class="caps">CSS</span>)</p>
+	<p>To upload the website (and its <span class="caps">CSS</span> etc) run:</p>
+
+
+<pre>rake website</pre>
+
+	<p>The default <code>tasks/website.rake</code> file pushes the files
+to a <a href="http://rubyforge.org">rubyforge.org</a> project account. Modify it
+to rsync files elsewhere.</p>
 
 
 	<h2>Screencast coming soon</h2>

data/website/index.txt

@@ -150,7 +150,13 @@ And open <code>website/index.html</code> in your browser to preview.
 The project's version number is automatically inserted into the page
 (change version numbers via <code>APP_VERSION</code> in <code>Rakefile</code>).
 
-To upload the website (and its CSS)
+To upload the website (and its CSS etc) run:
+
+<pre>rake website</pre>
+
+The default <code>tasks/website.rake</code> file pushes the files
+to a "rubyforge.org":http://rubyforge.org project account. Modify it
+to rsync files elsewhere.
 
 h2. Screencast coming soon
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newjs
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -103,6 +103,7 @@ files:
 - log/debug.log
 - newjs_generators/install_website/USAGE
 - newjs_generators/install_website/install_website_generator.rb
+- newjs_generators/install_website/templates/config/website.yml.sample.erb
 - newjs_generators/install_website/templates/script/txt2html
 - newjs_generators/install_website/templates/script/win_script.cmd
 - newjs_generators/install_website/templates/tasks/website.rake