sifttter-redux 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb29995581d17b202452de35c53a3c12416c0ced
-  data.tar.gz: 27198cf94b96ffb893f40a017cf54302dd34e04f
+  metadata.gz: f182a76d7be76e3ccdf01cba083d85245e2835ad
+  data.tar.gz: 21578bbf849033bdf56c68ac18b4e4b35fa912fa
 SHA512:
-  metadata.gz: bad0f1999585d250e3e952e260850089d9f0201755fdf65695aa98edb7cbeafb2bdc6abd3781ad1f6f5d486836c4fa69c93f188e86cc8e29f4d149c88084ece1
-  data.tar.gz: b3e83d30a8466b3235da0c301be4384905a35262d1c7df577f05b836354692132bf64e3e9f9cb677a9ffa5bdee943f0a086ad425cdb41514cf6e8bbbc7681059
+  metadata.gz: 882c5eb0824859668aa8f2f6c296071a76050c08f68820bac49873a290b334afa506d64190d41a516dbf21744989bdaeb16543f3bdf0e63bce5e8c073b5874de
+  data.tar.gz: 233d3e9bde6036ca58d339a6f49ffab8818b48ab0c9c5477c692a9123d0658a00e559f13b0ec8b1f055ed025b9867bd897d348d5112c90e28ed85884e2a95300

data/HISTORY.md

@@ -1,3 +1,12 @@
+# 1.0.4 (2014-05-06)
+
+* Fixed a bug where date range without and end date would incorrectly include today's date
+
+# 1.0.3 (2014-05-05)
+
+* Fixed a bug in which HTML entities from IFTTT could cause srd to fail
+* Bumped CLIUtils version to 2.2.3
+
 # 1.0.2 (2014-04-22)
 
 * Added `-d` flag to catch up a specific date

data/README.md

@@ -65,7 +65,7 @@ SYNOPSIS
     srd [global options] command [command options] [arguments...]
 
 VERSION
-    1.0.2
+    1.0.4
 
 GLOBAL OPTIONS
     --help         - Show this message

data/bin/srd

@@ -70,12 +70,13 @@ pre do |global, command, options, args|
 
     # Compare the two versions and, if needed, update.
     configuration.compare_version do |c, l|
-      messenger.debug { "Upgrading from #{ c } to #{ l }" }
+      messenger.debug("Upgrading from #{ c } to #{ l }")
       SifttterRedux.update_config_file
       exit!(0)
     end
   else
     # Force the user to init if they try to run any command other than `init` first.
+    messenger.info('You need to initialize Sifttter Redux first!')
     SifttterRedux.init(true)
     exit!(0)
   end
@@ -89,9 +90,9 @@ post do |global,command,options,args|
 end
 
 on_error do |exception|
-  messenger.error(exception.to_s)
-  exit!(1)
-  true
+  # messenger.error(exception.to_s)
+  # exit!(1)
+  # true
 end
 
 #  ======================================================
@@ -134,9 +135,9 @@ command :exec do |c|
       dbu.remote_target = configuration.sifttter_redux[:sifttter_remote_filepath]
       dbu.message = 'Downloading Sifttter files...'
 
-      messenger.info_block(dbu.message || dbu::DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
-        dbu.download
-      end
+      messenger.info(dbu.message || dbu::DEFAULT_MESSAGE)
+      dbu.download
+      messenger.info('Done.')
 
       # Process a new Sifttter entry for each date.
       dates.each do |date|
@@ -149,9 +150,9 @@ command :exec do |c|
         dbu.remote_target = configuration.sifttter_redux[:dayone_remote_filepath]
         dbu.message = 'Uploading Day One entries to Dropbox...'
 
-        messenger.info_block(dbu.message || SifttterRedux::DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
-          dbu.upload
-        end
+        messenger.info(dbu.message || dbu::DEFAULT_MESSAGE)
+        dbu.upload
+        messenger.info('Done.')
       end
 
       # Remove any downloaded local files that we no longer need.
@@ -202,9 +203,9 @@ command :upgrade do |c|
     dbu.remote_target = configuration.sifttter_redux[:sifttter_remote_filepath]
     dbu.message = "Backing up Sifttter files to #{ filename }..."
 
-    messenger.info_block(dbu.message || dbu::DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
-      dbu.download
-    end
+    messenger.info(dbu.message || dbu::DEFAULT_MESSAGE)
+    dbu.download
+    messenger.info('Done.')
 
     # Archive the Sifttter files.
     Archive::Zip.archive(filename, configuration.sifttter_redux[:sifttter_local_filepath])
@@ -215,7 +216,7 @@ command :upgrade do |c|
       t.gsub!(/^- /, "@begin\n@date ")
       t.gsub!(/ - /, "\n- ")
       t.gsub!(/\s?@done/, '@end')
-      messenger.debug { "Replacing contents of file: #{ file }"}
+      messenger.debug("Replacing contents of file: #{ file }")
       File.open(file, 'w') { |f| f.write(t) }
     end
 
@@ -224,9 +225,9 @@ command :upgrade do |c|
     dbu.remote_target = Pathname.new(configuration.sifttter_redux[:sifttter_remote_filepath]).dirname.to_s
     dbu.message = "Uploading revised Sifttter files to Dropbox..."
 
-    messenger.info_block(dbu.message || dbu::DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
-      dbu.upload
-    end
+    messenger.info(dbu.message || dbu::DEFAULT_MESSAGE)
+    dbu.upload
+    messenger.info('Done.')
 
     # Remove any downloaded local files that we no longer need.
     SifttterRedux.cleanup_temp_files

data/lib/sifttter-redux.rb

@@ -24,11 +24,10 @@ module SifttterRedux
       configuration.sifttter_redux[:sifttter_local_filepath]
     ]
 
-    messenger.info_block('Removing temporary local files...') do
-      dirs.each do |d|
-        FileUtils.rm_rf(d)
-        messenger.debug("Removed directory: #{ d }")
-      end
+    messenger.info('Removing temporary local files...')
+    dirs.each do |d|
+      FileUtils.rm_rf(d)
+      messenger.debug("Removed directory: #{ d }")
     end
   end
 
@@ -60,14 +59,15 @@ module SifttterRedux
         if File.directory?(dbu_path)
           messenger.warn("Using pre-existing Dropbox Uploader at #{ dbu_path }...")
         else
-          messenger.info_block("Downloading Dropbox Uploader to #{ dbu_path }...", 'Done.', true) do
-            system "git clone https://github.com/andreafabrizi/Dropbox-Uploader.git #{ dbu_path }"
-          end
+          messenger.info("Downloading Dropbox Uploader to #{ dbu_path }...")
+          system "git clone https://github.com/andreafabrizi/Dropbox-Uploader.git #{ dbu_path }"
+          messenger.info('Done.')
         end
 
         # If the user has never configured Dropbox Uploader, have them do it here.
         unless File.exists?(DEFAULT_DBU_CONFIG_FILEPATH)
-          messenger.info_block('Initializing Dropbox Uploader...') { system "#{ executable_path }" }
+          messenger.info('Initializing Dropbox Uploader...')
+          system "#{ executable_path }"
         end
 
         configuration.add_section(:db_uploader) unless configuration.data.key?(:db_uploader)
@@ -87,7 +87,7 @@ module SifttterRedux
   # @param [Hash] options GLI command line options
   # @return [Range]
   def self.get_dates_from_options(options)
-    if options[:c] || options[:n] || options[:w] || 
+    if options[:c] || options[:n] || options[:w] ||
        options[:y] || options[:f] || options[:t] ||
        options[:d]
       # Yesterday
@@ -113,14 +113,14 @@ module SifttterRedux
           messenger.warn("Ignoring overextended end date and using today's date (#{ Date.today })...")
           r = (_dates.first..Date.today)
         else
-          r = (_dates.first.._dates.last)
+          r = _dates
         end
       end
     else
       r = DateRangeMaker.today
     end
 
-    messenger.debug { "Date range: #{ r }" }
+    messenger.debug("Date range: #{ r }")
     r
   end
 
@@ -129,6 +129,8 @@ module SifttterRedux
   # @param [Boolean] from_scratch
   # @return [void]
   def self.init(from_scratch = false)
+    messenger.section('INITIALIZING...')
+
     if from_scratch
       configuration.reset
       configuration.add_section(:sifttter_redux)
@@ -147,7 +149,7 @@ module SifttterRedux
     pm.ask
     configuration.ingest_prefs(pm)
 
-    messenger.debug {"Collected configuration values: #{ configuration.data }" }
+    messenger.debug("Collected configuration values: #{ configuration.data }")
     configuration.save
     @initialized = true
   end

data/lib/sifttter-redux/constants.rb

@@ -29,5 +29,5 @@ module SifttterRedux
   SUMMARY = 'Automated IFTTT to Day One engine.'
 
   # The Gem's version
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

data/lib/sifttter-redux/sifttter.rb

@@ -1,3 +1,5 @@
+require 'htmlentities'
+
 module SifttterRedux
   # Sifttter Module
   # Used to examine Sifttter data and create
@@ -49,7 +51,7 @@ module SifttterRedux
 
       date_regex = "(?:#{ date.strftime("%B") } 0?#{ date.strftime("%-d") }, #{ date.strftime("%Y") })"
       time_regex = "(?:\d{1,2}:\d{1,2}\s?[AaPpMm]{2})"
-      entry_regex = /@begin\n@date\s#{ date_regex }(?: at (.*?)\n)?(.*?)@end/m
+      entry_regex = /@begin\n@date\s#{ date_regex }(?: at (#{ time_regex }?)\n)?(.*?)@end/m
 
       contents = File.read(filepath)
       cur_entries = contents.scan(entry_regex)
@@ -89,10 +91,12 @@ module SifttterRedux
       end
 
       if @entries.length > 0
+
         entrytext = "# Things done on #{ date_for_title }\n"
         @entries.each do |key, value|
+          coder = HTMLEntities.new
           entrytext += '### ' + key.gsub(/.txt/, '').gsub(/_/, ' ').upcase + "\n\n"
-          value.each { |v| entrytext += "#{ v[1] }\n" }
+          value.each { |v| entrytext += "#{ coder.encode(v[1]) }\n" }
           entrytext += "\n"
         end
 

data/sifttter-redux.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency('chronic', '0.10.2')
   spec.add_runtime_dependency('cliutils', '~> 2')
   spec.add_runtime_dependency('gli','2.9.0')
+  spec.add_runtime_dependency('htmlentities','4.3.1')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sifttter-redux
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.3.1
 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: