mu 5.7.12 → 5.7.13

data/lib/mu/command.rb

@@ -17,28 +17,30 @@ require 'optparse'
 require 'ostruct'
 
 class Mu
-  class Command
-    #include Test::Unit::Assertions
-    include Helper
+    class Command
+        #include Test::Unit::Assertions
+        include Helper
     
-    attr_accessor :options, :opts
+        attr_accessor :options, :opts
 
-    def initialize 
-      # Set defaults
-      @options = OpenStruct.new
-      @options.verbose             = false
+        def initialize
+            # Set defaults
+            @options = OpenStruct.new
+            @options.verbose             = false
+            @options.mu_string           = false
 
-        # TO DO - add additional defaults
-      @opts = OptionParser.new
-      @opts.on('-V', '--verbose')    { @options.verbose = true }
+            # TO DO - add additional defaults
+            @opts = OptionParser.new
+            @opts.on('-V', '--verbose')    { @options.verbose = true }
 
-    end
-
-    @@mu_ip = ENV['MU_IP']
-    @@mu_admin_user = ENV['MU_ADMIN_USER']
-    @@mu_admin_pass = ENV['MU_ADMIN_PASS']
+        end
+    
+        @@mu_ip         = ENV['MU_IP']
+        @@mu_admin_user = ENV['MU_ADMIN_USER']
+        @@mu_admin_pass = ENV['MU_ADMIN_PASS']
+   
         
-  end # Command
+    end # Command
 end # Mu
 
 Dir["#{File.dirname(__FILE__)}/command/*.rb"].each { |c| require c }

data/lib/mu/command/cmd_musl.rb

@@ -134,7 +134,18 @@ class Mu
                 #@opts.on( '--endpoint', 'One way communication' ) do
                 #    @options.endpoint = true
                 #end
-                @opts.on( '-s', '--scenario [FILENAME]', 'Specify the msl filename to be created' ) do |scenario|
+                #@opts.on('-m', '--mu_string <string>','user, password, mu_ip in the form of admin:admin@10.9.8.7') do |mu_string|
+                #    @options.mu_string       = true
+                #    @options.mu_string_valid = false
+                #    if mu_string =~ /(.+?):(.+?)@(.*)/
+                #        @@mu_admin_user = $1
+                #        @@mu_admin_pass = $2
+                #        @@mu_ip = $3
+                #        @options.mu_string_valid = true
+                #    end
+                #    next
+                #end
+                @opts.on( '-s', '--scenario <FILENAME>', 'Specify the msl filename to be created' ) do |scenario|
                     @options.scenario = scenario
                 end
                 # Remove all options just leaving the harfiles

data/lib/mu/command/cmd_runscale.rb

@@ -299,6 +299,7 @@ class Mu
                 File.open(filename, 'a'){|f| f.puts("#{msl_file},#{@verify_response}")}
             end
 
+            # TO DO - We need to fix the logic of our response verification, it isn't elegant right now
             def parse_verify_response(response)
                 if response.nil? # || response.empty?
                     msg "*** error = no response received from /verify ***", Logger::ERROR
@@ -307,6 +308,14 @@ class Mu
                 end
                 begin
                     msg JSON.pretty_generate(response), Logger::DEBUG
+                    
+                    if response.has_key?("error")
+                        @error  = "Player Error"
+                        @reason = response["error"]
+                        msg "*** Error = #{@error}, reason = #{@reason} ***", Logger::ERROR
+                        @verify_response = "Error = #{@error}, reason = #{@reason}"
+                        return @verify_response
+                    end
                     if !response["status"].nil?
                         if response["status"]["error"] == true
                             @error = response["status"]["error"]
@@ -320,6 +329,7 @@ class Mu
                     @verify_response = "okay"
                     return @verify_response
                 rescue => e
+                    puts "Broken Response: \n#{response}\n"
                     msg e, Logger::ERROR
                     raise
                     return nil

data/lib/mu/command/help.rb

@@ -6,7 +6,6 @@ class Help < Command
         puts "Usage: mu <command>:<option>"
         helps = [
             { :cmd => 'mu help', :help => "Display this help" },
-            { :cmd => 'mu cmd_cli:help', :help => 'Show help on using the Mu CLI Api through the command-line' },
             { :cmd => 'mu cmd_ddt:help', :help => 'Show help on using the Studio Verify Api through the command-line' },
             { :cmd => 'mu cmd_homepage:help', :help => 'Show help on using the Homepage Api through the command-line' },
             { :cmd => 'mu cmd_muapi:help', :help => 'Show help on using the Mu Api for fuzzing, templates, backup and archive' },

data/lib/mu/har.rb

@@ -452,8 +452,13 @@ class Har
         else ;         ('\x%02x' % i).freeze
         end
     end
-    ESCAPES['"'.ord]  = %q{\"}
-    ESCAPES["'".ord]  = %q{\'}
+
+    # Only works for 1.9
+    #ESCAPES["'".ord]  = %q{\'}
+    #ESCAPES['"'.ord]  = %q{\"}
+    # Works for 1.8 and 1.9
+    ESCAPES['"'.unpack('c*')[0]]  = %q{\"}
+    ESCAPES["'".unpack('c*')[0]]  = %q{\'}
     ESCAPES.freeze
 
     # Takes input and a table that maps ascii codes to their representation

data/lib/mu/http_helper.rb

@@ -3,10 +3,16 @@ class HttpHelper
   include Helper
 
   def initialize(host, username, password, docroot)
-    @host = host
+    # This check is to see if the user has set ENV variables or used the -m command line option
+    if(host.nil? || username.nil? || password.nil? || docroot.nil?)
+        raise "The host, username and/or password aren't defined. Please use the -m command line option '-m user:password@1.2.3.4' or set your MU environment variables MU_IP,MU_ADMIN_USER,MU_ADMIN_PASS"
+    end
+
+    @host     = host
     @username = username
     @password = password
-    @docroot = docroot
+    @docroot  = docroot
+    
     $cookie = "" if $cookie.nil?
   end
 

data/version.rb

@@ -1 +1 @@
-VERSION='5.7.12'
+VERSION='5.7.13'

metadata

@@ -1,116 +1,110 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mu
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 5.7.13
   prerelease: 
-  version: 5.7.12
 platform: ruby
-authors: 
+authors:
 - MuEng
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-12 00:00:00 -07:00
+date: 2011-04-13 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &20647040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *20647040
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &20646460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *20646460
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &20645880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.16"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.16'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json_pure
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *20645880
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: &20645300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hexy
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *20645300
+- !ruby/object:Gem::Dependency
+  name: hexy
+  requirement: &20644720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
-  version_requirements: *id005
-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: 
+  prerelease: false
+  version_requirements: *20644720
+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:
 - info@mudynamics.com
-executables: 
+executables:
 - mu
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/mu/api/ddt.rb
-- lib/mu/api/homepage.rb
-- lib/mu/api/muapi.rb
+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/scale.rb
+- lib/mu/api/muapi.rb
+- lib/mu/api/homepage.rb
 - lib/mu/api/system.rb
-- lib/mu/cli/muclish.tcl
-- lib/mu/client.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/command/api.rb
-- lib/mu/command/cmd_cli.rb
 - lib/mu/command/cmd_ddt.rb
-- lib/mu/command/cmd_homepage.rb
+- lib/mu/command/cmd_scale.rb
+- lib/mu/command/curl.rb
 - lib/mu/command/cmd_muapi.rb
+- lib/mu/command/help.rb
 - lib/mu/command/cmd_musl.rb
-- lib/mu/command/cmd_netconfig.rb
+- lib/mu/command/cmd_system.rb
 - lib/mu/command/cmd_runscale.rb
 - lib/mu/command/cmd_runscenario.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
@@ -119,30 +113,26 @@ files:
 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.6.2
 signing_key: 
 specification_version: 3
 summary: Mu Dynamics General Purpose Library and Command Line Tool
 test_files: []
-

data/lib/mu/cli/muclish.tcl

@@ -1,20 +0,0 @@
-#!/usr/bin/expect --
-set prompt "MU>"		;# default prompt
-set host [lindex $argv 0]
-set password [lindex $argv 1]
-set prompt [lindex $argv 2]
-
-# aux port? use mrtwig
-if {$host == "192.168.2.1"} {
-  eval spawn ssh root@10.10.3.60
-  expect "password:"  
-  send "happy1\r" 
-  expect "#"
-  send "ssh admin@192.168.2.1\r"
-} else {
-  eval spawn ssh admin@$host
-}
-expect "password:" 
-send "$password\r" 
-expect $prompt
-interact

data/lib/mu/command/cmd_cli.rb

@@ -1,151 +0,0 @@
-# Api methods to access the Mu CLI calls
-class Mu
-class Command
-class Cmd_cli < Command
-
-  attr_accessor :host, :username, :password, :api
-
-  # displays command-line help
-  def cmd_help argv
-    help
-  end
-
-  # runs the cli help command
-  #  * argv = command-line arguments
-  def cmd_cli_help argv
-    setup argv
-    msg run_cmd("help")
-  end
-
-  # runs the cli command '?"
-  #  * argv = command-line arguments
-  def cmd_question argv
-    setup argv
-    msg run_cmd("?")
-  end
-
-  # displays the command line history for the current session
-  #  * argv = command-line arguments
-  def cmd_history argv
-    setup argv
-    msg run_cmd("history")
-  end
-
-  # pings an ip address
-  #  * argv = command-line arguments, requires an ip address (-a) argument
-  def cmd_ping argv
-    setup argv
-    addr = @hash["address"]
-    msg run_cmd("ping #{addr}")
-  end
-
-  # runs traceroute on an ip address
-  #  * argv = command-line arguments, requires an ip address (-a) argument
-  def cmd_traceroute argv
-    setup argv
-    addr = @hash["address"]
-    msg run_cmd("traceroute #{addr}")
-  end
-
-private
-
-  # runs the cli command
-  def run_cmd(command, prompt=@prompt)
-    msg "run command #{command}"
-    @pipe.write("#{command}\r")
-    response = @pipe.readline(prompt)
-    @pipe.close
-    return response
-  end
-
-  def setup argv
-    parse_cli argv
-    @host = (@@mu_ip.nil?) ? "127.0.0.1" : @@mu_ip
-    @username  = (@@mu_admin_user.nil?) ? "admin" : @@mu_admin_user
-    @password  = (@@mu_admin_pass.nil?) ? "admin" : @@mu_admin_pass
-    @prompt = "MU>"
-    @pipe = IO.popen("./lib/mu/cli/muclish.tcl #{@host} #{@password} '#{@prompt}'", 'w+')
-    @pipe.sync = true
-    @banner = @pipe.readline(@prompt)
-  end
-  
-  def parse_cli argv
-      @hash = {}
-      args = Array.new
-      while not argv.empty?
-          args << argv.shift if argv.first[0,1] != '-'
-
-          k = argv.shift
-
-          if [ '-a', '--address' ].member? k
-              @hash['address'] = shift(k, argv)
-              next
-          end
-
-          if [ '-h', '--help' ].member? k
-            help
-            exit
-          end
-
-          if [ '-m', '--mu_string' ].member? k
-             mu_string = shift(k, argv)
-             if mu_string =~ /(.+?):(.+?)@(.*)/
-               @@mu_admin_user = $1
-               @@mu_admin_pass = $2
-               @@mu_ip = $3
-             end
-             next
-          end
-
-          if [ '-o', '--output' ].member? k
-            $stdout.reopen(shift(k, argv), "w")
-            next
-          end
-
-          if [ '-v', '--verbose' ].member? k
-            $log.level = Logger::DEBUG
-            next
-          end
-
-      end
-
-      args
-  end
-
-  def help
-        helps = [
-            { :short => '-a', :long => '--address', :value => '<string', :help => 'ip address to for ping or traceroute' },
-            { :short => '-h', :long => '--help', :value => '', :help => 'Help on command line options' },
-            { :short => '-o', :long => '--output', :value => '<string>', :help => 'output logging to this file' },
-            { :short => '-m', :long => '--mu_string', :value => '<string>', :help => 'user, password, mu_ip in the form of admin:admin@10.9.8.7' },
-            { :short => '-v', :long => '--verbose', :value => '', :help => 'set Logger::DEBUG level' }
-        ]
-
-       cmds = [
-          "mu cmd_cli:cli_help",
-          "mu cmd_cli:history",
-          "mu cmd_cli:ping -a <address>",
-          "mu cmd_cli:question",
-          "mu cmd_cli:traceroute -a <address>",
-       ]
-
-        max_long_size = helps.inject(0) { |memo, obj| [ obj[:long].size, memo ].max }
-        max_value_size = helps.inject(0) { |memo, obj| [ obj[:value].size, memo ].max }
-        puts
-        puts "Usage: mu cmd_cli:<command> <options>"
-        puts
-        helps.each do |h|
-            puts "%-*s %*s %-*s %s" % [max_long_size, h[:long], 2, h[:short], max_value_size, h[:value], h[:help]]
-        end
-        puts
-        puts "Available Commands"
-        puts
-        cmds.each do | c |
-           puts c
-        end
-        puts
-    end
-
-end
-end # Command
-end # Mu