sifttter-redux 0.6.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f91e99b36d3cad97575616fb109ec3d2fa8ba5eb
-  data.tar.gz: a580c1e1fb3c78b69fcec0e26bbfb39b06b65c22
+  metadata.gz: 090949c07d19d271f5967f3ef4a39499e481ecae
+  data.tar.gz: dc87641ba282c42ac14a945ccf178f2707dde6ff
 SHA512:
-  metadata.gz: 092a22e0178972b943b6f87273caa8370f9abebfb57333c60858303f5cdb1037024549003f046af03ff6d849754cac68e92d42d39424e914bf5c7490c8d4a477
-  data.tar.gz: e002acd2182c37bba56b5909a5091f3248582dec33ecaae257de376bb36e910a4346fe8f15103ba03120e114a8d3c8a21c70b11392b8affb5c045c42c0e2496e
+  metadata.gz: 70ca3cfbbce6a86e794bac9d114aa67c613505cc1c619788a6e99baadd5bdd597e92ab65bdebda3ac4a3fb34df59df48dea3b347eba45b59e84f3372f4aebbee
+  data.tar.gz: 514072d0313a62eb283dec3c34eb6a5f612ea722162d2a220e69a9b1c994c8f9f3a1a4c36994980073b0617092b7bf9b5aef6ced4a53359acc882e9aaed2dc44

data/HISTORY.md

@@ -1,3 +1,9 @@
+# 1.0.0 (2014-04-21)
+
+* Added new Sifttter file format (which allows for any Markdown)
+* Added `srd upgrade` to upgrade to new format
+* Lots of bugfixes
+
 # 0.6.4 (2014-04-13)
 
 * Now using Configurator's `compare_version`
@@ -169,4 +175,4 @@
 
 # 0.1.0
 
-* Initial release of Sifttter Redux
+* Initial release of Sifttter Redux

data/README.md

