sifttter-redux 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b449eb116b9d31aa2617e8c4016998017967e45
-  data.tar.gz: 8575cbe65d2dc1c220c690f835af1acb0f24f640
+  metadata.gz: 6089e8d0f4bb6e878a213306b36f3b1794ac7bbf
+  data.tar.gz: 8d429c68df6b8cb9d5cdb825baad4d96e5ff64c1
 SHA512:
-  metadata.gz: 7dc307b238a1af03e089bce59a4d3b9d993beb30639f0dfde83d8b85f509d458656d62d6ec712a25f4d81d22541b8382d3e3a06f6dbf6a69aa719d01c612235c
-  data.tar.gz: a49786fff55b83bb4729bbf512695b492282760b7967c8ad7ead5c0f53a515a6d3ad80b40c9f7d2413c8d261c60917d165f36bf3d4c021ceceead2ec9a98dc0f
+  metadata.gz: 0078c8d8e1253ba99f334d6d87d13bd1718db76f578d3ee2e4ac7acd3ff38c59c915d0ba98393b14e15772207a7ed50e0d1fc4c0ecb6dd8719412a1c5a9c8230
+  data.tar.gz: c4f4d97e124a3990a2e3d6fb541899d5f3a2b095fda56783699f13b5401e2c3c3fcf7212f57ecfd41a85a7b67b821fa88033675c21e0e0ba7d78feaf929f56c0

data/HISTORY.md

@@ -1,3 +1,13 @@
+# 0.4.6 (2014-03-13)
+
+* Added new error messaaging if Sifttter remote path is invalid
+* Removed dependencies on exernal UUID library
+* Removed OS module (not needed anymore)
+
+# 0.4.5 (2014-03-01)
+
+* Added Methadone logging for prompts
+
 # 0.4.4 (2014-02-28)
 
 * Fixed a prompt error when providing Dropbox-Uploader with a bad path

data/README.md

@@ -12,17 +12,7 @@ Siftter Redux has several fundamental differences:
 
 # Prerequisites
 
