nom 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7631851ac3b0706686593b269cf49b21d8de8599
-  data.tar.gz: 98c3d3b7f73cb9ee660c33d3e8f60385e6049183
+SHA256:
+  metadata.gz: 9552983cfcde8485668665b06976e054a7221c131d0dc134c9aa0cb435818f2b
+  data.tar.gz: 81568f52af092e92e20c4252b1073b0b8e5ac06c3629e63a50714d06744c89e2
 SHA512:
-  metadata.gz: 8d485c873e3f738c69be2d4ffa997677062a43c0c083346c5a4ba2655a4230ec2b5524d27f301d0e160add5b18865ea454924b7bb258c41ab6a78fa5e8bd4493
-  data.tar.gz: fb82204147412eace494619adf76e7d447af500baf9567b9182656ac16ddfc5f8590580f4ca94b07bbb2215d4cdc8c3a67966732414c683bda4775b0c882b8e5
+  metadata.gz: f96691c27e135e7399e5e2b2df338a0a6b89f70e98e5d0470b31aeff066719f77a0728bc112027ca450411d2e9fef9b70d41bad2eb3cc3deddf5e28c8fd6f8d7
+  data.tar.gz: 9350d1aedf1cbeeaee8f99f47aee4026dd2bf0e4ec0619c315d99ba76f2e1fdd64cd4b67ad02ba7f235d7b167dee18a8d5e7f284aa9df0f727d0cf6971bda3c8

data/README.md

