sifttter-redux 0.3.1 → 0.3.2

data/test/test_helper.rb

@@ -5,5 +5,5 @@ require 'test/unit'
 class Test::Unit::TestCase
 
   # Add global extensions to the test case class here
-  
+
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: sifttter-redux
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -38,20 +38,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.2
-- !ruby/object:Gem::Dependency
-  name: colored
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -66,8 +52,8 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.9.0
-description: Sifttter Redux is a modification of Craig Eley's Sifttter that allows
-  for smart installation on a standalone *NIX device (such as a Raspberry Pi).
+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
 executables:
 - srd
@@ -77,21 +63,23 @@ extra_rdoc_files:
 - HISTORY.md
 - LICENSE
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - HISTORY.md
 - LICENSE
 - README.md
 - Rakefile
 - bin/srd
-- lib/sifttter-redux.rb
-- lib/sifttter-redux/cli-message.rb
-- lib/sifttter-redux/config-manager.rb
-- lib/sifttter-redux/constants.rb
-- lib/sifttter-redux/date-range-maker.rb
-- lib/sifttter-redux/methods.rb
-- lib/sifttter-redux/os.rb
-- sifttter-redux.gemspec
+- lib/sifttter_redux.rb
+- 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/extensions.rb
+- lib/sifttter_redux/os.rb
+- lib/sifttter_redux/sifttter.rb
+- lib/sifttter_redux/version.rb
+- sifttter_redux.gemspec
 - test/catch_up_test.rb
 - test/test_helper.rb
 homepage: https://github.com/bachya/sifttter-redux
@@ -100,18 +88,18 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -123,3 +111,4 @@ summary: Automated IFTTT to Day One engine.
 test_files:
 - test/catch_up_test.rb
 - test/test_helper.rb
+has_rdoc: 

data/lib/sifttter-redux.rb

@@ -1,6 +0,0 @@
-require 'sifttter-redux/cli-message.rb'
-require 'sifttter-redux/config-manager.rb'
-require 'sifttter-redux/constants.rb'
-require 'sifttter-redux/date-range-maker.rb'
-require 'sifttter-redux/methods.rb'
-require 'sifttter-redux/os.rb'

data/lib/sifttter-redux/cli-message.rb

@@ -1,135 +0,0 @@
-#|  ======================================================
-#|  CliManager Module
-#|  Singleton to manage common CLI interfacing
-#|  ======================================================
-module CliMessage
-  
-  ERROR   = 1
-  INFO    = 2
-  SECTION = 3
-  WARNING = 4
-  
-  #|  ------------------------------------------------------
-  #|  error method
-  #|
-  #|  Outputs a formatted-red error message.
-  #|  @param message The message to output
-  #|  @return Void
-  #|  ------------------------------------------------------
-  def self.error(message, addNewline = true)
-    if addNewline
-      puts "---> ERROR: #{message}".red
-    else
-      print "---> ERROR: #{message}".red 
-    end
-    
-    @@last_message_type = ERROR
-  end
-  
-  #|  ------------------------------------------------------
-  #|  finish_message method
-  #|
-  #|  Finishes a previous message by appending "DONE" in the
-  #|  correct color.
-  #|  @return Void
-  #|  ------------------------------------------------------
-  def self.finish_message(message)
-    case @@last_message_type
-    when ERROR
-      puts message.red
-    when INFO
-      puts message.blue
-    when SECTION
-      puts message.green
-    when WARNING
-      puts message.yellow
-    end
-  end
-  
-  #|  ------------------------------------------------------
-  #|  info method
-  #|
-  #|  Outputs a formatted-blue informational message.
-  #|  @param message The message to output
-  #|  @return Void
-  #|  ------------------------------------------------------
-  def self.info(message, addNewline = true)
-    if addNewline
-      puts "---> INFO: #{message}".blue
-    else
-      print "---> INFO: #{message}".blue 
-    end
-    
-    @@last_message_type = INFO
-  end
-  
-  #|  ------------------------------------------------------
-  #|  prompt method
-  #|
-  #|  Outputs a prompt, collects the user's response, and
-  #|  returns it.
-  #|  @param prompt The prompt to output
-  #|  @param default The default option
-  #|  @return String
-  #|  ------------------------------------------------------
-  def self.prompt(prompt, default)
-    print "#{prompt} [default: #{default}]: "
-    choice = $stdin.gets.chomp
-    if choice.empty?
-      return default
-    else
-      return choice
-    end
-  end
-  
-  #|  ------------------------------------------------------
-  #|  section method
-  #|
-  #|  Outputs a formatted-orange section message.
-  #|  @param message The message to output
-  #|  @return Void
-  #|  ------------------------------------------------------
-  def self.section(message, addNewline = true)
-    if addNewline
-      puts "#### #{message}".green
-    else
-      print "#### #{message}".green
-    end
-    
-    @@last_message_type = SECTION
-  end
-  
-  #|  ------------------------------------------------------
-  #|  success method
-  #|
-  #|  Outputs a formatted-green success message.
-  #|  @param message The message to output
-  #|  @return Void
-  #|  ------------------------------------------------------
-  def self.success(message, addNewline = true)
-    if addNewline
-      puts "---> SUCCESS: #{message}".green
-    else
-      print "---> SUCCESS: #{message}".green
-    end
-    
-    @@last_message_type = WARNING
-  end
-  
-  #|  ------------------------------------------------------
-  #|  warning method
-  #|
-  #|  Outputs a formatted-yellow warning message.
-  #|  @param message The message to output
-  #|  @return Void
-  #|  ------------------------------------------------------
-  def self.warning(message, addNewline = true)
-    if addNewline
-      puts "---> WARNING: #{message}".yellow
-    else
-      print "---> WARNING: #{message}".yellow
-    end
-    
-    @@last_message_type = WARNING
-  end
-end

data/lib/sifttter-redux/config-manager.rb

@@ -1,136 +0,0 @@
-require 'singleton'
-
-#|  ======================================================
-#|  ConfigManager Class
-#|
-#|  Singleton to manage the YAML config file
-#|  for this script
-#|  ======================================================
-
-class ConfigManager
-  include Singleton
-  
-  attr_accessor :configFile
-  
-  #|  ------------------------------------------------------
-  #|  initialize method
-  #|
-  #|  Initializes this singleton with data from the config
-  #|  file. If the file doesn't exist, an empty hash is
-  #|  created in anticipation of future config saves.
-  #|  @return Void
-  #|  ------------------------------------------------------
-  def initialize
-    @configFile = SifttterRedux::SRD_CONFIG_FILEPATH
-    
-    if File.exists?(SifttterRedux::SRD_CONFIG_FILEPATH) 
-      @data = YAML.load_file(SifttterRedux::SRD_CONFIG_FILEPATH)
-      @data.each do |k, v|
-        define_singleton_method(k) { return v }
-      end
-    else
-      @data = {}
-    end
-  end
-  
-  #|  ------------------------------------------------------
-  #|  _dump method
-  #|
-  #|  Convenience method that dumps the configuration hash's
-  #|  data.
-  #|  @return Void
-  #|  ------------------------------------------------------
-  def _dump
-    puts @data
-  end
-  
-  #|  ------------------------------------------------------
-  #|  add_to_section method
-  #|
-  #|  Adds a hash to the configuration data.
-  #|  @param hash The hash to add to configuration
-  #|  @param section The section into which the hash goes
-  #|  @return Void
-  #|  ------------------------------------------------------
-  def add_to_section(hash, section)
-    unless @data.has_key?(section)
-      CliMessage.warning("Attempting to insert into a non-existing section: #{section}; skipping...")
-      return 
-    end
-    
-    @data[section].merge!(hash)
-  end
-  
-  #|  ------------------------------------------------------
-  #|  create_section method
-  #|
-  #|  Creates a new section in the configuration hash.
-  #|  @param section The section to create
-  #|  @return Void
-  #|  ------------------------------------------------------
-  def create_section(section)
-    if @data.has_key?(section)
-      CliMessage.warning("Attempting to create existing section (#{section}); skipping...")
-      return
-    end
-
-    define_singleton_method(section) { return @data[section] }
-    @data.merge!(section => {})
-  end
-  
-  #|  ------------------------------------------------------
-  #|  delete_section method
-  #|
-  #|  Deletes a section in the configuration hash.
-  #|  @param section The section to delete
-  #|  @return Void
-  #|  ------------------------------------------------------
-  def delete_section(section)
-    unless @data.has_key?(section)
-      CliMessage.warning("Attempting to delete non-existing section (#{section}); skipping...")
-      return
-    end
-    
-    remove_singleton_method(section)
-    @data.delete(section)
-  end
-  
-  #|  ------------------------------------------------------
-  #|  remove_singleton_method method
-  #|
-  #|  Removes a hash from the configuration data based on
-  #|  its key.
-  #|  @param hash The hash key remove
-  #|  @param section The section from which the key comes
-  #|  @return Void
-  #|  ------------------------------------------------------
-  def remove_from_section(key, section)
-    unless @data.has_key?(section) && @data[section].has_key?(key)
-      CliMessage.warning("Attempting to remove a non-existing key: #{section}.#{key}; skipping...")
-      return
-    end
-    
-    @data[section].delete(key)
-  end
-  
-  #|  ------------------------------------------------------
-  #|  reset method
-  #|
-  #|  Clears out the configuration data by resetting the hash.
-  #|  @return Void
-  #|  ------------------------------------------------------
-  def reset
-    @data = {}
-  end
-  
-  #|  ------------------------------------------------------
-  #|  save_configuration method
-  #|
-  #|  Saves the configuration data to the filesystem.
-  #|  @return File
-  #|  ------------------------------------------------------
-  def save_configuration
-    return File.open(@configFile, 'w') { |f| f.write(@data.to_yaml) }
-  end
-  
-end

