hmx_client 0.0.5 → 0.0.6

data/lib/hmx/helpers.rb

@@ -0,0 +1,61 @@
+require 'cli-colorize'
+
+module HmxClient
+  module Helpers
+     include CLIColorize
+
+     def getFromUser(prompt)
+       content = ''
+       done = false
+       puts prompt
+       while(!done)
+	 line = gets.strip
+         if (line[line.length-1] == '\\')
+	    done = false
+            content = content + line[0 .. line.length-2]
+         else
+            content = content + line
+            done = true
+         end
+       end
+       content
+     end
+     def error(msg)
+      puts(colorize(msg, :red))
+      exit 1
+     end
+    def longest(items)
+      items.map { |i| i.to_s.length }.sort.last
+    end
+
+    def display(msg="", newline=true)
+      if newline
+        puts(msg)
+      else
+        print(msg)
+        STDOUT.flush
+      end
+    end   
+
+   def display_table(objects, columns, headers)
+      lengths = []
+      columns.each_with_index do |column, index|
+        header = headers[index]
+        lengths << longest([header].concat(objects.map { |o| o[column].to_s }))
+      end
+      display_row headers, lengths
+      display_row headers.map { |header| "-" * header.length }, lengths
+      objects.each do |row|
+        display_row columns.map { |column| row[column] }, lengths
+      end
+    end
+
+    def display_row(row, lengths)
+      row.zip(lengths).each do |column, length|
+        format = column.is_a?(Fixnum) ? "%#{length}s  " : "%-#{length}s  "
+        display format % column, false
+      end
+      display
+    end
+   end
+end

data/lib/hmx/hmx.rb

@@ -3,26 +3,52 @@ require 'rest_client'
 require 'json'
 require 'digest/md5'
 
+module HmxClient
+
+include HmxClient::Helpers
+
+class HmxException < Exception 
+  attr :msg
+  def initialize(msg)
+    @msg = msg
+  end
+end
+
 class Hmx
+
   def loginApi(url, urlapi)
     @urlapi = urlapi
     @context = JSON.parse (RestClient.get url).to_str
   end
   def login(config) 
     puts config if $debug
+    @context = nil;
     @urlapi = config[:api]
