feat(tools):

resolves apache/openserverless#44

Author: d4rkstar

main.go

@@ -341,7 +341,7 @@ func Main() {
 	}
 
 	// setup the envvar for the embedded tools
-	os.Setenv("OPS_TOOLS", strings.Join(append(mainTools, tools.ToolList...), " "))
+	os.Setenv("OPS_TOOLS", strings.Join(tools.MergeToolsList(mainTools), " "))
 
 	// CLI: ops -v | --version | -h | --help | -reset
 	// preliminanre processing not requiring to  downloading anything

prepare_test.go

@@ -58,7 +58,6 @@ func Example_download() {
 	// Updating tasks...
 	// Tasks are already up to date!
 	// 2 <nil> /home/.ops/0.1.0/olaris
-
 }
 
 func Example_locate_root() {

tests/datefmt.bats

@@ -21,16 +21,17 @@ setup() {
     export NO_COLOR=1
 }
 
-@test "datefmt print usage" {
+@test "-datefmt help message" {
     run ops -datefmt -h
     assert_success
-    assert_line "Usage:"
+    assert_line --partial "ops -datefmt [options] [arguments]"
 
     run ops -datefmt --help
     assert_success
-    assert_line "Usage:"
+    assert_line --partial "ops -datefmt [options] [arguments]"
 }
 
+
 @test "datefmt with input timestamp and output format" {
     run ops -datefmt -t 1577836800 -f DateOnly
     assert_success

tests/echoif.bats

@@ -23,10 +23,12 @@ setup() {
 
 @test "-echoif help message" {
     run ops -echoif
-    assert_line "Usage: echoif <a> <b>"
+    assert_success
+    assert_line --partial "ops -echoif <a> <b>"
 
     run ops -echoif -h
-    assert_line "Usage: echoif <a> <b>"
+    assert_success
+    assert_line --partial "ops -echoif <a> <b>"
 }
 
 @test "-echoif echoes a with successful previous command" {
@@ -43,10 +45,12 @@ setup() {
 
 @test "-echoifempty help message" {
     run ops -echoifempty
-    assert_line "Usage: echoifempty <str> <a> <b>"
+    assert_success
+    assert_line --partial "ops -echoifempty <str> <a> <b>"
 
     run ops -echoifempty -h
-    assert_line "Usage: echoifempty <str> <a> <b>"
+    assert_success
+        assert_line --partial "ops -echoifempty <str> <a> <b>"
 }
 
 @test "-echoifempty echoes a if string is empty" {
@@ -61,10 +65,12 @@ setup() {
 
 @test "-echoifexists help message" {
     run ops -echoifexists
-    assert_line "Usage: echoifexists <file> <a> <b>"
+    assert_success
+    assert_line --partial "ops -echoifexists <file> <a> <b>"
 
     run ops -echoifexists -h
-    assert_line "Usage: echoifexists <file> <a> <b>"
+    assert_success
+    assert_line --partial "ops -echoifexists <file> <a> <b>"
 }
 
 @test "-echoifexists echoes a if file exists" {

tests/extract.bats

@@ -24,7 +24,8 @@ setup() {
 
 @test "extract" {
     run ops -extract
-    assert_line "Usage: file.(zip|tgz|tar[.gz|.bz2|.xz]) target"
+    assert_success
+    assert_line --partial "ops -extract file.(zip|tgz|tar[.gz|.bz2|.xz]) target"
     curl -sL -o7zip.tar.xz https://www.7-zip.org/a/7z2407-linux-x64.tar.xz 
 
     run ops -extract 7zip.tar.xz missing
@@ -54,17 +55,4 @@ setup() {
     run ops -extract coreutils.zip coreutils.exe
     assert_success
     assert test -e coreutils.exe
-}    
-
-@test "-empty" {
-    run ops -empty
-    assert_line "Usage: filename"
-    run ops -empty empty_file
-    assert test -f empty_file
-    assert_success
-    run ops -empty empty_file
-    assert_failure
-    assert_line "file already exists"
-    rm empty_file
-
-}
+}

tests/filetype.bats

@@ -23,10 +23,12 @@ setup() {
 
 @test "filetype usage print" {
     run ops -filetype
-    assert_line "Usage: filetype [-h] [-e] [-m] FILE"
+    assert_success
+    assert_line --partial "ops -filetype [-h] [-e] [-m] FILE"
 
     run ops -filetype -h
-    assert_line "Usage: filetype [-h] [-e] [-m] FILE"
+    assert_success
+    assert_line --partial "ops -filetype [-h] [-e] [-m] FILE"
 }
 
 @test "filetype -e" {

tests/needupdate.bats

@@ -23,10 +23,12 @@ setup() {
 
 @test "needupdate message" {
     run ops -needupdate
-    assert_line "Usage:"
+    assert_failure
+    assert_line --partial "ops -needupdate <versionA> <versionB>"
 
     run ops -needupdate -h
-    assert_line "Usage:"
+    assert_success
+    assert_line --partial "ops -needupdate <versionA> <versionB>"
 }
 
 @test "needupdate returns 0 if a > b" {

tests/random.bats

@@ -24,11 +24,11 @@ setup() {
 @test "ops -random help" {
     run ops -random -h
     assert_success
-    assert_line "Usage:"
+    assert_line --partial "ops -random [options]"
 
     run ops -random --help
     assert_success
-    assert_line "Usage:"
+    assert_line --partial "ops -random [options]"
 }
 
 @test "ops -random" {

tests/retry.bats

@@ -24,15 +24,15 @@ setup() {
 @test "ops -retry help" {
     run ops -retry
     assert_success
-    assert_line "Usage:"
+    assert_line --partial "ops -retry [options] task [task options]"
 
     run ops -retry -h
     assert_success
-    assert_line "Usage:"
+    assert_line --partial "ops -retry [options] task [task options]"
 
     run ops -retry --help
     assert_success
-    assert_line "Usage:"
+    assert_line --partial "ops -retry [options] task [task options]"
 }
 
 @test "ops -retry fail" {

tests/urlenc.bats

@@ -0,0 +1,51 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+setup() {
+    load 'test_helper/bats-support/load'
+    load 'test_helper/bats-assert/load'
+    export NO_COLOR=1
+}
+
+@test "ops -urlenc help" {
+    run ops -urlenc -h
+    assert_success
+    assert_line --partial "ops -urlenc [-e] [-s <string>] [parameters]"
+
+    run ops -urlenc --help
+    assert_success
+    assert_line --partial "ops -urlenc [-e] [-s <string>] [parameters]"
+}
+
+@test "ops -urlenc" {
+  run ops -urlenc
+  assert_success
+  refute_output
+
+  run ops -urlenc a=1 b=2
+  assert_success
+  assert_line "a%3D1&b%3D2"
+
+  run ops -urlenc -s "|" a=1 b=2
+  assert_success
+  assert_line "a%3D1|b%3D2"
+}
+
+@test "ops -urlenc string from env" {
+  run env TEST=ops ops -urlenc -e TEST
+  assert_line "ops"
+}