-In addition to Git (which, given you being on this site, I'll assume you have), there are two prerequisites needed to run Sifttter Redux in a *NIX environment:
-
-* Ruby (version 1.9.3 or greater)
-* UUID (required on the Raspberry Pi because it doesn't come with a function to do this by default)
-
-To install on a Debian-esque system:
-
-```
-$ sudo apt-get install ruby
-$ sudo apt-get install uuid
-```
+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
 
@@ -47,7 +37,7 @@ SYNOPSIS
     srd [global options] command [command options] [arguments...]
 
 VERSION
-    0.4.1
+    0.4.6
 
 GLOBAL OPTIONS
     --help         - Show this message
@@ -97,6 +87,22 @@ Initialization will perform the following steps:
  * The location on your filesystem where Day One files will be temporarily stored
  * The location of your Day One files in Dropbox
 
+## 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.
+
+### Local Filepaths
+
+Local filepaths are, as you'd expect, filepaths on your local machine. Some examples might be:
+
+* `/tmp/my_data`
+* `/home/bob/ifttt/sifttter_data`
+* `~/sifttter`
+
+### 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.
+
 ## Basic Execution
 
 ```

data/bin/srd

@@ -32,209 +32,121 @@
 #  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 #  OTHER DEALINGS IN THE SOFTWARE.
 #--------------------------------------------------------------------
-
-require 'fileutils'
 require 'gli'
 require 'methadone'
 require 'sifttter_redux'
+require 'securerandom'
 
 include GLI::App
 include Methadone::CLILogging
 include SifttterRedux
 
+#  ======================================================
+#  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 VERSION
 
 #  ======================================================
 #  Global Flags and Switches
 #  ======================================================
-
-switch(
-  [:verbose],
-  desc: 'Turns on verbose output'
-)
+switch([:verbose], desc: 'Turns on verbose output')
 
 #  ======================================================
 #  Pre, Post, and Error
 #  ======================================================
-
 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))  
+  Methadone::CLILogging::change_logger(Methadone::CLILogger.new(SRD_LOG_FILEPATH, SRD_LOG_FILEPATH))
 
   if File.exists?(SRD_CONFIG_FILEPATH)
+    current_version = Gem::Version.new(Configuration['sifttter_redux']['version'])
+    last_config_change_version = Gem::Version.new(NEWEST_CONFIG_VERSION)
+
     # If the config file needs updating, force the user to do that first.
-    if Configuration['sifttter_redux']['version'].nil? || Gem::Version.new(Configuration['sifttter_redux']['version']) < Gem::Version.new(NEWEST_CONFIG_VERSION)
+    if Configuration['sifttter_redux']['version'].nil? || current_version < last_config_change_version
       CLIMessage::info('This version needs to make some config changes.')
-      CLIMessage::info("Don't worry; when prompted, original values to existing config options will be presented.")
-      CLIMessage::prompt("Press enter to continue")
-
+      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')
       SifttterRedux::init(true)
       exit!
     end
+    
+    # Load Dropbox Uploader module.
+    DBU.load(Configuration['db_uploader']['exe_filepath'])
   else
-    # Force the user to initialize if they try to execute first.
-    CLIMessage::info('You need to initialize Sifttter Redux first...') unless command.name_for_help[0] == 'init'
-
+    # 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!
   end
-  
-  # Load Dropbox Uploader module.
-  DBU.load(Configuration['db_uploader']['exe_filepath']) if File.exists?(SRD_CONFIG_FILEPATH)
-  
+
   true
 end
 
 #  ======================================================
 #  Commands
 #  ======================================================
-
 #  ------------------------------------------------------
 #  exec command
 #
 #  Executes the script.
 #  ------------------------------------------------------
-
 desc 'Execute the script'
 command :exec do |c|
+  c.flag([:f], desc: 'Run catch-up mode with this start date')
+  c.flag([:n], desc: 'Run catch-up mode for the last N days')
+  c.flag([:t], 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')
 
-  c.flag(
-    [:f],
-    desc: 'Run catch-up mode with this start date'
-  )
-
-  c.flag(
-    [:n],
-    desc: 'Run catch-up mode for the last N days'
-  )
-
-  c.flag(
-    [:t],
-    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'
-  )
-
-  c.switch(
-    [:c],
-    desc: 'Run catch-up mode from the beginning of the week to yesterday'
-  )
-
-  c.switch(
-    [:i],
-    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'
-  )
+  c.switch([:c], desc: 'Run catch-up mode from the beginning of the week to yesterday')
+  c.switch([:i], 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')
 
   c.action do |global_options, options, args|
-
     SifttterRedux.verbose = global_options[:verbose] || options[:verbose]
 
-    CLIMessage::section_block('EXECUTING...') do
-      if options[:c] || options[:n] || options[:w] || options[:y] || options[:f] || options[:t]
-
-        command_complete = false
+    dates = SifttterRedux::get_dates_from_options(options)
+    unless dates.nil?
+      first_date = dates.first
+      second_date = dates.reverse_each.first
 
-        # Current Week
-        if !command_complete && options[:c]
-          dates = DateRangeMaker.last_n_weeks(0, options[:i])
-          command_complete = true
-        end
+      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 }")
 
-        # Last N Days
-        if !command_complete && options[:n]
-          dates = DateRangeMaker.last_n_days(options[:n].to_i, options[:i])
-          command_complete = true
-        end
+      # 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
 
-        # Yesterday
-        if !command_complete && options[:y]
-          dates = DateRangeMaker.yesterday
-          command_complete = true
-        end
-
-        # Last N Weeks
-        if !command_complete && options[:w]
-          dates = 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 = DateRangeMaker.range(options[:f], options[:t], 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)
-            end
-          rescue ArgumentError => e
-            CLIMessage::error(e)
-          end
-        end
-      else
-        dates = DateRangeMaker.today
+      # Process a new Sifttter entry for each date.
+      dates.each do |date|
+        Sifttter::run(date)
       end
 
-      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')
-          CLIMessage::info("Creating entry for #{ date_string }...")
-        else
-          date_string = "#{ first_date.strftime('%B %d, %Y') } to #{ second_date.strftime('%B %d, %Y') }"
-          CLIMessage::info("Creating entries for dates from #{ date_string }...")
-        end
-
-        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
-
-        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...'
-          DBU.upload
-        end
-
-        # Remove any downloaded local files that we no longer need.
-        dirs = [
-          Configuration['sifttter_redux']['dayone_local_filepath'],
-          Configuration['sifttter_redux']['sifttter_local_filepath']
-        ]
-
-        CLIMessage::info_block('Removing temporary local files...') { dirs.each { |d| FileUtils.rm_rf(d) } }
+      # 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
     end
   end
 
@@ -245,18 +157,15 @@ end
 #
 #  Initializes the script.
 #  ------------------------------------------------------
-desc 'Install and initialize dependencies'
+desc 'Install and SifttterRedux::initialize dependencies'
 command :init do |c|
-  
-  c.switch(
-    [:s],
-    desc: 'Run init from scratch (i.e., clear out all values from configuration)'
-  )
-  
+  c.switch([:s], desc: 'Run init from scratch (i.e., clear out all values from configuration)')
+
   c.action do |global_options, options, args|
     CLIMessage::section_block('INITIALIZING...') do
       if File.exists?(Configuration::config_path) && !options[:s]
-        SifttterRedux::init(true) if CLIMessage::prompt("It looks like you've already initialized Sifttter Redux. Do you want to re-initialize?", 'N').downcase == 'y'
+        long_message = "You've already initialized Sifttter Redux. Do it again?"
+        SifttterRedux::init(true) if CLIMessage::prompt(long_message, 'N').downcase == 'y'
       else
         SifttterRedux::init
       end

data/lib/sifttter_redux.rb

@@ -2,7 +2,6 @@ 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/os.rb'
 require 'sifttter_redux/sifttter.rb'
 require 'sifttter_redux/version.rb'
 
@@ -13,19 +12,84 @@ require 'sifttter_redux/version.rb'
 #  ======================================================
 
 module SifttterRedux
+  attr_accessor :verbose
 
-  #  ----------------------------------------------------
+  #  ====================================================
   #  Constants
-  #  ----------------------------------------------------
+  #  ====================================================
   DBU_LOCAL_FILEPATH = '/usr/local/opt'
-  DO_REMOTE_FILEPATH = "/Apps/Day\\ One/Journal.dayone/entries"
+
   DO_LOCAL_FILEPATH = '/tmp/dayone'
-  SRD_CONFIG_FILEPATH = File.join(ENV['HOME'], '.sifttter_redux')
-  SRD_LOG_FILEPATH = File.join(ENV['HOME'], '.sifttter_redux_log')
+  DO_REMOTE_FILEPATH = "/Apps/Day\\ One/Journal.dayone/entries"
+
   SFT_LOCAL_FILEPATH = '/tmp/sifttter'
   SFT_REMOTE_FILEPATH = '/Apps/ifttt/sifttter'
 
-  @verbose_output = true
+  SRD_CONFIG_FILEPATH = File.join(ENV['HOME'], '.sifttter_redux')
+  SRD_LOG_FILEPATH = File.join(ENV['HOME'], '.sifttter_redux_log')
+
+  #  ====================================================
+  #  Methods
+  #  ====================================================
+  #  ----------------------------------------------------
+  #  cleanup_temp_files method
+  #
+  #  Removes temporary directories and their contents
+  #  @return Void
+  #  ----------------------------------------------------
+  def self.cleanup_temp_files
+    dirs = [
+      Configuration['sifttter_redux']['dayone_local_filepath'],
+      Configuration['sifttter_redux']['sifttter_local_filepath']
+    ]
+
+    CLIMessage::info_block('Removing temporary local files...') { dirs.each { |d| FileUtils.rm_rf(d) } }
+  end
+
+  #  ----------------------------------------------------
+  #  get_dates_from_options method
+  #
+  #  Creates a date range from the supplied command line
+  #  options.
+  #  @param options A Hash of command line options
+  #  @return Range
+  #  ----------------------------------------------------
+  def self.get_dates_from_options(options)
+    CLIMessage::section_block('EXECUTING...') do
+      if options[:c] || options[:n] || options[:w] || options[:y] || options[:f] || options[:t]
+        # Yesterday
+        DateRangeMaker.yesterday if options[:y]
+
+        # Current Week
+        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]
+
+        # Last N Weeks
+        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)
+          end
+        end
+      else
+        DateRangeMaker.today
+      end
+    end
+  end
 
   #  ----------------------------------------------------
   #  initialize_procedures method
@@ -34,72 +98,54 @@ module SifttterRedux
   #  collecting all necessary items and info.
   #  @return Void
   #  ----------------------------------------------------
-  def self.init(already_initialized = false)
-    # Re-initialize the configuration data.
-    Configuration::add_section('sifttter_redux') unless Configuration::section_exists?('sifttter_redux')
+  def self.init(reinit = false)
+    unless reinit
+      Configuration::reset
+      Configuration::add_section('sifttter_redux')
+    end
     Configuration['sifttter_redux'].merge!('version' => VERSION, 'config_location' => Configuration::config_path)
 
     # Run the wizard to download Dropbox Uploader.
-    DBU::install_wizard(already_initialized = already_initialized)
+    DBU::install_wizard(reinit = reinit)
 
     # Collect other misc. preferences.
     CLIMessage::section_block('COLLECTING PREFERENCES...') do
       pref_prompts = [
         {
           prompt: 'Location for downloaded Sifttter files from Dropbox',
-          default: already_initialized ? Configuration['sifttter_redux']['sifttter_local_filepath'] : SFT_LOCAL_FILEPATH,
+          default: SFT_LOCAL_FILEPATH,
           key: 'sifttter_local_filepath',
           section: 'sifttter_redux'
         },
         {
           prompt: 'Location of Sifttter files in Dropbox',
-          default: already_initialized ? Configuration['sifttter_redux']['sifttter_remote_filepath'] : SFT_REMOTE_FILEPATH,
+          default: SFT_REMOTE_FILEPATH,
           key: 'sifttter_remote_filepath',
           section: 'sifttter_redux'
         },
         {
           prompt: 'Location for downloaded Day One files from Dropbox',
-          default: already_initialized ? Configuration['sifttter_redux']['dayone_local_filepath'] : DO_LOCAL_FILEPATH,
+          default: DO_LOCAL_FILEPATH,
           key: 'dayone_local_filepath',
           section: 'sifttter_redux'
         },
         {
           prompt: 'Location of Day One files in Dropbox',
-          default: already_initialized ? Configuration['sifttter_redux']['dayone_remote_filepath'] : DO_REMOTE_FILEPATH,
+          default: DO_REMOTE_FILEPATH,
           key: 'dayone_remote_filepath',
           section: 'sifttter_redux'
         }
       ]
 
       pref_prompts.each do |prompt|
-        pref = CLIMessage::prompt(prompt[:prompt], prompt[:default])
-        Configuration[prompt[:section]].merge!(prompt[:key] => pref)
+        d = reinit ? Configuration[prompt[:section]][prompt[:key]] : prompt[:default]
+        pref = CLIMessage::prompt(prompt[:prompt], d)
+
+        Configuration[prompt[:section]].merge!(prompt[:key] => File.expand_path(pref))
       end
     end
-    
+
     Methadone::CLILogging.info("Configuration values: #{ Configuration::dump }")
-    
     Configuration::save
   end
-
-  #  ----------------------------------------------------
-  #  verbose method
-  #
-  #  Returns the verbosity state.
-  #  @return Bool
-  #  ----------------------------------------------------
-  def self.verbose
-    @verbose_output
-  end
-
-  #  ----------------------------------------------------
-  #  verbose= method
-  #
-  #  Sets the verbosity state.
-  #  @return Void
-  #  ----------------------------------------------------
-  def self.verbose=(verbose)
-    @verbose_output = verbose
-  end
-
 end

data/lib/sifttter_redux/cli_message.rb

@@ -6,6 +6,9 @@ module SifttterRedux
   #  Singleton to manage common CLI interfacing
   #  ======================================================
   module CLIMessage
+    #  ====================================================
+    #  Methods
+    #  ====================================================
     #  ----------------------------------------------------
     #  error method
     #

data/lib/sifttter_redux/configuration.rb

@@ -8,6 +8,9 @@ module SifttterRedux
   #  into which they get stored.
   #  ======================================================
   module Configuration
+    #  ====================================================
+    #  Methods
+    #  ====================================================
     #  ----------------------------------------------------
     #  [] method
     #
@@ -29,7 +32,7 @@ module SifttterRedux
     #  []= method
     #
     #  Assigns the passed hash to the section. NOTE THAT THE
-    #  PREVIOUS CONTENTS OF THAT SECTION ARE DELETED.
+    #  PREVIOUS CONTENTS OF THAT SECTION ARE OVERWRITTEN.
     #  @param section_name The section in which to look
     #  @param hash The Hash that gets merged into the section
     #  @return Void

data/lib/sifttter_redux/dbu.rb

@@ -5,9 +5,15 @@ module SifttterRedux
   #  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
     #
@@ -38,13 +44,18 @@ module SifttterRedux
     #  local filesystem.
     #  @return Void
     #  ----------------------------------------------------
-    def self.install_wizard(already_initialized = false)
+    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.
-          path = CLIMessage::prompt('Location for Dropbox-Uploader', already_initialized && !Configuration['db_uploader']['base_filepath'].nil? ? Configuration['db_uploader']['base_filepath'] : DBU_LOCAL_FILEPATH)
+          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.
@@ -63,9 +74,11 @@ module SifttterRedux
             end
 
             # If the user has never configured Dropbox Uploader, have them do it here.
-            CLIMessage::info_block('Initializing Dropbox Uploader...') { system "#{ executable_path }" } unless File.exists?(CONFIG_FILEPATH)
+            unless File.exists?(CONFIG_FILEPATH)
+              CLIMessage::info_block('Initializing Dropbox Uploader...') { system "#{ executable_path }" }
+            end
 
-            Configuration::add_section('db_uploader') unless Configuration::section_exists?('db_uploader')
+            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.")

data/lib/sifttter_redux/sifttter.rb

@@ -5,8 +5,6 @@ module SifttterRedux
   #  Wrapper module for Sifttter itself
   #  ======================================================
   module Sifttter
-    include SifttterRedux::OS
-
     #  ----------------------------------------------------
     #  run_sifttter method
     #
@@ -18,9 +16,7 @@ module SifttterRedux
     #  @return Void
     #  ----------------------------------------------------
     def self.run(date)
-      uuid_command = 'uuidgen' if OS.mac?
-      uuid_command = 'uuid' if OS.linux?
-      uuid = %x{#{ uuid_command }}.gsub(/-/, '').strip
+      uuid = SecureRandom.uuid.upcase.gsub(/-/, '').strip
 
       date_for_title = date.strftime('%B %d, %Y')
       datestamp = date.to_time.utc.iso8601
@@ -51,6 +47,11 @@ module SifttterRedux
       time_regex = "(?:\d{1,2}:\d{1,2}\s?[AaPpMm]{2})"
 
       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)
+        return
+      end
 
       projects = []
       files.split("\n").each do |file|

data/lib/sifttter_redux/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sifttter-redux
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -90,7 +90,6 @@ files:
 - lib/sifttter_redux/configuration.rb
 - lib/sifttter_redux/date_range_maker.rb
 - lib/sifttter_redux/dbu.rb
-- lib/sifttter_redux/os.rb
 - lib/sifttter_redux/sifttter.rb
 - lib/sifttter_redux/string_extensions.rb
 - lib/sifttter_redux/version.rb

data/lib/sifttter_redux/os.rb

@@ -1,48 +0,0 @@
-module SifttterRedux
-  #  ======================================================
-  #  OS Module
-  #
-  #  Module to easily find the running operating system
-  #  ======================================================
-  module OS
-    #  ----------------------------------------------------
-    #  linux? method
-    #
-    #  Returns true if the host OS is Linux.
-    #  @return Bool
-    #  ----------------------------------------------------
-    def OS.linux?
-      self.unix? and not self.mac?
-    end
-
-    #  ----------------------------------------------------
-    #  mac? method
-    #
-    #  Returns true if the host OS is OS X.
-    #  @return Bool
-    #  ----------------------------------------------------
-    def OS.mac?
-      !(/darwin/ =~ RUBY_PLATFORM).nil?
-    end
-
-    #  ----------------------------------------------------
-    #  unix? method
-    #
-    #  Returns true if the host OS is Unix.
-    #  @return Bool
-    #  ----------------------------------------------------
-    def OS.unix?
-      !self.windows?
-    end
-
-    #  ----------------------------------------------------
-    #  windows? method
-    #
-    #  Returns true if the host OS is Windows
-    #  @return Bool
-    #  ----------------------------------------------------
-    def OS.windows?
-      !(/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM).nil?
-    end
-  end
-end