From ianb at erislabs.net  Mon Oct 10 02:24:38 2011
From: ianb at erislabs.net (Ian Beckwith)
Date: Mon, 10 Oct 2011 02:24:38 +0000
Subject: [Surfraw-commits] [SCM] surfraw - a fast unix command line
	interface to WWW branch, master,
	updated. surfraw_2-2-5_1-214-g977c5e8
Message-ID: <E1RD5Xi-0001SU-73@vasks.debian.org>

The following commit has been merged in the master branch:
commit b28abebe657b02d1e2b979cc2e899b6e46c90a79
Author: Kyle Isom <coder at kyleisom.net>
Date:   Wed Sep 28 19:53:49 2011 +0300

    New elvi: wolfram (kyle isom <coder at kyleisom.net>)

diff --git a/AUTHORS b/AUTHORS
index 6453da7..5846c06 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -114,7 +114,7 @@ Jakob <jakob at pipefour.org>
         elvi: pasearch
 
 Kyle Isom <coder at kyleisom.net>
-        elvi: cablesearch, duckduckgo, openports
+        elvi: cablesearch, duckduckgo, openports, wolfram
 	plus fixes.
 
 Jason Ryan <jasonwryan at gmail.com>
diff --git a/ChangeLog b/ChangeLog
index 6b4025f..9703f10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-09 Kyle Isom
+        * New elvi: wolfram - query Wolfram Alpha
+        * Author: Kyle Isom <coder at kyleisom.net>
+        * Added test for wolfram.
+
 2011-08-09  Ian Beckwith  <ianb at erislabs.net>
 
 	* New elvi: priberam - search Portuguese dictionary.
diff --git a/README b/README
index 79e79ea..feca23a 100644
--- a/README
+++ b/README
@@ -261,6 +261,7 @@ webster         -- Look up word in Merriam-Webster's Dictionary (www.m-w.com)
 wetandwild      -- Real time weather information (many sources)
 wikipedia       -- Search the free encyclopedia wikipedia
 woffle          -- Search the web using Woffle (localhost:8080)
+wolfram         -- Ask questions of the computational knowledge engine
 worldwidescience        -- Search for science with www.worldwidescience.org
 yahoo           -- Search Yahoo categories (www.yahoo.com)
 yandex          -- Search the web using Yandex (yandex.ru)
diff --git a/elvi/Makefile.am b/elvi/Makefile.am
index 6182131..f79c20c 100644
--- a/elvi/Makefile.am
+++ b/elvi/Makefile.am
@@ -109,6 +109,7 @@ dist_elvi_SCRIPTS	= \
 		  wetandwild \
 		  wikipedia \
 		  woffle \
+                  wolfram \
 		  worldwidescience \
 		  yahoo \
 		  yandex \
diff --git a/elvi/wolfram b/elvi/wolfram
new file mode 100755
index 0000000..eef6290
--- /dev/null
+++ b/elvi/wolfram
@@ -0,0 +1,41 @@
+#!/bin/sh
+# elvis: wolfram	-- Ask questions of the computational knowledge engine
+# coder at kyleisom.net 20110105
+. surfraw || exit 1
+
+w3_config_hook () {
+    def     SURFRAW_wolfram_results             "$SURFRAW_results"
+    def     SURFRAW_wolfram_base_url            "www.wolframalpha.com/"
+    def     SURFRAW_wolfram_search              search
+    def     SURFRAW_wolfram_params              "input/?i="
+}
+
+w3_usage_hook () {
+    cat <<EOF
+Usage: $w3_argv0 [options] [search words]...
+Description:
+  Surfraw search the web using wolfram (www.wolfram.com)
+Local options:
+    (null) 
+EOF
+    w3_global_usage
+}
+
+w3_parse_option_hook () {
+    opt="$1"
+    optarg="$2"
+    case "$opt" in
+    *) return 1 ;;
+    esac
+    return 0
+}
+
+w3_config
+w3_parse_args "$@"
+# w3_args now contains a list of arguments
+
+SURFRAW_wolfram_base_url="http://${SURFRAW_wolfram_base_url}"
+
+escaped_args=`w3_url_of_arg $w3_args`
+
+w3_browse_url "${SURFRAW_wolfram_base_url}${SURFRAW_wolfram_params}${escaped_args}"
diff --git a/links.IN b/links.IN
index 845d1d5..3409fa7 100644
--- a/links.IN
+++ b/links.IN
@@ -105,6 +105,7 @@ elvi.1sr.gz @mandir@/man1/webster.1sr.gz
 elvi.1sr.gz @mandir@/man1/wetandwild.1sr.gz
 elvi.1sr.gz @mandir@/man1/wikipedia.1sr.gz
 elvi.1sr.gz @mandir@/man1/woffle.1sr.gz
+elvi.1sr.gz @mandir@/man1/wolfram.1sr.gz
 elvi.1sr.gz @mandir@/man1/worldwidescience.1sr.gz
 elvi.1sr.gz @mandir@/man1/yahoo.1sr.gz
 elvi.1sr.gz @mandir@/man1/yandex.1sr.gz
diff --git a/test/urban.test b/test/wolfram.test
similarity index 51%
copy from test/urban.test
copy to test/wolfram.test
index 787ca17..8a4fd80 100644
--- a/test/urban.test
+++ b/test/wolfram.test
@@ -1,2 +1,3 @@
-urban foo
+wolfram foo
 metasyntactic
+

-- 
surfraw -  a fast unix command line interface to WWW


From ianb at erislabs.net  Mon Oct 10 02:24:38 2011
From: ianb at erislabs.net (Ian Beckwith)
Date: Mon, 10 Oct 2011 02:24:38 +0000
Subject: [Surfraw-commits] [SCM] surfraw - a fast unix command line
	interface to WWW branch, master,
	updated. surfraw_2-2-5_1-214-g977c5e8
Message-ID: <E1RD5Xi-0001Sy-Mn@vasks.debian.org>

The following commit has been merged in the master branch:
commit 73c550f5843ddc44cd3fc125a2231486d8377308
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Mon Oct 10 02:43:20 2011 +0100

    new elvi: pin by Jason Ryan

diff --git a/AUTHORS b/AUTHORS
index 5846c06..896097d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -118,7 +118,7 @@ Kyle Isom <coder at kyleisom.net>
 	plus fixes.
 
 Jason Ryan <jasonwryan at gmail.com>
-        elvi: archwiki, deli, stack
+        elvi: archwiki, deli, stack, pin
 
 Sara Fauzia <sara at archlinux.us>
         archpkg fix.
diff --git a/ChangeLog b/ChangeLog
index 9703f10..58e4a4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2011-09-09 Kyle Isom
+2011-10-10  Jason Ryan  <jasonwryan at gmail.com>
+
+	* New elvi: pin (search pinboard.in).
+
+2011-09-09  Kyle Isom  <coder at kyleisom.net>
+
         * New elvi: wolfram - query Wolfram Alpha
         * Author: Kyle Isom <coder at kyleisom.net>
         * Added test for wolfram.
diff --git a/README b/README
index feca23a..0d0125a 100644
--- a/README
+++ b/README
@@ -229,6 +229,7 @@ openports       -- search openports for OpenBSD packages
 opensearch      -- Search an OpenSearch-enabled website
 pasearch        -- Search the unofficial Penny Arcade archives (pipefour.org/pa)
 pgpkeys         -- Search the PGP key database
+pin             -- Search Pinboard bookmarks (http://pinboard.in)
 piratebay       -- Search thepiratebay.org for torrents
 priberam        -- Look up word in Priberam online dictionary (www.priberam.pt/dlpo)
 pubmed          -- Search medical/molbio databases (www.ncbi.nlm.nih.gov)
diff --git a/elvi/Makefile.am b/elvi/Makefile.am
index f79c20c..717ce53 100644
--- a/elvi/Makefile.am
+++ b/elvi/Makefile.am
@@ -76,6 +76,7 @@ dist_elvi_SCRIPTS	= \
 		  openports \
 		  opensearch \
 		  pasearch \
+		  pin \
 		  piratebay \
 		  pgpkeys \
 		  priberam \
diff --git a/elvi/pin b/elvi/pin
new file mode 100755
index 0000000..28edd90
--- /dev/null
+++ b/elvi/pin
@@ -0,0 +1,93 @@
+#!/bin/sh
+# elvis: pin		-- Search Pinboard bookmarks (http://pinboard.in)
+# author: jason ryan ? http://jasonwryan.com
+
+. surfraw || exit 1
+
+w3_config_hook () {
+def    SURFRAW_pinboard_tags "$SURFRAW_tags"
+def    SURFRAW_pinboard_user "$SURFRAW_user"
+def    SURFRAW_pinboard_new               0
+def    SURFRAW_pinboard_popular           0
+}
+
+w3_usage_hook () {
+    cat <<EOF
+Usage: $w3_argv0 [options] [search words]...
+Description:
+    Surfraw search Pinboard bookmarks (http://pinboard.in)
+
+    Local options:
+    Default search (without any options) includes tags, titles and descriptions 
+    and is not limited to a specific number of search terms.
+
+    -popular    |  -p  Search popular tags
+    -recent     |  -r  Search recent tags
+
+    -tags=TAGS  |  -t=TAGS  Only search tags (separate a maximum of 3 TAGS with 
+                   a "+" eg., unix+linux)
+    -user=NAME  |  -u=NAME  Search a user's bookmarks
+                    
+                                       
+EOF
+    w3_global_usage
+}
+
+w3_parse_option_hook () {
+    opt="$1"
+    optarg="$2"
+    case "$opt" in
+    -p* ) setoptyn SURFRAW_pinboard_popular 1        ;;
+    -r* ) setoptyn SURFRAW_pinboard_new     1        ;;
+    -t=*) setopt   SURFRAW_pinboard_tags    $optarg  ;;
+    -u=*) setopt   SURFRAW_pinboard_user    $optarg  ;;
+       *) return 1  ;;
+    esac
+    return 0
+}
+
+# create tag string
+tags () {    
+    local IFS=+
+
+    for tag in $SURFRAW_pinboard_tags; do
+        printf "%s" "t:$tag/"
+    done
+}
+
+
+w3_config
+w3_parse_args "$@"
+
+# w3_args now contains a list of arguments
+escaped_args=$(w3_url_of_arg $w3_args)
+base_url="https://pinboard.in/"
+
+# check for recent & popular
+if [ "$SURFRAW_pinboard_new" = 1 ]; then
+	suffix="recent/"
+elif [ "$SURFRAW_pinboard_popular" = 1 ]; then
+	suffix="popular"
+fi
+
+# Run through the other possibilities...
+if [ -z "$w3_args" ]; then  
+    
+    if [ -n "$SURFRAW_pinboard_user" ] && [ -n "$SURFRAW_pinboard_tags" ]; then
+        w3_browse_url "${base_url}u:$SURFRAW_pinboard_user/$(tags)"
+
+    elif [ -n "$SURFRAW_pinboard_tags" ]; then
+        w3_browse_url "${base_url}$(tags)"
+
+    elif [ -n "$SURFRAW_pinboard_user" ]; then
+        w3_browse_url "${base_url}u:$SURFRAW_pinboard_user"
+
+    else w3_browse_url "$base_url${suffix}"
+    fi
+
+elif [ -n "$w3_args" ]; then
+    w3_browse_url "${base_url}search/?query=${escaped_args}&all=Search+All"
+
+else
+    w3_browse_url "${base_url}"
+fi
diff --git a/elvi/wolfram b/elvi/wolfram
index eef6290..09f7d7b 100755
--- a/elvi/wolfram
+++ b/elvi/wolfram
@@ -1,5 +1,5 @@
 #!/bin/sh
-# elvis: wolfram	-- Ask questions of the computational knowledge engine
+# elvis: wolfram		-- Ask questions of the computational knowledge engine
 # coder at kyleisom.net 20110105
 . surfraw || exit 1
 
diff --git a/links.IN b/links.IN
index 3409fa7..4da7ab2 100644
--- a/links.IN
+++ b/links.IN
@@ -72,6 +72,7 @@ elvi.1sr.gz @mandir@/man1/openbsd.1sr.gz
 elvi.1sr.gz @mandir@/man1/openports.1sr.gz
 elvi.1sr.gz @mandir@/man1/opensearch.1sr.gz
 elvi.1sr.gz @mandir@/man1/pasearch.1sr.gz
+elvi.1sr.gz @mandir@/man1/pin.1sr.gz
 elvi.1sr.gz @mandir@/man1/piratebay.1sr.gz
 elvi.1sr.gz @mandir@/man1/pgpkeys.1sr.gz
 elvi.1sr.gz @mandir@/man1/priberam.1sr.gz
diff --git a/test/pin.test b/test/pin.test
new file mode 100644
index 0000000..fd72006
--- /dev/null
+++ b/test/pin.test
@@ -0,0 +1,2 @@
+pin surfraw
+fast unix command line interface

-- 
surfraw -  a fast unix command line interface to WWW


From ianb at erislabs.net  Mon Oct 10 02:24:39 2011
From: ianb at erislabs.net (Ian Beckwith)
Date: Mon, 10 Oct 2011 02:24:39 +0000
Subject: [Surfraw-commits] [SCM] surfraw - a fast unix command line
	interface to WWW branch, master,
	updated. surfraw_2-2-5_1-214-g977c5e8
Message-ID: <E1RD5Xj-0001TA-37@vasks.debian.org>

The following commit has been merged in the master branch:
commit 977c5e815b8538a871cc1da866a50d16da1f736d
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Mon Oct 10 03:23:25 2011 +0100

    new elvi: f5 and cisco, by Shain Singh <shain.singh at gmail.com>

diff --git a/.gitignore b/.gitignore
index 90d55e9..b56e5ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*~
 Makefile
 build-stamp
 config.log
diff --git a/AUTHORS b/AUTHORS
index 896097d..02b33d9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -126,6 +126,9 @@ Sara Fauzia <sara at archlinux.us>
 Paulo Almeida <paulo at diasalmeida.com>
         elvi: priberam
 
+Shain Singh <shain.singh at gmail.com>
+        elvi: cisco, f5 
+
 THANKS TO
 
 Brian Nelson           <bnelson at bloodclot.net>
diff --git a/ChangeLog b/ChangeLog
index 58e4a4a..d22d4ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-10  Shain Singh <shain.singh at gmail.com>
+
+	* New elvi: f5, cisco
+
 2011-10-10  Jason Ryan  <jasonwryan at gmail.com>
 
 	* New elvi: pin (search pinboard.in).
diff --git a/README b/README
index 0d0125a..00a4d5c 100644
--- a/README
+++ b/README
@@ -172,6 +172,7 @@ bugmenot        -- Bypass compulsory web registration with bugmenot.com
 bugzilla        -- Search for bugs on Bugzilla bugtrackers
 cablesearch     -- search openports for OpenBSD packages
 cia             -- Search CIA documents at www.cia.gov
+cisco           -- Search Cisco documentation (www.cisco.com)
 cite            -- Search computer science papers (citeseerx.ist.psu.edu)
 cliki           -- Search the common lisp wiki
 cnn             -- Search on CNN (cnn.com)
@@ -198,6 +199,7 @@ duckduckgo      -- Securely search the web using duckduckgo (www.duckduckgo.com)
 ebay            -- Search the Ebay auction site
 etym            -- Look up word origins at www.etymonline.com
 excite          -- Search on Excite (www.excite.com)
+f5              -- Search F5 related information (www.f5.com)
 finkpkg         -- Search Fink packages (pdb.finkproject.org)
 foldoc          -- The Free On-Line Dictionary Of Computing (foldoc.org)
 freebsd         -- Search FreeBSD related information (www.freebsd.org)
diff --git a/elvi/Makefile.am b/elvi/Makefile.am
index 717ce53..aa53291 100644
--- a/elvi/Makefile.am
+++ b/elvi/Makefile.am
@@ -20,6 +20,7 @@ dist_elvi_SCRIPTS	= \
 		  bugzilla \
 		  cablesearch \
 		  cia \
+		  cisco \
 		  cite \
 		  cliki \
 		  cnn \
@@ -46,6 +47,7 @@ dist_elvi_SCRIPTS	= \
 		  ebay \
 		  etym \
 		  excite \
+		  f5 \
 		  foldoc \
 		  finkpkg \
 		  freebsd \
diff --git a/elvi/sunonesearch b/elvi/cisco
similarity index 52%
copy from elvi/sunonesearch
copy to elvi/cisco
index 267b938..17d03fa 100755
--- a/elvi/sunonesearch
+++ b/elvi/cisco
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# elvis: sunonesearch	-- Search Sun One Search (onesearch.sun.com)
+# elvis: cisco		-- Search Cisco documentation (www.cisco.com)
 
 . surfraw || exit 1
 
@@ -8,7 +8,7 @@ w3_usage_hook () {
     cat <<EOF
 Usage: $w3_argv0 [options] [search words]...
 Description:
-  Surfraw search Sun One Search (onesearch.sun.com)
+Surfraw search Cisco documentation (www.cisco.com)
 EOF
     w3_global_usage
 }
@@ -17,8 +17,8 @@ w3_config
 w3_parse_args "$@"
 # w3_args now contains a list of arguments
 if test -z "$w3_args"; then
-    w3_browse_url "http://onesearch.sun.com/"
+    w3_browse_url "http://tools.cisco.com/"
 else
     escaped_args=`w3_url_of_arg $w3_args`
-    w3_browse_url "http://search.sun.com/search/onesearch/index.jsp?qt=${escaped_args}"
+    w3_browse_url "http://tools.cisco.com/search/JSP/search-results.get?isFormSubmit=true&strQueryText=${escaped_args}"
 fi
