lib/conf/argv.rb in rsence-pre-2.2.0.26 vs lib/conf/argv.rb in rsence-pre-2.2.0.27

@@ -81,18 +81,32 @@
         :latency        => 0,     # --latency
         :say            => false, # -S --say
         :http_delayed_start => nil, # --http-delayed-start
       
         # client_pkg (not supported yet)
-        :client_pkg_no_gzip               => false, # --build-no-gzip
-        :client_pkg_no_obfuscation        => false, # --build-no-obfuscation
-        :client_pkg_no_whitespace_removal => false, # --build-keep-whitespace
-        :client_pkg_quiet                 => true,  # --build-verbose
+        :client_pkg_no_gzip               => false, # --client-no-gzip
+        :client_pkg_no_obfuscation        => false, # --client-no-obfuscation
+        :client_pkg_no_whitespace_removal => false, # --client-keep-whitespace
+        :client_pkg_quiet                 => true,  # --client-verbose
       
       }
     end
     
+    def set_client_pkg_arg( arg_name )
+      if arg_name == '--client-no-gzip'
+        @args[:client_pkg_no_gzip] = true
+      elsif arg_name == '--client-no-obfuscation'
+        @args[:client_pkg_no_obfuscation] = true
+      elsif arg_name == '--client-keep-whitespace'
+        @args[:client_pkg_no_whitespace_removel] = true
+      elsif arg_name == '--client-verbose'
+        @args[:client_pkg_quiet] = false
+      else
+        invalid_option( arg_name )
+      end
+    end
+
     # Main argument parser for all 'start' -type commands.
     def parse_startup_argv
       init_args
       expect_option  = false
       option_name = false
@@ -126,10 +140,12 @@
                 set_verbose
               elsif arg == '--log-fg'
                 set_log_fg
               elsif arg == '--trace-js'
                 @args[:trace_js]   = true
+              elsif arg.start_with?( '--client-' )
+                set_client_pkg_arg( arg )
               elsif arg == '--trace-delegate'
                 @args[:trace_delegate] = true
               elsif arg == '--port'
                 expect_option = true
                 option_name = :port
@@ -761,25 +777,24 @@
         cmd = @argv[0].to_sym
         cmd = :help if [:h, :'-h', :'--help', :'-help'].include? cmd
       end
       if @@cmds.include?(cmd)
         @cmd = cmd
+        unless [:help, :version].include?( cmd )
+          puts "RSence #{@@version} -- Ruby #{RUBY_VERSION}"
+        end
         if cmd == :help
           parse_help_argv
         elsif cmd == :version
           puts version
           exit
         elsif [:run,:start,:stop,:restart].include? cmd
-          puts "RSence #{@@version} -- Ruby #{RUBY_VERSION}"
           parse_startup_argv
         elsif cmd == :status
-          puts "RSence #{@@version} -- Ruby #{RUBY_VERSION}"
           parse_status_argv
         elsif cmd == :save
-          puts "RSence #{@@version} -- Ruby #{RUBY_VERSION}"
           parse_save_argv
         elsif cmd == :initenv or cmd == :init
-          puts "RSence #{@@version} -- Ruby #{RUBY_VERSION}"
           parse_initenv_argv
         end
       else
         puts @@strs[:help][:unknown] + cmd.to_s.inspect
         puts @@strs[:help][:help_help]