@@ -3,7 +3,32 @@ Sifttter Redux
 [![Build Status](https://travis-ci.org/bachya/Sifttter-Redux.svg?branch=master)](https://travis-ci.org/bachya/Sifttter-Redux)
 [![Gem Version](https://badge.fury.io/rb/sifttter-redux.svg)](http://badge.fury.io/rb/sifttter-redux)
 
-Siftter Redux is a modification of Craig Eley's [Sifttter](http://craigeley.com/post/72565974459/sifttter-an-ifttt-to-day-one-logger "Sifttter"), a script to collect information from [IFTTT](http://www.ifttt.com "IFTTT") and place it in a [Day One](http://dayoneapp.com, "Day One") journal.
+# 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
+```
+
+# Intro
+
+Siftter Redux is a modification of Craig Eley's
+[Sifttter](http://craigeley.com/post/72565974459/sifttter-an-ifttt-to-day-one-logger "Sifttter"),
+a script to collect information from [IFTTT](http://www.ifttt.com "IFTTT") and
+place it in a [Day One](http://dayoneapp.com, "Day One") journal.
 
 Siftter Redux has several fundamental differences:
 
@@ -14,7 +39,8 @@ Siftter Redux has several fundamental differences:
 
 # Prerequisites
 
-In addition to Git (which, given you being on this site, I'll assume you have), Ruby (v. 1.9.3 or greater) is needed.
+In addition to Git (which, given you being on this site, I'll assume you have),
+Ruby (v. 1.9.3 or greater) is needed.
 
 # Installation
 
@@ -52,7 +78,8 @@ COMMANDS
     init - Install and initialize dependencies
 ```
 
-Note that each command's options can be revealed by adding the `--help` switch after the command. For example:
+Note that each command's options can be revealed by adding the `--help` switch
+after the command. For example:
 
 ```
 $ srd exec --help
@@ -81,7 +108,7 @@ $ srd init
 
 Initialization will perform the following steps:
 
-1. Download [Dropbox Uploader](https://github.com/andreafabrizi/Dropbox-Uploader "Dropbox-Uploder") to a location of your choice.
+1. Download [Dropbox Uploader](https://github.com/andreafabrizi/Dropbox-Uploader "Dropbox-Uploder")to a location of your choice.
 2. Automatically configure Dropbox Uploader.
 3. Collect some user paths (note that you can use tab completion here!):
  * The location on your filesystem where Sifttter files will be temporarily stored
@@ -91,11 +118,13 @@ Initialization will perform the following steps:
 
 ## Pathing
 
-Note that when Sifttter Redux asks you for paths, it will ask for "local" and "remote" filepaths. It's important to understand the difference.
+Note that when Sifttter Redux asks you for paths, it will ask for "local" and
+"remote" filepaths. It's important to understand the difference.
 
 ### Local Filepaths
 
-Local filepaths are, as you'd expect, filepaths on your local machine. Some examples might be:
+Local filepaths are, as you'd expect, filepaths on your local machine. Some
+examples might be:
 
 * `/tmp/my_data`
 * `/home/bob/ifttt/sifttter_data`
@@ -103,7 +132,10 @@ Local filepaths are, as you'd expect, filepaths on your local machine. Some exam
 
 ### Remote Filepaths
 
-Remote filepaths, on the other hand, are absolute filepaths in your Dropbox folder (*as Dropbox Uploader would see them*). For instance, `/home/bob/Dropbox/apps/sifttter` is *not* a valid remote filepath; rather, `/apps/sifttter` would be correct.
+Remote filepaths, on the other hand, are absolute filepaths in your Dropbox
+folder (*as Dropbox Uploader would see them*). For instance,
+`/home/bob/Dropbox/apps/sifttter` is *not* a valid remote filepath; rather,
+`/apps/sifttter` would be correct.
 
 ## Basic Execution
 
@@ -121,9 +153,12 @@ $ srd exec
 
 ## "Catch-up" Mode
 
-Sometimes, events occur that prevent Sifttter Redux from running (power loss to your device, a bad Cron job, etc.). In this case, Sifttter Redux's "catch-up" mode can be used to collect any valid journal on or before today's date.
+Sometimes, events occur that prevent Sifttter Redux from running (power loss to
+  your device, a bad Cron job, etc.). In this case, Sifttter Redux's "catch-up"
+  mode can be used to collect any valid journal on or before today's date.
 
-There are many ways to use this mode (note that "today" in these examples is **February 15, 2014**):
+There are many ways to use this mode (note that "today" in these examples is
+**February 15, 2014**):
 
 ### Yesterday Catch-up
 
@@ -143,7 +178,8 @@ $ srd exec -y
 
 ### Last "N" Days Catch-up
 
-Sifttter Redux allows you to specify the number of days back it should look for new entries:
+Sifttter Redux allows you to specify the number of days back it should look for
+new entries:
 
 ```
 $ srd exec -n 3
@@ -180,7 +216,9 @@ $ srd exec -n 12
 #### EXECUTION COMPLETE!
 ```
 
-Note that this option goes until yesterday ("yesterday" because you might not be ready to have today's entries scanned). If you'd rather include today's date, you can always add the `-i` switch:
+Note that this option goes until yesterday ("yesterday" because you might not be
+ready to have today's entries scanned). If you'd rather include today's date, you
+can always add the `-i` switch:
 
 ```
 $ srd exec -i -n 3
@@ -199,7 +237,8 @@ $ srd exec -i -n 3
 
 ### Last "N" Weeks Catch-up
 
-Sifttter Redux also allows you to specify a number of weeks back that should be scanned for new entries:
+Sifttter Redux also allows you to specify a number of weeks back that should be
+scanned for new entries:
 
 ```
 $ srd exec -w 1
@@ -312,7 +351,8 @@ $ srd exec -f 2014-02-01 -t 2014-02-12
 #### EXECUTION COMPLETE!
 ```
 
-Even more simply, to create entries from a specific point until yesterday ("yesterday" because you might not be ready to have today's entries scanned):
+Even more simply, to create entries from a specific point until yesterday
+("yesterday" because you might not be ready to have today's entries scanned):
 
 ```
 $ srd exec -f 2014-02-01
@@ -367,7 +407,7 @@ $ srd exec -i -f 2014-02-01
 
 Two notes to be aware of:
 
-* `-f` and `-t` are *inclusive* parameters, meaning that when specified, those dates will be included when searching for Siftter data.
+* `-f` and `-t` are *inclusive* parameters, meaning that when specified, thosedates will be included when searching for Siftter data.
 * Although you can specify `-f` by itself, you cannot specify `-t` by itself.
 
 Sifttter Redux makes use of the excellent [Chronic gem](https://github.com/mojombo/chronic "Chronic"), which provides natural language parsing for dates and times. This means that you can run commands with more "human" dates:
@@ -392,9 +432,13 @@ See [Chronic's Examples section](https://github.com/mojombo/chronic#examples "Ch
 
 # Cron Job
 
-By installing an entry to a `crontab`, Sifttter Redux can be run automatically on a schedule. The aim of this project was to use a Raspberry Pi; as such, the instructions below are specifically catered to that platform. That said, it should be possible to install and configure on any *NIX platform.
+By installing an entry to a `crontab`, Sifttter Redux can be run automatically
+on a schedule. The aim of this project was to use a Raspberry Pi; as such, the
+instructions below are specifically catered to that platform. That said, it
+should be possible to install and configure on any *NIX platform.
 
-One issue that arises is the loading of the bundled gems; because cron runs in a limited environment, it does not automatically know where to find installed gems.
+One issue that arises is the loading of the bundled gems; because cron runs in a
+limited environment, it does not automatically know where to find installed gems.
 
 ## Using RVM
 
@@ -414,7 +458,8 @@ $ bundle install --global
 
 # Logging
 
-Sifttter Redux logs a lot of good info to `~/.sifttter_redux_log`. It makes use of Ruby's standard log levels:
+Sifttter Redux logs a lot of good info to `~/.sifttter_redux_log`. It makes use
+of Ruby's standard log levels:
 
 * DEBUG
 * INFO
@@ -423,15 +468,15 @@ Sifttter Redux logs a lot of good info to `~/.sifttter_redux_log`. It makes use
 * FATAL
 * UNKNOWN
 
-If you want to see more or less in your log files, simply change the `log_level` value in `~/.sifttter_redux` to your desired level.
-
-# Known Issues & Future Releases
-
-Bugs, issues, and enhancement requests (my own or those submitted by others) can be found on the [Issues Page](https://github.com/bachya/Sifttter-Redux/issues "Open Items").
+If you want to see more or less in your log files, simply change the `log_level`
+value in `~/.sifttter_redux` to your desired level.
 
 # Bugs and Feature Requests
 
-To report bugs with or suggest features/changes for Sifttter Redux, please use the [Issues Page](http://github.com/bachya/sifttter-redux/issues).
+My current roadmap can be found on my [Trello board](https://trello.com/b/z4vl3YxC/sifttter-redux "Sifttter Redux Trello Board")
+
+To report bugs with or suggest features/changes for Sifttter Redux, please use
+the [Issues Page](http://github.com/bachya/sifttter-redux/issues).
 
 Contributions are welcome and encouraged. To contribute:
 
@@ -447,15 +492,26 @@ Contributions are welcome and encouraged. To contribute:
 
 Copyright © 2014 Aaron Bach <bachya1208@gmail.com>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the 'Software'), to deal in the
+Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # Credits
 
 * Craig Eley for [Sifttter](http://craigeley.com/post/72565974459/sifttter-an-ifttt-to-day-one-logger "Sifttter") and for giving me the idea for Sifttter Redux
 * Dave Copeland for [GLI](https://github.com/davetron5000/gli "GLI")
 * Andrea Fabrizi for [Dropbox Uploader](https://github.com/andreafabrizi/Dropbox-Uploader "Dropbox Uploader")
-* ~~Tom Preston-Werner~~ (sorry: can't support [harrassment](http://www.businessinsider.com/github-co-founder-suspended-2014-3 "GitHub Founder Tom Preston-Werner Suspended After Harassment Allegations")) ~~and~~ Lee Jarvis for [Chronic](https://github.com/mojombo/chronic "Chronic")
+* ~~Tom Preston-Werner~~ (sorry: can't support [harrassment](http://www.businessinsider.com/github-co-founder-suspended-2014-3 "GitHub Founder Tom Preston-Werner Suspended After Harassment Allegations")) ~~and~~ Lee Jarvis for [Chronic](https://github.com/mojombo/chronic "Chronic")

data/bin/srd

@@ -32,6 +32,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 #--------------------------------------------------------------------
+require 'archive/zip'
 require 'cliutils'
 require 'gli'
 require 'sifttter-redux'
@@ -44,13 +45,8 @@ include GLI::App
 #  ======================================================
 #  App Info
 #  ======================================================
-program_desc 'Sifttter Redux
-
-    A customized IFTTT-to-Day One service that allows for
-    smart installation and automated running on a standalone
-    *NIX device (such as a Raspberry Pi).'
-
-version SifttterRedux::VERSION
+program_desc(SifttterRedux::DESCRIPTION)
+version(SifttterRedux::VERSION)
 
 #  ======================================================
 #  Global Flags and Switches
@@ -61,7 +57,6 @@ switch([:verbose], desc: 'Turns on verbose output')
 #  Pre, Post, and Error
 #  ======================================================
 pre do |global, command, options, args|
-
   # Load SifttterRedux configuration module.
   load_configuration(SifttterRedux::DEFAULT_SRD_CONFIG_FILEPATH)
   file_logger = Logger.new(SifttterRedux::DEFAULT_SRD_LOG_FILEPATH)
@@ -84,7 +79,6 @@ pre do |global, command, options, args|
     SifttterRedux.init(true)
     exit!(0)
   end
-
   true
 end
 
@@ -176,14 +170,65 @@ desc 'Install and initialize dependencies'
 command :init do |c|
   c.switch([:s], desc: 'Run init from scratch (i.e., clear out all values from configuration)')
   c.action do |global_options, options, args|
-    messenger.section_block('INITIALIZING...') do
-      if options[:s]
-        SifttterRedux::init(true)
-      else
-        long_message = "You've already initialized Sifttter Redux. Do it again?"
-        SifttterRedux::init if messenger.prompt(long_message, 'N').downcase == 'y'
-      end
+    if options[:s]
+      SifttterRedux::init(true)
+    else
+      long_message = "You've already initialized Sifttter Redux. Do it again?"
+      SifttterRedux::init if messenger.prompt(long_message, 'N').downcase == 'y'
+    end
+  end
+end
+
+#  ------------------------------------------------------
+#  upgrade command
+#
+#  Upgrades existing Sifttter files to the format needed
+#  by v 1.x.x.
+#  ------------------------------------------------------
+desc 'Upgrades Sifttter files to the new format'
+command :upgrade do |c|
+  c.switch([:verbose], desc: 'Turns on verbose output')
+  c.action do |global_options, options, args|
+    SifttterRedux.verbose = global_options[:verbose] || options[:verbose]
+
+    # Set the archive filepath and the files that will go into it.
+    filename = "#{ ENV['HOME'] }/sifttter_backup_#{ Time.now.to_i }.zip"
+
+    # Download Sifttter files from Dropbox.
+    dbu = SifttterRedux::DropboxUploader.new(configuration.db_uploader[:exe_filepath])
+    dbu.verbose = SifttterRedux.verbose
+    dbu.local_target = configuration.sifttter_redux[:sifttter_local_filepath]
+    dbu.remote_target = configuration.sifttter_redux[:sifttter_remote_filepath]
+    dbu.message = "Backing up Sifttter files to #{ filename }..."
+
+    messenger.info_block(dbu.message || dbu::DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
+      dbu.download
     end
+
+    # Archive the Sifttter files.
+    Archive::Zip.archive(filename, configuration.sifttter_redux[:sifttter_local_filepath])
+
+    # Replace the old scheme with the new one.
+    Dir.glob(configuration.sifttter_redux[:sifttter_local_filepath] + '/*.txt').each do |file|
+      t = File.read(file)
+      t.gsub!(/^- /, "@begin\n@date ")
+      t.gsub!(/ - /, "\n- ")
+      t.gsub!(/\s?@done/, '@end')
+      messenger.debug { "Replacing contents of file: #{ file }"}
+      File.open(file, 'w') { |f| f.write(t) }
+    end
+
+    # Upload the new Sifttter files back to Dropbox.
+    dbu.local_target = "#{ configuration.sifttter_redux[:sifttter_local_filepath] }"
+    dbu.remote_target = Pathname.new(configuration.sifttter_redux[:sifttter_remote_filepath]).dirname.to_s
+    dbu.message = "Uploading revised Sifttter files to Dropbox..."
+
+    messenger.info_block(dbu.message || dbu::DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
+      dbu.upload
+    end
+
+    # Remove any downloaded local files that we no longer need.
+    SifttterRedux.cleanup_temp_files
   end
 end
 

data/features/2.initialization.feature

@@ -53,7 +53,7 @@ Feature: Initialization
     When I run `srd init` interactively
       And I type ""
     Then the exit status should be 0
-    
+
   Scenario: Reinitialization (accept)
     Given a file located at "/tmp/srd/.sifttter_redux" with the contents:
     """
@@ -97,8 +97,8 @@ Feature: Initialization
         base_filepath: "/usr/local/opt"
         dbu_filepath: "/usr/local/opt/Dropbox-Uploader"
         exe_filepath: "/usr/local/opt/Dropbox-Uploader/dropbox_uploader.sh"
-      """  
-  
+      """
+
   Scenario: Reinitialization (from scratch)
     Given no file located at "/tmp/srd/.sifttter_redux"
       And an empty file located at "/tmp/srd/.dropbox_uploader"
@@ -126,4 +126,4 @@ Feature: Initialization
         base_filepath: "/usr/local/opt"
         dbu_filepath: "/usr/local/opt/Dropbox-Uploader"
         exe_filepath: "/usr/local/opt/Dropbox-Uploader/dropbox_uploader.sh"
-      """
+      """

data/lib/sifttter-redux/constants.rb

@@ -18,7 +18,7 @@ module SifttterRedux
   DESCRIPTION = 'A customized IFTTT-to-Day One service that allows for smart installation and automated running on a standalone *NIX device (such as a Raspberry Pi).'
 
   # The last version to require a config update
-  NEWEST_CONFIG_VERSION = '0.6'
+  NEWEST_CONFIG_VERSION = '1.0.0'
 
   # Hash of preference files
   PREF_FILES = {
@@ -29,5 +29,5 @@ module SifttterRedux
   SUMMARY = 'Automated IFTTT to Day One engine.'
 
   # The Gem's version
-  VERSION = '0.6.4'
-end
+  VERSION = '1.0.0'
+end

data/lib/sifttter-redux/sifttter.rb

@@ -1,42 +1,79 @@
 module SifttterRedux
   # Sifttter Module
-  # Wrapper module for Sifttter itself
+  # Used to examine Sifttter data and create
+  # Day One entries as necessary.
   module Sifttter
-    # Sifttter: An IFTTT-to-Day One Logger by Craig Eley
-    # Based on tp-dailylog.rb by Brett Terpstra 2012
-    # @param [Date] date The date to use when scanning Sifttter
-    # @return [void]
-    def self.run(date)
-      uuid = SecureRandom.uuid.upcase.gsub(/-/, '').strip
+    extend self
 
-      date_for_title = date.strftime('%B %d, %Y')
-      datestamp = date.to_time.utc.iso8601
-      starred = false
+    class << self
+      # Stores the collection of entries to create.
+      # @return [Hash]
+      attr_accessor :entries
+    end
 
-      template = ERB.new <<-XMLTEMPLATE
+    # Generates an ERB template for a Day One entry
+    # @param [String] datestamp The ISO8601 datestamp
+    # @param [String] entrytext The text of the entry
+    # @param [Boolean] starred Whether the entry should be starred
+    # @param [String] uuid The UUID of the entry
+    def generate_template(datestamp, entrytext, starred, uuid)
+      ERB.new <<-XMLTEMPLATE
       <?xml version="1.0" encoding="UTF-8"?>
       <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
       <plist version="1.0">
       <dict>
-      	<key>Creation Date</key>
-      	<date><%= datestamp %></date>
-      	<key>Entry Text</key>
-      	<string><%= entrytext %></string>
-      	<key>Starred</key>
-      	<<%= starred %>/>
-      	<key>Tags</key>
-      	<array>
-      		<string>daily logs</string>
-      	</array>
-      	<key>UUID</key>
-      	<string><%= uuid %></string>
+        <key>Creation Date</key>
+        <date><%= datestamp %></date>
+        <key>Entry Text</key>
+        <string><%= entrytext %></string>
+        <key>Starred</key>
+        <<%= starred %>/>
+        <key>Tags</key>
+        <array>
+          <string>daily logs</string>
+        </array>
+        <key>UUID</key>
+        <string><%= uuid %></string>
       </dict>
       </plist>
       XMLTEMPLATE
+    end
+
+    # Opens a filepath and parses it for Sifttter
+    # data for the passed date.
+    # @param [String] file The filepath to parse
+    # @param [Date] date The date to search for
+    # @return [void]
+    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 (.*?)\n)?(.*?)@end/m
+      
+      contents = File.read(filepath)
+      cur_entries = contents.scan(entry_regex)
+      unless cur_entries.empty?
+        @entries.merge!(title => []) unless @entries.key?(title)
+        cur_entries.each { |e| @entries[title] << [e[0], e[1].strip] }
+      end
+    end
 
+    # Finds Siftter data for the passed date and
+    # creates corresponding Day One entries.
+    # @param [Date] date The date to search for
+    # @return [void]
+    def self.run(date)
+      @entries = {}
+      uuid = SecureRandom.uuid.upcase.gsub(/-/, '').strip
+      date_for_title = date.strftime('%B %d, %Y')
+      datestamp = date.to_time.utc.iso8601
+      starred = false
+
+      
+      output_dir = configuration.sifttter_redux[:dayone_local_filepath]
+      Dir.mkdir(output_dir) unless Dir.exists?(output_dir)
+      
       files = `find #{ configuration.sifttter_redux[:sifttter_local_filepath] } -type f -name "*.txt" | grep -v -i daily | sort`
       if files.empty?
         messenger.error('No Sifttter files to parse...')
@@ -44,47 +81,29 @@ module SifttterRedux
         messenger.error("Is #{ configuration.sifttter_redux[:sifttter_remote_filepath] } the correct remote filepath?")
         exit!(1)
       end
-
-      projects = []
+      
       files.split("\n").each do |file|
-        if File.exists?(file.strip)
-      		f = File.open(file.strip, encoding: 'UTF-8')
-      		lines = f.read
-      		f.close
-      		project = '### ' + File.basename(file).gsub(/^.*?\/([^\/]+)$/, "\\1") + "\n"
-
-      		found_completed = false
-      		lines.each_line do |line|
-      			if line =~ /&/
-      				line.gsub!(/[&]/, 'and')
-      			end
-      			if line =~ /#{ date_regex }/
-      				found_completed = true
-      				project += line.gsub(/@done/,"").gsub(/#{ date_regex }\s(-|at)\s/, "").gsub(/#{ time_regex }\s-\s/, "").strip + "\n"
-      			end
-      		end
-      	end
-      	if found_completed
-      		projects.push(project)
-      	end
-      end
-
-      if projects.length <=0
-      	messenger.warn('No entries found...')
+        file.strip!
+        if File.exists?(file)
+          parse_sifttter_file(file, date)
+        end
       end
+      
+      if @entries.length > 0
+        entrytext = "# Things done on #{ date_for_title }\n"
+        @entries.each do |key, value|
+          entrytext += '### ' + key.gsub(/.txt/, '') + "\n\n"
+          value.each { |v| entrytext += "#{ v[1] }\n" }
+          entrytext += "\n"
+        end
 
-      if projects.length > 0
-      	entrytext = "# Things done on #{ date_for_title }\n\n"
-      	projects.each do |project|
-      		entrytext += project.gsub(/.txt/, ' ') + "\n\n"
-      	end
-
-        Dir.mkdir(configuration.sifttter_redux[:dayone_local_filepath]) if !Dir.exists?(configuration.sifttter_redux[:dayone_local_filepath])
-
-      	fh = File.new(File.expand_path(configuration.sifttter_redux[:dayone_local_filepath] + '/' + uuid + '.doentry'), 'w+')
-      	fh.puts template.result(binding)
-      	fh.close
-      	messenger.success("Entry logged for #{ date_for_title }...")
+        template = generate_template(datestamp, entrytext, starred, uuid)
+        fh = File.new(File.expand_path("#{ output_dir }/#{ uuid }.doentry"), 'w+')
+        fh.puts template.result(binding)
+        fh.close
+        messenger.success("Entry logged for #{ date_for_title }...")
+      else
+        messenger.warn('No entries found...')
       end
     end
   end

data/lib/sifttter-redux.rb

@@ -6,17 +6,16 @@ require 'sifttter-redux/sifttter'
 # The SifttterRedux module, which wraps everything
 # in this gem.
 module SifttterRedux
-  
   class << self
     # Stores whether initalization has completed.
     # @return [Boolean]
     attr_reader :initialized
-    
+
     # Stores whether verbose output is turned on.
     # @return [Boolean]
     attr_accessor :verbose
   end
-  
+
   # Removes temporary directories and their contents
   # @return [void]
   def self.cleanup_temp_files
@@ -25,7 +24,7 @@ module SifttterRedux
       configuration.sifttter_redux[:sifttter_local_filepath]
     ]
 
-    messenger.info_block('Removing temporary local files...') do 
+    messenger.info_block('Removing temporary local files...') do
       dirs.each do |d|
         FileUtils.rm_rf(d)
         messenger.debug("Removed directory: #{ d }")
@@ -35,52 +34,50 @@ module SifttterRedux
 
   # Runs a wizard that installs Dropbox Uploader on the
   # local filesystem.
-  # @param [Boolean] from_scratch 
+  # @param [Boolean] from_scratch
   # @return [void]
   def self.dbu_install_wizard(from_scratch = false)
     valid_path_chosen = false
-    
-    messenger.section_block('CONFIGURING DROPBOX UPLOADER...') do
-      until valid_path_chosen
-        # Prompt the user for a location to save Dropbox Uploader.
-        if from_scratch && !configuration.db_uploader[:base_filepath].nil?
-          default = configuration.db_uploader[:base_filepath]
-        else
-          default = DEFAULT_DBU_LOCAL_FILEPATH
-        end
-        path = messenger.prompt('Location for Dropbox-Uploader', default)
-        path = default if path.empty?
-        path.chop! if path.end_with?('/')
-        
-        # If the entered directory exists, clone the repository.
-        if Dir.exists?(File.expand_path(path))
-          valid_path_chosen = true
-          
-          dbu_path = File.join(path, 'Dropbox-Uploader')
-          executable_path = File.join(dbu_path, 'dropbox_uploader.sh')
-
-          if File.directory?(dbu_path)
-            messenger.warn("Using pre-existing Dropbox Uploader at #{ dbu_path }...")
-          else
-            messenger.info_block("Downloading Dropbox Uploader to #{ dbu_path }...", 'Done.', true) do
-              system "git clone https://github.com/andreafabrizi/Dropbox-Uploader.git #{ dbu_path }"
-            end
-          end
 
-          # If the user has never configured Dropbox Uploader, have them do it here.
-          unless File.exists?(DEFAULT_DBU_CONFIG_FILEPATH)
-            messenger.info_block('Initializing Dropbox Uploader...') { system "#{ executable_path }" }
-          end
+    until valid_path_chosen
+      # Prompt the user for a location to save Dropbox Uploader.
+      if from_scratch && !configuration.db_uploader[:base_filepath].nil?
+        default = configuration.db_uploader[:base_filepath]
+      else
+        default = DEFAULT_DBU_LOCAL_FILEPATH
+      end
+      path = messenger.prompt('Location for Dropbox-Uploader', default)
+      path = default if path.empty?
+      path.chop! if path.end_with?('/')
+
+      # If the entered directory exists, clone the repository.
+      if Dir.exists?(File.expand_path(path))
+        valid_path_chosen = true
 
-          configuration.add_section(:db_uploader) unless configuration.data.key?(:db_uploader)
-          configuration.db_uploader.merge!({
-            base_filepath: path, 
-            dbu_filepath: dbu_path,
-            exe_filepath: executable_path
-          })
+        dbu_path = File.join(path, 'Dropbox-Uploader')
+        executable_path = File.join(dbu_path, 'dropbox_uploader.sh')
+
+        if File.directory?(dbu_path)
+          messenger.warn("Using pre-existing Dropbox Uploader at #{ dbu_path }...")
         else
-          messenger.error("Sorry, but #{ path } isn't a valid directory.")
+          messenger.info_block("Downloading Dropbox Uploader to #{ dbu_path }...", 'Done.', true) do
+            system "git clone https://github.com/andreafabrizi/Dropbox-Uploader.git #{ dbu_path }"
+          end
         end
+
+        # If the user has never configured Dropbox Uploader, have them do it here.
+        unless File.exists?(DEFAULT_DBU_CONFIG_FILEPATH)
+          messenger.info_block('Initializing Dropbox Uploader...') { system "#{ executable_path }" }
+        end
+
+        configuration.add_section(:db_uploader) unless configuration.data.key?(:db_uploader)
+        configuration.db_uploader.merge!({
+          base_filepath: path,
+          dbu_filepath: dbu_path,
+          exe_filepath: executable_path
+        })
+      else
+        messenger.error("Sorry, but #{ path } isn't a valid directory.")
       end
     end
   end
@@ -90,38 +87,36 @@ module SifttterRedux
   # @param [Hash] options GLI command line options
   # @return [Range]
   def self.get_dates_from_options(options)
-    messenger.section_block('EXECUTING...') do
-      if options[:c] || options[:n] || options[:w] || options[:y] || options[:f] || options[:t]
-        # Yesterday
-        r = DateRangeMaker.yesterday if options[:y]
-
-        # Current Week
-        r = DateRangeMaker.last_n_weeks(0, options[:i]) if options[:c]
-        
-        # Last N Days
-        r = DateRangeMaker.last_n_days(options[:n].to_i, options[:i]) if options[:n]
-
-        # Last N Weeks
-        r = DateRangeMaker.last_n_weeks(options[:w].to_i, options[:i]) if options[:w]
-
-        # Custom Range
-        if (options[:f] || options[:t])
-          _dates = DateRangeMaker.range(options[:f], options[:t], options[:i])
-
-          if _dates.last > Date.today
-            messenger.warn("Ignoring overextended end date and using today's date (#{ Date.today })...")
-            r = (_dates.first..Date.today)
-          else
-            r = (_dates.first.._dates.last)
-          end
+    if options[:c] || options[:n] || options[:w] || options[:y] || options[:f] || options[:t]
+      # Yesterday
+      r = DateRangeMaker.yesterday if options[:y]
+
+      # Current Week
+      r = DateRangeMaker.last_n_weeks(0, options[:i]) if options[:c]
+
+      # Last N Days
+      r = DateRangeMaker.last_n_days(options[:n].to_i, options[:i]) if options[:n]
+
+      # Last N Weeks
+      r = DateRangeMaker.last_n_weeks(options[:w].to_i, options[:i]) if options[:w]
+
+      # Custom Range
+      if (options[:f] || options[:t])
+        _dates = DateRangeMaker.range(options[:f], options[:t], options[:i])
+
+        if _dates.last > Date.today
+          messenger.warn("Ignoring overextended end date and using today's date (#{ Date.today })...")
+          r = (_dates.first..Date.today)
+        else
+          r = (_dates.first.._dates.last)
         end
-      else
-        r = DateRangeMaker.today
       end
-      
-      messenger.debug("Date range: #{ r }")
-      r
+    else
+      r = DateRangeMaker.today
     end
+
+    messenger.debug { "Date range: #{ r }" }
+    r
   end
 
   # Initializes Sifttter Redux by downloading and
@@ -147,7 +142,7 @@ module SifttterRedux
     pm.ask
     configuration.ingest_prefs(pm)
 
-    messenger.debug { "Configuration values after pref collection: #{ configuration.data }" }
+    messenger.debug {"Collected configuration values: #{ configuration.data }" }
     configuration.save
     @initialized = true
   end
@@ -156,7 +151,10 @@ module SifttterRedux
   # re-done and does it.
   # @return [void]
   def self.update_config_file
-    messenger.info("This version needs to make some config changes. Don't worry; when prompted, your current values for existing config options will be presented (so it'll be easier to fly through the upgrade).")
+    m = "This version needs to make some config changes. Don't worry; " \
+        "when prompted, your current values for existing config options " \
+        "will be presented (so it'll be easier to fly through the upgrade)."
+    messenger.info(m)
     messenger.prompt('Press enter to continue')
     SifttterRedux.init(true)
   end

data/res/preference_prompts.yaml

@@ -1,17 +1,17 @@
 prompts:
-  - prompt: Where do you want to download Sifttter files to (temporarily)?
+  - prompt_text: Where do you want to download Sifttter files to (temporarily)?
     default: /tmp/sifttter
     config_key: sifttter_local_filepath
     config_section: sifttter_redux
-  - prompt: Where are your Sifttter files located in Dropbox?
+  - prompt_text: Where are your Sifttter files located in Dropbox?
     default: /Apps/ifttt/sifttter
     config_key: sifttter_remote_filepath
     config_section: sifttter_redux
-  - prompt: Where do you want to download Day One files to (temporarily)?
+  - prompt_text: Where do you want to download Day One files to (temporarily)?
     default: /tmp/dayone
     config_key: dayone_local_filepath
     config_section: sifttter_redux
-  - prompt: Where are your Day One files located in Dropbox?
+  - prompt_text: Where are your Day One files located in Dropbox?
     default: /Apps/Day\ One/Journal.dayone/entries
     config_key: dayone_remote_filepath
     config_section: sifttter_redux

data/sifttter-redux.gemspec

@@ -3,7 +3,7 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sifttter-redux/constants'
 
-Gem::Specification.new do |spec|   
+Gem::Specification.new do |spec|
   spec.name             = 'sifttter-redux'
   spec.version          = SifttterRedux::VERSION
   spec.authors          = ['Aaron Bach']
@@ -18,15 +18,16 @@ Gem::Specification.new do |spec|
   spec.files            = `git ls-files`.split("\n")
   spec.executables      = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files       = spec.files.grep(%r{^(test|spec|features)/})
-  
+
   spec.license          = 'MIT'
   spec.rdoc_options     = ['--charset=UTF-8']
   spec.extra_rdoc_files = %w[README.md HISTORY.md LICENSE]
-  
+
   spec.add_development_dependency('rake', '10.1.1')
   spec.add_development_dependency('rdoc', '4.1.1')
   spec.add_development_dependency('aruba', '0.5.4')
+  spec.add_runtime_dependency('archive-zip', '0.6.0')
   spec.add_runtime_dependency('chronic', '0.10.2')
-  spec.add_runtime_dependency('cliutils', '~> 1.3')
+  spec.add_runtime_dependency('cliutils', '~> 2')
   spec.add_runtime_dependency('gli','2.9.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sifttter-redux
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.5.4
+- !ruby/object:Gem::Dependency
+  name: archive-zip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement