wmls 0.1.18 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 442f54ea46bc1651edef06f5b4c3fabae504fd4c
-  data.tar.gz: dd6b888becb63884c18b0dcddc2343cadd7088fd
+  metadata.gz: 17b61e58f1cb6cd7348ca44488b3131ca2a09306
+  data.tar.gz: caa970c7834d81229b205e41cc19b8d2b1fcb938
 SHA512:
-  metadata.gz: 723876ef4d3e1889ea31bdab567439034011ca570f41f0bdff30782379811d0cb040a0195712ea1b0dc1aa4485168af49998281eaa326d30c2275e461640886e
-  data.tar.gz: e8ddbbc6b54d8df8aef6b12bc1b51a7c723524d5c2fb752e4003c348dbe45cccdaf141c7a2dfe9902edaf61ebb5e823e7c21584a3c46dfe9c4ad4ced12275f92
+  metadata.gz: 551c7d5a9221db13bf1fda35f2ae2f7817221e869e3980efe2fa77870cc23d74c65510a7af6837cd66c32acbc275e227f3e2a0efa0382ae7181bdc9148a3bcb5
+  data.tar.gz: 7c030bfc5c2ad6693bdc6bb9d32f917f98210499088a2a69a1b427228556816b8f550318b1cf354844dd358c48a963716772aa8e799c5e320e750004db1de89b

data/README.md

@@ -0,0 +1,63 @@
+#wmls WITSML command line tool in Ruby
+
+Use this script to call GetCap, GetFromStore, AddToStore, UpdateInStore, or DeleteFromStore on 
+a WITSML server.
+
+##Install
+Make sure you've [installed Ruby](https://www.ruby-lang.org/en/downloads/). Then
+
+```
+gem install wmls
+```
+After install, the wmls command should be on your path. It uses lib/wmls.rb, a library you can use to write your own WITSML programs, which is installed as part of this gem.
+
+
+
+##Usage
+
+    wmls [options]
+    -Dvariable=value                 Replace occurrences of %variable% with value, in the query template  
+    -v, --verbose                    Run verbosely  
+    -r, --url url                    URL of the WITSML service  
+    -t, --timeout seconds            timeout in seconds (optional, default 60)  
+    -u, --username USER              HTTP user name  
+    -p, --password PASS              HTTP password  
+    -q, --query QUERYFILE            Path to file containing query, delete, add or update template  
+    -a, --action  cap|get|add|update|delete     WITSML action; default is 'get'  
+    -o, --optionsin OPTIONSIN        optionsIn string (optional)      
+    -h, --help                       Show this message  
+
+
+##Example
+
+```
+  wmls -q query_v1311/get_all_wells.xml -r https://yourserver.com/witsml -u username -p mypassword -a get
+```
+
+I've included a bunch of sample query templates originally created by Gary Masters of Energistics.
+You can obtain them by downloading the source zip at
+  https://github.com/wellstorm/wmls/archive/master.zip
+The templates contain variables delimited by % characters, e.g. "%uidWellbore%".
+Inspect the templates you want to use to determine the variables you need to replace.
+Pass substitution values for these values on the wmls command line, e.g:
+
+```
+  wmls -DuidWell=ABC -DuidWellbore=1234 ...
+ ```
+
+##License
+Apache 2.0
+
+##History
+ 10 Mar 2011 -- initial commit.  
+ 16 Oct 2011 -- added -D option to wmls command line tool  (0.1.7)  
+ 01 May 2012 -- added GetCap support (0.1.8)  
+01 May 2012 -- added support for capabilitiesIn parameter to all calls (0.1.9)  
+04 May 2012 -- added support for a headers parameter to all calls (0.1.11)    
+07 May 2012 -- fix headers param to get_cap (default should be {}) (0.1.13)  
+14 Jun 2012 -- return values to shell from wmls script (0.1.14)    
+14 Aug 2012 -- add timeout option to wmls script (0.1.15)  
+18 Jul 2015 -- replace REXML with nokogiri, and fix missing endDateTimeIndex (0.1.16)   (thanks emre.demirors and alex.bednarczyk)  
+21 Jul 2015 -- revert back to REXML. (nokogiri install too fragile) (0.1.18)  (do not install this version)  
+19 Apr 2016 -- revert back to 0.1.15 plus endDateTimeIndex fix (1.0.0)  
+

data/lib/wmls.rb

@@ -18,7 +18,7 @@ require 'net/http'
 require 'net/https'
 require 'uri'
 require 'stringio'