data/lib/sifttter-redux/constants.rb

@@ -1,15 +0,0 @@
-module SifttterRedux
-  VERSION = "0.3.1"
-  
-  # Sifttter and Sifttter Redux Constants
-  SRD_CONFIG_FILEPATH = File.join(ENV['HOME'], '.sifttter_redux')
-  SFT_LOCAL_FILEPATH = "/tmp/sifttter"
-  SFT_REMOTE_FILEPATH = "/Apps/ifttt/sifttter"
-
-  # Dropbox Upload Constants
-  DBU_LOCAL_FILEPATH = "/usr/local/opt"
-
-  # Day One Constants
-  DO_REMOTE_FILEPATH = "/Apps/Day\\ One/Journal.dayone/entries"
-  DO_LOCAL_FILEPATH = "/tmp/dayone"
-end

data/lib/sifttter-redux/date-range-maker.rb

@@ -1,208 +0,0 @@
-require 'chronic'
-
-#|  ======================================================
-#|  DateRangeMakerError Class
-#|  ======================================================
-class DateRangeMakerError < StandardError
-  def initialize(msg = "You've triggered a DateRangeMakerError")
-    super
-  end
-end
-
-#|  ======================================================
-#|  BadChronicDateError Class
-#|  ======================================================
-class BadChronicDateError < DateRangeMakerError
-  def initialize(msg = "Invalid date provided to Chronic...")
-    super
-  end
-end
-
-#|  ======================================================
-#|  BadDateOrderError Class
-#|  ======================================================
-class BadDateOrderError < DateRangeMakerError
-  def initialize(msg = "The start date must be before or equal to the end date...")
-    super
-  end
-end
-
-#|  ======================================================
-#|  InvalidFlagsError Class
-#|  ======================================================
-class InvalidFlagsError < DateRangeMakerError
-  def initialize(msg = "You can't specify -t without specifying -f...")
-    super
-  end
-end
-
-#|  ======================================================
-#|  NegativeDaysError Class
-#|  ======================================================
-class NegativeDaysError < DateRangeMakerError
-  def initialize(msg = "You must specify a positive number of days to look back...")
-    super
-  end
-end
-
-#|  ======================================================
-#|  DateRangeMaker Class
-#|
-#|  Singleton to manage the YAML config file
-#|  for this script
-#|  ======================================================
-class DateRangeMaker 
-  
-  #|  ------------------------------------------------------
-  #|  initialize method
-  #|  @return Void
-  #|  ------------------------------------------------------
-  def initialize
-
-  end
-  
-  #|  ------------------------------------------------------
-  #|  last_n_days method
-  #|
-  #|  Returns a date range for the last N days (including
-  #|  today's date if specified).
-  #|  @param num_days The number of days to look back
-  #|  @param options Miscellaneous options hash
-  #|  @return Range
-  #|  ------------------------------------------------------
-  def last_n_days(num_days, options = {})
-    raise NegativeDaysError if num_days < 0
-    
-    opts = {
-      :include_today => false
-    }
-    
-    options.each do |k, v|
-      k = k.to_sym
-      raise ArgumentError, "Unknown property: #{k}" unless opts.key?(k)
-      opts[k] = v
-    end
-    
-    if (opts[:include_today])
-      _r = (Date.today - num_days..Date.today)
-    else
-      _r = (Date.today - num_days...Date.today)
-    end
-    
-    return _r
-  end
-  
-  #|  ------------------------------------------------------
-  #|  last_n_weeks method
-  #|
-  #|  Returns a date range for the last N weeks (including
-  #|  today's date if specified).
-  #|  @param num_days The number of weeks to look back
-  #|  @param options Miscellaneous options hash
-  #|  @return Range
-  #|  ------------------------------------------------------
-  def last_n_weeks(num_weeks = 0, options = {})
-    raise NegativeDaysError if num_weeks < 0
-    
-    opts = {
-      :include_today => false
-    }
-    
-    options.each do |k, v|
-      k = k.to_sym
-      raise ArgumentError, "Unknown property: #{k}" unless opts.key?(k)
-      opts[k] = v
-    end
-    
-    beginning_date = Date.today - Date.today.wday + 1
-    end_date = Date.today - Date.today.wday + 7
-    
-    # We're currently before the end of the week, so
-    # reset the new ending date to today.
-    if (end_date > Date.today)
-      end_date = Date.today
-    end
-    
-    if (opts[:include_today])
-      _r = (beginning_date - num_weeks * 7..end_date)
-    else
-      _r = (beginning_date - num_weeks * 7...end_date)
-    end
-    
-    return _r
-  end
-  
-  #|  ------------------------------------------------------
-  #|  range method
-  #|
-  #|  Returns a date range for specified start dates and
-  #|  end dates. Note that specifying an end date greater
-  #|  than today's date will force today to be the end date.
-  #|  @param start_date The start date
-  #|  @param end_date The end date
-  #|  @param options Miscellaneous options hash
-  #|  @return Range
-  #|  ------------------------------------------------------
-  def range(start_date, end_date, options = {})
-    opts = {
-      :include_today => false
-    }
-    
-    options.each do |k, v|
-      k = k.to_sym
-      raise ArgumentError, "Unknown property: #{k}" unless opts.key?(k)
-      opts[k] = v
-    end
-    
-    begin
-      chronic_start_date = Chronic.parse(start_date).to_date
-    rescue 
-      raise BadChronicDateError.new("Invalid date provided to Chronic: #{start_date}") if !start_date.nil?
-      nil
-    end
-    
-    begin
-      chronic_end_date = Chronic.parse(end_date).to_date
-    rescue  
-      raise BadChronicDateError.new("Invalid date provided to Chronic: #{end_date}") if !end_date.nil?
-      nil
-    end
-    
-    raise InvalidFlagsError.new if (start_date.nil? && !end_date.nil?)
-    raise BadDateOrderError.new if (chronic_end_date && chronic_start_date > chronic_end_date)
-    
-    if (!chronic_start_date.nil?)
-      if (chronic_end_date.nil?)
-        if (opts[:include_today])
-          dates = (chronic_start_date..Date.today)
-        else
-          dates = (chronic_start_date...Date.today)
-        end
-      else
-        dates = (chronic_start_date..chronic_end_date)
-      end
-    end
-    
-    return dates
-  end
-  
-  #|  ------------------------------------------------------
-  #|  today method
-  #|
-  #|  Returns a date range for today
-  #|  @return Range
-  #|  ------------------------------------------------------
-  def today
-    return (Date.today..Date.today)
-  end
-  
-  #|  ------------------------------------------------------
-  #|  yesterday method
-  #|
-  #|  Returns a date range for yesterday
-  #|  @return Range
-  #|  ------------------------------------------------------
-  def yesterday
-    return (Date.today - 1..Date.today - 1)
-  end
-end