sifttter-redux 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6089e8d0f4bb6e878a213306b36f3b1794ac7bbf
-  data.tar.gz: 8d429c68df6b8cb9d5cdb825baad4d96e5ff64c1
+  metadata.gz: 3f5212c6ef9ead91e8f71e3e2292f2e9aca80f29
+  data.tar.gz: a49f77302bd648f7fcbd742c0d8be1687b373fae
 SHA512:
-  metadata.gz: 0078c8d8e1253ba99f334d6d87d13bd1718db76f578d3ee2e4ac7acd3ff38c59c915d0ba98393b14e15772207a7ed50e0d1fc4c0ecb6dd8719412a1c5a9c8230
-  data.tar.gz: c4f4d97e124a3990a2e3d6fb541899d5f3a2b095fda56783699f13b5401e2c3c3fcf7212f57ecfd41a85a7b67b821fa88033675c21e0e0ba7d78feaf929f56c0
+  metadata.gz: 51a7a13606982a278551f2d2094ab16c459396987160b0a5fdd39697f334364842b044da24797c7a41c86fa345b8ca1918fe230f751b904d8e8f64ad5cf07d8f
+  data.tar.gz: 3e5e4007131430433b69b902593f837f396f49c3c1fcd4f6f728145f8969ec4fe5aaff676089676463409ae2431d8d1696289707d72d2efd5675e08790cfdf25

data/HISTORY.md

@@ -1,3 +1,11 @@
+# 0.4.7 (2014-03-14)
+
+* Reworked logging to not require Methadone
+* Logging more verbose and configurable in ~/.sifttter_redux
+* Dropbox Uploader updates
+* Added support for path completion when prompting user to enter a filepath
+* Cleaned up error handling to be displayed to user at single point
+
 # 0.4.6 (2014-03-13)
 
 * Added new error messaaging if Sifttter remote path is invalid

data/README.md

@@ -37,7 +37,7 @@ SYNOPSIS
     srd [global options] command [command options] [arguments...]
 
 VERSION
-    0.4.6
+    0.4.7
 
 GLOBAL OPTIONS
     --help         - Show this message
@@ -81,10 +81,10 @@ Initialization will perform the following steps:
 
 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 preferences:
- * The location on your filesystem where Sifttter files will be temporarily stored
+3. Collect some user paths:
+ * The location on your filesystem where Sifttter files will be temporarily stored (**tab completion works here!**)
  * The location of your Sifttter files in Dropbox
- * The location on your filesystem where Day One files will be temporarily stored
+ * The location on your filesystem where Day One files will be temporarily stored (**tab completion works here!**)
  * The location of your Day One files in Dropbox
 
 ## Pathing

data/bin/srd

@@ -33,12 +33,11 @@
 #  OTHER DEALINGS IN THE SOFTWARE.
 #--------------------------------------------------------------------
 require 'gli'
-require 'methadone'
+require 'logger'
 require 'sifttter_redux'
 require 'securerandom'
 
 include GLI::App
-include Methadone::CLILogging
 include SifttterRedux
 
 #  ======================================================
@@ -63,9 +62,9 @@ switch([:verbose], desc: 'Turns on verbose output')
 pre do |global, command, options, args|
   # Load SifttterRedux configuration module.
   Configuration::load(SRD_CONFIG_FILEPATH)
-
-  # Load Methadone CLILogging module.
-  Methadone::CLILogging::change_logger(Methadone::CLILogger.new(SRD_LOG_FILEPATH, SRD_LOG_FILEPATH))
+  
+  # Set up logging.
+  CLIMessage::activate_logging
 
   if File.exists?(SRD_CONFIG_FILEPATH)
     current_version = Gem::Version.new(Configuration['sifttter_redux']['version'])
@@ -77,18 +76,15 @@ pre do |global, command, options, args|
       CLIMessage::info("Don't worry; when prompted, your current values for")
       CLIMessage::info("existing config options will be presented (so it'll")
       CLIMessage::info('be easier to fly through the upgrade).')
-      CLIMessage::prompt('Press enter to continue')
+      CLIMessage::prompt('Press enter to continue: ')
       SifttterRedux::init(true)
-      exit!
+      exit!(0)
     end
-    
-    # Load Dropbox Uploader module.
-    DBU.load(Configuration['db_uploader']['exe_filepath'])
   else
     # Force the user to init if they try to run any command other than `init` first.
     CLIMessage::info('Initializing Sifttter Redux first...') unless command.name_for_help[0] == 'init'
     SifttterRedux::init
-    exit!
+    exit!(0)
   end
 
   true
@@ -117,36 +113,49 @@ command :exec do |c|
   c.action do |global_options, options, args|
     SifttterRedux.verbose = global_options[:verbose] || options[:verbose]
 
