sifttter-redux 0.3.1 → 0.3.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDU5ZGQ5Y2Q5MjhhMmZkMjczNjk1NGMxNGZkNWM0ZjcwMDRiNGJjYg==
-  data.tar.gz: !binary |-
-    NmEwNjIwMDQxZGVmZDkwNzA1ZDE2ZWJmMGYzM2NjN2MyOTUyYzVhZQ==
+SHA1:
+  metadata.gz: e7a7651a47fcd93ff3150a17b949fd50c4ca1c85
+  data.tar.gz: 24ea7968b26c83f2e4a54d166da41a56690cb2ed
 SHA512:
-  metadata.gz: !binary |-
-    NTA2NzBlYTgxNjQyMmMxMWVkNDgzYTlkYzlkM2U1ZDAwNDExYzI0M2RlYTE0
-    NGQxYTg4YTUzYmFhOWI5NThiMDRhZjkxZWRhYzZkN2QyYThlMGVhNDJlNDcx
-    Y2ExM2E1OWE3MTUxYWJhYzRjZjQxODY2NWIyYjU0Y2I2MzBlNWI=
-  data.tar.gz: !binary |-
-    ZGQ5N2QwNDM2MTAyZmFkY2VjYjg5OWQ3NTdhYTdkNDA2OWQ0MTY4M2Q0YjU2
-    ZDNmNmE1NTJlMTU0N2MyODdlMzBkNDM2MDU1ZmI1NTE4N2RkNDdkMjMwMjNi
-    MDY2YjQ4NzJiMDYyNDZkZTY2YjNlYjMxNzFiYWQ1NGRmMGNhMWE=
+  metadata.gz: 89c8c7e370f1cc517d787a82a15267ab993cc7dc36e29898652af7e5463dc05f9efead2b249291dd3a4dce40b8d7d57aa24d36f663bb280c7ed870b4f1cdc8a0
+  data.tar.gz: 875ee4c39c7a8b7345cb54bf9a1edafce183fb7c4740281ddc7f45c557ead91df07e4332882111571a83b36ceda6712e305b86e0ae53b0224481799994b48650

data/HISTORY.md

@@ -1,3 +1,9 @@
+# 0.3.2 (2014-02-20)
+
+* Added verbose flag
+* Big refactorings = much nicer, more modular code
+* Removed dependency on colored gem
+
 # 0.3.1
 
 * Removed reliance on Rails methods for first-and-last-day-of-week calculations
@@ -21,7 +27,7 @@
 # 0.2.4 (originally 0.2.3)
 
 * Updated some help documentation
-* Changed message re: no entries found to a warning state 
+* Changed message re: no entries found to a warning state
 
 # 0.2.2
 
@@ -32,7 +38,7 @@
 * Fixed a bug where the config manager would fail on certain platforms
 * Fixed a bug where the path to Dropbox Uploader became malformed
 
-# 0.2.0 
+# 0.2.0
 
 * Implemented catch-up mode
 

data/README.md

@@ -1,7 +1,7 @@
 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. 
+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's primary difference is in its execution method: it intended to run autonomously so that it does not need to be manually activated. This allows IFTTT data to be synchronized to Day One on a schedule.
 
@@ -69,7 +69,7 @@ Initialization will perform the following steps:
  2. The location of your Sifttter files in Dropbox
  3. The location on your filesystem where Day One files will be temporarily stored
  4. The location of your Day One files in Dropbox
