cmdr 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c85785a4bdc460cf48eaa5edd2a730b4c69ccd6
-  data.tar.gz: 70d9325dd394e0f4721f107070c79ea09f7def43
+  metadata.gz: 1cc9c9e0179e5ee5cd891cb329c477c5895279f2
+  data.tar.gz: 4777f73a93902ce20cb4cb70ceb0ccd9833470a7
 SHA512:
-  metadata.gz: db8c7fb892001b7920f132ff60639797f908ca8f4b561d5f7e5c788f4b44e14d6598ac26df7288b80fd1e8086d56cc4252f096f35bd51f0c8d87888b695fb9fb
-  data.tar.gz: 72178ab86cb5afd30871eda7f1ffcd90870ccbfd7d50f6ccd593b5f1253eb4db222ee30998892b2c87b6183e32b91e305ee5fd0f6c10b7d8de61bb636e9d3193
+  metadata.gz: 4d519009145bd2756dd2c36ba30c07f237800f88c7bb1bedea656cd215ee4625b53698655af0c6e3d8d0a8f368a294cb5a08792ea86e7efc49db430ec4ae1976
+  data.tar.gz: 0cbe2c292533d70314783671ea45172b76c208a6492d583ea38ef3ceebbfba6e0324d383f2ad0609546471d8d649761c1f9779c0850ae5de513dd00ccc5f9f0d

data/lib/cmdr.rb

@@ -1,152 +1,91 @@
-#!/uar/bin/ruby
+#!/usr/bin/env ruby
 
-#file: cmdr.rb
+# file: cmdr.rb
 
-require 'builder'
-require 'rscript'
-require 'rexml/document'
-include REXML
 
 class Cmdr
 
-  def initialize(opt={}, app_mgr=nil)
-    
-    opt[:public].merge!({
-      user: 
-      {'-1' => 
-        {
-          history: 
-          {list: [], index: []}
-        }
-      }
-    })        
-    
-    @v = opt[:public]
-    @@app = app_mgr
+  def initialize()
 
-    super()
-  end
+    @linebuffer = ''
+    @history = []
+    @out = []
 
-  
-  def run_cmd(raw_command, user_id='-1', bottom_up_display=true)
+  end
 
-    input_string = raw_command.clone
+  def input(c, enter: "\r", backspace: "\u007F", arrowup: :arrow_up)
 
