sifttter-redux 0.3.1 → 0.3.2

data/lib/sifttter_redux/dbu.rb

@@ -0,0 +1,138 @@
+module SifttterRedux
+  #  ======================================================
+  #  DBU Module
+  #
+  #  Wrapper module for the Dropbox Uploader project
+  #  ======================================================
+  module DBU
+    DEFAULT_MESSAGE = 'RUNNING DROPBOX UPLOADER'
+
+    #  ----------------------------------------------------
+    #  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
+        fail ArgumentError, 'Local and remote DBU targets cannot be nil'
+      end
+    end
+
+    #  ----------------------------------------------------
+    #  install_wizard method
+    #
+    #  Runs a wizard that installs Dropbox Uploader on the
+    #  local filesystem.
+    #  @return Void
+    #  ----------------------------------------------------
+    def self.install_wizard
+      valid_directory_chosen = false
+
+      CliMessage.section_block('CONFIGURING DROPBOX UPLOADER...') do
+        until valid_directory_chosen
+          # Prompt the user for a location to save Dropbox Uploader. '
+          path = CliMessage.prompt('Location for Dropbox-Uploader', DBU_LOCAL_FILEPATH)
+          path.chop! if path.end_with?('/')
+          path = '/usr/local/opt' if path.empty?
+
+          # If the entered directory exists, clone the repository.
+          if File.directory?(path)
+            valid_directory_chosen = true
+            path << '/Dropbox-Uploader'
+
+            if File.directory?(path)
+              CliMessage.warning("Using pre-existing Dropbox Uploader at #{ path }...")
+            else
+              CliMessage.info_block("Downloading Dropbox Uploader to #{ path }...", 'Done.', true) do
+                system "git clone https://github.com/andreafabrizi/Dropbox-Uploader.git #{ path }"
+              end
+            end
+
+            Configuration.add_section('db_uploader')
+            Configuration['db_uploader'].merge!('local_filepath' => path)
+          else
+            puts "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
+        fail ArgumentError, 'Local and remote DBU targets cannot be nil'
+      end
+    end
+  end
+end

data/lib/sifttter_redux/extensions.rb

@@ -0,0 +1,65 @@
+#  ======================================================
+#  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/os.rb

@@ -0,0 +1,48 @@
+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

data/lib/sifttter_redux/sifttter.rb

@@ -0,0 +1,98 @@
+module SifttterRedux
+  #  ======================================================
+  #  Sifttter Module
+  #
+  #  Wrapper module for Sifttter itself
+  #  ======================================================
+  module Sifttter
+    using SifttterRedux::OS
+
+    #  ----------------------------------------------------
+    #  run_sifttter method
+    #
+    #  Modified form of Sifttter
+    #
+    #  Sifttter: An IFTTT-to-Day One Logger by Craig Eley
+    #  Based on tp-dailylog.rb by Brett Terpstra 2012
+    #  @param date The date to use when scanning Sifttter
+    #  @return Void
+    #  ----------------------------------------------------
+    def self.run(date)
+      uuid_command = 'uuidgen' if OS.mac?
+      uuid_command = 'uuid' if OS.linux?
+      uuid = %x{#{ uuid_command }}.gsub(/-/, '').strip
+
+      date_for_title = date.strftime('%B %d, %Y')
+      datestamp = date.to_time.utc.iso8601
+      starred = false
+
+      template = ERB.new <<-XMLTEMPLATE
+      <?xml version="1.0" encoding="UTF-8"?>
+      <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+      <plist version="1.0">
+      <dict>
+      	<key>Creation Date</key>
+      	<date><%= datestamp %></date>
+      	<key>Entry Text</key>
+      	<string><%= entrytext %></string>
+      	<key>Starred</key>
+      	<<%= starred %>/>
+      	<key>Tags</key>
+      	<array>
+      		<string>daily logs</string>
+      	</array>
+      	<key>UUID</key>
+      	<string><%= uuid %></string>
+      </dict>
+      </plist>
+      XMLTEMPLATE
+
+      date_regex = "(?:#{ date.strftime("%B") } 0?#{ date.strftime("%-d") }, #{ date.strftime("%Y") })"
+      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`
+
+      projects = []
+      files.split("\n").each do |file|
+        if File.exists?(file.strip)
+      		f = File.open(file.strip, encoding: 'UTF-8')
+      		lines = f.read
+      		f.close
+      		project = '### ' + File.basename(file).gsub(/^.*?\/([^\/]+)$/, "\\1") + "\n"
+
+      		found_completed = false
+      		lines.each_line do |line|
+      			if line =~ /&/
+      				line.gsub!(/[&]/, 'and')
+      			end
+      			if line =~ /#{ date_regex }/
+      				found_completed = true
+      				project += line.gsub(/@done/,"").gsub(/#{ date_regex }\s(-|at)\s/, "").gsub(/#{ time_regex }\s-\s/, "").strip + "\n"
+      			end
+      		end
+      	end
+      	if found_completed
+      		projects.push(project)
+      	end
+      end
+
+      if projects.length <=0
+      	CliMessage.warning('No entries found...')
+      end
+
+      if projects.length > 0
+      	entrytext = "# Things done on #{ date_for_title }\n\n"
+      	projects.each do |project|
+      		entrytext += project.gsub(/.txt/, ' ') + "\n\n"
+      	end
+
+        Dir.mkdir(Configuration['sifttter_redux']['dayone_local_filepath']) if !Dir.exists?(Configuration['sifttter_redux']['dayone_local_filepath'])
+
+      	fh = File.new(File.expand_path(Configuration['sifttter_redux']['dayone_local_filepath'] + '/' + uuid + '.doentry'), 'w+')
+      	fh.puts template.result(binding)
+      	fh.close
+      	CliMessage.success("Entry logged for #{ date_for_title }...")
+      end
+    end
+  end
+end

data/lib/sifttter_redux/version.rb

@@ -0,0 +1,3 @@
+module SifttterRedux
+  VERSION = '0.3.2'
+end

data/{sifttter-redux.gemspec → sifttter_redux.gemspec}

@@ -1,5 +1,5 @@
 # Ensure we require the local version and not one we might have installed already
-require File.join([File.dirname(__FILE__), 'lib', 'sifttter-redux', 'constants.rb'])
+require File.join([File.dirname(__FILE__), 'lib', 'sifttter_redux', 'version.rb'])
 
 spec = Gem::Specification.new do |s| 
   s.name = 'sifttter-redux'
@@ -9,10 +9,10 @@ spec = Gem::Specification.new do |s|
   s.homepage = 'https://github.com/bachya/sifttter-redux'
   s.platform = Gem::Platform::RUBY
   s.summary = 'Automated IFTTT to Day One engine.'
-  s.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).'
+  s.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).'
 
-  s.files = `git ls-files`.split($/)
-  s.test_files = `git ls-files -- test`.split($/)
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- test`.split("\n")
   s.require_paths << 'lib'
   s.bindir = 'bin'
   s.executables << 'srd'
@@ -23,6 +23,5 @@ spec = Gem::Specification.new do |s|
   
   s.add_development_dependency('rake', '~> 0')
   s.add_runtime_dependency('chronic', '0.10.2')
-  s.add_runtime_dependency('colored','1.2')
   s.add_runtime_dependency('gli','2.9.0')
 end

data/test/catch_up_test.rb

@@ -1,106 +1,102 @@
-require 'date'
-require 'test_helper'
-require File.join(File.dirname(__FILE__), '..', 'lib/sifttter-redux/date-range-maker.rb')
+require "date"
+require "test_helper"
+require File.join(File.dirname(__FILE__), "..", "lib/sifttter_redux/date_from_to_maker.rb")
 
 class DefaultTest < Test::Unit::TestCase
 
-  def setup
-    $drm = DateRangeMaker.new
-  end
-
   def test_today
-    assert_equal($drm.today, (Date.today..Date.today))
+    assert_equal(SifttterRedux::DateRangeMaker.today, (Date.today..Date.today))
   end
-  
+
   def test_yesterday
-    assert_equal($drm.yesterday, (Date.today - 1..Date.today - 1))
+    assert_equal(SifttterRedux::DateRangeMaker.yesterday, (Date.today - 1..Date.today - 1))
   end
-  
+
   def test_last_5_days
-    assert_equal($drm.last_n_days(5), (Date.today - 5...Date.today))
+    assert_equal(SifttterRedux::DateRangeMaker.last_n_days(5), (Date.today - 5...Date.today))
   end
-  
+
   def test_last_5_days_include_today
-    assert_equal($drm.last_n_days(5, {:include_today => true}), (Date.today - 5..Date.today))
+    assert_equal(SifttterRedux::DateRangeMaker.last_n_days(5, true), (Date.today - 5..Date.today))
   end
-  
+
   def test_last_12_days
-    assert_equal($drm.last_n_days(12), (Date.today - 12...Date.today))
+    assert_equal(SifttterRedux::DateRangeMaker.last_n_days(12), (Date.today - 12...Date.today))
   end
-  
+
   def test_last_12_days_include_today
-    assert_equal($drm.last_n_days(12, {:include_today => true}), (Date.today - 12..Date.today))
+    assert_equal(SifttterRedux::DateRangeMaker.last_n_days(12, true), (Date.today - 12..Date.today))
   end
-  
+
   def test_current_week
     end_date = Date.today - Date.today.wday + 7
     if end_date > Date.today
       end_date = Date.today
     end
-      
-    assert_equal($drm.last_n_weeks, (Date.today - Date.today.wday + 1...end_date))
+
+    assert_equal(SifttterRedux::DateRangeMaker.last_n_weeks, (Date.today - Date.today.wday + 1...end_date))
   end
-  
+
   def test_current_week_include_today
     end_date = Date.today - Date.today.wday + 7
     if end_date > Date.today
       end_date = Date.today
     end
-      
-    assert_equal($drm.last_n_weeks(0, {:include_today => true}), (Date.today - Date.today.wday + 1..end_date))
+
+    assert_equal(SifttterRedux::DateRangeMaker.last_n_weeks(0, true), (Date.today - Date.today.wday + 1..end_date))
   end
-  
+
   def test_last_2_weeks
     end_date = Date.today - Date.today.wday + 7
     if end_date > Date.today
       end_date = Date.today
     end
-      
-    assert_equal($drm.last_n_weeks(2), (Date.today - Date.today.wday - 13...end_date))
+
+    assert_equal(SifttterRedux::DateRangeMaker.last_n_weeks(2), (Date.today - Date.today.wday - 13...end_date))
   end
-  
+
   def test_last_2_weeks_include_today
     end_date = Date.today - Date.today.wday + 7
     if end_date > Date.today
       end_date = Date.today
     end
-      
-    assert_equal($drm.last_n_weeks(2, {:include_today => true}), (Date.today - Date.today.wday - 13..end_date))
+
+    assert_equal(SifttterRedux::DateRangeMaker.last_n_weeks(2, true), (Date.today - Date.today.wday - 13..end_date))
   end
-  
-  def test_range_only_start_date
-    assert_equal($drm.range("2014-02-01", nil), (Date.parse("2014-02-01")...Date.today))
+
+  def test_from_to_only_start_date
+    assert_equal(SifttterRedux::DateRangeMaker.from_to("2014-02-01", nil), (Date.parse("2014-02-01")...Date.today))
   end
-  
-  def test_range_only_start_date_include_today
-    assert_equal($drm.range("2014-02-01", nil, {:include_today => true}), (Date.parse("2014-02-01")..Date.today))
+
+  def test_from_to_only_start_date_include_today
+    assert_equal(SifttterRedux::DateRangeMaker.from_to("2014-02-01", nil, true), (Date.parse("2014-02-01")..Date.today))
   end
-  
-  def test_range_start_date_and_end_date
-    assert_equal($drm.range("2014-02-01", "2014-02-05"), (Date.parse("2014-02-01")..Date.parse("2014-02-05")))
+
+  def test_from_to_start_date_and_end_date
+    assert_equal(SifttterRedux::DateRangeMaker.from_to("2014-02-01", "2014-02-05"), (Date.parse("2014-02-01")..Date.parse("2014-02-05")))
   end
-  
-  def test_range_bad_dates
-    assert_raise BadChronicDateError do
-      $drm.range("Bad Start Date", "Bad End Date")
+
+  def test_from_to_bad_dates
+    assert_raise ArgumentError do
+      SifttterRedux::DateRangeMaker.from_to("Bad Start Date", "Bad End Date")
     end
   end
-  
-  def test_range_end_date_with_no_start_date
-    assert_raise InvalidFlagsError do
-      $drm.range(nil, Date.today)
+
+  def test_from_to_end_date_with_no_start_date
+    assert_raise ArgumentError do
+      SifttterRedux::DateRangeMaker.from_to(nil, Date.today)
     end
   end
-  
-  def test_range_end_date_before_start_date
-    assert_raise BadDateOrderError do
-      $drm.range(Date.today, Date.today - 1)
+
+  def test_from_to_end_date_before_start_date
+    assert_raise ArgumentError do
+      SifttterRedux::DateRangeMaker.from_to(Date.today, Date.today - 1)
     end
   end
-  
-  def test_range_negative_look_back
-    assert_raise NegativeDaysError do
-      $drm.last_n_days(-5)
+
+  def test_from_to_negative_look_back
+    assert_raise ArgumentError do
+      SifttterRedux::DateRangeMaker.last_n_days(-5)
     end
   end
 end