columbus3 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8480197278059d6cc6346ceff12dcbf7720be198
-  data.tar.gz: 41474b1b7e3e516254abe182c21c5fee53007665
+  metadata.gz: 8c78ff706093b6276c11eef2ef6ab9d86e4af6ff
+  data.tar.gz: 4390c9537d75ed606438cae99d9c3aaa27c11eda
 SHA512:
-  metadata.gz: 39cc383a83ce20a3ea6f6a686ef98d659a6023298e1314cba7eff049a9b6392577c7a190b83b180e23190d90aa5bbdaaa6161d66ad5ac1546314c82c0a25f42c
-  data.tar.gz: 7c28ac6ff25291aa57d78fc6855d99807aab7bbf1b2cb04929f6da98d99c8af20d7528a821d892ae515b59ad3c2ef42a4f8070363765cb6eb01e349ab356e67e
+  metadata.gz: 0173ba8ca1fee18886d2761545ca835934a8fb8a8df95b8361a37cbf0737af2954de754c475c43878d3eaf10e4c82875e331402220adfa4ede1eecd839798b18
+  data.tar.gz: 1f2613d70f1e94c452385512601f17a8e0d17145fdc718c0ef5012a37a6a1d99c8eab2f46ea2ba338a33cf0576e2808f33e3536827df7459ce84f7b1a7185f48

data/exe/columbus3

@@ -47,30 +47,35 @@ EOS
 #
 # Main App Starts Here!
 #
+cmd = nil
 opts = Slop.parse :help => true do
   banner usage
   
   ##############################################################################
   on "-v", "--version", 'Print version information' do
+    cmd ="version"
     puts "#{appname} version #{version}"
   end
 
   ##############################################################################
-  command :help do
-    banner "#{appname} help"
+  command :man do
+    banner "#{appname} man"
     description "Print man page for #{appname}"
 
     run do |_, _|
+      cmd ="man"
       puts man
     end
   end
 
   ##############################################################################
   command :process do
-    banner "#{appname} process track [... track]"
-    description "Generate a sidecar file for the track"
+    banner "#{appname} process [--help] [track ...]"
+    description "Generate a sidecar file for the specified tracks"
 
     run do |opts, args|
+      cmd ="process"
+
       args.each do |arg|
         track = V900Track.new arg
         sidecar = Columbus3::Sidecar.new arg
@@ -82,19 +87,19 @@ opts = Slop.parse :help => true do
 
   ##############################################################################
   command :search do
-    banner "#{appname} search --dir directory term"
-    description "Search dir for tracks matching criteria in dir"
+    banner "#{appname} search [--help] [--dir directory] query"
+    description "Search dir for tracks matching query"
 
     on "--debug", "Show how the query is processed"
     on "-d", "--dir=", "Directory with sidecar files"
 
     run do |opts, args|
+      cmd ="search"
+
       debug = opts.to_hash[:debug]
       directory = opts.to_hash[:dir] || "."
       
       files = Dir.glob(directory + "/" + "*.yaml")
-      puts args
-      puts args.join(" ")
       query = QueryParser.new.parse(args.join(" "))
 
       if debug then
@@ -115,30 +120,37 @@ opts = Slop.parse :help => true do
 
   ##############################################################################
   command :show do
-    banner "#{appname} show [--force] track [... track]"
+    banner "#{appname} show [--help] [--filename filename] [--force] [track ...]"
     description "View tracks"
 
+    on "-f", "--filename=", "Output filename (default is _show.html)"
     on "--force", "Force rewriting of the js file, even if it already exists"
 
     run do |opts, args|
+      cmd ="show"
+
+      filename = opts.to_hash[:filename] || "_show.html"
       force = opts.to_hash[:force]
 
       args.each do |arg|
         Columbus3::LeafletRenderer::to_leaflet arg, force
       end
-      Columbus3::LeafletRenderer::show args
+      (Columbus3::LeafletRenderer::show filename, args) if args != []
     end
   end
 
   ##############################################################################
   command :export do
-    banner "#{appname} export track [... track]"
+    banner "#{appname} export [--help] [track ...]"
     description "Export track to GPX"
 
     run do |opts, args|
-      
+      cmd ="export"
+      puts "Not implemented yet. Use GPSBabel in the meantime."
     end
   end
-
 end
 
+if not cmd then
+  puts opts
+end

data/lib/columbus3/renderer/renderer.rb

@@ -7,7 +7,7 @@ module Columbus3
   module LeafletRenderer
     # apply the ERB in html/show.html.erb (which includes all the tracks to display)
     # and save it in the current directory, under _show.html
-    def self.show files
+    def self.show filename, files
       template = File.join(File.dirname(__FILE__), "/../../html/show.html.erb")
       renderer = ERB.new(File.read(template))
       
@@ -22,7 +22,7 @@ module Columbus3
       html = renderer.result(binding)
 
       # save it to file
-      File.open("_show.html", "w") do |file|
+      File.open(filename, "w") do |file|
         file << html
       end
     end

data/lib/columbus3/v900track/v900waypoint.rb

@@ -18,7 +18,8 @@ class V900Waypoint
     date = @row["DATE"]
     time = @row["TIME"]
     # make sure it is understood as ZULU time (UTC) and pad time to six numbers 75858 -> 075858
-    Time.parse("#{date}T" + ("%06d" % time) + "Z") 
+    # http://stackoverflow.com/questions/1543171/how-can-i-output-leading-zeros-in-ruby
+    Time.parse("#{date}T" + time.to_s.rjust(6, "0") + "Z") 
   end
 
   def lon

data/lib/columbus3/version.rb

@@ -1,3 +1,3 @@
 module Columbus3
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: columbus3
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Adolfo Villafiorita
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-19 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler