columbus3 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edbdaa1d3a33d32631aa09d31bc18031922c1d29
-  data.tar.gz: 8f752d7479d59cd52124bd2ba4c97a7efa7529ac
+  metadata.gz: 8c00cb92f8e4ce111bc55fde1ba803980007527d
+  data.tar.gz: 095e7942545cb34f47ffa77b887478109f6bae04
 SHA512:
-  metadata.gz: d046ab5901c867276226fc1a6787d1254f325762dc047fadc734e3ed59a6e9b482b914bfc76109638a4e6b83ad513e63f07df8daf4f5dc1f58dcea0d788a662f
-  data.tar.gz: 2f49fde9fe667fce154be6a9bf3acb2cc82e850b7071c9de8a2dd822e0f219491e25b0b589d1042e15b62100677f621bff2c9350eb0491d01c17a3715cfb9340
+  metadata.gz: 0b1db031f90efc89a6de3ebb78eb94b536778c7577b5b8a7d8adc3abbf52bfbeb2d11305b96ab5c293b76fa0af217f70d7610ef49eaf8b000c53538958e95f81
+  data.tar.gz: f4447afbad97edb832345b01d2da52192967f2adeb72a2024fcf6e4438768b610c105cea0aa3d7a84c224571fd61f93f894db3e308a316c8f48d1029b7b07b78

data/README.textile

@@ -33,22 +33,27 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 
 h2. Version History
 
+*0.4.0*
+* Improved syntax for search:
+** new option -r searches in sub-directories
+** new option --fields allows to specify the fields to look for
+
 *0.3.0*
-** Added documentation for @search@ command; added this README file
-** New command @graph@ plots data about a track (look for @_graph.html@ in the current directory)
-** Added @--force@ option to @process@
-** Internals: fixes to the @sidecar@ class
+* Added documentation for @search@ command; added this README file
+* New command @graph@ plots data about a track (look for @_graph.html@ in the current directory)
+* Added @--force@ option to @process@
+* Internals: fixes to the @sidecar@ class
 
 *0.2.1*
-** Fixed bug in time parsing
+* Fixed bug in time parsing
 
 *0.2.0*
-** Fixes to syntax
-** Print man page if not arguments are provided
-** Added --filename option to *show* command
+* Fixes to syntax
+* Print man page if not arguments are provided
+* Added --filename option to *show* command
 
 *0.1.0*
-** Initial release
+* Initial release
 
 h2. License
 

data/exe/columbus3

@@ -2,6 +2,7 @@
 
 require "slop"
 require "columbus3"
+require "find"
 
 appname = "columbus3"
 version = Columbus3::VERSION
@@ -58,10 +59,23 @@ Examples of simple searches
   'max_speed > 120'      any track with a max speed greater than 120 km/h
   'min_height == 10'     any track with a min height lower than 10 meters
 
-Examplex of more more complex searches
+Examples of complex searches
   'location ~ "USA" and start_date >= 2015-01-01' tracks in the USA after or on Jan 1, 2015
   'start_location ~ "Trenton" and end_location ~ "New York"'  trips from Trenton to New York
 
+List of supported fields in output
+  path           -> relative path of the CSV file
+  filename       -> basename of the CSV file
+  start_location -> start location
+  end_location   -> end location
+  start_date     -> start date (and time)
+  end_date       -> end date (and time)
+  duration       -> duration in seconds
+  min_speed      -> minimum speed in km/h
+  max_speed      -> maximum speed in km/h
+  min_height     -> minimum height in meters
+  max_height     -> maximum height in meters
+
 VERSION
   This is version #{version}
 
@@ -129,19 +143,33 @@ opts = Slop.parse :help => true do
 
   ##############################################################################
   command :search do
-    banner "#{appname} search [--help] [--dir directory] query"
+    banner "#{appname} search [--help] [-r] [--dir directory] [--fields fields] query"
     description "Search dir for tracks matching query"
 
     on "--debug", "Show how the query is processed"
+    on "-r", "--recurse", "Recurse in subdirectories"
     on "-d", "--dir=", "Directory with sidecar files"
+    on "-fields=", "Comma separated list of fields to show"
 
     run do |opts, args|
       cmd ="search"
 
       debug = opts.to_hash[:debug]
       directory = opts.to_hash[:dir] || "."
+      recurse = opts.to_hash[:recurse]
+      fields_opt = opts.to_hash[:fields]
+
+      if fields? then
+        fields = fields_opt.split(",").map { |x| x.to_sym }
+      else
+        fields = [:path, :filename, :start_location, :end_location, :start_date, :end_date, :duration, :min_speed, :max_speed, :min_height, :max_height]
+      end
       
-      files = Dir.glob(directory + "/" + "*.yaml")
+      if recurse then
+        files = Find.find(directory).select { |e| File.extname(e) == ".yaml" }
+      else
+        files = Dir.glob(File.join(directory, "*.yaml"))
+      end
       query = QueryParser.new.parse(args.join(" "))
 
       if debug then
@@ -153,7 +181,7 @@ opts = Slop.parse :help => true do
         sidecar_search.load files
         match = sidecar_search.search query
         match.each do |m|
-          string = [:filename, :start_location, :end_location, :start_date, :end_date, :duration, :min_speed, :max_speed, :min_height, :max_height].map { |x| "#{m[x]}"}.join("\t")
+          string = fields.map { |x| "#{m[x]}"}.join("\t")
           puts string
         end
       end

data/lib/columbus3/metadata/sidecar.rb

@@ -47,7 +47,7 @@ module Columbus3
     end
 
     def load array
-      @metadata = array.each.map { |x| YAML.load(File.read(x)) }
+      @metadata = array.each.map { |x| YAML.load(File.read(x)).merge({ :path => x }) }
     end
 
     def search term

data/lib/columbus3/version.rb

@@ -1,3 +1,3 @@
 module Columbus3
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: columbus3
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Adolfo Villafiorita
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler