sifttter-redux 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f182a76d7be76e3ccdf01cba083d85245e2835ad
-  data.tar.gz: 21578bbf849033bdf56c68ac18b4e4b35fa912fa
+  metadata.gz: 59e71f8476272d582e3ece798a23f42c60595e68
+  data.tar.gz: b7b746fdc048acee90bb2902f4a0c559c6eaf8df
 SHA512:
-  metadata.gz: 882c5eb0824859668aa8f2f6c296071a76050c08f68820bac49873a290b334afa506d64190d41a516dbf21744989bdaeb16543f3bdf0e63bce5e8c073b5874de
-  data.tar.gz: 233d3e9bde6036ca58d339a6f49ffab8818b48ab0c9c5477c692a9123d0658a00e559f13b0ec8b1f055ed025b9867bd897d348d5112c90e28ed85884e2a95300
+  metadata.gz: 40b87a62aba139e09d778f2d5f93b97b3eb79925accf45c12e861dc46ce1cb41870194074ebba1b8d945011c99618eb3f05de1317fbff463549938fef33c0853
+  data.tar.gz: 5510997199d38138920a50eb32fc2b0536c96addcd2bbb33f9e34c39c13dbbe8d63bac3bad5553e43e6d8793850e9c622b0f040986d8dd6a311da2d7af08f005

data/README.md

@@ -5,23 +5,7 @@ Sifttter Redux
 
 # Upgrading From 0.x.x to 1.0.0?
 
-Version 1.0.0 uses a new schema that allows for any type of Markdown. Using
-version 1.0.0, Sifttter files need to follow this format:
-
-```
-@begin
-@date April 21, 2014
-**Any** sort of *Markdown* goes here...
-@end
-```
-
-Note that a new command has been introduced that attempts to upgrade to this
-new format. **Although the command backs up your current Sifttter files, you
-are strongly encouraged to make a separate, manual backup.**
-
-```Bash
-$ srd upgrade
-```
+Make sure you read the [IFTTT Template](#ifttt-template) section.
 
 # Intro
 
@@ -65,7 +49,7 @@ SYNOPSIS
     srd [global options] command [command options] [arguments...]
 
 VERSION
-    1.0.4
+   1.0.5 
 
 GLOBAL OPTIONS
     --help         - Show this message
@@ -100,6 +84,46 @@ COMMAND OPTIONS
     -y             - Run catch-up mode for yesterday
 ```
 
+## IFTTT Template
+
+Version 1.0.0+ uses a new schema that allows for any type of Markdown. Thus, Sifttter
+files from IFTTT need to follow this format:
+
+```
+@begin
+@date April 21, 2014 at 12:34PM
+**Any** sort of *Markdown* goes here...
+@end
+```
+
+Whereas the previous Sifttter Redux only allowed output of bulleted lists, this new 
+template style allows you to include *any* Markdown, making output like tables possibe.
+
+### Upgrade Command
+
+Note that a new command has been introduced that attempts to upgrade to this
+new format. **Although the command backs up your current Sifttter files, you
+are strongly encouraged to make a separate, manual backup.**
+
+```Bash
+$ srd upgrade
+```
+
+### Template Tokens
+
+IFTTT templates can make use of the following tokens:
+
+* `%time%`: the time the entry was created
+
+As an example, to include the entry time in a template:
+
+```
+@begin
+@date April 21, 2014 at 12:34PM
+- %time%: My text goes here...
+@end
+```
+
 ## Initialization
 
 ```
@@ -177,6 +201,22 @@ $ srd exec -y
 #### EXECUTION COMPLETE!
 ```
 
+### Catch-up for a Specific Date
+
+To create an entry for specific date:
+
+```
+$ srd exec -d 2014-02-14
+#### EXECUTING...
+---> INFO: Creating entry for February 14, 2014...
+---> INFO: Downloading Sifttter files...DONE.
+---> SUCCESS: Entry logged for February 14, 2014...
+---> INFO: Uploading Day One entries to Dropbox...DONE.
+---> INFO: Removing downloaded Day One files...DONE.
+---> INFO: Removing downloaded Sifttter files...DONE.
+#### EXECUTION COMPLETE!
+```
+
 ### Last "N" Days Catch-up
 
 Sifttter Redux allows you to specify the number of days back it should look for

data/bin/srd

@@ -90,9 +90,9 @@ post do |global,command,options,args|
 end
 
 on_error do |exception|
-  # messenger.error(exception.to_s)
-  # exit!(1)
-  # true
+  messenger.error(exception.to_s)
+  exit!(1)
+  true
 end
 
 #  ======================================================

data/lib/sifttter-redux/constants.rb

@@ -29,5 +29,5 @@ module SifttterRedux
   SUMMARY = 'Automated IFTTT to Day One engine.'
 
   # The Gem's version
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/lib/sifttter-redux/sifttter.rb

@@ -49,9 +49,9 @@ module SifttterRedux
     def parse_sifttter_file(filepath, date)
       title = File.basename(filepath).gsub(/^.*?\/([^\/]+)$/, "\\1") + "\n"
 
-      date_regex = "(?:#{ date.strftime("%B") } 0?#{ date.strftime("%-d") }, #{ date.strftime("%Y") })"
-      time_regex = "(?:\d{1,2}:\d{1,2}\s?[AaPpMm]{2})"
-      entry_regex = /@begin\n@date\s#{ date_regex }(?: at (#{ time_regex }?)\n)?(.*?)@end/m
+      date_regex = /(?:#{ date.strftime("%B") } 0?#{ date.strftime("%-d") }, #{ date.strftime("%Y") })/
+      time_regex = /(?:\d{1,2}:\d{1,2}\s?[AaPpMm]{2})/
+      entry_regex = /@begin\n@date\s#{ date_regex }(?: at (#{ time_regex }?)\n)?(.*?)\n@end/m
 
       contents = File.read(filepath)
       cur_entries = contents.scan(entry_regex)
@@ -96,7 +96,7 @@ module SifttterRedux
         @entries.each do |key, value|
           coder = HTMLEntities.new
           entrytext += '### ' + key.gsub(/.txt/, '').gsub(/_/, ' ').upcase + "\n\n"
-          value.each { |v| entrytext += "#{ coder.encode(v[1]) }\n" }
+          value.each { |v| entrytext += "#{ coder.encode(v[1].gsub(/%time%/, v[0])) }\n" }
           entrytext += "\n"
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sifttter-redux
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake