This is an automated email from the git hooks/post-receive script.

bob.dybian-guest pushed a commit to branch master
in repository galileo.

commit 5ad40af41fa183a9a28f283dbf7b4356b60f3b76
Author: Dylan Aïssi <bob.dyb...@gmail.com>
Date:   Mon Sep 19 21:45:06 2016 +0200

    Imported Upstream version 0.5.1
---
 .hg_archival.txt       |  4 ++--
 .hgtags                |  1 +
 CHANGES                | 16 ++++++++++++++++
 README.txt             |  2 +-
 doc/galileo.1          |  7 ++++++-
 doc/galileorc.5        |  6 +++++-
 galileo/__init__.py    |  2 +-
 galileo/config.py      |  1 +
 galileo/interactive.py |  8 +++++++-
 galileo/main.py        |  3 +--
 galileo/ui.py          | 10 ++++++++--
 11 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/.hg_archival.txt b/.hg_archival.txt
index 667c429..73711ac 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,4 +1,4 @@
 repo: f439ecfadaa724fc313310f8531884bec45c286c
-node: 1b2fc31c42a13be65326591e12d2b5d25c79ed34
+node: f0ebc19c748d3d7044a923ab98aab34c5f215815
 branch: default
-tag: 0.5
+tag: 0.5.1
diff --git a/.hgtags b/.hgtags
index 58743ce..7589922 100644
--- a/.hgtags
+++ b/.hgtags
@@ -7,3 +7,4 @@ a4b5c744e45d6eb98045e25462580b8e489941d7 0.4
 630b4debcd4fcd80d382e443c8c33c0d1564807e 0.4.2
 332f44e94f0acb6169574cf6108a2ba46e30daea 0.4.3
 8a506618011ad5666664d144788e9f2b8526166b 0.4.4
+1b2fc31c42a13be65326591e12d2b5d25c79ed34 0.5
diff --git a/CHANGES b/CHANGES
index 0981ea0..2047593 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,19 @@
+galileo 0.5.1 (2016-09-18)
+--------------------------
+
+This is the first patch release of galileo 0.5, a free utility to securely
+synchronize fitbit bluetooth trackers with the fitbit web service.
+
+This release restores a working default for the synchronisation server name,
+and makes this setting a configurable parameter.
+
+Contributors to this release: Antenore Gatta.
+
+Main changes since 0.5:
+- Make the server name a configuration option (PR#22)
+- Change the default synchronisation server to a working default (issue#296)
+
+
 galileo 0.5 (2016-07-22)
 ------------------------
 
diff --git a/README.txt b/README.txt
index 7070c52..7144f08 100644
--- a/README.txt
+++ b/README.txt
@@ -2,7 +2,7 @@ Galileo
 =======
 
 :author: Benoît Allard <benoit.all...@gmx.de>
-:version: 0.5
+:version: 0.5.1
 :license: LGPLv3+
 :bug tracker: https://bitbucket.org/benallard/galileo/issues
 :mailing list: gali...@freelists.org (subscribe_, archive_)
diff --git a/doc/galileo.1 b/doc/galileo.1
index a703ab0..7614ccd 100644
--- a/doc/galileo.1
+++ b/doc/galileo.1
@@ -4,7 +4,7 @@
 .\"   groff -man -Tascii galileo.1
 .\" or
 .\"   man ./galileo.1
-.TH galileo  1  "June 2014" 0.5 "User Commands"
+.TH galileo  1  "June 2014" 0.5.1 "User Commands"
 .SH NAME
 galileo \- synchronize Fitbit devices
 
@@ -21,6 +21,7 @@ galileo \- synchronize Fitbit devices
 .RB [ "\-\-dump" | "\-\-no\-dump" ]
 .RB [ "\-\-upload" | "\-\-no\-upload" ]
 .RB [ "\-\-https\-only" | "\-\-no\-https\-only" ]
+.RB [ "\-s \fISERVERNAME\fR" ]
 .RB [ "\-\-log\-size \fISIZE\fR" ]
 .RB [ "\-\-syslog" | "\-\-no\-syslog" ]
 .RB [ "sync" | "daemon" | "version" ]
@@ -162,6 +163,10 @@ if HTTPS connection is not possible, this will allow the 
fallback to HTTP.
 This should only be required if problems with encryption libraries prevent
 data transfer without this option.
 .TP
+.BR "\-s \fISERVERNAME\fR" ", " "\-\-fitbit\-server \fISERVERNAME\fR"
+the server to connect to when performing the synchronization (default to
+\fBapi.fitbit.com\fR).
+.TP
 .BI \-\-log\-size " SIZE"
 indicate the amount of communication that should be displayed in case of
 errors. Galileo will keep in memory the last \fISIZE\fR communications to help
diff --git a/doc/galileorc.5 b/doc/galileorc.5
index b56f329..f7134cb 100644
--- a/doc/galileorc.5
+++ b/doc/galileorc.5
@@ -4,7 +4,7 @@
 .\"   groff -man -Tascii galileorc.5
 .\" or
 .\"   man ./galileorc.5
-.TH galileorc 5 "June 2014" 0.5 "File Formats Manual"
+.TH galileorc 5 "June 2014" 0.5.1 "File Formats Manual"
 
 .SH NAME
 galileorc \- configuration files for the galileo Fitbit synchronization
@@ -108,6 +108,10 @@ option is set.
 setting this to \fBfalse\fR will prevent galileo from sending tracker
 data to the Fitbit web service.
 .TP
+.B fitbit-server
+this setting allow to specify the name of the server to connect to when
+performing the synchronization.
+.TP
 .B https-only
 setting this to \fBfalse\fR will allow galileo to fallback to
 unencrypted HTTP if HTTPS fails for sending tracker data to the Fitbit
diff --git a/galileo/__init__.py b/galileo/__init__.py
index efa194d..4125cfd 100644
--- a/galileo/__init__.py
+++ b/galileo/__init__.py
@@ -2,4 +2,4 @@
 galileo.py Utility to synchronize a fitbit tracker with the fitbit server.
 """
 
-__version__ = '0.5'
+__version__ = '0.5.1'
diff --git a/galileo/config.py b/galileo/config.py
index e568363..0143492 100644
--- a/galileo/config.py
+++ b/galileo/config.py
@@ -251,6 +251,7 @@ class Config(object):
                 BoolParameter('keepDumps', 'keep-dumps', ('dump',), True, 
False, "enable saving of the megadump to file"),
                 BoolParameter('doUpload', 'do-upload',  ('upload',), True, 
False, "upload the dump to the server"),
                 BoolParameter('httpsOnly', 'https-only', ('https-only',), 
True, False, "use http if https is not available"),
+                StrParameter('fitbitServer', 'fitbit-server', ('-s', 
'--fitbit-server',), "client.fitbit.com", False, "server used for 
synchronisation"),
                 IntParameter('logSize', 'log-size', ('--log-size',), 10, 
False, "Amount of communication to display in case of error"),
                 BoolParameter('syslog', 'syslog', ('syslog',), False, False, 
"send output to syslog instead of stderr"),
                 Argument(),
diff --git a/galileo/interactive.py b/galileo/interactive.py
index 531dc58..6f9f3a4 100644
--- a/galileo/interactive.py
+++ b/galileo/interactive.py
@@ -9,6 +9,12 @@ 
https://bitbucket.org/benallard/libfitbit/src/tip/python/ifitbit.py?at=default
 
 from __future__ import print_function
 
+try:
+    # Override the input from python2 with raw_input
+    input = raw_input
+except NameError:
+    pass
+
 #---------------------------
 # The engine
 
@@ -53,7 +59,7 @@ def main(config):
     exit = False
     print_help()
     while not exit:
-        orders = raw_input('> ').strip()
+        orders = input('> ').strip()
         if ';' in orders:
             orders = orders.split(';')
         else:
diff --git a/galileo/main.py b/galileo/main.py
index 606c0ae..14b338a 100644
--- a/galileo/main.py
+++ b/galileo/main.py
@@ -34,7 +34,7 @@ def syncAllTrackers(config):
 
     fitbit = FitbitClient(dongle)
 
-    galileo = GalileoClient('https', 'api.fitbit.com',
+    galileo = GalileoClient('https', config.fitbitServer,
                             'tracker/client/message')
 
     if not fitbit.disconnect():
@@ -259,7 +259,6 @@ def main():
         # Syslog messages must have the time/name first.
         format = ('%(asctime)s ' + galileo.__name__ + ': '
                   '%(levelname)s: %(module)s: %(message)s')
-        # TODO: Make address into a config option.
         handler = logging.handlers.SysLogHandler(
             address='/dev/log',
             facility=logging.handlers.SysLogHandler.LOG_DAEMON)
diff --git a/galileo/ui.py b/galileo/ui.py
index be26673..46a932c 100644
--- a/galileo/ui.py
+++ b/galileo/ui.py
@@ -12,6 +12,12 @@ except ImportError:
     # Python2
     from HTMLParser import HTMLParser
 
+try:
+    # Override the input from python2 with raw_input
+    input = raw_input
+except NameError:
+    pass
+
 class Form(object):
     def __init__(self):
         self.fields = set()
@@ -210,7 +216,7 @@ def query_yes_no(question, default="y"):
 
     while True:
         sys.stdout.write(question + prompt)
-        choice = raw_input().lower()
+        choice = input().lower()
         if default is not None and choice == '':
             return valid[default]
         elif choice in valid:
@@ -233,5 +239,5 @@ class InteractiveUI(HardCodedUI):
             return [('param', {'name': 'secret'}, [], ''),
                      ('param', {'name': 'tryOther'}, [], 'TRY_OTHER')]
         sys.stdout.write("Type here the number you see:")
-        secret = raw_input()
+        secret = input()
         return [('param', {'name': 'secret'}, [], secret)]

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/debian-med/galileo.git

_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

Reply via email to