jsc 0.2.2 → 0.2.3

data/History.txt

@@ -1,8 +1,10 @@
 == 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

data/README.rdoc

@@ -10,18 +10,19 @@ Ruby API to Google Closure Compiler Web service.
 
 With <b>jsc</b> you can compile your JavaScript code throught {Google Closure Compiler REST service}[http://code.google.com/closure/compiler/].
 
-The package comes with a jsc commands which accepts several options, run:
+The package comes with a jsc command which accepts several options, run:
 
   jsc --help 
 
 for help.
 
 More in details:
-* Ruby API actually is a single function call (ex: JSCompiler.compile(file_name, "statistics", "SIMPLE_OPTIMIZATIONS") )
+* Ruby API actually is a single function call, JSCompiler.compile()
 * Handling of JSON responses, parse and print them (same output of the Google web interface!)
 * Handling of Server Errors responses
-* Compile a piece of code, a file or a whole directory
+* Compile a file or a piece of code
 * <b>Emacs snippet</b> to compile code your code for errors and warnings
+* flymake compatible
 
 Check {Google API Reference}[http://code.google.com/intl/it-IT/closure/compiler/docs/api-ref.html] for more info about accepted parameters.
 
@@ -47,13 +48,24 @@ Compile a piece of code, check for errors:
 
   jsc -e -c "function("
 
-Compile a file and get compiled code if no errors or warnings are found:
+Compile a file for both errors and warnings:
 
   jsc js/compiled_code.js -a
 
-== Emacs Snippet
+== Install
+
+If you have gemcutter in your gem sources, run:
+
+  [sudo] gem install jsc
+
+== Emacs+flymake+jsc
+ 
+For GNU Emacs users, jsc provides a {flymake}[http://www.emacswiki.org/emacs/FlyMake] compatible output. So you can use jsc+flymake to have a syntax check tool running in the background while editing your javascript files.
+Look at the {wiki page}[http://wiki.github.com/sub/jsc/flymake] for more info.
+
+== Emacs snippet
 
-Wants to compile your code right from Emacs?
+Do you want to compile your code right from Emacs?
 
 Copy 
 
@@ -65,12 +77,6 @@ Now, select the code to compile and run:
 * <em>CcJe</em> to check for errors
 * <em>CcJw</em> to check for warnings.
 
-== Install
-
-If you have gemcutter in your gem sources, run:
-
-  [sudo] gem install jsc
-
 == Copyright
 
 Copyright (c) 2010 Davide Saurino. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/bin/jsc

@@ -30,7 +30,10 @@ jsc [options] ... ARG
    get statistics for compiled code
 
 --all, -a:
-   execute every check for this code
+   execute error and warnings check for this code
+
+--cleancode:
+   returns compiled code if no errors or warnings are found
 
 --level value, -l value:
    compile with level value
@@ -51,12 +54,12 @@ jsc [options] ... ARG
 
 ARG: A path to a javascript file or the code that will be compiled.
 
-If one of the following options is not specified
+You can use only ONE of the following options
 
--e, -w, -s, -a
+-e, -w, -s, -a, --cleancode
 
-the code will be first compiled for errors and only if no errors are found 
-it will return the compiled code 
+If none is specified then the  code will be first compiled for errors 
+and only if no errors are found it will return the compiled code.
 EOU
 
 opts = GetoptLong.new(
@@ -67,6 +70,7 @@ opts = GetoptLong.new(
                       [ '--warns', '-w', GetoptLong::NO_ARGUMENT ],
                       [ '--stats', '-s', GetoptLong::NO_ARGUMENT ],
                       [ '--all', '-a', GetoptLong::NO_ARGUMENT ],
+                      [ '--cleancode', GetoptLong::NO_ARGUMENT ],
                       [ '--level','-l',  GetoptLong::REQUIRED_ARGUMENT ],
                       [ '--debug', GetoptLong::NO_ARGUMENT ],
                       [ '--flymake','-f',  GetoptLong::NO_ARGUMENT ]
@@ -102,6 +106,8 @@ opts.each do |opt, arg|
     output_info = "statistics"
   when '--all'
     output_info = "all"
+  when '--cleancode'
+    output_info = "clean"
   when '--flymake'
     type = "flymake"
   end
@@ -116,8 +122,14 @@ end
 arg = code.blank? ? ARGV.shift : code
 
 if output_info.eql?("all")
-  puts JSCompiler.full_compile(arg, file, level, type)
+  full_compile_log = JSCompiler.full_compile(arg, file, level, type)
+  puts full_compile_log unless full_compile_log.blank?
+elsif output_info.eql?("clean")
+  clean_compile_log = JSCompiler.cleancode(arg, file, level, type)
+  puts clean_compile_log unless clean_compile_log.blank?
 elsif output_info.blank?
+  # I'm here if none of -e,-w,-a,-s is specified so
+  # I compile only for errors and, if not, for compiled_code
   errors_output = JSCompiler.compile(arg, file, "errors", level, type)
   unless errors_output.eql?("No errors")
     puts errors_output
@@ -125,5 +137,6 @@ elsif output_info.blank?
     puts JSCompiler.compile(arg, file, "", level, type)
   end
 else
+  # Some option is specified, I pass that to compile()
   puts JSCompiler.compile(arg, file, output_info, level, type)
 end

data/features/run_command.feature

@@ -44,7 +44,7 @@ Feature: Run jsc command
 
   Scenario: Get version
     When I run "jsc --version"
-    Then I should see "0.2.2"
+    Then I should see "0.2.3"
     And the exit status should be 0
 
   # Scenario: Get compiled code

data/lib/jsc.rb

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

data/lib/jsc/closure_compiler.rb

@@ -108,29 +108,52 @@ 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, type)
-      ['errors', 'warnings','compiled_code'].each do |x|
+    def cleancode(arg, file, level, type)
+      ['errors', 'warnings', 'compiled_code'].each do |x|
         str = JSCompiler.compile(arg, file, x, level, type)
         return str unless str.eql?("No " + x)
       end
     end
-    
+
+    # Compiles a file or a piece of code for
+    # errors or warnings. Returns nothing if no
+    # errors or warnings are found
+    #
+    # Accepted parameters:
+    # * <b>arg</b>: the code or the file path to compile
+    # * <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, type)
+      errors_log = compile(arg, file, "errors", level, type)
+      str = ""
+      if errors_log.eql?("No errors")
+        warnings_log = compile(arg, file, "warnings", level, type)
+        str = warnings_log unless warnings_log.eql?("No warnings")
+      else
+        str = errors_log
+      end
+      
+      str
+
+    end
+
     # Calls compile method for every file in <em>dir</em> directory
     #
     # Accepted parameters:
     # * <b>dir</b>: the directory
     # * <b>op</b>: output_info parameter
     # * <b>level</b>: compilation_level parameter
-    def compile_dir(dir, op, level)
-      out = ""
-      Dir.entries(dir).each do |file|
-        if File.extname(file) == ".js"
-          out << "Statistics for file #{file}...\n"
-          out << compile(file, true, op, level) + "\n***************\n"
-        end
-      end
-      return out
-    end
+    # def compile_dir(dir, op, level)
+    #   out = ""
+    #   Dir.entries(dir).each do |file|
+    #     if File.extname(file) == ".js"
+    #       out << "Statistics for file #{file}...\n"
+    #       out << compile(file, true, op, level) + "\n***************\n"
+    #     end
+    #   end
+    #   return out
+    # end
 
     # Parses and returns JSON server <em>response</em>
     #

data/spec/jsc_spec.rb

@@ -128,7 +128,40 @@ describe JSCompiler do
       end
  
       it 'should receive the compiled code' do
-        @resp.should_not be_nil
+        @resp.should match("")
+      end
+    end
+    
+    describe 'and get errors' do
+      before do
+        @resp = JSCompiler.full_compile(ERROR_CODE, false, "SIMPLE_OPTIMIZATIONS", "")
+      end
+      
+      it 'should return the result string' do
+        @resp.should match(/Error n./)
+      end
+    end
+
+    describe 'and get warnings' do
+      before do
+        @resp = JSCompiler.full_compile(WARNING_CODE, false, "SIMPLE_OPTIMIZATIONS", "")
+      end
+      
+      it 'should return the result string' do
+        @resp.should match(/Warning n./)
+      end  
+    end
+
+  end
+
+  describe 'CLEAN code compile' do
+    describe 'without errors or warnings' do
+      before do
+        @resp = JSCompiler.full_compile(COMPILE_CODE, false, "SIMPLE_OPTIMIZATIONS", "")
+      end
+ 
+      it 'should receive the compiled code' do
+        @resp.should be_nil
       end
     end
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Davide Saurino
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-27 00:00:00 +01:00
+date: 2010-03-03 00:00:00 +01:00
 default_executable: jsc
 dependencies: 
 - !ruby/object:Gem::Dependency