mu 5.7.33 → 5.7.34

data/lib/mu/command/cmd_runscale.rb

@@ -293,14 +293,15 @@ class Mu
                 filename = "app_id_stats.csv"
                 msg "Update stats to: #{File.expand_path(filename)}", Logger::INFO
                 unless File.exists?(filename)
-                    heading = "scenario,executed,errors,timeouts,client_tx_bytes,client_tx_msgs,client_tx_bitrate,client_rx_bytes,client_rx_msgs,client_rx_bitrate,server_tx_bytes,server_tx_msgs,server_tx_bitrate,server_rx_bytes,server_rx_msgs,server_rx_bitrate,total_instances,max_active_tcp_connections"
+                    heading = "scenario,executed,errors,timeouts,client_tx_bytes,client_tx_msgs,client_tx_bitrate,client_rx_bytes,client_rx_msgs,client_rx_bitrate,server_tx_bytes,server_tx_msgs,server_tx_bitrate,server_rx_bytes,server_rx_msgs,server_rx_bitrate,total_instances,max_active_tcp_connections,verify_response"
                     File.open(filename, 'a'){|f| f.puts(heading)}
                 end
                 @row = [msl_file,@executed,@errors,@timeouts,
 @client_tx_bytes,@client_tx_msgs,@client_tx_bitrate,
 @client_rx_bytes,@client_rx_msgs,@client_rx_bitrate,
 @server_tx_bytes,@server_tx_msgs,@server_tx_bitrate,
-@server_rx_bytes,@server_rx_msgs,@server_rx_bitrate,@total_instances,@max_active_tcp_connections ]
+@server_rx_bytes,@server_rx_msgs,@server_rx_bitrate,
+@total_instances,@max_active_tcp_connections,@verify_response]
                 File.open(filename, 'a'){|f| f.puts(@row.join(','))}
             end
 

data/lib/mu/har.rb

@@ -240,7 +240,8 @@ class Har
                         cs.block('struct [',']') do
                             cs.string(param['name'] + '=')
                             cs.block('uri_percent_encode [',']') do
-                                cs.string Regexp.escape(param['value'])
+                                # This is so we correctly escape strange unicode characters
+                                cs.string Regexp.escape(param['value'].bytes.to_a.map(&:chr).join.inspect)
                             end
                         end
                     end
@@ -393,7 +394,7 @@ class Har
             elsif(header['name'] === 'Content-Encoding')
                 # Check out content encoding
                 # We can do GZIP
-                if  header['value'] == HTTP_GZIP_CONTENT_ENCODING
+                if  header['value'] == HTTP_GZIP_CONTENT_ENCODING or header['value'] == HTTP_DEFLATE_CONTENT_ENCODING
                     content_encoding = true
                 else
                     raise NotImplementedError, "Content-Encoding: #{header['value']}"
@@ -415,13 +416,17 @@ class Har
         # If we need to replace the content with a special repeated field
         if @options.strip_large_content
             body = []
-
-            if req_res['content']['size'] > @options.large_content_size
-                # Take first 1K bytes from the content and repeat
-                body << payload[0, HTTP_CONTENT_SLICE_SIZE]
+            if req_res.has_key?('content')
+                if req_res['content']['size'] > @options.large_content_size
+                    # Take first 1K bytes from the content and repeat
+                    body << payload[0, HTTP_CONTENT_SLICE_SIZE]
+                else
+                    # Set response body
+                    body << payload
+                end
             else
-                # Set response body
-                body << payload
+                # If the content is empty no need to strip it
+                return
             end
 
             # Yes calculate the number of 1K chunks we need to inject
@@ -447,8 +452,12 @@ class Har
             end
             cs_send.literal_no_format("\"");
         else