-require 'nokogiri'
+require 'rexml/document'
 
 # A WITSML client library. 
 #
@@ -149,27 +149,29 @@ END
   end
 
   def pretty_xml(xml_data)
-    doc = Nokogiri::XML(xml_data)
-    return doc.to_xml
+    s = ''
+    doc = REXML::Document.new(xml_data)
+    doc.write(s, 2)
+    return s
   end
 
   # parse the xml and return the singular of the root element name.
   def extract_type(xml_data)
-    doc = Nokogiri::XML(xml_data)
+    doc = REXML::Document.new(xml_data)
     plural = doc.root.name
     return plural[0..plural.length-2]
   end
 
   #extract the witsml response: status_code and xml_out
   def extract_response(xml_data)
-    doc = Nokogiri::XML(xml_data)
+    doc = REXML::Document.new(xml_data)
     r = 0
     x = ''
     s = ''
-    doc.xpath('//Result').each() { |elt| r = elt.text }
-    doc.xpath('//XMLout').each() { |elt| x = pretty_xml(elt.text) }
-    doc.xpath('//CapabilitiesOut').each() { |elt| x = pretty_xml(elt.text) }
-    doc.xpath('//SuppMsgOut').each() { |elt| s = elt.text }
+    doc.root.each_element('//Result') { |elt| r = elt.text}  
+    doc.root.each_element('//XMLout') { |elt| x = pretty_xml(elt.text)}  
+    doc.root.each_element('//CapabilitiesOut') { |elt| x = pretty_xml(elt.text)}  
+    doc.root.each_element('//SuppMsgOut') { |elt| s = elt.text }  
     return [r.to_i,s,x];
   end
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: wmls
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 1.0.0
 platform: ruby
 authors:
 - Hugh Winkler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies: []
 description: Wmls calls GetCap, GetFromStore, AddToStore, UpdateInStore, or DeleteFromStore
   on a WITSML server.
-email: hugh.winkler@wellstorm.com
+email: hughw@hughw.net
 executables:
 - wmls
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - LICENSE
-- README
-- bin/wmls
 - lib/wmls.rb
+- bin/wmls
 homepage: https://github.com/wellstorm/wmls/
 licenses:
 - Apache-2.0
@@ -32,17 +32,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Calls GetCap, GetFromStore, AddToStore, UpdateInStore, or DeleteFromStore

data/README

@@ -1,43 +0,0 @@
-wmls -- WITSML command line tool in Ruby.
-
-wmls is a script in the bin folder. It uses lib/wmls.rb, a library you can use to 
-write your own WiTSML programs. 
-
-Use this script to call GetCap, GetFromStore, AddToStore, UpdateInStore, or DeleteFromStore on 
-a WITSML server.
-
-Usage: wmls [options]
-    -Dvariable=value                 Replace occurrences of %variable% with value, in the query template
-    -v, --verbose                    Run verbosely
-    -r, --url url                    URL of the WITSML service
-    -t, --timeout seconds            timeout in seconds (optional, default 60)
-    -u, --username USER              HTTP user name
-    -p, --password PASS              HTTP password
-    -q, --query QUERYFILE            Path to file containing query, delete, add or update template
-    -a cap|get|add|update|delete         WITSML action; default is 'get'
-        --action
-    -o, --optionsin OPTIONSIN        optionsIn string (optional)    
-    -h, --help                       Show this message
-
-Example:
-wmls -q query_v1311/get_all_wells.xml -r https://witsml.wellstorm.com/witsml/services/store -u username -p mypassword -a get
-
-I've included a bunch of sample query templates originally created by Gary Masters of Energistics. 
-
-wmls files: Copyright 2012 Welstorm Development
-License: Apache 2.0
-
-History:
-
-10 Mar 2011 -- initial commit.
-16 Oct 2011 -- added -D option to wmls command line tool  (0.1.7)
-01 May 2012 -- added GetCap support (0.1.8)
-01 May 2012 -- added support for capabilitiesIn parameter to all calls (0.1.9)
-04 May 2012 -- added support for a headers parameter to all calls (0.1.11)
-07 May 2012 -- fix headers param to get_cap (default should be {}) (0.1.13)
-14 Jun 2012 -- return values to shell from wmls script (0.1.14)
-14 Aug 2012 -- add timeout option to wmls script
-18 Jul 2015 -- replace REXML with nokogiri, and fix missing endDateTimeIndex (0.1.16)
-               (thanks emre.demirors and alex.bednarczyk)
-21 Jul 2015 -- revert back to REXML. (nokogiri gem install too fragile) (0.1.18)
-