-    command, options_string = raw_command[/\w+/], ($').strip
+    key = c
 
+    reveal(c)
     
-    if @v[:alias].has_key? command then
-      command, options_string2 = @v[:alias][command][/\w+/], ($').strip 
-      options_string = options_string2 + ' '+ options_string
-    elsif @v[:user][user_id][:alias].has_key? command then
-      command, options_string2 = @v[:user][user_id][:alias][command][/\w+/], ($').strip 
-      options_string = options_string2 + ' '+ options_string      
-    end
-
-    # save the command to history
-    unless raw_command[/arrowup|arrowdown/] then
-      @v[:user][user_id][:history][:list] << raw_command 
-      @v[:user][user_id][:history][:index] = -1
-    end
-
-    raw_args = options_string.gsub(/\".[^\|\'"]+["']/) {|x| x.gsub(/\s/,'%20')}.split(/\s/)\
-      .map {|x| x.gsub(/%20/,' ').sub(/\"(.*)\"/,'\1')}
-    rs = RScript.new()
-    code, args = rs.read(raw_args)
-  
-    @user_id = user_id unless user_id == '-1'
-    doc = Document.new eval(code)
-  
-    node = XPath.first(doc.root, 'summary/javascript')
-    job_with_js = ''
+    @out << case key
+    when enter
+       
+      command = @linebuffer 
+      
+      @history << command 
+      
+      if @linebuffer.length < 1 then
+        return clear_cli()
+      end      
+      
+      result = yield(@linebuffer)
+      
+      if result then
+        display_output("\n" + result)
+      else
+        display_output 'command not found >> '  + @linebuffer.inspect
+      end
 
-    if node then
-      job_with_js = node.text.to_s
-      node.parent.delete node
-    end
+      @linebuffer = ''
+      clear_cli()
 
-    if XPath.first(doc.root, "records/*") then
-      r = XPath.match(doc.root, 'records/*').map do |node|
-        nodes = XPath.match(node, '*')
-        if nodes.length > 1 then
-          item_details = nodes.map do |x|
-            t = x.cdatas.length > 0 ? x.cdatas.join.strip : x.text.to_s.strip
-            "<strong>%s</strong>: %s" % [x.name, t]
-          end
-        else
-          item_details = nodes.map do |x|
-            x.cdatas.length > 0 ? x.cdatas.join.strip : x.text.to_s.strip
-          end              
-        end
-        "<ul><li>%s</li></ul>" % item_details.join("</li><li>")  
-      end
-      out = "<ul><li>%s</li></ul>" % r.join("</li><li>")
+    when backspace
+      @linebuffer.chop!
+      cli_update()
+    when arrowup
+      old_command = @history.last
+      @linebuffer = old_command
+      cli_update old_command
     else
-      text1 = XPath.first(doc.root, 'summary/title/text() | summary/to_s/text()')
-      out = REXML::Text::unnormalize(text1.to_s).gsub(/"/,'&#34;')
-    end
     
-    javascript = []
-    javascript << (bottom_up_display == true ? listmite(out) : listite(out))
-    javascript << job_with_js
-
-    xml = Builder::XmlMarkup.new( :target => buffer='', :indent => 2 )
-    xml.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
-    xml.result do
-      xml.summary do
-        xml.status 'success'
-        xml.script {xml.cdata!(javascript.join("\n"))}
-        xml.output r.to_s
+      if key.length < 2  then
+    
+        @linebuffer << key
+        key
       end
-      xml.records
+
     end
 
-    buffer
+  end
 
+  # display the cli banner upon initialisation
+  #
+  def cli_banner()
+    print "> "
   end
 
   protected
-
-  def listite(out)
-"
-olist = document.getElementById('list');
-ocontent = document.getElementById('content');  
-oli = document.createElement('li');
-
-oli.innerHTML = \"#{out.gsub(/\r|\n/,"").gsub(/"/,'&#34;')}\";
-ocontent.insertBefore(oli, ocontent.firstChild);
-
-olist.scrollTop = olist.scrollHeight;
-
-ocommandInput = document.getElementById('user_input');
-ocommandInput.value = '';
-"
+  
+  # display the current input
+  #
+  def cli_update(s='')
+    print s
   end
 
-  def listmite(out)
-"
-  ocontent = document.getElementById('content');
-  oli = document.createElement('li');
-
-  oli.innerHTML = \"#{out.gsub(/\r|\n/,"").gsub(/"/,'&#34;')}\";
-  ocontent.appendChild(oli);
-  olist.scrollTop = olist.scrollHeight;
+  alias clear_cli cli_update
 
-  ocommandInput = document.getElementById('user_input');
-  ocommandInput.value = '';
-"
-  end
-  
-  def run_rscript(rsf_url, jobs, arg='')
-    ajobs = jobs.split(/\s/)
-    args = [rsf_url, ajobs, arg].flatten
-    RScript.new().read(args)    
+  # display the output
+  #
+  def display_output(s='') 
+    print s
   end
 
-  def run_script(url, jobs, qargs='')
-    result, args = run_rscript(url, jobs, qargs)
-    eval(result)
+  # display the key pressed
+  #
+  def reveal(c)
+    print c
   end
-  
-end
 
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmdr
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,55 +10,29 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDRDCCAiygAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
+  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTEzMDIwNjIwNTQ0OVoXDTE0MDIwNjIwNTQ0OVowSDESMBAG
+  8ixkARkWAmV1MB4XDTE2MTAzMDE2MDgxOFoXDTE3MTAzMDE2MDgxOFowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMB2RtBMHwkvex3PK14VYBNlfUPEEYUciQvZ3gqUayZdTrVDc1lbi/SYtXT5
-  0XSgMaMMXrTwiEYhJg1bhBfAatEWhCUwZcTSb8PmZHLKhLZFxKQ9W3bMyyxtIfGa
-  o1rASVtHnePYgj0bVWpi0fl/jSb1uGIn3D4IqyfCqZtLvRBc+3KLlAdbbTsJB1CI
-  KrE8IavBg1PEVBzomR675uFEKCYZcFjzm/EoXCCP3JWxfUsu21DRhnh/2bKZZ9me
-  5TrffrlbkLaFNR/pZXuvjUiJIEH6XOK4IwCVPfg5Emc4q251julYgHeoZjJGlS2w
-  SfZ9lElfZg+oDuKHeKyT6+49pmUCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4E
-  FgQUQa4kRS3DafiIRUNfmaUswd7FZ4wwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEB
-  BQUAA4IBAQAe5035EZ5R6d+HwXR9dEpGltKVs+HWLvNoB57OwNfde0TY1pwtJvhi
-  2gduCTLka30H5psssqUED2kUTDQL8gIgafbNTztFF98dIts3utuvL5hn/6ydhL8Q
-  8ZH1sdGXDlbme9NiIJZVtw8vk496AajgKGxrmyFyQoQXxrBvpawMU8nstelEF59V
-  EZsG6kTStqNRL8Wx5W5olBJZ28PX+fjXzSeKmW1olCXueWQwFakhjW5hJ2FBEtCg
-  ybv2OhcQyzX5ZKzty0PYkZoLwN7En02+rBmRdZgjFr28Y6Bidrlc4XWzYh7rchTI
-  asmNVUZ9/GHrHPmCZ+INjcj7cAHMr7mm
+  ggEBAKsWLDFeFbYAH0Pbhka+4oXMFsG0Lj6cyce1YVzuYUQJ56AzOcbIZ6jVlS0o
+  yS/3IRBe2syfn6JYtXK4BLzRhxzIB00iKhHchva6jTQyrGM4pYYDs/wcW3qBt6HC
+  v7mb3YqAguhzUCPUrXr92BPLHka/rPOL1H5FRCp0eLnsQOB4NLYHPH6Jo91yea+p
+  u7vS1wxdGyIajwkZB5nIbcRxd/BLXJhyKzbKOadQWvRMcqmDWmiKMnXOkNIb1kma
+  aeU4gZfcxC4pfz+bNAP9ySgO2ArLWMHIUeCyTR3BewAhS78P4r/Qf32f0hGyZd6b
+  hB1E/RiIOrH0RfJTyZBYwM3jV8UCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUM7nKqZE9+vhW31pRqSj/u8Q0wg8wJgYDVR0RBB8w
+  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAIfmEHwQw
+  V7LcxwUPAMLo0BGce+pkIPfkY0+ljpVvtfppYq/m4ZdKWgrkoqqluam0aMyIAEJp
+  WftNoNlUZBBtcwoR9k4bZBtIIXB2fzlqHGBFS7Gemy76tDZlKYedQVbzvCG8hjs/
+  Gd8+oGgpxMgFDfpZ6MbbtO33u2qppE+fxtWanBJAjBeWPck9a9OS3Wn2kuNBc9+G
+  H+SzfeQ18BKVa3gXhAvTTAe2rIAImWVuU+kx6cqpFUwMlT89IxEh95yfjD54dooC
+  aQuuxN6Drf3pdfalETmFyPgJ7gU+AcENcNa4wGuZKF786/ki4mt++AhKIiQI+Tbn
+  fduXC3tBaNX+gQ==
   -----END CERTIFICATE-----
-date: 2013-07-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rscript
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2016-10-30 00:00:00.000000000 Z
+dependencies: []
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -76,17 +50,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: cmdr