red 3.1.1 → 3.1.2

data/History.txt

@@ -1,3 +1,9 @@
+== 3.1.2 2008-08-06
+
+* 2 bug fixes:
+  * Added gem dependency for ParseTree.
+  * Rescued the error thrown when no argument is given for -s option flag.
+
 == 3.1.1 2008-08-06
 
 * 1 major enhancement:

data/Manifest.txt

@@ -20,6 +20,7 @@ lib/red/errors.rb
 lib/red/executable.rb
 lib/red/illegal_nodes.rb
 lib/red/literal_nodes.rb
+lib/red/messages.rb
 lib/red/variable_nodes.rb
 lib/red/version.rb
 lib/red/wrap_nodes.rb

data/bin/red

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # Red's command line transliterator executable.
 # 
-# Created on 2008-8-6.
-# Copyright (c) 2008. All rights reserved.
+# Copyright (c) 2008 Jesse Sielaff.
 
 begin
   require 'rubygems'
@@ -11,42 +10,33 @@ rescue LoadError
 end
 
 require 'red'
+require 'red/executable'
+require 'red/messages'
+require 'red/version'
 require 'optparse'
 
-include Red, Red::Executable
-
-OPTIONS = { :rails => false }
+include Red
 
 parser = OptionParser.new do |opts|
-  opts.banner = <<-BANNER
-Usage: red [filename] [options]
-
-Description:
-  Red is a Ruby-to-JavaScript transliterator.
-  
-  For more information see http://github.com/jessesielaff/red/wikis
-
-Options are:
-  BANNER
+  opts.banner = RED_MESSAGES[:banner]
   opts.separator ""
   opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
-  opts.on("-r", "--rails", "Adds Red plugin to ./vendor/plugins") { build_red_plugin_for_rails }
-  opts.on("-s", "--string=RUBY_STRING", "Translate a single string to JavaScript") { |string| direct_translate(string) }
+  opts.on("-r", "--rails", "Add Red plugin to ./vendor/plugins") { build_red_plugin_for_rails }
+  opts.on("-s", "--string=RUBY_STRING", "Translate a single string to JavaScript.") { |string| direct_translate(string) }
+  opts.on("-v", "--version", "Print version number.") { puts Red::VERSION::STRING; exit }
   begin
     opts.parse!(ARGV)
   rescue OptionParser::InvalidOption => e
-    puts "You used an #{e.message}."
-    puts "Use red -h for help."
-    exit
+    puts RED_MESSAGES[:invalid] % [e.message]; exit
+  rescue OptionParser::MissingArgument => e
+    puts RED_MESSAGES[:missing] % [e.message]; exit
   end
 end
 
-if filename = ARGV[0]
-  self.compile_red_to_js(filename)
+if ARGV.empty?
+  puts RED_MESSAGES[:usage]; exit
 else
-  puts <<-USAGE
-Usage: red [filename] [options]
-
-Use red -h for help.
-  USAGE
+  class << Red
+    self.compile_red_to_js(ARGV[0])
+  end
 end

data/config/hoe.rb

@@ -2,13 +2,13 @@ require 'red/version'
 
 AUTHOR = 'Jesse Sielaff'
 EMAIL = "jesse.sielaff@gmail.com"
-DESCRIPTION = "A Ruby-to-JavaScript transliterator using ParseTree."
+DESCRIPTION = "Red is a Ruby-to-JavaScript transliterator using ParseTree."
 GEM_NAME = 'red'
 RUBYFORGE_PROJECT = 'red-js'
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 EXTRA_DEPENDENCIES = [
-  ['parse_tree', '>= 2.2.0'],
+  ['ParseTree', '>= 2.2.0'],
   ['rake', '>= 0.8.1']
 ]
 
@@ -62,10 +62,10 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
 
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = EXTRA_DEPENDENCIES
+  p.extra_deps = EXTRA_DEPENDENCIES
 
-    #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  end
+  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
+end
 
 CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
 PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"

data/lib/red/executable.rb

@@ -1,66 +1,54 @@
-module Red
-  module Executable # :nodoc:
-    def build_red_plugin_for_rails
-      unless File.exists?('vendor/plugins')
-        puts "Directory vendor/plugins does not exist."
-        exit
-      end
-      
-      begin
-        Dir.mkdir('vendor/plugins/red') unless File.exists?('vendor/plugins/red')
-      rescue SystemCallError
-        puts "Unable to create directory in vendor/plugins"
-        exit
-      end
-      
-      File.open('vendor/plugins/red/init.rb', 'w') { |f| f.write("require 'rubygems'\nrequire 'red'\n\n# Red is not yet supported for Rails projects.\n")} #Red.for_rails(binding)\n") }
-      
-      puts "Red plugin added to project."
+module Red # :nodoc:
+  def build_red_plugin_for_rails
+    unless File.exists?('vendor/plugins')
+      puts "Directory vendor/plugins does not exist."
       exit
     end
     
-    def direct_translate(string)
-      js_output = hush_warnings { string.string_to_node }.compile_node
-      print_js(js_output, 'test')
+    begin
+      Dir.mkdir('vendor/plugins/red') unless File.exists?('vendor/plugins/red')
+    rescue SystemCallError
+      puts "Unable to create directory in vendor/plugins"
       exit
     end
     
-    def hush_warnings
-      $stderr = File.open('spew', 'w')
-      output = yield
-      $stderr = $>
-      
-      File.delete('spew')
-      
-      return output
-    end
+    File.open('vendor/plugins/red/init.rb', 'w') { |f| f.write("require 'rubygems'\nrequire 'red'\n\n# Red is not yet supported for Rails projects.\n")} #Red.for_rails(binding)\n") }
     
-    def print_js(js_output, filename) # :nodoc:
-      puts <<-OUTPUT.%([("- #{filename}.js" unless filename == 'test'), js_output, @@red_errors ||= ''])
-
-%s
-=================================
-
-%s
-
-=================================
-%s
-
-      OUTPUT
-    end
+    puts "Red plugin added to project."
+    exit
+  end
+  
+  def direct_translate(string)
+    js_output = hush_warnings { string.string_to_node }.compile_node
+    print_js(js_output, 'test')
+    exit
+  end
+  
+  def hush_warnings
+    $stderr = File.open('spew', 'w')
+    output = yield
+    $stderr = $>
+    
+    File.delete('spew')
     
-    def compile_red_to_js(filename)
-      unless File.exists?(file = "%s.red" % [filename]) || File.exists?(file = "%sred/%s.red" % [(dir = "public/javascripts/"), filename])
-        puts "File #{filename}.red does not exist."
-        exit
-      end
-      
-      source = File.read(file)
-      js_output = hush_warnings { source.string_to_node }.compile_node
-      
-      File.open("%s%s.js" % [dir, filename], 'w') {|f| f.write(js_output)} unless filename == 'test'
-      
-      print_js(js_output, filename)
+    return output
+  end
+  
+  def print_js(js_output, filename) # :nodoc:
+    puts RED_MESSAGES[:output] % [("- #{filename}.js" unless filename == 'test'), js_output, @@red_errors ||= '']
+  end
+  
+  def compile_red_to_js(filename)
+    unless File.exists?(file = "%s.red" % [filename]) || File.exists?(file = "%sred/%s.red" % [(dir = "public/javascripts/"), filename])
+      puts "File #{filename}.red does not exist."
+      exit
     end
+    
+    source = File.read(file)
+    js_output = hush_warnings { source.string_to_node }.compile_node
+    
+    File.open("%s%s.js" % [dir, filename], 'w') {|f| f.write(js_output)} unless filename == 'test'
+    
+    print_js(js_output, filename)
   end
 end

data/lib/red/messages.rb

@@ -0,0 +1,49 @@
+module Red # :nodoc:
+  RED_MESSAGES = {}
+  RED_MESSAGES[:banner] = <<-MESSAGE
+
+Description:
+  Red is a Ruby-to-JavaScript transliterator.
+  For more information see http://github.com/jessesielaff/red/wikis
+
+Usage: red [filename] [options]
+
+Options:
+  MESSAGE
+  
+  RED_MESSAGES[:invalid] = <<-MESSAGE
+
+You used an %s
+
+Use red -h for help.
+
+  MESSAGE
+  
+  RED_MESSAGES[:missing] = <<-MESSAGE
+
+You had a %s <ruby-string>
+
+Use red -h for help.
+
+  MESSAGE
+  
+  RED_MESSAGES[:usage] = <<-MESSAGE
+
+Usage: red [filename] [options]
+
+Use red -h for help.
+
+  MESSAGE
+  
+  RED_MESSAGES[:output] = <<-MESSAGE
+
+%s
+=================================
+
+%s
+
+=================================
+%s
+
+  MESSAGE
+end

data/lib/red/version.rb

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

data/lib/red.rb

@@ -11,7 +11,6 @@ require 'red/control_nodes'
 require 'red/data_nodes'
 require 'red/definition_nodes'
 require 'red/errors'
-require 'red/executable'
 require 'red/illegal_nodes'
 require 'red/literal_nodes'
 require 'red/variable_nodes'

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>foo</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/red"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/red" class="numbers">3.1.1</a>
+      <a href="http://rubyforge.org/projects/red" class="numbers">3.1.2</a>
     </div>
     <h1>&amp;#x2192; &#8216;foo&#8217;</h1>
 <h2>What</h2>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: red
 version: !ruby/object:Gem::Version 
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors: 
 - Jesse Sielaff
@@ -12,6 +12,26 @@ cert_chain: []
 date: 2008-08-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: ParseTree
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.2.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -22,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.7.0
     version: 
-description: A Ruby-to-JavaScript transliterator using ParseTree.
+description: Red is a Ruby-to-JavaScript transliterator using ParseTree.
 email: 
 - jesse.sielaff@gmail.com
 executables: 
@@ -59,6 +79,7 @@ files:
 - lib/red/executable.rb
 - lib/red/illegal_nodes.rb
 - lib/red/literal_nodes.rb
+- lib/red/messages.rb
 - lib/red/variable_nodes.rb
 - lib/red/version.rb
 - lib/red/wrap_nodes.rb
@@ -108,6 +129,6 @@ rubyforge_project: red-js
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: A Ruby-to-JavaScript transliterator using ParseTree.
+summary: Red is a Ruby-to-JavaScript transliterator using ParseTree.
 test_files: []