-    session = requestSession(config[:partition], config[:user])
-    salty = session['MXSession']['salty']
-    sendString = config[:password] + ':' + salty
-    digestToSend = Digest::MD5.hexdigest(sendString)
-    @context = validateUser(config[:partition], config[:user], digestToSend, session['MXSession']['sessionId'])
+    if config.has_key?(:context)
+      @context = JSON.parse(config[:context])
+      #Do a null check
+      begin
+        performDistRequest(:info, []) 
+      rescue => e
+        @context = nil;
+      end  
+    end   
+    if (@context.nil?)
+      session = requestSession(config[:partition], config[:user])
+      salty = session['MXSession']['salty']
+      sendString = config[:password] + ':' + salty
+      digestToSend = Digest::MD5.hexdigest(sendString)
+      @context = validateUser(config[:partition], config[:user], digestToSend, session['MXSession']['sessionId'])
+      config[:context] = JSON.generate(@context)
+    end
   end
   def initialize
     @distMap = {
+          :info => [ 'user', 'INFO', 'response', []],
           :getData => [ 'user', 'GETDATA', 'data', [ { :pos => 0, :name => 'displayName' } ]],
           :getContent  => [ 'user', 'GETCONTENT', 'content', [ { :pos  => 0, :name => 'displayName' }]],
-	  :putData => ['user', 'PUTDATA', 'data', [ { :pos => 0, :name => 'data' }]],
-          :putSimpleData => [ 'user', 'PUTSIMPLEDATA', 'data', [ { :pos => 0, :name => 'displayName'}, { :pos => 1, :name => 'content'}]],
+	  :putData => ['user', 'PUTDATA', 'data', [ { :pos => 0, :name => 'data', :file => 1, :json => 1 }]],
+          :putSimpleData => [ 'user', 'PUTSIMPLEDATA', 'data', [ { :pos => 0, :name => 'displayName'}, { :pos => 1, :name => 'content', :file => 1}]],
           :query => [ 'user', 'QUERY', 'result', [ { :pos => 0, :name => 'index' }, { :pos => 1, :name => 'params' }]],
           :dynquery => ['user', 'DYNQUERY', 'result', [ { :pos => 0, :name => 'typeName' }, { :pos => 1, :name => 'filterFn' }, { :pos => 2, :name => 'mapFn' } ]],
           :deleteData => [ 'user', 'DELETEDATA', 'data', [ { :pos => 0, :name => 'displayName' } ]],
@@ -36,24 +62,64 @@ class Hmx
 								{ :pos => 1, :name => 'user' },
 								{ :pos => 2, :name => 'hashPassword' },
 								{ :pos => 3, :name => 'session' }
-					]]
-
+					]],
+          :submitTask => [ 'user', 'SUBMITTASK', 'task', [ { :pos => 0, :name => 'task' } ]],
+          :runView => [ 'user', 'RUNVIEW', 'response', [ { :pos => 0, :name => 'view' }, { :pos => 1, :name => 'params' } ] ],
+	  :getTypes => [ 'admin', 'GETTYPES', 'types', []],
+          :getType => [ 'admin', 'GETTYPE', 'type', [ { :pos => 0, :name => 'typeName' } ]],
+          :updateType => [ 'admin', 'UPDATETYPE', 'type', [ { :pos => 0, :name => 'type' }]],
+	  :getFn => [ 'user', 'GETFN', 'fnContent', [ { :pos =>0, :name => 'fnName' } ]],
+          :putFn => [ 'user', 'PUTFN', 'response', [ { :pos => 0, :name => 'fnName' }, { :pos => 1, :name => 'fnContent', :file => 1 } ]],
+	  :expireSessions => [ 'admin', 'EXPIRESESSIONS', 'sessions', []],
+          :getAllTasks => [ 'task', 'GETALLTASKS', 'tasks', []],
+          :getTask => [ 'task', 'GETTASK', 'task', [ { :pos=> 0, :name => 'taskId' } ]],
+          :purgeTasks => [ 'task', 'PURGETASKS', 'response', []],
+          :getFountainState => [ 'admin', 'GETFOUNTAINSTATE', 'state', []],
+          :setFountainId => [ 'admin', 'SETFOUNTAINID', 'dummy', [ { :pos => 0, :name => 'fountain' }, { :pos => 1, :name=> 'value' }]],
+          :getFountain => [ 'user', 'AUTOID', 'id', [ { :pos => 0, :name => 'fountain' } ]],
+          :bootstrap => ['special', 'BOOTSTRAP', 'response', []]
     }
   end
   def performDistRequest(cmd, args)
      spec = @distMap[cmd]
      hash = getSenderHash()
-     spec[3].each { | param | hash[param[:name]] = args[param[:pos]] }
+     spec[3].each { | param |
+			# if the args has enough , use that
+                        # otherwise, prompt for the parameter
+                        if (args.length > param[:pos])
+			  hash[param[:name]] = args[param[:pos]] 
+			elsif (param.has_key?(:file) && !HmxClient::Command.fileIn.nil?)
+			  # Content comes from file
+  			  realFile = File.expand_path(HmxClient::Command.fileIn)
+                          puts "Reading #{ realFile } to get parameter #{ param[:name] }"
+                          hash[param[:name]] = File.open(realFile) { | f | 
+							c = ''
+                                                        while(line = f.gets)
+                                                            c = c + line
+                                                        end
+							c
+                                                  }
+                        else
+			  hash[param[:name]] = getFromUser("Please enter the value of #{ param[:name] }")
+                        end
+                        if (param.has_key?(:json))
+                          hash[param[:name]] = JSON.parse(hash[param[:name]])
+                        end
+                   }
      standardRequest(spec[0], spec[1], hash, spec[2])
   end
   def performRequest(prefix, function, command)
-    puts "Send data #{ JSON.generate(command) }" if $debug
+    puts "Send data #{ JSON.generate(command) }" if HmxClient::Command.debug?
     response = RestClient.post @urlapi+'/'+prefix, :function=>function, :params=>JSON.generate(command), :multipart=>true