-            payload.gsub!(/#\{|##\{/, "\\x23{")
-            cs_send.literal_no_format("\"" + self.escape(payload) + "\"")
+            # If the payload contains a string that looks like it will require ruby variable interpolation #{} => \x23{} when escaped
+            if(payload =~ /#\{.*}/)
+                new_payload = payload.split(/#\{/).join("#\"\n\"{")
+                payload = new_payload
+            end
+            cs_send.literal("\"" + self.escape(payload) + "\"")
         end
 
 
@@ -497,6 +506,9 @@ class Har
 
     # Takes input and a table that maps ascii codes to their representation
     def escape input, escapes=nil
+        #output = input.bytes.to_a.map(&:chr).join.inspect
+        #return output
+
         escapes ||= ESCAPES
         output = []
         input.each_byte do |i|

data/lib/mu/maker.rb

@@ -12,6 +12,7 @@ class Maker
         scenario.create(name) do
             yield scenario
         end
+        scenario.musl << "\r\n"
         return scenario.musl.join
     end
     

data/version.rb

@@ -1 +1 @@
-VERSION='5.7.33'
+VERSION='5.7.34'

metadata

@@ -1,148 +1,158 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mu
-version: !ruby/object:Gem::Version
-  version: 5.7.33
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 5.7.34
 platform: ruby
-authors:
+authors: 
 - MuEng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-12 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-08-03 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &21107060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.4.4
   type: :runtime
-  prerelease: false
-  version_requirements: *21107060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &21106460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.6.1
   type: :runtime
-  prerelease: false
-  version_requirements: *21106460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: mime-types
-  requirement: &21105860 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.16'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.16"
   type: :runtime
-  prerelease: false
-  version_requirements: *21105860
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &21105340 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *21105340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: hexy
-  requirement: &21104680 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.1.1
   type: :runtime
-  prerelease: false
-  version_requirements: *21104680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: uuid
-  requirement: &21104060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 2.0.2
   type: :runtime
-  prerelease: false
-  version_requirements: *21104060
-description: ! "The Mu gem allows users to include mu libraries within scripts\n    that
-  interact with mu appliance software. The gem also supplies command line interfaces\n
-  \   to many of these same libraries"
-email:
+  version_requirements: *id006
+description: |-
+  The Mu gem allows users to include mu libraries within scripts
+      that interact with mu appliance software. The gem also supplies command line interfaces
+      to many of these same libraries
+email: 
 - info@mudynamics.com
-executables:
+executables: 
 - mu
 extensions: []
+
 extra_rdoc_files: []
-files:
-- lib/mu.rb
-- lib/mu/har.rb
-- lib/mu/http_helper.rb
-- lib/mu/client.rb
-- lib/mu/api/netconfig.rb
-- lib/mu/api/muapi.rb
+
+files: 
+- lib/mu/api/ddt.rb
 - lib/mu/api/homepage.rb
-- lib/mu/api/system.rb
+- lib/mu/api/muapi.rb
+- lib/mu/api/netconfig.rb
 - lib/mu/api/scale.rb
-- lib/mu/api/ddt.rb
-- lib/mu/helper.rb
-- lib/mu/maker.rb
-- lib/mu/command/cmd_homepage.rb
+- lib/mu/api/system.rb
+- lib/mu/client.rb
 - lib/mu/command/api.rb
 - lib/mu/command/cmd_ddt.rb
-- lib/mu/command/cmd_scale.rb
-- lib/mu/command/curl.rb
+- lib/mu/command/cmd_homepage.rb
 - lib/mu/command/cmd_muapi.rb
-- lib/mu/command/help.rb
 - lib/mu/command/cmd_musl.rb
-- lib/mu/command/cmd_system.rb
+- lib/mu/command/cmd_netconfig.rb
+- lib/mu/command/cmd_runanalysis.rb
 - lib/mu/command/cmd_runscale.rb
 - lib/mu/command/cmd_runscenario.rb
-- lib/mu/command/cmd_runanalysis.rb
-- lib/mu/command/cmd_netconfig.rb
 - lib/mu/command/cmd_runverify.rb
+- lib/mu/command/cmd_scale.rb
+- lib/mu/command/cmd_system.rb
+- lib/mu/command/curl.rb
+- lib/mu/command/help.rb
 - lib/mu/command.rb
 - lib/mu/curl/error.rb
 - lib/mu/curl/verify.rb
+- lib/mu/har.rb
+- lib/mu/helper.rb
+- lib/mu/http_helper.rb
+- lib/mu/maker.rb
+- lib/mu.rb
 - bin/mu
 - Mu_Gem.html
 - version.rb
 - LICENSE.txt
 - README.rdoc
+has_rdoc: true
 homepage: http://www.mudynamics.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Mu Dynamics General Purpose Library and Command Line Tool
 test_files: []
+