flickru 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a232ff981265c75b9600596b486f6df9b14cb66
-  data.tar.gz: f44447d52df46409e781cac65f242ed53a6876f0
+  metadata.gz: 01b148927c183da5d1d20f7f8d96ce1a1c30cfa8
+  data.tar.gz: 2e4c16f7818c236236485bba98058a9e0e8a43b6
 SHA512:
-  metadata.gz: 2da1b2b790679d03aff92a3518fc5725faa891194d85982f74d61345028db19b546a9322cdcee5aeb5474a666eec0dc5b5aa8ab80fd93ec6e7ec1d40924549e0
-  data.tar.gz: '049ebfd5474fe867f865a6fabb0c175f2ba7e9ab1fcb86cc75ff8088dbf67cba95f2b84ab4aa116c9112493f450821754b6c3d4e7240c89d5fc18d2aab73bbf5'
+  metadata.gz: abe4f57e9c7cea3ce46ca73c78e9628315dbd31dbe8c77f64b0b22c2d60a37912e565177faf6e9555922b3ab57b0623c8bbe54e297cafff2b550f541723b07b0
+  data.tar.gz: 5a4f6c2939af7362f62a8169138fdfffb0add5dd0673b516f72ca0cedc34a1f6a6d236266587059064fccb59670beeb693dd2187d7801d4f73b995bd46655cc8

data/bin/geowiki

@@ -1,81 +1,14 @@
-#!/usr/bin/env bash
+#!/usr/bin/env ruby
 
-###########
-# Globals #
-###########
+rb_file = File.expand_path(__FILE__)
 
-APP_NAME=`basename $0`
-PAGE=`echo "$1" | tr ' ' '_'`
+bin_dir   = File.dirname(rb_file)
+gem_dir   = File.dirname(bin_dir)
+share_dir = File.join(gem_dir, 'share')
 
-#############
-# Functions #
-#############
+sh_file = File.join(share_dir, File.basename(__FILE__) + '.sh')
 
-function usage() {
-   echo "$APP_NAME - find coordinates of a place described by Wikipedia"
-   echo "usage: $APP_NAME <place Wikipedia page>"
-   echo "example: $APP_NAME 'Mille-Isles, Quebec'"
-}
+args = %Q{"#{ARGV.join(' ')}"}
 
-function error() {
-   echo -e "\033[31m$APP_NAME:$1: $2\033[0m" 1>&2
-}
-
-#################
-# Preconditions #
-#################
-
-if [[ "$1" == "-h" ]] || [[ "$1" == "--help" ]]; then
-   usage
-   exit
-elif [[ $# -ne 1 ]]; then
-   usage
-   error $LINENO "wrong number of arguments"
-   exit 1
-fi
-
-#########
-# Setup #
-#########
-
-# temporal file management
-if [[ -d /tmp ]]; then
-   TMP="/tmp/$PAGE.tmp.$$.$RANDOM.html"
-else
-   TMP="$PAGE.tmp.html"
-fi
-function clean_up() {
-        rm -f "$TMP"
-        exit $1
-}
-trap clean_up SIGHUP SIGINT SIGTERM
-
-########
-# Main #
-########
-
-wget -o /dev/null -O "$TMP" "http://en.wikipedia.org/wiki/$PAGE"
-
-   if [[ $? -ne 0 ]]; then
-      error $LINENO "Wikipedia page '$PAGE' not found"
-      clean_up 1
-   fi
-
-URL=`cat "$TMP" | tr '"' '\n' | grep geohack | head -n 1 | sed -e 's|^//||' -e 's|&amp;|\&|'`
-
-   if [[ -z "$URL" ]]; then
-      error $LINENO "location not found in Wikipedia page '$PAGE'"
-      clean_up 1
-   fi
-
-curl "$URL" -o "$TMP" 2> /dev/null
-
-   if [[ $? -ne 0 ]]; then
-      error $LINENO "GeoHack URL '$URL' not found"
-      clean_up 1
-   fi
-
-cat "$TMP" | grep '<span class="geo"' \
-| sed -e 's|^.*"Latitude">\([^<]*\)</span>, .*"Longitude">\([^<]*\)</span>.*$|\1, \2|'
-
-clean_up
+print `#{sh_file} #{args}`
+exit $?.exitstatus

data/lib/flickru/version.rb

@@ -1,5 +1,5 @@
 module Flickru
   unless defined? VERSION
-    VERSION = "0.4.4"
+    VERSION = "0.5.0"
   end
 end

data/share/geowiki.sh

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+
+###########
+# Globals #
+###########
+
+APP_NAME=`basename $0`
+PAGE=`echo "$1" | tr ' ' '_'`
+
+#############
+# Functions #
+#############
+
+function usage() {
+   echo "$APP_NAME - find coordinates of a place described by Wikipedia"
+   echo "usage: $APP_NAME <place Wikipedia page>"
+   echo "example: $APP_NAME 'Mille-Isles, Quebec'"
+}
+
+function error() {
+   echo -e "\033[31m$APP_NAME:$1: $2\033[0m" 1>&2
+}
+
+#################
+# Preconditions #
+#################
+
+if ! `hash wget 2> /dev/null`; then
+   error $LINENO "wget command not found"
+   exit 1
+fi
+
+if [[ "$1" == "-h" ]] || [[ "$1" == "--help" ]]; then
+   usage
+   exit
+elif [[ $# -ne 1 ]]; then
+   usage
+   error $LINENO "wrong number of arguments"
+   exit 1
+fi
+
+#########
+# Setup #
+#########
+
+# temporal file management
+if [[ -d /tmp ]]; then
+   TMP="/tmp/$PAGE.tmp.$$.$RANDOM.html"
+else
+   TMP="$PAGE.tmp.html"
+fi
+function clean_up() {
+        rm -f "$TMP"
+        exit $1
+}
+trap clean_up SIGHUP SIGINT SIGTERM
+
+########
+# Main #
+########
+
+wget -o /dev/null -O "$TMP" "http://en.wikipedia.org/wiki/$PAGE"
+
+   if [[ $? -ne 0 ]]; then
+      error $LINENO "Wikipedia page '$PAGE' not found"
+      clean_up 1
+   fi
+
+URL=`cat "$TMP" | tr '"' '\n' | grep geohack | head -n 1 | sed -e 's|^//||' -e 's|&amp;|\&|'`
+
+   if [[ -z "$URL" ]]; then
+      error $LINENO "location not found in Wikipedia page '$PAGE'"
+      clean_up 1
+   fi
+
+curl "$URL" -o "$TMP" 2> /dev/null
+
+   if [[ $? -ne 0 ]]; then
+      error $LINENO "GeoHack URL '$URL' not found"
+      clean_up 1
+   fi
+
+cat "$TMP" | grep '<span class="geo"' \
+| sed -e 's|^.*"Latitude">\([^<]*\)</span>, .*"Longitude">\([^<]*\)</span>.*$|\1, \2|'
+
+clean_up

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flickru
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Jesus Pardillo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-15 00:00:00.000000000 Z
+date: 2016-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -234,6 +234,7 @@ email:
 - dev@jesuspardillo.com
 executables:
 - flickru
+- geowiki
 extensions: []
 extra_rdoc_files: []
 files:
@@ -249,6 +250,7 @@ files:
 - lib/flickru/ruby.rb
 - lib/flickru/string.rb
 - lib/flickru/version.rb
+- share/geowiki.sh
 - spec/flickru_spec.rb
 - var/ts/tc_accuracies/Testing Collection/Troll Face@Spain#Country/Troll Face@Spain#Country.jpg
 - var/ts/tc_accuracies/Testing Collection/Troll Face@Spain#ReGiOn/Troll Face@Spain#ReGiOn.jpg