@@ -59,7 +59,7 @@ And get nice graphs. The upper graph shows weight over time, with a weighted (no
 
     $ nom plot
 
-![Graphs of weight and input over time](http://files.morr.cc/nom-0.1.0.svg)
+![Graphs of weight and input over time](http://files.blinry.org/nom-0.1.0.svg)
 
 Enter `nom help` if you're lost:
 
@@ -91,9 +91,14 @@ Enter `nom help` if you're lost:
 
 ## Conventions
 
-*nom* operates on three files in the directory `~/.nom/`: `config` contains configuration settings, `input` contains stuff you ate, `weight` contains weight measurements. You can edit them by hand.
+*nom* looks for its configuration directory in `${XDG_DATA_HOME}/nom`, `~/.local/share/nom`, or `~/.nom/` (in that order),
+and operates on three files in that configuration directory:
+* `config` contains configuration settings
+* `input` contains stuff you ate
+* `weight` contains weight measurements.
+The files are plain text, you can edit them by hand.
 
-By default, energy quantities will have the unit "kcal". You can change this by adding a line like `unit: 0.239` to your `~/.nom/config`, which means you want to use the unit "0.239 kcal" (= "1 kJ"). Energy quantities are displayed in parentheses: `(42)`
+By default, energy quantities will have the unit "kcal". You can change this by adding a line like `unit: 0.239` to your `config`, which means you want to use the unit "0.239 kcal" (= "1 kJ"). Energy quantities are displayed in parentheses: `(42)`
 
 Weight quantities are displayed as "kg", but you can use arbitrary units, like pounds.
 

data/bin/nom

@@ -19,9 +19,19 @@ commands = [
     [ "help", nil, nil, "Print this help" ],
 ]
 
+aliases = {
+    "--help": "help",
+    "-h": "help",
+}
+
 nom = Nom::Nom.new
 
-cmd_name = ARGV.shift or "status"
+cmd_name = (ARGV.shift or "status")
+
+if aliases.include? cmd_name.to_sym
+    cmd_name = aliases[cmd_name.to_sym]
+end
+
 command = commands.find{|c| c[0] == cmd_name or c[1] == cmd_name}
 
 if command.nil?

data/lib/nom/nom.plt.erb

@@ -1,4 +1,4 @@
-set terminal svg size 1440,900 font "Linux Biolinum,20"
+set terminal svg size 1920,1080 font "Linux Biolinum,20"
 set output "<%= svg.path %>"
 
 set multiplot layout 2,1

data/lib/nom/nom.rb

@@ -13,8 +13,16 @@ require "nom/helpers"
 module Nom
     class Nom
         def initialize
-            @nom_dir = File.join(Dir.home,".nom")
-            if not Dir.exists? @nom_dir
+            xdg_data = (ENV["XDG_DATA_HOME"] or File.join(Dir.home, ".local", "share"))
+            preferred_config_location = File.join(xdg_data, "nom")
+            [ preferred_config_location, File.join(Dir.home,".nom") ].each do |dir|
+                if Dir.exists? dir
+                    @nom_dir = dir
+                    break
+                end
+            end
+            if not @nom_dir or not Dir.exists? @nom_dir
+                @nom_dir = preferred_config_location
                 puts "Creating #{@nom_dir}"
                 Dir.mkdir(@nom_dir)
             end
@@ -34,9 +42,9 @@ module Nom
             end
 
             @weights.interpolate_gaps!
-            @weights.precompute_moving_average!(0.1, 0.1, goal, rate)
+            @weights.precompute_moving_average!(0.05, 0.05, goal, rate)
             @weights.predict_weights!(rate, goal, 30)
-            @weights.precompute_moving_average!(0.1, 0.1, goal, rate)
+            @weights.precompute_moving_average!(0.05, 0.05, goal, rate)
 
             precompute_inputs_at
             precompute_base_rate_at
@@ -106,13 +114,13 @@ module Nom
             term = args.join(" ")
             puts
             term = term.encode("ISO-8859-1")
-            url = "http://fddb.info/db/de/suche/?udd=0&cat=site-de&search=#{URI.escape(term)}"
+            url = "https://fddb.info/db/de/suche/?udd=0&cat=site-de&search=#{CGI.escape(term)}"
 
-            page = Nokogiri::HTML(open(url))
+            page = Nokogiri::HTML(URI.open(url))
             results = page.css(".standardcontent a").map{|a| a["href"]}.select{|href| href.include? "lebensmittel"}
 
             results[0..4].each do |result|
-                page = Nokogiri::HTML(open(result))
+                page = Nokogiri::HTML(URI.open("https://fddb.info"+result))
                 title = page.css(".breadcrumb a").last.text
                 brand = page.css(".standardcontent p a").select{|a| a["href"].include? "hersteller"}.first.text
                 puts "#{title} (#{brand})"
@@ -121,7 +129,7 @@ module Nom
                     size = serving.css("a.servb").text
                     kcal = serving.css("div")[5].css("div")[1].text.to_i
                     #kj = serving.css("div")[2].css("div")[1].text.to_i
-                    puts "    (#{quantize(kcal)}) #{size}"
+                    puts "    (#{quantize(kcal,1)}) #{size}"
                 end
             end
         end
@@ -306,8 +314,8 @@ module Nom
             end
         end
 
-        def quantize kcal
-            (1.0*kcal/@config.get("unit")).round
+        def quantize kcal, decimal_places=0
+            (1.0*kcal/@config.get("unit")).round(decimal_places)
         end
 
         def dequantize number
@@ -349,17 +357,16 @@ module Nom
         def log_since start
             remaining = 0
             start.upto(Date.today) do |date|
-                remaining += allowed_kcal(date)
                 puts
                 puts "#{format_date(date)}: (#{quantize(allowed_kcal(date))})"
                 puts
-                remaining = allowed_kcal(date)
+                remaining = quantize(allowed_kcal(date))
                 inputs_at(date).each do |i|
                     entry(quantize(i.kcal), i.description)
-                    remaining -= i.kcal
+                    remaining -= quantize(i.kcal)
                 end
                 separator
-                entry(quantize(remaining), "remaining (#{(100-100.0*quantize(remaining)/quantize(allowed_kcal(date))).round}% used)")
+                entry(remaining, "remaining (#{(100-100.0*remaining/quantize(allowed_kcal(date))).round}% used)")
             end
             if kcal_balance > 0 and @config.has("balance_start")
                 cost = if @config.has("balance_factor")

data/lib/nom/weight_database.rb

@@ -27,7 +27,7 @@ module Nom
         end
 
         def precompute_moving_average!(alpha, beta, goal, rate)
-            trend = dampened_rate(@weights[first], goal, rate)/7.0
+            trend = 0
 
             @moving_averages[first] = at(first)
             (first+1).upto(last).each do |d|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nom
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
-- Sebastian Morr
-autorequire: 
+- blinry
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -29,7 +29,7 @@ description: |-
                      tracking your energy intake and creating a negative feedback loop.
                      It's inspired by John Walker's "The Hacker's Diet" and tries to
                      automate things as much as possible.
-email: sebastian@morr.cc
+email: mail@blinry.org
 executables:
 - nom
 extensions: []
@@ -47,7 +47,7 @@ homepage: https://github.com/blinry/nom
 licenses:
 - GPL-2.0+
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -63,9 +63,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - gnuplot
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.3.21
+signing_key:
 specification_version: 4
 summary: Lose weight and hair through stress and poor nutrition
 test_files: []