sifttter-redux 0.5.4 → 0.6

data/res/preference_prompts.yaml

@@ -0,0 +1,17 @@
+:prompts:
+  - prompt: Where do you want to download Sifttter files to (temporarily)?
+    default: /tmp/sifttter
+    key: sifttter_local_filepath
+    section: sifttter_redux
+  - prompt: Where are your Sifttter files located in Dropbox?
+    default: /Apps/ifttt/sifttter
+    key: sifttter_remote_filepath
+    section: sifttter_redux
+  - prompt: Where do you want to download Day One files to (temporarily)?
+    default: /tmp/dayone
+    key: dayone_local_filepath
+    section: sifttter_redux
+  - prompt: Where are your Day One files located in Dropbox?
+    default: /Apps/Day\ One/Journal.dayone/entries
+    key: dayone_remote_filepath
+    section: sifttter_redux

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

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'sifttter_redux/version'
+require 'sifttter-redux/constants'
 
 Gem::Specification.new do |spec|   
   spec.name             = 'sifttter-redux'
@@ -27,5 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rdoc', '4.1.1')
   spec.add_development_dependency('aruba', '0.5.4')
   spec.add_runtime_dependency('chronic', '0.10.2')
+  spec.add_runtime_dependency('cliutils', '1.1.0')
   spec.add_runtime_dependency('gli','2.9.0')
 end

data/test/date_range_maker_test.rb

@@ -1,6 +1,6 @@
 require 'date'
 require 'test_helper'
-require File.join(File.dirname(__FILE__), '..', 'lib/sifttter_redux/date_range_maker.rb')
+require File.join(File.dirname(__FILE__), '..', 'lib/sifttter-redux/date-range-maker.rb')
 
 class DateRangeMakerTest < Test::Unit::TestCase
   def test_today

data/tmp/srd/.sifttter_redux

@@ -0,0 +1,13 @@
+---
+:sifttter_redux:
+  :config_location: "/Users/abach/Git/sifttter-redux/features/support/../../tmp/srd/.sifttter_redux"
+  :log_level: WARN
+  :version: 0.5.4
+  :sifttter_local_filepath: "/Users/abach/Git/sifttter-redux/features/support/../../tmp/srd/sifttter_download"
+  :sifttter_remote_filepath: "/Apps/ifttt/Sifttter"
+  :dayone_local_filepath: "/Users/abach/Git/sifttter-redux/features/support/../../tmp/srd/day_one_download"
+  :dayone_remote_filepath: "/Apps/Day\\ One/Journal.dayone/entries"
+:db_uploader:
+  :base_filepath: "/usr/local/opt"
+  :dbu_filepath: "/usr/local/opt/Dropbox-Uploader"
+  :exe_filepath: "/usr/local/opt/Dropbox-Uploader/dropbox_uploader.sh"

data/tmp/srd/.sifttter_redux_log

@@ -0,0 +1,10 @@
+# Logfile created on 2014-03-22 08:12:43 -0600 by logger.rb/44203
+D, [2014-03-22T08:12:43.563366 #13209] DEBUG -- : CONFIGURING DROPBOX UPLOADER...
+D, [2014-03-22T08:12:43.563826 #13209] DEBUG -- : Answer to "Location for Dropbox-Uploader": /usr/local/opt
+W, [2014-03-22T08:12:43.563882 #13209]  WARN -- : Using pre-existing Dropbox Uploader at /usr/local/opt/Dropbox-Uploader...
+D, [2014-03-22T08:12:43.563920 #13209] DEBUG -- : COLLECTING PREFERENCES...
+D, [2014-03-22T08:12:43.564297 #13209] DEBUG -- : Answer to "Temporary path to download Sifttter files to": ~/sifttter_download
+D, [2014-03-22T08:12:43.564661 #13209] DEBUG -- : Answer to "Path to Sifttter files in Dropbox": /Apps/ifttt/Sifttter
+D, [2014-03-22T08:12:43.564995 #13209] DEBUG -- : Answer to "Temporary path to download Day One files to": ~/day_one_download
+D, [2014-03-22T08:12:43.565542 #13209] DEBUG -- : Answer to "Path to Day One files in Dropbox": /Apps/Day\ One/Journal.dayone/entries
+D, [2014-03-22T08:12:43.565605 #13209] DEBUG -- : Configuration values: {:sifttter_redux=>{:config_location=>"/Users/abach/Git/sifttter-redux/features/support/../../tmp/srd/.sifttter_redux", :log_level=>"WARN", :version=>"0.5.4", :sifttter_local_filepath=>"/Users/abach/Git/sifttter-redux/features/support/../../tmp/srd/sifttter_download", :sifttter_remote_filepath=>"/Apps/ifttt/Sifttter", :dayone_local_filepath=>"/Users/abach/Git/sifttter-redux/features/support/../../tmp/srd/day_one_download", :dayone_remote_filepath=>"/Apps/Day\\ One/Journal.dayone/entries"}, :db_uploader=>{:base_filepath=>"/usr/local/opt", :dbu_filepath=>"/usr/local/opt/Dropbox-Uploader", :exe_filepath=>"/usr/local/opt/Dropbox-Uploader/dropbox_uploader.sh"}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sifttter-redux
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: '0.6'
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,6 +66,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.2
+- !ruby/object:Gem::Dependency
+  name: cliutils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -100,18 +114,22 @@ files:
 - README.md
 - Rakefile
 - bin/srd
-- 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/dropbox_uploader.rb
-- lib/sifttter_redux/sifttter.rb
-- lib/sifttter_redux/version.rb
-- sifttter_redux.gemspec
-- test/cli_message_test.rb
-- test/configuration_test.rb
+- features/1.ui.feature
+- features/2.initialization.feature
+- features/step_definitions/sifttter-redux_steps.rb
+- features/support/env.rb
+- lib/sifttter-redux.rb
+- lib/sifttter-redux/constants.rb
+- lib/sifttter-redux/date-range-maker.rb
+- lib/sifttter-redux/dropbox-uploader.rb
+- lib/sifttter-redux/sifttter.rb
+- res/preference_prompts.yaml
+- sifttter-redux.gemspec
 - test/date_range_maker_test.rb
 - test/test_helper.rb
+- tmp/srd/.dropbox_uploader
+- tmp/srd/.sifttter_redux
+- tmp/srd/.sifttter_redux_log
 homepage: https://github.com/bachya/sifttter-redux
 licenses:
 - MIT
@@ -138,8 +156,10 @@ signing_key:
 specification_version: 4
 summary: Automated IFTTT to Day One engine.
 test_files:
-- test/cli_message_test.rb
-- test/configuration_test.rb
+- features/1.ui.feature
+- features/2.initialization.feature
+- features/step_definitions/sifttter-redux_steps.rb
+- features/support/env.rb
 - test/date_range_maker_test.rb
 - test/test_helper.rb
 has_rdoc: 

data/lib/sifttter_redux/cli_message.rb

@@ -1,270 +0,0 @@
-require 'logger'
-require 'readline'
-
-module SifttterRedux
-  #  ======================================================
-  #  CliManager Module
-  #  Singleton to manage common CLI interfacing
-  #  ======================================================
-  module CLIMessage
-    #  ====================================================
-    #  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
-    #
-    #  Outputs a formatted-red error message.
-    #  @param m The message to output
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.error(m)
-      puts "# #{ m }".red
-      @@logger.error(m.red) unless @@logger.nil?
-    end
-
-    #  ----------------------------------------------------
-    #  info method
-    #
-    #  Outputs a formatted-blue informational message.
-    #  @param m The message to output
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.info(m)
-      puts "# #{ m }".blue
-      @@logger.debug(m.blue) unless @@logger.nil?
-    end
-
-    #  ----------------------------------------------------
-    #  info_block method
-    #
-    #  Wraps a block in an opening and closing info message.
-    #  @param m1 The opening message to output
-    #  @param m2 The closing message to output
-    #  @param multiline Whether the message should be multiline
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.info_block(m1, m2 = 'Done.', multiline = false)
-      if block_given?
-        if multiline
-          info(m1)
-        else
-          print "# #{ m1 }".blue
-        end
-
-        yield
-
-        if multiline
-          info(m2)
-        else
-          puts m2.blue
-        end
-      else
-        fail ArgumentError, 'Did not specify a valid block'
-      end
-    end
-
-    #  ----------------------------------------------------
-    #  log_level method
-    #
-    #  Creates a simple logger to use
-    #  @return Void
-    #  ----------------------------------------------------
-    LOG_LEVELS = {
-      'DEBUG' => Logger::DEBUG,
-      'INFO' => Logger::INFO,
-      'WARN' => Logger::WARN,
-      'ERROR' => Logger::ERROR,
-      'FATAL' => Logger::FATAL,
-      'UNKNOWN' => Logger::UNKNOWN
-    }
-
-    def self.log_level(level)
-      @@logger.level = LOG_LEVELS[level] if LOG_LEVELS.key?(level)
-    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 = 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-purple section message.
-    #  @param m The message to output
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.section(m)
-      puts "---> #{ m }".purple
-      @@logger.debug(m.purple) unless @@logger.nil?
-    end
-
-    #  ----------------------------------------------------
-    #  section_block method
-    #
-    #  Wraps a block in an opening and closing section
-    #  message.
-    #  @param m1 The opening message to output
-    #  @param m2 The closing message to output
-    #  @param multiline A multiline message or not
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.section_block(m, multiline = true)
-      if block_given?
-        if multiline
-          section(m)
-        else
-          print "---> #{ m }".purple
-        end
-
-        yield
-      else
-        error = 'Did not specify a valid block'
-        fail ArgumentError, error
-      end
-    end
-
-    #  ----------------------------------------------------
-    #  success method
-    #
-    #  Outputs a formatted-green success message.
-    #  @param m The message to output
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.success(m)
-      puts "# #{ m }".green
-      @@logger.debug(m.green) unless @@logger.nil?
-    end
-
-    #  ----------------------------------------------------
-    #  warning method
-    #
-    #  Outputs a formatted-yellow warning message.
-    #  @param m The message to output
-    #  @return Void
-    #  ----------------------------------------------------
-    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/configuration.rb

@@ -1,89 +0,0 @@
-require 'yaml'
-
-module SifttterRedux
-  #  ======================================================
-  #  Configuration Module
-  #
-  #  Manages any configuration values and the flat file
-  #  into which they get stored.
-  #  ======================================================
-  module Configuration
-    extend self
-    
-    @_data = {}
-    #  ====================================================
-    #  Methods
-    #  ====================================================
-    #  ----------------------------------------------------
-    #  deep_merge! method
-    #
-    #  Deep merges two hashes.
-    #  deep_merge by Stefan Rusterholz;
-    #  see http://www.ruby-forum.com/topic/142809
-    #  @return Void
-    #  ----------------------------------------------------
-    def deep_merge!(target, data)
-      merger = proc{|key, v1, v2|
-        Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-      target.merge! data, &merger
-    end
-    
-    def method_missing(name, *args, &block)
-      @_data[name.to_sym] || @_data.merge!(name.to_sym => {})
-    end
-
-    def self.add_section(section_name)
-      @_data[section_name] = {} unless @_data.key?(section_name)
-    end
-    
-    def self.config_path
-      @_config_path
-    end
-    
-    def self.delete_section(section_name)
-      @_data.delete(section_name) if @_data.key?(section_name)
-    end
-    
-    def self.dump
-      @_data
-    end
-
-    #  ----------------------------------------------------
-    #  load method
-    #
-    #  Loads the configuration data (if it exists) and sets
-    #  the filepath to the flat file.
-    #  @param path The filepath
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.load(path)
-      @_config_path = path
-      
-      if File.exists?(path)
-        data = YAML.load_file(path)
-        deep_merge!(@_data, data)
-      end
-    end
-
-    #  ----------------------------------------------------
-    #  reset method
-    #
-    #  Clears the configuration data.
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.reset
-      @_data = {}
-    end
-
-    #  ----------------------------------------------------
-    #  save method
-    #
-    #  Saves the configuration data to the previously
-    #  stored flat file.
-    #  @return Void
-    #  ----------------------------------------------------
-    def self.save
-      File.open(@_config_path, 'w') { |f| f.write(@_data.to_yaml) }
-    end
-  end
-end