-    dates = SifttterRedux::get_dates_from_options(options)
-    unless dates.nil?
-      first_date = dates.first
-      second_date = dates.reverse_each.first
-
-      date_string = first_date.strftime('%B %d, %Y')
-      date_string << " to #{ second_date.strftime('%B %d, %Y') }" if first_date != second_date
-      CLIMessage::info("Creating #{ first_date == second_date ? 'entry' : 'entries' }: #{ date_string }")
-
-      # Download Sifttter files from Dropbox.
-      DBU.local_target = Configuration['sifttter_redux']['sifttter_local_filepath']
-      DBU.remote_target = Configuration['sifttter_redux']['sifttter_remote_filepath']
-      DBU.message = 'Downloading Sifttter files...'
-      DBU.download
-
-      # Process a new Sifttter entry for each date.
-      dates.each do |date|
-        Sifttter::run(date)
+    begin
+      dates = SifttterRedux::get_dates_from_options(options)
+      unless dates.nil?
+        first_date = dates.first
+        second_date = dates.reverse_each.first
+
+        date_string = first_date.strftime('%B %d, %Y')
+        date_string << " to #{ second_date.strftime('%B %d, %Y') }" if first_date != second_date
+        CLIMessage::info("Creating #{ first_date == second_date ? 'entry' : 'entries' }: #{ date_string }")
+
+        # Download Sifttter files from Dropbox.
+        dbu = 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 = 'Downloading Sifttter files...'
+
+        CLIMessage::info_block(dbu.message || dbu::DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
+          dbu.download
+        end
+
+        # Process a new Sifttter entry for each date.
+        dates.each do |date|
+          Sifttter::run(date)
+        end
+
+        # Upload any Day One entries to Dropbox (if there are any).
+        unless Dir[Configuration['sifttter_redux']['dayone_local_filepath'] + '/*'].empty?
+          dbu.local_target = "#{ Configuration['sifttter_redux']['dayone_local_filepath'] }/*"
+          dbu.remote_target = Configuration['sifttter_redux']['dayone_remote_filepath']
+          dbu.message = 'Uploading Day One entries to Dropbox...'
+
+          CLIMessage::info_block(dbu.message || dbu::DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
+            dbu.upload
+          end
+        end
+
+        # Remove any downloaded local files that we no longer need.
+        SifttterRedux::cleanup_temp_files
       end
-
-      # Upload any Day One entries to Dropbox (if there are any).
-      unless Dir[Configuration['sifttter_redux']['dayone_local_filepath'] + '/*'].empty?
-        DBU.local_target = "#{ Configuration['sifttter_redux']['dayone_local_filepath'] }/*"
-        DBU.remote_target = Configuration['sifttter_redux']['dayone_remote_filepath']
-        DBU.message = 'Uploading Day One entries to Dropbox...'
-        DBU.upload
-      end
-
-      # Remove any downloaded local files that we no longer need.
-      SifttterRedux::cleanup_temp_files
+    rescue StandardError => e
+      CLIMessage::error(e.to_s)
+      exit!(1)
     end
   end
 

data/lib/sifttter_redux/cli_message.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'string_extensions.rb')
+require 'readline'
 
 module SifttterRedux
   #  ======================================================
@@ -9,6 +9,37 @@ module SifttterRedux
     #  ====================================================
     #  Methods
     #  ====================================================
+    #  ----------------------------------------------------
+    #  activate_logging method
+    #
+    #  Creates a simple logger to use
+    #  @return Void
+    #  ----------------------------------------------------
+    def self.activate_logging
+      @@logger = Logger.new(File.join(ENV['HOME'], '.sifttter_redux_log'))
+    end
+
+    #  ----------------------------------------------------
+    #  deactivate_logging method
+    #
+    #  Stops logging to file.
+    #  @return Void
+    #  ----------------------------------------------------
+    def self.deactivate_logging
+      @@logger = nil
+    end
+
+    #  ----------------------------------------------------
+    #  debug method
+    #
+    #  Logs a debug message to the logfile.
+    #  @param m The message to log
+    #  @return Void
+    #  ----------------------------------------------------
+    def self.debug(m)
+      @@logger.debug(m.blue) unless @@logger.nil?
+    end
+
     #  ----------------------------------------------------
     #  error method
     #
@@ -16,9 +47,9 @@ module SifttterRedux
     #  @param m The message to output
     #  @return Void
     #  ----------------------------------------------------
-    def self.error(m, log = true)
-      Methadone::CLILogging.error(m) if log
-      puts "---> ERROR: #{ m }".red
+    def self.error(m)
+      puts "# #{ m }".red
+      @@logger.error(m.red) unless @@logger.nil?
     end
 
     #  ----------------------------------------------------
@@ -28,9 +59,9 @@ module SifttterRedux
     #  @param m The message to output
     #  @return Void
     #  ----------------------------------------------------
-    def self.info(m, log = true)
-      Methadone::CLILogging.info(m) if log
-      puts "---> INFO: #{ m }".blue
+    def self.info(m)
+      puts "# #{ m }".blue
+      @@logger.debug(m.blue) unless @@logger.nil?
     end
 
     #  ----------------------------------------------------
@@ -42,25 +73,23 @@ module SifttterRedux
     #  @param multiline Whether the message should be multiline
     #  @return Void
     #  ----------------------------------------------------
-    def self.info_block(m1, m2 = 'Done.', multiline = false, log = true)
+    def self.info_block(m1, m2 = 'Done.', multiline = false)
       if block_given?
         if multiline
-          info(m1, log)
+          info(m1)
         else
-          print "---> INFO: #{ m1 }".blue
+          print "# #{ m1 }".blue
         end
 
         yield
 
         if multiline
-          info(m2, log)
+          info(m2)
         else
           puts m2.blue
         end
       else
-        error = 'Did not specify a valid block'
-        Methadone::CLILogging.error(error) if log
-        fail ArgumentError, error
+        fail ArgumentError, 'Did not specify a valid block'
       end
     end
 
@@ -73,29 +102,61 @@ module SifttterRedux
     #  @param default The default option
     #  @return String
     #  ----------------------------------------------------
-    def self.prompt(prompt, default = nil, log = true)
-      print "#{ prompt } #{ default.nil? ? '' : "[default: #{ default }]:" } ".blue
+    def self.prompt(prompt, default = nil)
+      print "# #{ prompt } #{ default.nil? ? '' : "[default: #{ default }]:" } ".green
       choice = $stdin.gets.chomp
       if choice.empty?
         r = default
       else
         r = choice
       end
+      @@logger.debug("Answer to \"#{ prompt }\": #{ r }") unless @@logger.nil?
+      r
+    end
 
-      Methadone::CLILogging.info("Answer to '#{ prompt }': #{r}") if log
+    #  ----------------------------------------------------
+    #  prompt_for_filepath method
+    #
+    #  Outputs a prompt, collects the user's response, and
+    #  returns it; adds in readline support for path
+    #  completion.
+    #
+    #  "ruby readline filename tab completion" - William Morgan
+    #  http://masanjin.net/blog/ruby-readline-tab-completion
+    #
+    #  @param prompt The prompt to output
+    #  @param default The default option
+    #  @param start_dir The directory in which to start
+    #  @return String
+    #  ----------------------------------------------------
+    def self.prompt_for_filepath(prompt, default = nil, start_dir = '')
+      Readline.completion_append_character = nil
+      Readline.completion_proc = lambda do |prefix|
+        files = Dir["#{start_dir}#{prefix}*"]
+        files.
+          map { |f| File.expand_path(f) }.
+          map { |f| File.directory?(f) ? f + "/" : f }
+      end
+      choice = Readline.readline("# #{ prompt } #{ default.nil? ? '' : "[default: #{ default }]:" } ".green)
+      if choice.empty?
+        r = default
+      else
+        r = choice
+      end
+      @@logger.debug("Answer to \"#{ prompt }\": #{ r }") unless @@logger.nil?
       r
     end
 
     #  ----------------------------------------------------
     #  section method
     #
-    #  Outputs a formatted-orange section message.
+    #  Outputs a formatted-purple section message.
     #  @param m The message to output
     #  @return Void
     #  ----------------------------------------------------
-    def self.section(m, log = true)
-      Methadone::CLILogging.info(m) if log
-      puts "#### #{ m }".purple
+    def self.section(m)
+      puts "---> #{ m }".purple
+      @@logger.debug(m.purple) unless @@logger.nil?
     end
 
     #  ----------------------------------------------------
@@ -108,18 +169,17 @@ module SifttterRedux
     #  @param multiline A multiline message or not
     #  @return Void
     #  ----------------------------------------------------
-    def self.section_block(m, multiline = true, log = true)
+    def self.section_block(m, multiline = true)
       if block_given?
         if multiline
-          section(m, log)
+          section(m)
         else
-          print "#### #{ m }".purple
+          print "---> #{ m }".purple
         end
 
         yield
       else
         error = 'Did not specify a valid block'
-        Methadone::CLILogging.error(error) if log
         fail ArgumentError, error
       end
     end
@@ -131,9 +191,9 @@ module SifttterRedux
     #  @param m The message to output
     #  @return Void
     #  ----------------------------------------------------
-    def self.success(m, log = true)
-      Methadone::CLILogging.info(m) if log
-      puts "---> SUCCESS: #{ m }".green
+    def self.success(m)
+      puts "# #{ m }".green
+      @@logger.debug(m.green) unless @@logger.nil?
     end
 
     #  ----------------------------------------------------
@@ -143,9 +203,75 @@ module SifttterRedux
     #  @param m The message to output
     #  @return Void
     #  ----------------------------------------------------
-    def self.warning(m, log = true)
-      Methadone::CLILogging.warn(m) if log
-      puts "---> WARNING: #{ m }".yellow
+    def self.warning(m)
+      puts "# #{ m }".yellow
+      @@logger.warn(m.yellow) unless @@logger.nil?
     end
   end
 end
+
+#  ======================================================
+#  String Class
+#  ======================================================
+class String
+  #  ----------------------------------------------------
+  #  colorize method
+  #
+  #  Outputs a string in a formatted color.
+  #  @param color_code The code to use
+  #  @return Void
+  #  ----------------------------------------------------
+  def colorize(color_code)
+    "\e[#{ color_code }m#{ self }\e[0m"
+  end
+
+  #  ----------------------------------------------------
+  #  blue method
+  #
+  #  Convenience method to output a blue string
+  #  @return Void
+  #  ----------------------------------------------------
+  def blue
+    colorize(34)
+  end
+
+  #  ----------------------------------------------------
+  #  green method
+  #
+  #  Convenience method to output a green string
+  #  @return Void
+  #  ----------------------------------------------------
+  def green
+    colorize(32)
+  end
+
+  #  ----------------------------------------------------
+  #  purple method
+  #
+  #  Convenience method to output a purple string
+  #  @return Void
+  #  ----------------------------------------------------
+  def purple
+    colorize(35)
+  end
+
+  #  ----------------------------------------------------
+  #  red method
+  #
+  #  Convenience method to output a red string
+  #  @return Void
+  #  ----------------------------------------------------
+  def red
+    colorize(31)
+  end
+
+  #  ----------------------------------------------------
+  #  yellow method
+  #
+  #  Convenience method to output a yellow string
+  #  @return Void
+  #  ----------------------------------------------------
+  def yellow
+    colorize(33)
+  end
+end

data/lib/sifttter_redux/date_range_maker.rb

@@ -21,7 +21,6 @@ module SifttterRedux
     def self.last_n_days(num_days, include_today = false)
       if num_days < 0
         error = 'Cannot specify a negative number of days'
-        Methadone::CLILogging.error(error)
         fail ArgumentError, error
       end
 
@@ -44,7 +43,6 @@ module SifttterRedux
     def self.last_n_weeks(num_weeks = 0, include_today = false)
       if num_weeks < 0
         error = 'Cannot specify a negative number of weeks'
-        Methadone::CLILogging.error(error)
         fail ArgumentError, error
       end
 
@@ -76,7 +74,6 @@ module SifttterRedux
     def self.range(start_date, end_date, include_today = false)
       if start_date.nil? && !end_date.nil?
         error = "You can't specify -t without specifying -f"
-        Methadone::CLILogging.error(error)
         fail ArgumentError, error
       end
 
@@ -85,7 +82,6 @@ module SifttterRedux
       rescue
         unless start_date.nil?
           error = "Invalid date provided to Chronic: #{ start_date }"
-          Methadone::CLILogging.error(error)
           fail ArgumentError, error
         end
         nil
@@ -96,7 +92,6 @@ module SifttterRedux
       rescue
         unless end_date.nil?
           error = "Invalid date provided to Chronic: #{ end_date }"
-          Methadone::CLILogging.error(error)
           fail ArgumentError, error
         end
         nil
@@ -104,7 +99,6 @@ module SifttterRedux
 
       if chronic_end_date && chronic_start_date > chronic_end_date
         error = 'The start date must be before or equal to the end date'
-        Methadone::CLILogging.error(error)
         fail ArgumentError, error
       end
 

data/lib/sifttter_redux/dropbox_uploader.rb

@@ -0,0 +1,77 @@
+module SifttterRedux
+  #  ======================================================
+  #  DropboxUploader Class
+  #
+  #  Wrapper class for the Dropbox Uploader project
+  #  ======================================================
+  class DropboxUploader
+    #  ====================================================
+    #  Constants
+    #  ====================================================
+    CONFIG_FILEPATH = File.join(ENV['HOME'], '.dropbox_uploader')
+    DEFAULT_MESSAGE = 'RUNNING DROPBOX UPLOADER'
+
+    #  ====================================================
+    #  Attributes
+    #  ====================================================
+    attr_accessor :local_target, :remote_target, :message, :verbose
+
+    #  ====================================================
+    #  Methods
+    #  ====================================================
+    #  ----------------------------------------------------
+    #  initialize method
+    #
+    #  Loads the location of dropbox_uploader.sh.
+    #  @param dbu_path The local filepath to the script
+    #  @logger A Logger to use
+    #  @return Void
+    #  ----------------------------------------------------
+    def initialize(dbu_path, logger = nil)
+      @dbu = dbu_path
+      @logger = logger
+    end
+
+    #  ----------------------------------------------------
+    #  download method
+    #
+    #  Downloads files from Dropbox (assumes that both
+    #  local_target and remote_target have been set).
+    #  @return Void
+    #  ----------------------------------------------------
+    def download
+      if !@local_target.nil? && !@remote_target.nil?
+        if @verbose
+          system "#{ @dbu } download #{ @remote_target } #{ @local_target }"
+        else
+          exec = `#{ @dbu } download #{ @remote_target } #{ @local_target }`
+        end
+      else
+        error_msg = 'Local and remote targets cannot be nil'
+        @logger.error(error_msg) if @logger
+        fail StandardError, error_msg
+      end
+    end
+
+    #  ----------------------------------------------------
+    #  upload method
+    #
+    #  Uploads files tro Dropbox (assumes that both
+    #  local_target and remote_target have been set).
+    #  @return Void
+    #  ----------------------------------------------------
+    def upload
+      if !@local_target.nil? && !@remote_target.nil?
+        if @verbose
+          system "#{ @dbu } upload #{ @local_target } #{ @remote_target }"
+        else
+          exec = `#{ @dbu } upload #{ @local_target }" "#{ @remote_target }`
+        end
+      else
+        error_msg = 'Local and remote targets cannot be nil'
+        @logger.error(error_msg) if @logger
+        fail StandardError, error_msg
+      end
+    end
+  end
+end

data/lib/sifttter_redux/sifttter.rb

@@ -48,8 +48,7 @@ module SifttterRedux
 
       files = `find #{ Configuration['sifttter_redux']['sifttter_local_filepath'] } -type f -name "*.txt" | grep -v -i daily | sort`
       if files.empty?
-        m = "Couldn't download Sifttter files; is #{ Configuration['sifttter_redux']['sifttter_remote_filepath'] } the correct remote filepath?"
-        CLIMessage.error(m)
+        CLIMessage::error("No Sifttter files to parse; is #{ Configuration['sifttter_redux']['sifttter_remote_filepath'] } the correct remote filepath?")
         return
       end
 

data/lib/sifttter_redux/version.rb

@@ -1,4 +1,4 @@
 module SifttterRedux
-  VERSION = '0.4.6'
-  NEWEST_CONFIG_VERSION = '0.4.3'
+  VERSION = '0.4.7'
+  NEWEST_CONFIG_VERSION = '0.4.7'
 end

data/lib/sifttter_redux.rb

@@ -1,9 +1,9 @@
-require 'sifttter_redux/cli_message.rb'
-require 'sifttter_redux/configuration.rb'
-require 'sifttter_redux/date_range_maker.rb'
-require 'sifttter_redux/dbu.rb'
-require 'sifttter_redux/sifttter.rb'
-require 'sifttter_redux/version.rb'
+require 'sifttter_redux/cli_message'
+require 'sifttter_redux/configuration'
+require 'sifttter_redux/date_range_maker'
+require 'sifttter_redux/dropbox_uploader'
+require 'sifttter_redux/sifttter'
+require 'sifttter_redux/version'
 
 #  ======================================================
 #  SifttterRedux Module
@@ -17,6 +17,7 @@ module SifttterRedux
   #  ====================================================
   #  Constants
   #  ====================================================
+  DBU_CONFIG_FILEPATH = File.join(ENV['HOME'], '.dropbox_uploader')
   DBU_LOCAL_FILEPATH = '/usr/local/opt'
 
   DO_LOCAL_FILEPATH = '/tmp/dayone'
@@ -43,7 +44,63 @@ module SifttterRedux
       Configuration['sifttter_redux']['sifttter_local_filepath']
     ]
 
-    CLIMessage::info_block('Removing temporary local files...') { dirs.each { |d| FileUtils.rm_rf(d) } }
+    CLIMessage::info_block('Removing temporary local files...') do 
+      dirs.each do |d|
+        FileUtils.rm_rf(d)
+        CLIMessage::debug("Removed directory: #{ d }")
+      end
+    end
+  end
+  
+  #  ----------------------------------------------------
+  #  install_wizard method
+  #
+  #  Runs a wizard that installs Dropbox Uploader on the
+  #  local filesystem.
+  #  @return Void
+  #  ----------------------------------------------------
+  def self.dbu_install_wizard(reinit = false)
+    valid_path_chosen = false
+    
+    CLIMessage::section_block('CONFIGURING DROPBOX UPLOADER...') do
+      until valid_path_chosen
+        # Prompt the user for a location to save Dropbox Uploader.
+        if reinit && !Configuration['db_uploader']['base_filepath'].nil?
+          default = Configuration['db_uploader']['base_filepath']
+        else
+          default = DBU_LOCAL_FILEPATH
+        end
+        path = CLIMessage::prompt_for_filepath('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 File.directory?(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)
+            CLIMessage::warning("Using pre-existing Dropbox Uploader at #{ dbu_path }...")
+          else
+            CLIMessage::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?(DBU_CONFIG_FILEPATH)
+            CLIMessage::info_block('Initializing Dropbox Uploader...') { system "#{ executable_path }" }
+          end
+
+          Configuration::add_section('db_uploader') unless reinit
+          Configuration['db_uploader'].merge!('base_filepath' => path, 'dbu_filepath' => dbu_path, 'exe_filepath' => executable_path)
+        else
+          CLIMessage::error("Sorry, but #{ path } isn't a valid directory.")
+        end
+      end
+    end
   end
 
   #  ----------------------------------------------------
@@ -58,36 +115,35 @@ module SifttterRedux
     CLIMessage::section_block('EXECUTING...') do
       if options[:c] || options[:n] || options[:w] || options[:y] || options[:f] || options[:t]
         # Yesterday
-        DateRangeMaker.yesterday if options[:y]
+        r = DateRangeMaker.yesterday if options[:y]
 
         # Current Week
-        DateRangeMaker.last_n_weeks(0, options[:i]) if options[:c]
+        r = DateRangeMaker.last_n_weeks(0, options[:i]) if options[:c]
         
         # Last N Days
-        DateRangeMaker.last_n_days(options[:n].to_i, options[:i]) if options[:n]
+        r = DateRangeMaker.last_n_days(options[:n].to_i, options[:i]) if options[:n]
 
         # Last N Weeks
-        DateRangeMaker.last_n_weeks(options[:w].to_i, options[:i]) if options[:w]
+        r = DateRangeMaker.last_n_weeks(options[:w].to_i, options[:i]) if options[:w]
 
         # Custom Range
         if (options[:f] || options[:t])
-          begin
-            _dates = DateRangeMaker.range(options[:f], options[:t], options[:i])
-
-            if _dates.last > Date.today
-              long_message = "Ignoring overextended end date and using today's date (#{ Date.today })..."
-              CLIMessage::warning(long_message)
-              (_dates.first..Date.today)
-            else
-              (_dates.first.._dates.last)
-            end
-          rescue ArgumentError => e
-            CLIMessage::error(e)
+          _dates = DateRangeMaker.range(options[:f], options[:t], options[:i])
+
+          if _dates.last > Date.today
+            long_message = "Ignoring overextended end date and using today's date (#{ Date.today })..."
+            CLIMessage::warning(long_message)
+            r = (_dates.first..Date.today)
+          else
+            r = (_dates.first.._dates.last)
           end
         end
       else
-        DateRangeMaker.today
+        r = DateRangeMaker.today
       end
+      
+      CLIMessage::debug("Date range: #{ r }")
+      r
     end
   end
 
@@ -103,10 +159,14 @@ module SifttterRedux
       Configuration::reset
       Configuration::add_section('sifttter_redux')
     end
-    Configuration['sifttter_redux'].merge!('version' => VERSION, 'config_location' => Configuration::config_path)
+    Configuration['sifttter_redux'].merge!({
+      'config_location' => Configuration::config_path,
+      'log_level' => 'WARN',
+      'version' => VERSION,
+    })
 
     # Run the wizard to download Dropbox Uploader.
-    DBU::install_wizard(reinit = reinit)
+    dbu_install_wizard(reinit = reinit)
 
     # Collect other misc. preferences.
     CLIMessage::section_block('COLLECTING PREFERENCES...') do
@@ -139,13 +199,14 @@ module SifttterRedux
 
       pref_prompts.each do |prompt|
         d = reinit ? Configuration[prompt[:section]][prompt[:key]] : prompt[:default]
-        pref = CLIMessage::prompt(prompt[:prompt], d)
+        pref = CLIMessage::prompt_for_filepath(prompt[:prompt], d)
 
         Configuration[prompt[:section]].merge!(prompt[:key] => File.expand_path(pref))
+        CLIMessage::debug("Value for #{ prompt[:key] }: #{ pref }")
       end
     end
 
-    Methadone::CLILogging.info("Configuration values: #{ Configuration::dump }")
+    CLIMessage::debug("Configuration values: #{ Configuration::dump }")
     Configuration::save
   end
 end

data/sifttter_redux.gemspec

@@ -24,5 +24,4 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('rake', '~> 0')
   s.add_runtime_dependency('chronic', '0.10.2')
   s.add_runtime_dependency('gli','2.9.0')
-  s.add_runtime_dependency('methadone', '1.3.2')
 end

data/test/cli_message_test.rb

@@ -1,52 +1,54 @@
-require 'methadone'
+require 'readline'
 require 'test_helper'
 require File.join(File.dirname(__FILE__), '..', 'lib/sifttter_redux/cli_message.rb')
 
-include Methadone::CLILogging
-
 class CLIMessageTest < Test::Unit::TestCase
+  def setup
+    SifttterRedux::CLIMessage::deactivate_logging
+  end
+  
   def test_error_message
-    assert_output('---> ERROR: test'.red + "\n") { SifttterRedux::CLIMessage::error('test', false) }
+    assert_output('# test'.red + "\n") { SifttterRedux::CLIMessage::error('test') }
   end
 
   def test_info_message
-    assert_output('---> INFO: test'.blue + "\n") { SifttterRedux::CLIMessage::info('test', false) }
+    assert_output('# test'.blue + "\n") { SifttterRedux::CLIMessage::info('test') }
   end
 
   def test_info_block_single_line
-    assert_output("---> INFO: start".blue + "body\n" + 'end'.blue + "\n") do
-      SifttterRedux::CLIMessage::info_block('start', 'end', false, false) { puts 'body' }
+    assert_output("# start".blue + "body\n" + 'end'.blue + "\n") do
+      SifttterRedux::CLIMessage::info_block('start', 'end') { puts 'body' }
     end
   end
 
   def test_info_block_multiline
-    assert_output("---> INFO: start".blue + "\nbody\n" + '---> INFO: end'.blue + "\n") do
-      SifttterRedux::CLIMessage::info_block('start', 'end', true, false) { puts 'body' }
+    assert_output("# start".blue + "\nbody\n" + '# end'.blue + "\n") do
+      SifttterRedux::CLIMessage::info_block('start', 'end', true) { puts 'body' }
     end
   end
   
   def test_info_block_no_block
     assert_raise ArgumentError do
-      SifttterRedux::CLIMessage::info_block('start', 'end', true, false)
+      SifttterRedux::CLIMessage::info_block('start', 'end', true)
     end
   end
 
   def test_section_message
-    assert_output('#### test'.purple + "\n") { SifttterRedux::CLIMessage::section('test', false) }
+    assert_output('---> test'.purple + "\n") { SifttterRedux::CLIMessage::section('test') }
   end
 
   def test_section_block_single_line
-    assert_output("#### section".purple + "\nbody\n") do
-      SifttterRedux::CLIMessage::section_block('section', true, false) { puts 'body' }
+    assert_output("---> section".purple + "\nbody\n") do
+      SifttterRedux::CLIMessage::section_block('section', true) { puts 'body' }
     end
   end
 
   def test_success_message
-    assert_output('---> SUCCESS: test'.green + "\n") { SifttterRedux::CLIMessage::success('test', false) }
+    assert_output('# test'.green + "\n") { SifttterRedux::CLIMessage::success('test') }
   end
 
   def test_warning_message
-    assert_output('---> WARNING: test'.yellow + "\n") { SifttterRedux::CLIMessage::warning('test', false) }
+    assert_output('# test'.yellow + "\n") { SifttterRedux::CLIMessage::warning('test') }
   end
   
   def test_prompt

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sifttter-redux
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,20 +52,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.9.0
-- !ruby/object:Gem::Dependency
-  name: methadone
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.2
 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).
 email: bachya1208@gmail.com
@@ -89,9 +75,8 @@ files:
 - lib/sifttter_redux/cli_message.rb
 - lib/sifttter_redux/configuration.rb
 - lib/sifttter_redux/date_range_maker.rb
-- lib/sifttter_redux/dbu.rb
+- lib/sifttter_redux/dropbox_uploader.rb
 - lib/sifttter_redux/sifttter.rb
-- lib/sifttter_redux/string_extensions.rb
 - lib/sifttter_redux/version.rb
 - sifttter_redux.gemspec
 - test/cli_message_test.rb

data/lib/sifttter_redux/dbu.rb

@@ -1,160 +0,0 @@
-module SifttterRedux
-  #  ======================================================
-  #  DBU Module
-  #
-  #  Wrapper module for the Dropbox Uploader project
-  #  ======================================================
-  module DBU
-    #  ====================================================
-    #  Constants
-    #  ====================================================
-    CONFIG_FILEPATH = File.join(ENV['HOME'], '.dropbox_uploader')
-    DEFAULT_MESSAGE = 'RUNNING DROPBOX UPLOADER'
-
-    #  ====================================================
-    #  Methods
-    #  ====================================================
-    #  ----------------------------------------------------
-    #  download method
-    #
-    #  Downloads the files at the remote Dropbox filepath
-    #  to a filepath on the local filesystem.
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.download
-      if !@local_path.nil? && !@remote_path.nil?
-        CLIMessage::info_block(@message ||= DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
-          if SifttterRedux.verbose
-            system "#{ @dbu } download #{ @remote_path } #{ @local_path }"
-          else
-            exec = `#{ @dbu } download #{ @remote_path } #{ @local_path }`
-          end
-        end
-      else
-        error = 'Local and remote DBU targets cannot be nil'
-        Methadone::CLILogging.error(error)
-        fail ArgumentError, error
-      end
-    end
-
-    #  ----------------------------------------------------
-    #  install_wizard method
-    #
-    #  Runs a wizard that installs Dropbox Uploader on the
-    #  local filesystem.
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.install_wizard(reinit = false)
-      valid_path_chosen = false
-      
-      CLIMessage::section_block('CONFIGURING DROPBOX UPLOADER...') do
-        until valid_path_chosen
-          # Prompt the user for a location to save Dropbox Uploader.
-          if reinit && !Configuration['db_uploader']['base_filepath'].nil?
-            default = Configuration['db_uploader']['base_filepath']
-          else
-            default = DBU_LOCAL_FILEPATH
-          end
-          path = CLIMessage::prompt('Location for Dropbox-Uploader', default)
-          path.chop! if path.end_with?('/')
-          
-          # If the entered directory exists, clone the repository.
-          if File.directory?(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)
-              CLIMessage::warning("Using pre-existing Dropbox Uploader at #{ dbu_path }...")
-            else
-              CLIMessage::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?(CONFIG_FILEPATH)
-              CLIMessage::info_block('Initializing Dropbox Uploader...') { system "#{ executable_path }" }
-            end
-
-            Configuration::add_section('db_uploader') unless reinit
-            Configuration['db_uploader'].merge!('base_filepath' => path, 'dbu_filepath' => dbu_path, 'exe_filepath' => executable_path)
-          else
-            CLIMessage::error("Sorry, but #{ path } isn't a valid directory.")
-          end
-        end
-      end
-    end
-
-    #  ----------------------------------------------------
-    #  load method
-    #
-    #  Loads the location of dropbox_uploader.sh.
-    #  @param dbu_path The local filepath to the script
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.load(dbu_path)
-      @dbu = dbu_path
-    end
-
-    #  ----------------------------------------------------
-    #  set_local_target method
-    #
-    #  Sets the local filesystem path to which files will
-    #  be downloaded.
-    #  @param path A local filepath
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.local_target=(path)
-      @local_path = path
-    end
-
-    #  ----------------------------------------------------
-    #  set_message method
-    #
-    #  Sets the message to be displayed just before
-    #  downloading commences.
-    #  @param message The string to display
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.message=(message)
-      @message = message
-    end
-
-    #  ----------------------------------------------------
-    #  set_remote_target method
-    #
-    #  Sets the remote Dropbox path from which files will
-    #  be downloaded.
-    #  @param path A remote Dropbox filepath
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.remote_target=(path)
-      @remote_path = path
-    end
-
-    #  ----------------------------------------------------
-    #  upload method
-    #
-    #  Uploads the files from the local filesystem path to
-    #  the remote Dropbox path.
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.upload
-      if !@local_path.nil? && !@remote_path.nil?
-        CLIMessage::info_block(@message ||= DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
-          if SifttterRedux.verbose
-            system "#{ @dbu } upload #{ @local_path } #{ @remote_path }"
-          else
-            exec = `#{ @dbu } upload #{ @local_path } #{ @remote_path }`
-          end
-        end
-      else
-        error = 'Local and remote DBU targets cannot be nil'
-        Methadone::CLILogging.error(error)
-        fail ArgumentError, error
-      end
-    end
-  end
-end

data/lib/sifttter_redux/string_extensions.rb

@@ -1,65 +0,0 @@
-#  ======================================================
-#  String Class
-#  ======================================================
-class String
-  #  ----------------------------------------------------
-  #  colorize method
-  #
-  #  Outputs a string in a formatted color.
-  #  @param color_code The code to use
-  #  @return Void
-  #  ----------------------------------------------------
-  def colorize(color_code)
-    "\e[#{ color_code }m#{ self }\e[0m"
-  end
-
-  #  ----------------------------------------------------
-  #  blue method
-  #
-  #  Convenience method to output a blue string
-  #  @return Void
-  #  ----------------------------------------------------
-  def blue
-    colorize(34)
-  end
-
-  #  ----------------------------------------------------
-  #  green method
-  #
-  #  Convenience method to output a green string
-  #  @return Void
-  #  ----------------------------------------------------
-  def green
-    colorize(32)
-  end
-
-  #  ----------------------------------------------------
-  #  purple method
-  #
-  #  Convenience method to output a purple string
-  #  @return Void
-  #  ----------------------------------------------------
-  def purple
-    colorize(35)
-  end
-
-  #  ----------------------------------------------------
-  #  red method
-  #
-  #  Convenience method to output a red string
-  #  @return Void
-  #  ----------------------------------------------------
-  def red
-    colorize(31)
-  end
-
-  #  ----------------------------------------------------
-  #  yellow method
-  #
-  #  Convenience method to output a yellow string
-  #  @return Void
-  #  ----------------------------------------------------
-  def yellow
-    colorize(33)
-  end
-end