postrunner 0.0.6 → 0.0.7

data/lib/postrunner/BackedUpFile.rb

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = ActivitiesDB.rb -- PostRunner - Manage the data from your Garmin sport devices.
+#
+# Copyright (c) 2015 by Chris Schlaeger <cs@taskjuggler.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+module PostRunner
+
+  # BackUpFile is a specialized version of File that creates a copy on
+  class BackedUpFile < File
+
+     def BackedUpFile.open(filename, mode = 'r', *opt, &block)
+       # If the file is opened for writing we create a backup file.
+       create_backup_file(filename) if mode.include?('w') || mode.include?('a')
+       super
+     end
+
+     def BackedUpFile.write(filename, string)
+       create_backup_file(filename)
+       super
+     end
+
+     private
+
+     def BackedUpFile.create_backup_file(filename)
+       bak_file = filename + '.bak'
+
+       # Delete the backup file if it exists.
+       if File.exists?(bak_file)
+         begin
+           File.delete(bak_file)
+         rescue SystemCallError
+           Log.fatal "Cannote remove backup file '#{bak_file}': #{$!}"
+         end
+       end
+
+       # Rename the old file to <filename>.bak
+       if File.exists?(filename)
+         begin
+           File.rename(filename, bak_file)
+         rescue SystemCallError
+           Log.fatal "Cannot rename file '#{filename}' to '#{bak_file}': #{$!}"
+         end
+       end
+     end
+
+  end
+
+end
+

data/lib/postrunner/ChartView.rb

@@ -9,14 +9,10 @@
 # published by the Free Software Foundation.
 #
 
-require 'postrunner/ViewWidgets'
-
 module PostRunner
 
   class ChartView
 
-    include ViewWidgets
-
     def initialize(activity, unit_system)
       @activity = activity
       @sport = activity.fit_activity.sessions[0].sport
@@ -24,17 +20,19 @@ module PostRunner
       @empty_charts = {}
     end
 
-    def head(doc)
-      [ 'jquery/jquery-2.1.1.min.js', 'flot/jquery.flot.js',
-        'flot/jquery.flot.time.js' ].each do |js|
-        doc.script({ 'language' => 'javascript', 'type' => 'text/javascript',
-                     'src' => js })
-      end
-      doc.style(style)
-      doc.script(java_script)
-    end
+    def to_html(doc)
+      doc.unique(:chartview_style) {
+        doc.head {
+          [ 'jquery/jquery-2.1.1.min.js', 'flot/jquery.flot.js',
+            'flot/jquery.flot.time.js' ].each do |js|
+            doc.script({ 'language' => 'javascript',
+                         'type' => 'text/javascript', 'src' => js })
+          end
+          doc.style(style)
+        }
+      }
 
-    def div(doc)
+      doc.script(java_script)
       if @sport == 'running'
         chart_div(doc, 'pace', "Pace (#{select_unit('min/km')})")
       else
@@ -274,9 +272,9 @@ EOT
       # Don't plot frame for graph without data.
       return if @empty_charts[field]
 
-      frame(doc, title) {
+      ViewFrame.new(title) {
         doc.div({ 'id' => "#{field}_chart", 'class' => 'chart-placeholder'})
-      }
+      }.to_html(doc)
     end
 
     def hover_function(chart_id, y_label, y_unit)

data/lib/postrunner/DeviceList.rb

@@ -3,7 +3,7 @@
 #
 # = DeviceList.rb -- PostRunner - Manage the data from your Garmin sport devices.
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2015 by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -12,22 +12,18 @@
 
 require 'fit4ruby'
 
-require 'postrunner/ViewWidgets'
+require 'postrunner/ViewFrame'
 
 module PostRunner
 
   class DeviceList
 
-    include ViewWidgets
-
     def initialize(fit_activity)
       @fit_activity = fit_activity
     end
 
     def to_html(doc)
-      frame(doc, 'Devices') {
-        devices.each { |d| d.to_html(doc) }
-      }
+      ViewFrame.new('Devices', 600, devices).to_html(doc)
     end
 
     def to_s

data/lib/postrunner/FlexiTable.rb

@@ -3,7 +3,7 @@
 #
 # = FlexiTable.rb -- PostRunner - Manage the data from your Garmin sport devices.
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2015 by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -252,6 +252,9 @@ module PostRunner
     def to_html(doc)
       index_table
 