-    puts "Raw response is #{ response.to_str }" if $debug
+    puts "Raw response is #{ response.to_str }" if HmxClient::Command.debug?
     return JSON.parse(response.to_str)
   end
   def standardRequest(prefix, commandName, params, returnPart)
     response = performRequest(prefix, commandName, params)
+    puts "JSON response is #{ response }" if HmxClient::Command.debug?
+    if response['inError']
+       raise HmxException.new(response['exception']), "Error returned from server" 
+    end
     return response[returnPart]
   end
   def getSenderHash()
@@ -61,16 +127,16 @@ class Hmx
     hash['context'] = @context if @context
     return hash
   end
-  def getData(*args)
+  def getData(args)
     performDistRequest(:getData, args)
   end
-  def getContent(*args)
+  def getContent(args)
     performDistRequest(:getContent, args)
   end
-  def putData(*args)
+  def putData(args)
     performDistRequest(:putData, args)
   end
-  def putSimpleData(*args)
+  def putSimpleData(args)
     performDistRequest(:putSimpleData, args)
   end
   def query(*args)
@@ -94,4 +160,47 @@ class Hmx
   def validateUser(*args)
     performDistRequest(:validateUser, args)
   end
+  def runView(*args)
+    performDistRequest(:runView, args)
+  end
+  def getTypes(*args)
+    performDistRequest(:getTypes, args)
+  end
+  def updateType(*args)
+    performDistRequest(:updateType, args)
+  end
+  def getType(*args)
+    performDistRequest(:getType, args)
+  end
+  def getFn(args)
+    performDistRequest(:getFn, args)
+  end
+  def putFn(args)
+    performDistRequest(:putFn, args)
+  end
+  def expireSessions(args)
+    performDistRequest(:expireSessions, args)
+  end
+  def getAllTasks(args)
+    performDistRequest(:getAllTasks, args)
+  end
+  def getTask(args)
+    performDistRequest(:getTask, args)
+  end
+  def purgeTasks(args)
+    performDistRequest(:purgeTasks, args)
+  end
+  def getFountainState(args)
+    performDistRequest(:getFountainState, args)
+  end
+  def setFountainId(args)
+    performDistRequest(:setFountainId, args)
+  end
+  def getFountain(args)
+    performDistRequest(:getFountain, args)
+  end
+  def bootstrap
+    performDistRequest(:bootstrap, [])
+  end
+end
 end

data/lib/hmx/version.rb

@@ -1,3 +1,3 @@
 module HmxClient
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/hmx_client.rb

@@ -1,5 +1,5 @@
 base_path = File.dirname(__FILE__)
-%w{client hmx}.each do |lib|
+%w{command client hmx helpers}.each do |lib|
   require "#{base_path}/hmx/#{lib}"
 end
 module HmxClient

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hmx_client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-25 00:00:00.000000000Z
+date: 2011-11-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70272876666120 !ruby/object:Gem::Requirement
+  requirement: &70187035831060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272876666120
+  version_requirements: *70187035831060
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70272876665520 !ruby/object:Gem::Requirement
+  requirement: &70187035830640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272876665520
+  version_requirements: *70187035830640
 description: Gives a client the ability to interact fully with the API for HMX
 email:
 - ukmoore@gmail.com
@@ -47,6 +47,24 @@ files:
 - bin/hmx
 - hmx_client.gemspec
 - lib/hmx/client.rb
+- lib/hmx/command.rb
+- lib/hmx/command/base.rb
+- lib/hmx/command/bootstrap.rb
+- lib/hmx/command/clone.rb
+- lib/hmx/command/config.rb
+- lib/hmx/command/dump.rb
+- lib/hmx/command/fn.rb
+- lib/hmx/command/fountain.rb
+- lib/hmx/command/get.rb
+- lib/hmx/command/getContent.rb
+- lib/hmx/command/help.rb
+- lib/hmx/command/query.rb
+- lib/hmx/command/session.rb
+- lib/hmx/command/task.rb
+- lib/hmx/command/type.rb
+- lib/hmx/command/user.rb
+- lib/hmx/command/view.rb
+- lib/hmx/helpers.rb
 - lib/hmx/hmx.rb
 - lib/hmx/version.rb
 - lib/hmx_client.rb