diff --git a/elvi/f5 b/elvi/f5
new file mode 100755
index 0000000..1941b95
--- /dev/null
+++ b/elvi/f5
@@ -0,0 +1,56 @@
+#!/bin/sh
+# $Id$
+# elvis: f5		-- Search F5 related information (www.f5.com)
+. surfraw || exit 1
+
+w3_config_hook () {
+defyn   SURFRAW_f5_dc           no
+}
+
+w3_usage_hook () {
+    cat <<EOF
+Usage: $w3_argv0 [options] [search-string | PR-number]
+Description:
+  Surfraw search F5 related information
+Local options:
+  -dc[=(yes|no)]                Search F5 Devcentral
+                                Default: $SURFRAW_f5_dc
+                                Environment: SURFRAW_f5_dc
+Examples:
+  $w3_argv0                       Teleport to the F5 Knowledgebase
+  $w3_argv0 -dc                   Teleport to the F5 Devcentral site
+EOF
+    w3_global_usage
+}
+
+w3_parse_option_hook () {
+    opt="$1"
+    optarg="$2"
+    case "$opt" in
+	-dc)	setoptyn	SURFRAW_f5_dc		yes	;;
+	-dc=*) setoptyn	SURFRAW_f5_dc		$optarg	;;
+	*) return 1 ;;
+    esac
+    return 0
+}
+
+w3_config
+w3_parse_args "$@"
+# w3_args now contains a list of arguments
+test -z "$w3_args" || escaped_args=`w3_url_of_arg $w3_args`
+
+if ok SURFRAW_f5_dc; then
+    if test -z "$escaped_args"; then
+        w3_browse_url "http://devcentral.f5.com"
+    else
+        w3_browse_url "http://devcentral.f5.com/Default.aspx?tabid=37&cx=015798286719081439686:g38hs-tdy64&cof=FORID:11i&q=${escaped_args}"
+    fi
+    exit $?
+fi
+if test -z "$escaped_args"; then
+    w3_browse_url "http://www.f5.com"
+else
+    w3_browse_url "http://search.f5.com/search?q=${escaped_args}&btnG=Search&entqr=0&ud=1&sort=date%3AD%3AL%3Ad1&output=xml_no_dtd&oe=UTF-8&ie=UTF-8&client=default_frontend&proxystylesheet=default_frontend"
+
+fi
+exit $?
diff --git a/test/cisco.test b/test/cisco.test
new file mode 100644
index 0000000..2a23863
--- /dev/null
+++ b/test/cisco.test
@@ -0,0 +1,2 @@
+cisco netflow
+Cisco IOS NetFlow
diff --git a/test/f5.test b/test/f5.test
new file mode 100644
index 0000000..c215e07
--- /dev/null
+++ b/test/f5.test
@@ -0,0 +1,3 @@
+f5 SNMP
+Simple Network Management Protocol
+

-- 
surfraw -  a fast unix command line interface to WWW


From ianb at erislabs.net  Mon Oct 10 02:54:52 2011
From: ianb at erislabs.net (Ian Beckwith)
Date: Mon, 10 Oct 2011 02:54:52 +0000
Subject: [Surfraw-commits] [SCM] surfraw - a fast unix command line
	interface to WWW branch, master,
	updated. surfraw_2-2-5_1-215-g8b80a8a
Message-ID: <E1RD60y-0004C2-5V@vasks.debian.org>

The following commit has been merged in the master branch:
commit 8b80a8a424085aca817695bf9114055578fd20b8
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Mon Oct 10 03:54:47 2011 +0100

    surfraw.IN: test_elvi(): tweak sed regex

diff --git a/ChangeLog b/ChangeLog
index d22d4ef..994c3ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-10  Ian Beckwith  <ianb at erislabs.net>
+
+	* surfraw.IN: test_elvi(): tweak sed regex
+	* add tests for f5, cisco and pin.
+
 2011-10-10  Shain Singh <shain.singh at gmail.com>
 
 	* New elvi: f5, cisco
diff --git a/surfraw.IN b/surfraw.IN
index dedf369..945ca7e 100755
--- a/surfraw.IN
+++ b/surfraw.IN
@@ -317,7 +317,7 @@ w3_parse_option_hook () {
 
 list_elvi() {
     local dir="$1"
-    sed -n 's/^.*elvis: \(.*\)$/\1/p' $(find "$dir" ! -type d ! -type l ! -name '*~' | sort)
+    sed -n 's/^.*elvis:[ 	]\+\(.*\)$/\1/p' $(find "$dir" ! -type d ! -type l ! -name '*~' | sort)
     for script in $(find "$dir" ! -type d -type l | sort) ; do
 	printf '%-16s--> %s\n' $(basename "$script") $(basename $(readlink "${script}"))
     done

-- 
surfraw -  a fast unix command line interface to WWW