+      doc.unique(:flexitable_style) {
+        doc.head { doc.style(style) }
+      }
       doc.table(@html_attrs) {
         @head_rows.each { |r| r.to_html(doc) }
         @body_rows.each { |r| r.to_html(doc) }
@@ -318,6 +321,30 @@ module PostRunner
       s + "\n"
     end
 
+    def style
+      <<EOT
+.flexitable {
+  width: 100%;
+  border: 2px solid #545454;
+  border-collapse: collapse;
+  font-size:11pt;
+}
+.ft_head_row {
+  background-color: #DEDEDE
+}
+.ft_even_row {
+  background-color: #FCFCFC
+}
+.ft_odd_row {
+  background-color: #F1F1F1
+}
+.ft_cell {
+  border: 1px solid #CCCCCC;
+  padding: 1px 3px;
+}
+EOT
+    end
+
   end
 
 end

data/lib/postrunner/HTMLBuilder.rb

@@ -19,18 +19,79 @@ module PostRunner
   class HTMLBuilder
 
     # Create a new HTMLBuilder object.
-    def initialize
+    def initialize(title)
       # This is the Nokogiri Document that will store all the data.
       @doc = Nokogiri::HTML::Document.new
       # We only need to keep a stack of the currently edited nodes so we know
       # where we are in the node tree.
       @node_stack = []
+      @tags = []
+
+      @html = create_node('html') {
+        @head = create_node('head') {
+          create_node('meta', { 'http-equiv' => 'Content-Type',
+                      'content' => 'text/html; charset=utf-8' })
+          create_node('title', title)
+        }
+        @body = create_node('body')
+      }
+      @node_stack << @html
+      @node_stack << @body
+    end
+
+    # Append nodes provided in block to head section of HTML document.
+    def head
+      @node_stack.push(@head)
+      yield if block_given?
+      unless @node_stack.pop == @head
+        raise ArgumentError, "node_stack corrupted in head"
+      end
+    end
+
+    # Append nodes provided in block to body section of HTML document.
+    def body(*args)
+      @node_stack.push(@body)
+      args.each do |arg|
+        if arg.is_a?(Hash)
+          arg.each { |k, v| @body[k] = v }
+        end
+      end
+      yield if block_given?
+      unless @node_stack.pop == @body
+        raise ArgumentError, "node_stack corrupted in body"
+      end
+    end
+
+    # Only execute the passed block if the provided tag has not been added
+    # yet.
+    def unique(tag)
+      unless @tags.include?(tag)
+        @tags << tag
+        yield if block_given?
+      end
     end
 
     # Any call to an undefined method will create a HTML node of the same
     # name.
-    def method_missing(method_name, *args)
-      node = Nokogiri::XML::Node.new(method_name.to_s, @doc)
+    def method_missing(method_name, *args, &block)
+      create_node(method_name.to_s, *args, &block)
+    end
+
+    # Only needed to comply with style guides. This all calls to unknown
+    # method will be handled properly. So, we always return true.
+    def respond_to?(method)
+      true
+    end
+
+    # Dump the HTML document as HTML formatted String.
+    def to_html
+      @doc.to_html
+    end
+
+    private
+
+    def create_node(name, *args)
+      node = Nokogiri::XML::Node.new(name, @doc)
       if (parent = @node_stack.last)
         parent.add_child(node)
       else
@@ -52,19 +113,6 @@ module PostRunner
       @node_stack.pop
     end
 
-    # Only needed to comply with style guides. This all calls to unknown
-    # method will be handled properly. So, we always return true.
-    def respond_to?(method)
-      true
-    end
-
-    # Dump the HTML document as HTML formatted String.
-    def to_html
-      @doc.to_html
-    end
-
-    private
-
     def add_child(parent, node)
       if parent
         parent.add_child(node)

data/lib/postrunner/Main.rb

@@ -3,7 +3,7 @@
 #
 # = Main.rb -- PostRunner - Manage the data from your Garmin sport devices.
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2015 by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -32,6 +32,8 @@ module PostRunner
     def initialize(args)
       @filter = nil
       @name = nil
+      @attribute = nil
+      @value = nil
       @activities = nil
       @db_dir = File.join(ENV['HOME'], '.postrunner')
 
@@ -49,7 +51,7 @@ module PostRunner
 
         opts.separator <<"EOT"
 
-Copyright (c) 2014 by Chris Schlaeger
+Copyright (c) 2014, 2015 by Chris Schlaeger
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of version 2 of the GNU General Public License as published by the
@@ -133,9 +135,18 @@ list
 records
           List all personal records.
 
-rename <ref>
-          Replace the FIT file name with a more meaningful name that describes
-          the activity.
+rename <new name> <ref>
+          For the specified activities replace current activity name with a
+          new name that describes the activity. By default the activity name
+          matches the FIT file name.
+
+set <attribute> <value> <ref>
+          For the specified activies set the attribute to the given value. The
+          following attributes are supported:
+
+          name: The activity name (defaults to FIT file name)
+          type: The type of the activity
+          subtype: The subtype of the activity
 
 show [ <ref> ]
           Show the referenced FIT activity in a web browser. If no reference
@@ -144,9 +155,12 @@ show [ <ref> ]
 summary <ref>
           Display the summary information for the FIT file.
 
-units   metric | statute
+units <metric | statute>
           Change the unit system.
 
+htmldir <directory>
+          Change the output directory for the generated HTML files
+
 
 <fit file> An absolute or relative name of a .FIT file.
 
@@ -154,26 +168,27 @@ units   metric | statute
            :1 is the newest imported activity
            :-1 is the oldest imported activity
            :1-2 refers to the first and second activity in the database
+           :1--1 refers to all activities
 EOT
 
       end
 
-      parser.parse!(args)
+      begin
+        parser.parse!(args)
+      rescue OptionParser::InvalidOption
+        Log.fatal "#{$!}"
+      end
     end
 
     def execute_command(args)
       @activities = ActivitiesDB.new(@db_dir, @cfg)
-      if @cfg.get_option(:version) != VERSION
-        Log.warn "Version upgrade detected. Database conversion started..."
-        @activities.generate_all_html_reports
-        @cfg.set_option(:version, VERSION)
-        Log.info "Version upgrade completed."
-      end
+      handle_version_update
 
       case (cmd = args.shift)
       when 'check'
         if args.empty?
           @activities.check
+          @activities.generate_all_html_reports
         else
           process_files_or_activities(args, :check)
         end
@@ -201,9 +216,17 @@ EOT
         @activities.show_records
       when 'rename'
         unless (@name = args.shift)
-          Log.fatal "You must provide a new name for the activity"
+          Log.fatal 'You must provide a new name for the activity'
         end
         process_activities(args, :rename)
+      when 'set'
+        unless (@attribute = args.shift)
+          Log.fatal 'You must specify the attribute you want to change'
+        end
+        unless (@value = args.shift)
+          Log.fatal 'You must specify the new value for the attribute'
+        end
+        process_activities(args, :set)
       when 'show'
         if args.empty?
           @activities.show_list_in_browser
@@ -214,6 +237,8 @@ EOT
         process_activities(args, :summary)
       when 'units'
         change_unit_system(args)
+      when 'htmldir'
+        change_html_dir(args)
       when nil
         Log.fatal("No command provided. " +
                   "See 'postrunner -h' for more information.")
@@ -289,6 +314,8 @@ EOT
         activity.dump(@filter)
       when :rename
         @activities.rename(activity, @name)
+      when :set
+        @activities.set(activity, @attribute, @value)
       when :show
         activity.show
       when :summary
@@ -299,11 +326,7 @@ EOT
     end
 
     def read_fit_file(fit_file)
-      begin
-        return Fit4Ruby::read(fit_file, @filter)
-      rescue StandardError
-        Log.error("Cannot read FIT file '#{fit_file}': #{$!}")
-      end
+      return Fit4Ruby::read(fit_file, @filter)
     end
 
     def change_unit_system(args)
@@ -317,6 +340,27 @@ EOT
       end
     end
 
+    def change_html_dir(args)
+      if args.length != 1
+        Log.fatal('You must specify a directory')
+      end
+
+      if @cfg[:html_dir] != args[0]
+        @cfg.set_option(:html_dir, args[0])
+        @activities.create_directories
+        @activities.generate_all_html_reports
+      end
+    end
+
+    def handle_version_update
+      if @cfg.get_option(:version) != VERSION
+        Log.warn "PostRunner version upgrade detected."
+        @activities.handle_version_update
+        @cfg.set_option(:version, VERSION)
+        Log.info "Version upgrade completed."
+      end
+    end
+
   end
 
 end