- 
+
 ### Basic Execution
 
 ```
@@ -385,8 +385,8 @@ $ bundle install --global
 
 Some functionality I would like to tackle for future releases:
 
+* Plugin architecture for services that IFTTT doesn't support
 * Interactive cron job installer
-* Verbose mode that more explicity tells the user what's currently going on
 * Smarter checking of the config file to see if an old version is being used
 
 ## Bugs and Feature Requests

data/bin/srd

@@ -1,15 +1,16 @@
 #!/usr/bin/env ruby
-#-------------------------------------------------------------------------------------------------------------
+# Encoding: utf-8
+#--------------------------------------------------------------------
 #  Sifttter Redux
 #
-#  A modification of Craig Eley's Sifttter that allows for smart installation on a standalone *NIX
-#  device (such as a Raspberry Pi).
+#  A modification of Craig Eley's Sifttter that allows for smart
+#  installation on a standalone *NIX device (such as a Raspberry Pi).
 #
 #  Sifttter copyright Craig Eley 2014 <http://craigeley.com>
 #
 #  Copyright (c) 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
@@ -18,10 +19,10 @@
 #  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 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
@@ -30,206 +31,208 @@
 #  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.
-#-------------------------------------------------------------------------------------------------------------
+#--------------------------------------------------------------------
 
-require 'colored'
 require 'fileutils'
 require 'gli'
-require 'sifttter-redux'
-require 'time'
-require 'yaml'
+require 'sifttter_redux'
 
 include GLI::App
-
-program_desc "Sifttter Redux
-
-    A modification of Craig Eley's Sifttter (an 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 '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).'
+
+#  ======================================================
+#  Global Flags and Switches
+#  ======================================================
+
+switch(
+  [:verbose],
+  desc: 'Turns on verbose output'
+)
+
+#  ======================================================
+#  Pre, Post, and Error
+#  ======================================================
+
+pre do |global, command, options, args|
+  SifttterRedux::Configuration.load(SifttterRedux::SRD_CONFIG_FILEPATH)
+  SifttterRedux::DBU.load(
+    File.join(
+      SifttterRedux::Configuration['db_uploader']['local_filepath'],
+      'dropbox_uploader.sh'
+    )
+  )
 
-#|  ======================================================
-#|  Pre, Post, and Error 
-#|  ======================================================
-
-pre do |global,command,options,args|
-  $config = ConfigManager.instance
-  $date_range_maker = DateRangeMaker.new
-
-  if !File.exists?(SifttterRedux::SRD_CONFIG_FILEPATH)
-    CliMessage.info("It doesn't look like you've initlized Sifttter Redux yet. Doing that now...")
-    initialize_procedures
-  end
-  
-  $db_uploader = File.join($config.db_uploader["local_filepath"], "dropbox_uploader.sh")
-  true
-end
-
-post do |global,command,options,args|
-  # Post logic here
-  # Use skips_post before a command to skip this
-  # block on that command only
-end
-
-on_error do |exception|
-  # Error logic here
-  # return false to skip default error handling
+  init unless File.exists?(SifttterRedux::SRD_CONFIG_FILEPATH)
   true
 end
 
-#|  ======================================================
-#|  Commands
-#|  ======================================================
+#  ======================================================
+#  Commands
+#  ======================================================
 
-#|  ------------------------------------------------------
-#|  exec command
-#|
-#|  Executes the script.
-#|  ------------------------------------------------------
+#  ------------------------------------------------------
+#  exec command
+#
+#  Executes the script.
+#  ------------------------------------------------------
 
 desc 'Execute the script'
-command :exec do |c|  
-  
+command :exec do |c|
+
   c.flag(
     [:f],
-    :desc => 'Run catch-up mode with this start date',
+    desc: 'Run catch-up mode with this start date'
   )
-  
+
   c.flag(
     [:n],
-    :desc => 'Run catch-up mode for the last N days'
+    desc: 'Run catch-up mode for the last N days'
   )
-    
+
   c.flag(
     [:t],
-    :desc => 'Run catch-up mode with this end date (must be accompanied by -f)',
+    desc: 'Run catch-up mode with this end date (must also have -f)'
   )
-  
+
   c.flag(
     [:w],
-    :desc => 'Run catch-up mode for the last N weeks'
+    desc: 'Run catch-up mode for the last N weeks'
   )
-  
+
   c.switch(
     [:c],
-    :desc => 'Run catch-up mode for the current week (i.e., the beginning of the week to yesterday)'
+    desc: 'Run catch-up mode from the beginning of the week to yesterday'
   )
-  
+
   c.switch(
     [:i],
-    :desc => 'Include today\'s date in catch-up'
+    desc: "Include today's date in catch-up"
   )
-  
+
+  c.switch(
+    [:verbose],
+    desc: 'Turns on verbose output'
+  )
+
   c.switch(
     [:y],
-    :desc => 'Run catch-up mode for yesterday'
+    desc: 'Run catch-up mode for yesterday'
   )
-  
+
   c.action do |global_options, options, args|
-    command_complete = false
 
-    CliMessage.section('EXECUTING...')
-    
-    if (options[:c] || options[:n] || options[:w] || options[:y] || options[:f] || options[:t])
+    SifttterRedux.verbose = global_options[:verbose] || options[:verbose]
 
-      # Current Week
-      if (!command_complete && options[:c])
-        dates = $date_range_maker.last_n_weeks(0, {:include_today => options[:i]})
-        command_complete = true
-      end
-      
-      # Last N Days
-      if (!command_complete && options[:n])
-        dates = $date_range_maker.last_n_days(options[:n].to_i, {:include_today => options[:i]})
-        command_complete = true
-      end
-      
-      # Yesterday
-      if (!command_complete && options[:y])
-        dates = $date_range_maker.yesterday
-        command_complete = true
-      end
-      
-      # Last N Weeks
-      if (!command_complete && options[:w])
-        dates = $date_range_maker.last_n_weeks(options[:w].to_i, {:include_today => options[:i]})
-        command_complete = true
-      end
-      
-      # Specific Range
-      if (!command_complete && (options[:f] || options[:t]))
-        begin
-          dates = $date_range_maker.range(options[:f], options[:t], {:include_today => options[:i]})
-          
-          if (dates.last > Date.today)
-            CliMessage.warning("Ignoring overextended end date and using today's date (#{Date.today})")
-            dates = (dates.first..Date.today)
+    SifttterRedux::CliMessage.section_block('EXECUTING...') do
+      if options[:c] || options[:n] || options[:w] || options[:y] || options[:f] || options[:t]
+
+        command_complete = false
+
+        # Current Week
+        if !command_complete && options[:c]
+          dates = SifttterRedux::DateRangeMaker.last_n_weeks(0, options[:i])
+          command_complete = true
+        end
+
+        # Last N Days
+        if !command_complete && options[:n]
+          dates = SifttterRedux::DateRangeMaker.last_n_days(options[:n].to_i, options[:i])
+          command_complete = true
+        end
+
+        # Yesterday
+        if !command_complete && options[:y]
+          dates = SifttterRedux::DateRangeMaker.yesterday
+          command_complete = true
+        end
+
+        # Last N Weeks
+        if !command_complete && options[:w]
+          dates = SifttterRedux::DateRangeMaker.last_n_weeks(options[:w].to_i, options[:i])
+          command_complete = true
+        end
+
+        # Specific Range
+        if !command_complete && (options[:f] || options[:t])
+          begin
+            dates = SifttterRedux::DateRangeMaker.from_to(options[:f], options[:t], options[:i])
+
+            if dates.last > Date.today
+              SifttterRedux::CliMessage.warning("Ignoring overextended end date and using today's date (#{ Date.today })")
+              dates = (dates.first..Date.today)
+            end
+          rescue ArgumentError => e
+            SifttterRedux::CliMessage.error(e)
           end
-        rescue DateRangeMakerError
-          CliMessage.error($!)
         end
-        command_complete = true
-      end
-    else
-      dates = $date_range_maker.today
-      command_complete = true
-    end
-    
-    if (!dates.nil?)
-      first_date = dates.first
-      second_date = dates.reverse_each.first
-      
-      if (first_date == second_date)
-        CliMessage.info("Creating entry for #{first_date.strftime('%B %d, %Y')}...")
       else
-        CliMessage.info("Creating entries for dates from #{first_date.strftime('%B %d, %Y')} to #{second_date.strftime('%B %d, %Y')}...")
-      end
-    
-      download_sifttter_files
-      
-      dates.each do |date|
-        run_sifttter(date)
+        dates = SifttterRedux::DateRangeMaker.today
       end
-      
-      # Upload any Day One entries to Dropbox (if there are any).
-      if (!Dir[$config.sifttter_redux["dayone_local_filepath"] + "/*"].empty?)
-        CliMessage.info("Uploading Day One entries to Dropbox...", false)
-        output = `#{$db_uploader} upload #{$config.sifttter_redux["dayone_local_filepath"] + "/*"} #{$config.sifttter_redux["dayone_remote_filepath"]}`
-        CliMessage.finish_message('DONE.')
+
+      unless dates.nil?
+        first_date = dates.first
+        second_date = dates.reverse_each.first
+
+        if first_date == second_date
+          date_string = first_date.strftime('%B %d, %Y')
+          SifttterRedux::CliMessage.info("Creating entry for #{ date_string }...")
+        else
+          date_string = "#{ first_date.strftime('%B %d, %Y') } to #{ second_date.strftime('%B %d, %Y') }"
+          SifttterRedux::CliMessage.info("Creating entries for dates from #{ date_string }...")
+        end
+
+        SifttterRedux::DBU.local_target = '/tmp/sifttter'
+        SifttterRedux::DBU.remote_target = '/Apps/ifttt/sifttter'
+        SifttterRedux::DBU.message = 'Downloading Sifttter files...'
+        SifttterRedux::DBU.download
+
+        dates.each do |date|
+          SifttterRedux::Sifttter.run(date)
+        end
+
+        # Upload any Day One entries to Dropbox (if there are any).
+        unless Dir[SifttterRedux::Configuration['sifttter_redux']['dayone_local_filepath'] + '/*'].empty?
+          SifttterRedux::DBU.local_target = "#{SifttterRedux::Configuration['sifttter_redux']['dayone_local_filepath']}/*"
+          SifttterRedux::DBU.remote_target = SifttterRedux::Configuration['sifttter_redux']['dayone_remote_filepath']
+          SifttterRedux::DBU.message = 'Uploading Day One entries to Dropbox...'
+          SifttterRedux::DBU.upload
+        end
+
+        # Remove any downloaded local files that we no longer need.
+        dirs = [
+          SifttterRedux::Configuration['sifttter_redux']['dayone_local_filepath'],
+          SifttterRedux::Configuration['sifttter_redux']['sifttter_local_filepath']
+        ]
+
+        SifttterRedux::CliMessage.info_block('Removing temporary local files...') { dirs.each { |d| FileUtils.rm_rf(d) } }
       end
-      
-      # Remove any downloaded local files that we no longer need.
-      CliMessage.info("Removing downloaded Day One files...", false)
-      FileUtils.rm_rf($config.sifttter_redux["dayone_local_filepath"]) if Dir.exists?($config.sifttter_redux["dayone_local_filepath"])
-      CliMessage.finish_message('DONE.')
-      
-      CliMessage.info("Removing downloaded Sifttter files...", false)
-      FileUtils.rm_rf($config.sifttter_redux["sifttter_local_filepath"]) if Dir.exists?($config.sifttter_redux["sifttter_local_filepath"])
-      CliMessage.finish_message('DONE.')
     end
-    
-    CliMessage.section('EXECUTION COMPLETE!')
   end
+
 end
 
-#|  ------------------------------------------------------
-#|  init command
-#|
-#|  Initializes the script.
-#|  ------------------------------------------------------
+#  ------------------------------------------------------
+#  init command
+#
+#  Initializes the script.
+#  ------------------------------------------------------
 desc 'Install and initialize dependencies'
 command :init do |c|
   c.action do |global_options, options, args|
-    CliMessage.section('INITIALIZING...')
 
-    if File.exists?($config.configFile)
-      initialize_procedures if CliMessage.prompt("It looks like you've already initialized Sifttter Redux. Do you want to re-initialize?", "N").downcase == 'y'
-    else
-      initialize_procedures
+    SifttterRedux::CliMessage.section_block('INITIALIZING...') do
+      if File.exists?(SifttterRedux::Configuration.config_path)
+        SifttterRedux.init if SifttterRedux::CliMessage.prompt("It looks like you've already initialized Sifttter Redux. Do you want to re-initialize?", 'N').downcase == 'y'
+      else
+        SifttterRedux.init
+      end
     end
-    
-    CliMessage.section('INITIALIZATION COMPLETE!')
+
   end
 end