jsc 0.2.1 → 0.2.2

data/.bnsignore

@@ -0,0 +1,18 @@
+# The list of files that should be ignored by Mr Bones.
+# Lines that start with '#' are comments.
+#
+# A .gitignore file can be used instead by setting it as the ignore
+# file in your Rakefile:
+#
+#   Bones {
+#     ignore_file  '.gitignore'
+#   }
+#
+# For a project with a C extension, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+announcement.txt
+coverage
+doc
+pkg

data/.gitignore

@@ -1,7 +1,27 @@
-syntax: glob
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
 *~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
 pkg/
-*#
-.#*
 spec/wip_spec.rb
 doc/
+tmp/
+js/extra/
+jsc.gemspec

data/History.txt

@@ -1,3 +1,17 @@
+== 0.2.2 / 2010-02-27
+added support for different types of formatters with a new parser module
+added --flymake option to return a flymake compatible output
+
+== 0.2.1 / 2010-02-25
+FIX: user ActiveSupport JSON decoding (JSON.parse fail randomly)
+moved from bones to jeweler
+term/ansicolor module configured as Mixin for strings
+return error messages in red
+added support for cucumber and aruba
+now require rubygems in rakefile
+--debug option added to bin command
+LICENSE file added
+
 == 0.2.0 / 2009-12-14
 
 added -a, -v, -c options

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Davide Saurino
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,12 +1,12 @@
+== jsc
+
 jsc, JavaScript Compiler
     by Davide Saurino
     http://github.com/sub/jsc
 
-== DESCRIPTION:
-
-Simple Ruby API to Google Closure Compiler Web service.
+Ruby API to Google Closure Compiler Web service.
 
-== FEATURES:
+== Features
 
 With <b>jsc</b> you can compile your JavaScript code throught {Google Closure Compiler REST service}[http://code.google.com/closure/compiler/].
 
@@ -25,33 +25,33 @@ More in details:
 
 Check {Google API Reference}[http://code.google.com/intl/it-IT/closure/compiler/docs/api-ref.html] for more info about accepted parameters.
 
-== SYNOPSIS:
+== Synopsis
 
 Get compiled code, if no errors are found:
 
-  ruby bin/jsc js/compiled_code.js
+  jsc js/compiled_code.js
 
 Compile a file, check for errors:
 
-  ruby bin/jsc js/errors.js -e
+  jsc js/errors.js -e
 
 Compile a file, check for warnings:
 
-  ruby bin/jsc js/warnings.js -w
+  jsc js/warnings.js -w
 
 Compile a file and get compression stats:
 
-  ruby bin/jsc js/compiled_code.js -s
+  jsc js/compiled_code.js -s
 
 Compile a piece of code, check for errors:
 
-  ruby bin/jsc -e -c "function("
+  jsc -e -c "function("
 
 Compile a file and get compiled code if no errors or warnings are found:
 
-  ruby bin/jsc js/compiled_code.js -a
+  jsc js/compiled_code.js -a
 
-== EMACS SNIPPETS
+== Emacs Snippet
 
 Wants to compile your code right from Emacs?
 
@@ -65,24 +65,12 @@ Now, select the code to compile and run:
 * <em>CcJe</em> to check for errors
 * <em>CcJw</em> to check for warnings.
 
-== REQUIREMENTS:
-
-jsc requires the {bones}[http://gemcutter.org/gems/bones] gem.
-
-== INSTALL:
+== Install
 
 If you have gemcutter in your gem sources, run:
 
   [sudo] gem install jsc
 
-== LICENSE:
-
-(The MIT License)
-
-Copyright © 2009 Davide Saurino
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ‘Software’), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+== Copyright
 
-THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+Copyright (c) 2010 Davide Saurino. See LICENSE for details.

data/Rakefile

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
@@ -5,34 +6,59 @@ require 'rake/rdoctask'
 require 'lib/jsc.rb'
 #require 'lib/jsc/tasks'
 
-require 'term/ansicolor'
+## START Jeweler gem config
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "jsc"
+    gemspec.summary = "Ruby API to Google Closure Compiler Web service"
+#    gemspec.description = ""
+    gemspec.email = "davide.saurino@gmail.com"
+    gemspec.homepage = "http://github.com/sub/jsc"
+    gemspec.authors = ["Davide Saurino"]
+#   gemspec.version = JSCompiler::VERSION
 
-class Color
-  class << self
-    include Term::ANSIColor
+    gemspec.add_dependency 'term-ansicolor', '1.0.4'
   end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler not available. Install it with: gem install jeweler"
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
 end
 
-## Mr.Bones config
 begin
-  require 'bones'
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
 rescue LoadError
-  abort '### Please install the "bones" gem ###'
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
 end
 
-ensure_in_path 'lib'
-require 'jsc'
+task :test => :check_dependencies
 
-task :default => 'test:run'
-task 'gem:release' => 'test:run'
+task :default => :test
 
-Bones {
-  name  'jsc'
-  authors  'sub'
-  email  'fitzkarraldo@gmail.com'
-  url  'http://github.com/sub/jsc'
-  version  JSCompiler::VERSION
-  summary 'Simple Ruby API to Google Closure Compiler Web service'
-  readme_file 'README.rdoc'
-}
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "jsc #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
 
+## END Jeweler config

data/TODO.org

@@ -1,12 +1,6 @@
 * jsc
-** colourful output in shell!
-** come far uscire un carattere sotto la lettera dove c'è l'errore
-** ann with bones + ann on ruby-talk?
-** test jsc bin file
- (15:02:14) @jabber.org: eh appunto con cucumber
- (15:02:23) @jabber.org: guarda le features di rake-compiler
- (15:02:28) @jabber.org: sono scritte bene
- (15:02:29) @jabber.org: oppure
- (15:02:36) @jabber.org: quelle di ffi-swig-generator
-oppure con aruba http://github.com/aslakhellesoy/aruba
-** newgem http://newgem.rubyforge.org/ o jeweler http://github.com/technicalpickles/jeweler
+** implement use of optional parameters of API
+*** FUTURE
+**** OptionParser to parse command input
+http://www.ruby-doc.org/stdlib/libdoc/optparse/rdoc/classes/OptionParser.htmlb
+

data/VERSION

@@ -0,0 +1 @@
+0.2.2

data/bin/jsc

@@ -40,6 +40,12 @@ jsc [options] ... ARG
 --version, -v:
    show version
 
+--debug:
+  activate debug mode
+
+--flymake, -f:
+  call flymake formatter
+
 --help, -h:
    this help
 
@@ -61,11 +67,13 @@ opts = GetoptLong.new(
                       [ '--warns', '-w', GetoptLong::NO_ARGUMENT ],
                       [ '--stats', '-s', GetoptLong::NO_ARGUMENT ],
                       [ '--all', '-a', GetoptLong::NO_ARGUMENT ],
-                      [ '--level','-l',  GetoptLong::REQUIRED_ARGUMENT ]
+                      [ '--level','-l',  GetoptLong::REQUIRED_ARGUMENT ],
+                      [ '--debug', GetoptLong::NO_ARGUMENT ],
+                      [ '--flymake','-f',  GetoptLong::NO_ARGUMENT ]
                       )
 
 file = true
-output_info, level, code = ""
+output_info, level, code, type = ""
 
 opts.each do |opt, arg|
   case opt
@@ -75,6 +83,8 @@ opts.each do |opt, arg|
   when '--version'
     puts JSCompiler::VERSION
     exit 0
+  when '--debug'
+    $debug = true
   when '--code'
     file = false
     code = arg
@@ -92,6 +102,8 @@ opts.each do |opt, arg|
     output_info = "statistics"
   when '--all'
     output_info = "all"
+  when '--flymake'
+    type = "flymake"
   end
 end
 
@@ -104,14 +116,14 @@ end
 arg = code.blank? ? ARGV.shift : code
 
 if output_info.eql?("all")
-  puts JSCompiler.full_compile(arg, file, level)
+  puts JSCompiler.full_compile(arg, file, level, type)
 elsif output_info.blank?
-  errors_output = JSCompiler.compile(arg, file, "errors", level)
+  errors_output = JSCompiler.compile(arg, file, "errors", level, type)
   unless errors_output.eql?("No errors")
     puts errors_output
   else
-    puts JSCompiler.compile(arg, file, "", level)
+    puts JSCompiler.compile(arg, file, "", level, type)
   end
 else
-  puts JSCompiler.compile(arg, file, output_info, level)
+  puts JSCompiler.compile(arg, file, output_info, level, type)
 end

data/features/run_command.feature

@@ -0,0 +1,67 @@
+Feature: Run jsc command
+
+  In order to improve my development process
+  As a Javascript programmer using jsc
+  I should get the correct software output
+
+  Background:
+    Given a file named "js/errors.js" with:
+      """
+      functiont hello(name) {
+      alert('Hello, ' + name)
+      }
+      hello('New user');
+      """
+    And a file named "js/warnings.js" with:
+      """
+      function hello(name) {
+        return;
+      alert('Hello, ' + name)
+      }
+      hello('New user');
+      """
+    And a file named "js/compiled_code.js" with:
+      """
+      function hello(name) {
+      alert('Hello, ' + name)
+      }
+      hello('New user');
+      """
+
+  Scenario: Missing params
+    When I run "jsc"
+    Then I should see exactly "Missing any argument (try --help)\n"
+    And the exit status should be 0
+    
+  Scenario: Get help
+    When I run "jsc --help"
+    Then I should see "== Usage"
+    And the exit status should be 0
+
+  Scenario: Detect error if file not found
+    When I run "jsc something.js"
+    Then I should see "No such file or directory - something.js"
+
+  Scenario: Get version
+    When I run "jsc --version"
+    Then I should see "0.2.2"
+    And the exit status should be 0
+
+  # Scenario: Get compiled code
+  Scenario: Compile file and get errors
+    When I run "jsc js/errors.js -e"
+    Then I should see "You've got 2 errors"
+
+  Scenario: Compile file and get warnings
+    When I run "jsc js/warnings.js -w"
+    Then I should see "You've got 1 warnings"
+
+  Scenario: Compile file and get statistics
+    When I run "jsc js/compiled_code.js -s"
+    Then I should see "Original Size:"
+    And I should see "Compiled Size:"
+
+  Scenario: Compile with flymake mode
+    When I run "jsc js/errors.js -e --flymake"
+    Then I should see "js/errors.js:3: error: JSC_PARSE_ERROR: Parse error. syntax error"
+    Then I should not see "You've got 2 errors"

data/features/support/env.rb

@@ -0,0 +1,8 @@
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'rubygems'
+require 'cucumber/rake/task'
+require 'aruba'
+
+# Cucumber::Rake::Task.new do |t|
+#   t.cucumber_opts = %w{--format pretty}
+# end

data/lib/jsc.rb

@@ -1,7 +1,7 @@
 module JSCompiler
 
   # :stopdoc:
-   VERSION = '0.2.1'
+   VERSION = '0.2.2'
 #  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
 #  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/jsc/closure_compiler.rb

@@ -6,17 +6,28 @@ require 'active_support/core_ext/integer/inflections'
 #require 'json'
 require 'net/http'
 
+require 'term/ansicolor'
+
 # Link to Google Closure Compiler service
 GOOGLE_SERVICE_ADDRESS = "http://closure-compiler.appspot.com/compile"
 # Default output_info parameter
 DEFAULT_SERVICE = "compiled_code"
 # Default compilation_level parameter
 DEFAULT_LEVEL = "SIMPLE_OPTIMIZATIONS"
+# Default formatting type parameter
+DEFAULT_TYPE = "default"
+
+class String
+  include Term::ANSIColor
+end
 
 module JSCompiler
 
   class << self
 
+    attr_reader :op, :level, :format_type, :file
+    attr_writer :op, :level, :format_type, :file
+
     # Creates the <em>JSON</em> hash for the request and returns the hash to send along with the request
     #
     # Accepted parameters:
@@ -25,9 +36,9 @@ module JSCompiler
     def create_json_request(code)
       parameters = {
     	"code" => code,
-	"level" => @level,
+	"level" => self.level,
 	"format"   => "json",
-	"info"  => @op
+	"info"  => self.op
       }
     end
 
@@ -40,6 +51,13 @@ module JSCompiler
         'output_format' => data["format"],
         'output_info' => data["info"]
       }
+
+      if $debug
+        puts "#DEBUG post_args \n"
+        p post_args
+        puts "\n"
+      end
+
       # send the request
       resp, data = Net::HTTP.post_form(URI.parse(GOOGLE_SERVICE_ADDRESS), post_args)
     end
@@ -52,18 +70,29 @@ module JSCompiler
     #                   1 => arg is a file path
     # * <b>op</b>: output_info parameter
     # * <b>level</b>: compilation_level parameter
-    def compile(arg, is_file, op, level)
-      @op = op.blank? ? DEFAULT_SERVICE : op
-      @level = level.blank? ? DEFAULT_LEVEL : level
+    # * <b>type</b>: the type of parsing requested
+    def compile(arg, is_file, op, level, type)
+      self.op = op.blank? ? DEFAULT_SERVICE : op
+      self.level = level.blank? ? DEFAULT_LEVEL : level
+      self.format_type = type.blank? ? DEFAULT_TYPE : type
+      self.file = ""
       value = true
 
       begin
         if is_file
           js_code = read_file(arg)
+          self.file = arg
         else
           js_code = arg
         end
         resp, data = post_to_cc(create_json_request(js_code))
+
+        if $debug
+          puts "#DEBUG data \n"
+          p data
+          puts "\n"
+        end
+
       rescue StandardError => e
         return e
       end
@@ -79,9 +108,9 @@ module JSCompiler
     # * <b>file</b>: 0 => arg is code
     #                1 => arg is a file path
     # * <b>level</b>: compilation_level parameter
-    def full_compile(arg, file, level)
+    def full_compile(arg, file, level, type)
       ['errors', 'warnings','compiled_code'].each do |x|
-        str = JSCompiler.compile(arg, file, x, level)
+        str = JSCompiler.compile(arg, file, x, level, type)
         return str unless str.eql?("No " + x)
       end
     end
@@ -113,10 +142,13 @@ module JSCompiler
 
       if parsed_response.has_key?("serverErrors") 
         result = parsed_response['serverErrors']
-        return "Server Error: #{result[0]['error']} - Error Code: #{result[0]['code']}"
+        error_message = "Server Error: #{result[0]['error']} \n"
+        error_message << "Error Code: #{result[0]['code']}"
+        return error_message.red
+#        return red, bold, error_message, reset
       end
 
-      case @op
+      case self.op
       when "compiled_code"
         out = parsed_response['compiledCode']
       when "statistics"
@@ -125,23 +157,13 @@ module JSCompiler
       else "errors"
         #case for errors or warnings
         begin
-          result = parsed_response[@op]
-          unless result.nil?
-            num = result.size
-            out << "You've got #{result.size} #{@op}\n"
-            i = 0
-            result.each do |message|
-              i += 1
-              out << "\n#{@op.singularize.capitalize} n.#{i}\n"
-              out << "\t#{message['type']}: " + message[@op.singularize] + " at line #{message['lineno']} character #{message['charno']}\n"
-              out << "\t" + message['line'] + "\n" unless message['line'].nil?
-            end
-            return out
-          else
-            return "No #{@op}"
-          end
-        rescue
-          out = "Error parsing JSON output...Check your output"
+          result = parsed_response[self.op]
+          # call parser
+#          return parse(result)
+          JSCompiler::Parser.parse(result)
+        rescue StandardError => e
+          out = e
+          out << "Error parsing JSON output...Check it."
         end
       end
     end