mhc 1.1.0 → 1.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/emacs/Cask +1 -1
  3. data/emacs/mhc-vars.el +1 -1
  4. data/emacs/mhc.el +1 -1
  5. data/lib/mhc/templates/config.yml.erb +33 -10
  6. data/lib/mhc/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4a35853f0483a4ea2ebe72cea18b5f04e11eb115
4
- data.tar.gz: abb4fbac0bed6fbfde24a58fd8ca6614ced22c63
3
+ metadata.gz: 7c9ab546227bfcd6c56b48af0bd308d2219214c3
4
+ data.tar.gz: 0ec52f413f4e033d96032450fcc07c75d7fa2d60
5
5
  SHA512:
6
- metadata.gz: 1fddb81016df1b68e8e321e8c6a152e2498812e089e0d07223ba6c0ec074513adfa53e472622ef42effe4e090d8211fdb5b6d68218a02fc061dde78d83992035
7
- data.tar.gz: 1bb78936fb975dfd903eb4b6a795db39ab6bceea1620b69a3217e4c76c5392a2d640845af5924c090d9fb59d9c5c3540026cb3073abb7460fbe787daf3539d0c
6
+ metadata.gz: 70dbddc76e2f44969dc11cd233d402bc4de639ff1e5870c7044c6c8cad813149d342706f5040cce6ec642666828fdbe104d8dc50e76fb30f9bab57a00790ab5a
7
+ data.tar.gz: ce91e6cbca1ca392399d259a21c5bab7247846fbe22611c1242fe5ee85f61439c5dcca8940bcfbf3651f34021146bdba669bfd0a700e606e3aac53bae3a53ed5
data/emacs/Cask CHANGED
@@ -5,7 +5,7 @@
5
5
  (source org)
6
6
  (source melpa)
7
7
 
8
- (package "mhc" "1.1.0" "Message Harmonized Calendaring system") ;; MHC_VERSION
8
+ (package "mhc" "1.1.1" "Message Harmonized Calendaring system") ;; MHC_VERSION
9
9
 
10
10
  (files "mhc.el" "mhc-*.el")
11
11
 
data/emacs/mhc-vars.el CHANGED
@@ -17,7 +17,7 @@
17
17
 
18
18
 
19
19
  ;;; Constants:
20
- (defconst mhc-version "mhc 1.1.0") ;; MHC_VERSION
20
+ (defconst mhc-version "mhc 1.1.1") ;; MHC_VERSION
21
21
 
22
22
 
23
23
  ;;; Configration Variables:
data/emacs/mhc.el CHANGED
@@ -3,7 +3,7 @@
3
3
  ;; Description: Message Harmonized Calendaring system.
4
4
  ;; Author: Yoshinari Nomura <nom@quickhack.net>
5
5
  ;; Created: 1994-07-04
6
- ;; Version: 1.1.0
6
+ ;; Version: 1.1.1
7
7
  ;; Keywords: calendar
8
8
  ;; URL: http://www.quickhack.net/mhc
9
9
  ;; Package-Requires: ((calfw "20150703"))
data/lib/mhc/templates/config.yml.erb CHANGED
@@ -28,9 +28,24 @@ SYNC_CHANNELS:
28
28
  ################################################################
29
29
 
30
30
  # Each sync channel binds two CALENDARS (see below) for
31
- # data-synchronization. Currently, STRATEGY allows only "mirror",
32
- # CALENDAR1 must be a local MHC calendar, and CALENDAR2 must be a
33
- # Google Calendar. True two-way sync is not yet implemented.
31
+ # data-synchronization. Currently, STRATEGY allows:
32
+ #
33
+ # + "mirror" :: mirrors CALENDAR1 to CALENDAR2.
34
+ # CALENDAR1 must be a local MHC calendar,
35
+ # and CALENDAR2 must be a Google Calendar.
36
+ # Note that articles between past 90 days and future 90
37
+ # days in MHC will be mirrored to the target Google
38
+ # Calendar. 90 is hard-coded in lib/mhc/calendar.rb for
39
+ # now. Other articles out of the range in Google
40
+ # Calendar will be DELETED.
41
+ # + "import" :: imports newly created (non-recurring) articles
42
+ # on CALENDAR1 into CALENDAR2.
43
+ # CALENDAR1 must be a Google Calendar,
44
+ # and CALENDAR2 must be a local MHC calendar.
45
+ # All articles in CALENDAR1 will be DELETED after
46
+ # the import.
47
+ #
48
+ # True two-way sync is not yet implemented.
34
49
 
35
50
  - NAME: business
36
51
  CALENDAR1: business
@@ -42,6 +57,15 @@ SYNC_CHANNELS:
42
57
  CALENDAR2: google_family
43
58
  STRATEGY: mirror
44
59
 
60
+ # ``google_inbox'' is a spool-like calendar on Google Calendar.
61
+ # After create some articles into google_inbox with Android client,
62
+ # doing ``mhc sync inbox'' on your PC will import the articles into MHC.
63
+ # All articles in google_inbox will be DELETED after the import.
64
+ - NAME: inbox
65
+ CALENDAR1: google_inbox
66
+ CALENDAR2: master
67
+ STRATEGY: import
68
+
45
69
  ################################################################
46
70
  CALENDARS:
47
71
  ################################################################
@@ -85,7 +109,7 @@ CALENDARS:
85
109
  ## Google Calendar
86
110
 
87
111
  # Currently, Google Calendar stuffs work only as destinations
88
- # to publish from local MHC calendars.
112
+ # for sync with MHC calendars.
89
113
  #
90
114
  # Since MHC uses standard CalDAV protocol, I believe
91
115
  # it works with other CalDAV-based network calendars such as
@@ -113,12 +137,6 @@ CALENDARS:
113
137
  #
114
138
  # {sync_channel_name} must exist in the section of SYNC_CHANNELS:
115
139
  #
116
- # NOTE:
117
- # Articles between past 90 days and future 90 days in MHC will be
118
- # published to the target Google Calendar. 90 is hard-coded in
119
- # lib/mhc/calendar.rb for now. Other articles out of the range in
120
- # Google Calendar will be DELETED.
121
- #
122
140
  # Before the first try, I recommend you to make a new calendar on your
123
141
  # Google Calendar dedicated to MHC. and backup your local spool of
124
142
  # MHC.
@@ -140,3 +158,8 @@ CALENDARS:
140
158
  - <<: *google_default
141
159
  NAME: google_family
142
160
  URL: "https://calendar.google.com/calendar/dav/***@group.calendar.google.com/events/"
161
+
162
+ # Displayname: Spool calendar to which Android adds articles
163
+ - <<: *google_default
164
+ NAME: google_inbox
165
+ URL: https://calendar.google.com/calendar/dav/**************************@group.calendar.google.com/events/
data/lib/mhc/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Mhc
2
- VERSION = "1.1.0"
2
+ VERSION = "1.1.1"
3
3
  PRODID = "-//Quickhack.net//MHC #{Mhc::VERSION}//EN"
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mhc
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yoshinari Nomura
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-10-22 00:00:00.000000000 Z
11
+ date: 2015-11-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor