sifttter-redux 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8428d3a20d173ff492101ecc333afa4920f6335f
-  data.tar.gz: 1ecda6813567e1d839fda7116b859e568c896aea
+  metadata.gz: 125b9d118c416b34ebe992b95f18bb55d97d3807
+  data.tar.gz: a5e68191e9b9a584427e86e241f8ab0933b19104
 SHA512:
-  metadata.gz: bac421d706ad288bbd317a72a03eed6f42ec233650aa4b7023254c87c49baefff9215d2842c7c1fd72ebf312ee253e872c2c683320005623471efe00a42ef667
-  data.tar.gz: 4b61980d4dca38b59833e2d16dd53b057fe075f50246e69490d8c1c477ada6e6c0454d81a2b39a478d8e9e6c5bf90486250661f95e868429bee2ad9c30cadccb
+  metadata.gz: 1e59c3223ed42ccb22ff39a66673f5ce906646157a0e42f97c23a5e217da86bffdaeec2b977ea65c971812fd2c60becd605d11bdc6d408ce68a1160d201258bf
+  data.tar.gz: b8d58d3b7ce838909504694dd5346ee94874b790cda987604ed1facf27890cf2d814aaef527c2634484615c874d9d88d6bd2497ae3d29189213d83e38e11efff

data/.gitignore

@@ -1,8 +1,5 @@
 Gemfile.lock
 .bundle
 .DS_Store
-features
 results.html
-README.rdoc
-Sifttter-Redux.rdoc
 *.gem

data/HISTORY.md

@@ -1,3 +1,7 @@
+# 0.5.2 (2014-03-18)
+
+* New Configuration management system
+
 # 0.5.1 (2014-03-18)
 
 * Fixed a bug regarding missing Methadone references

data/README.md

@@ -39,7 +39,7 @@ SYNOPSIS
     srd [global options] command [command options] [arguments...]
 
 VERSION
-    0.5.1
+    0.5.2
 
 GLOBAL OPTIONS
     --help         - Show this message

data/Rakefile

@@ -1,9 +1,84 @@
 require 'rake/clean'
-require 'rake/testtask'
+require 'rubygems'
+require 'rubygems/package_task'
+require 'rdoc/task'
+require 'cucumber'
+require 'cucumber/rake/task'
+Rake::RDocTask.new do |rd|
+  rd.main = "README.rdoc"
+  rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*")
+  rd.title = 'Your application title'
+end
+
+spec = eval(File.read('sifttter_redux.gemspec'))
+
+Gem::PackageTask.new(spec) do |pkg|
+end
+CUKE_RESULTS = 'results.html'
+CLEAN << CUKE_RESULTS
+desc 'Run features'
+Cucumber::Rake::Task.new(:features) do |t|
+  opts = "features --format html -o #{CUKE_RESULTS} --format progress -x"
+  opts += " --tags #{ENV['TAGS']}" if ENV['TAGS']
+  t.cucumber_opts =  opts
+  t.fork = false
+end
+
+desc 'Run features tagged as work-in-progress (@wip)'
+Cucumber::Rake::Task.new('features:wip') do |t|
+  tag_opts = ' --tags ~@pending'
+  tag_opts = ' --tags @wip'
+  t.cucumber_opts = "features --format html -o #{CUKE_RESULTS} --format pretty -x -s#{tag_opts}"
+  t.fork = false
+end
 
+task :cucumber => :features
+task 'cucumber:wip' => 'features:wip'
+task :wip => 'features:wip'
+require 'rake/testtask'
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/*_test.rb']
 end
 
-task :default => [:test]
+task :default => [:test,:features]
+
+# require 'rake/clean'
+# require 'rubygems'
+# require 'rubygems/package_task'
+# require 'cucumber'
+# require 'cucumber/rake/task'
+# spec = eval(File.read('sifttter_redux.gemspec'))
+# 
+# Gem::PackageTask.new(spec) do |pkg|
+# end
+# 
+# CUKE_RESULTS = 'results.html'
+# CLEAN << CUKE_RESULTS
+# 
+# desc 'Run features'
+# Cucumber::Rake::Task.new(:features) do |t|
+#   opts = "features --format html -o #{CUKE_RESULTS} --format progress -x"
+#   opts += " --tags #{ENV['TAGS']}" if ENV['TAGS']
+#   t.cucumber_opts =  opts
+#   t.fork = false
+# end
+# 
+# desc 'Run features tagged as work-in-progress (@wip)'
+# Cucumber::Rake::Task.new('features:wip') do |t|
+#   tag_opts = ' --tags ~@pending'
+#   tag_opts = ' --tags @wip'
+#   t.cucumber_opts = "features --format html -o #{CUKE_RESULTS} --format pretty -x -s#{tag_opts}"
+#   t.fork = false
+# end
+# 
+# task :cucumber => :features
+# task 'cucumber:wip' => 'features:wip'
+# task :wip => 'features:wip'
+# require 'rake/testtask'
+# Rake::TestTask.new do |t|
+#   t.libs << "test"
+#   t.test_files = FileList['test/*_test.rb']
+# end
+# 
+# task :default => [:test,:features]

data/bin/srd

@@ -59,19 +59,20 @@ 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)
-  
+
   # Set up logging.
   CLIMessage::activate_logging
-  CLIMessage::log_level(Configuration['sifttter_redux']['log_level'])
+  CLIMessage::log_level(Configuration::sifttter_redux[:log_level] || Logger::WARN)
 
   if File.exists?(SRD_CONFIG_FILEPATH)
-    current_version = Gem::Version.new(Configuration['sifttter_redux']['version'])
+    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? || current_version < last_config_change_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, your current values for")
       CLIMessage::info("existing config options will be presented (so it'll")
@@ -124,10 +125,10 @@ command :exec do |c|
         CLIMessage::info("Creating #{ first_date == second_date ? 'entry' : 'entries' }: #{ date_string }")
 
         # Download Sifttter files from Dropbox.
-        dbu = DropboxUploader.new(Configuration['db_uploader']['exe_filepath'])
+        dbu = DropboxUploader.new(Configuration::db_uploader[:exe_filepath])
         dbu.verbose = SifttterRedux.verbose
-        dbu.local_target = Configuration['sifttter_redux']['sifttter_local_filepath']
-        dbu.remote_target = Configuration['sifttter_redux']['sifttter_remote_filepath']
+        dbu.local_target = Configuration::sifttter_redux[:sifttter_local_filepath]
+        dbu.remote_target = Configuration::sifttter_redux[:sifttter_remote_filepath]
         dbu.message = 'Downloading Sifttter files...'
 
         CLIMessage::info_block(dbu.message || dbu::DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
@@ -140,9 +141,9 @@ command :exec do |c|
         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']
+        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...'
 
           CLIMessage::info_block(dbu.message || dbu::DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do

data/lib/sifttter_redux/cli_message.rb

@@ -108,6 +108,7 @@ module SifttterRedux
       'FATAL' => Logger::FATAL,
       'UNKNOWN' => Logger::UNKNOWN
     }
+
     def self.log_level(level)
       @@logger.level = LOG_LEVELS[level] if LOG_LEVELS.key?(level)
     end

data/lib/sifttter_redux/configuration.rb

@@ -8,92 +8,44 @@ module SifttterRedux
   #  into which they get stored.
   #  ======================================================
   module Configuration
+    extend self
+    
+    @_data = {}
     #  ====================================================
     #  Methods
     #  ====================================================
     #  ----------------------------------------------------
-    #  [] method
+    #  deep_merge! method
     #
-    #  Returns the Hash of data for a particular section.
-    #  @param section_name The section in which to look
-    #  @return Hash
+    #  Deep merges two hashes.
+    #  deep_merge by Stefan Rusterholz;
+    #  see http://www.ruby-forum.com/topic/142809
+    #  @return Void
     #  ----------------------------------------------------
-    def self.[](section_name)
-      if section_exists?(section_name)
-        @data[section_name]
-      else
-        error = "Section does not exist: #{ section_name }"
-        fail ArgumentError, error
-      end
+    def deep_merge!(target, data)
+      merger = proc{|key, v1, v2|
+        Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+      target.merge! data, &merger
     end
     
-    #  ----------------------------------------------------
-    #  []= method
-    #
-    #  Assigns the passed hash to the section. NOTE THAT THE
-    #  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
-    #  ----------------------------------------------------
-    def self.[]=(section_name, hash)
-      if hash.is_a?(Hash)
-        @data[section_name] = {}
-        @data[section_name].merge!(hash)
-      else
-        error = "Parameter is not a Hash: #{ hash }"
-        fail ArgumentError, error
-      end
+    def method_missing(name, *args, &block)
+      @_data[name.to_sym] || {}
     end
 
-    #  ----------------------------------------------------
-    #  add_section method
-    #
-    #  Creates a new section in the configuration data.
-    #  @param section_name The section to add
-    #  @return Void
-    #  ----------------------------------------------------
     def self.add_section(section_name)
-      if !self.section_exists?(section_name)
-        @data[section_name] = {}
-      else
-        CLIMessage::warning("Can't create already-existing section: #{ section_name }")
-      end
+      @_data[section_name] = {} unless @_data.key?(section_name)
     end
-
-    #  ----------------------------------------------------
-    #  config_path method
-    #
-    #  Returns the filepath to the flat configuration file.
-    #  @return String
-    #  ----------------------------------------------------
+    
     def self.config_path
-      @config_path
+      @_config_path
     end
-
-    #  ----------------------------------------------------
-    #  delete_section method
-    #
-    #  Deletes a section from the configuration data.
-    #  @param section_name The section to delete
-    #  @return Void
-    #  ----------------------------------------------------
+    
     def self.delete_section(section_name)
-      if self.section_exists?(section_name)
-        @data.delete(section_name)
-      else
-        CLIMessage::warning("Can't delete non-existing section: #{ section_name }")
-      end
+      @_data.delete(section_name) if @_data.key?(section_name)
     end
     
-    #  ----------------------------------------------------
-    #  dump method
-    #
-    #  Returns the data Hash
-    #  @return Hash
-    #  ----------------------------------------------------
     def self.dump
-      @data
+      @_data
     end
 
     #  ----------------------------------------------------
@@ -105,12 +57,11 @@ module SifttterRedux
     #  @return Void
     #  ----------------------------------------------------
     def self.load(path)
-      @config_path = path
-
+      @_config_path = path
+      
       if File.exists?(path)
-        @data = YAML.load_file(path)
-      else
-        @data = {}
+        data = YAML.load_file(path)
+        deep_merge!(@_data, data)
       end
     end
 
@@ -121,7 +72,7 @@ module SifttterRedux
     #  @return Void
     #  ----------------------------------------------------
     def self.reset
-      @data = {}
+      @_data = {}
     end
 
     #  ----------------------------------------------------
@@ -132,18 +83,7 @@ module SifttterRedux
     #  @return Void
     #  ----------------------------------------------------
     def self.save
-      File.open(@config_path, 'w') { |f| f.write(@data.to_yaml) }
-    end
-
-    #  ----------------------------------------------------
-    #  section_exists? method
-    #
-    #  Checks for the existance of the passed section.
-    #  @param section_name The section to look for
-    #  @return Bool
-    #  ----------------------------------------------------
-    def self.section_exists?(section_name)
-      @data.key?(section_name)
+      File.open(@_config_path, 'w') { |f| f.write(@_data.to_yaml) }
     end
   end
 end

data/lib/sifttter_redux/sifttter.rb

@@ -46,9 +46,9 @@ 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})"
 
-      files = `find #{ Configuration['sifttter_redux']['sifttter_local_filepath'] } -type f -name "*.txt" | grep -v -i daily | sort`
+      files = `find #{ Configuration::sifttter_redux[:sifttter_local_filepath] } -type f -name "*.txt" | grep -v -i daily | sort`
       if files.empty?
-        CLIMessage::error("No Sifttter files to parse; is #{ Configuration['sifttter_redux']['sifttter_remote_filepath'] } the correct remote filepath?")
+        CLIMessage::error("No Sifttter files to parse; is #{ Configuration::sifttter_redux[:sifttter_remote_filepath] } the correct remote filepath?")
         return
       end
 
@@ -86,9 +86,9 @@ module SifttterRedux
       		entrytext += project.gsub(/.txt/, ' ') + "\n\n"
       	end
 
-        Dir.mkdir(Configuration['sifttter_redux']['dayone_local_filepath']) if !Dir.exists?(Configuration['sifttter_redux']['dayone_local_filepath'])
+        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 = 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 }...")

data/lib/sifttter_redux/version.rb

@@ -1,4 +1,6 @@
 module SifttterRedux
-  VERSION = '0.5.1'
-  NEWEST_CONFIG_VERSION = '0.4.7'
+  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).'
+  SUMMARY = 'Automated IFTTT to Day One engine.'
+  VERSION = '0.5.2'
+  NEWEST_CONFIG_VERSION = '0.5.2'
 end

data/lib/sifttter_redux.rb

@@ -40,8 +40,8 @@ module SifttterRedux
   #  ----------------------------------------------------
   def self.cleanup_temp_files
     dirs = [
-      Configuration['sifttter_redux']['dayone_local_filepath'],
-      Configuration['sifttter_redux']['sifttter_local_filepath']
+      Configuration::sifttter_redux[:dayone_local_filepath],
+      Configuration::sifttter_redux[:sifttter_local_filepath]
     ]
 
     CLIMessage::info_block('Removing temporary local files...') do 
@@ -65,8 +65,8 @@ module SifttterRedux
     CLIMessage::section_block('CONFIGURING DROPBOX UPLOADER...') do
       until valid_path_chosen
         # Prompt the user for a location to save Dropbox Uploader.
-        if reinit && !Configuration['db_uploader']['base_filepath'].nil?
-          default = Configuration['db_uploader']['base_filepath']
+        if reinit && !Configuration::db_uploader[:base_filepath].nil?
+          default = Configuration::db_uploader[:base_filepath]
         else
           default = DBU_LOCAL_FILEPATH
         end
@@ -94,8 +94,12 @@ module SifttterRedux
             CLIMessage::info_block('Initializing Dropbox Uploader...') { system "#{ executable_path }" }
           end
 
-          Configuration::add_section('db_uploader') unless reinit
-          Configuration['db_uploader'].merge!('base_filepath' => path, 'dbu_filepath' => dbu_path, 'exe_filepath' => executable_path)
+          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.")
         end
@@ -159,10 +163,11 @@ module SifttterRedux
       Configuration::reset
       Configuration::add_section('sifttter_redux')
     end
-    Configuration['sifttter_redux'].merge!({
-      'config_location' => Configuration::config_path,
-      'log_level' => 'WARN',
-      'version' => VERSION,
+
+    Configuration::sifttter_redux.merge!({
+      config_location: Configuration::config_path,
+      log_level: 'WARN',
+      version: VERSION,
     })
 
     # Run the wizard to download Dropbox Uploader.
@@ -172,36 +177,37 @@ module SifttterRedux
     CLIMessage::section_block('COLLECTING PREFERENCES...') do
       pref_prompts = [
         {
-          prompt: 'Location for downloaded Sifttter files from Dropbox',
+          prompt: 'Temporary path to download Sifttter files to',
           default: SFT_LOCAL_FILEPATH,
-          key: 'sifttter_local_filepath',
-          section: 'sifttter_redux'
+          key: :sifttter_local_filepath,
+          section: :sifttter_redux
         },
         {
-          prompt: 'Location of Sifttter files in Dropbox',
+          prompt: 'Path to Sifttter files in Dropbox',
           default: SFT_REMOTE_FILEPATH,
-          key: 'sifttter_remote_filepath',
-          section: 'sifttter_redux'
+          key: :sifttter_remote_filepath,
+          section: :sifttter_redux
         },
         {
-          prompt: 'Location for downloaded Day One files from Dropbox',
+          prompt: 'Temporary path to download Day One files to',
           default: DO_LOCAL_FILEPATH,
-          key: 'dayone_local_filepath',
-          section: 'sifttter_redux'
+          key: :dayone_local_filepath,
+          section: :sifttter_redux
         },
         {
-          prompt: 'Location of Day One files in Dropbox',
+          prompt: 'Path to Day One files in Dropbox',
           default: DO_REMOTE_FILEPATH,
-          key: 'dayone_remote_filepath',
-          section: 'sifttter_redux'
+          key: :dayone_remote_filepath,
+          section: :sifttter_redux
         }
       ]
 
       pref_prompts.each do |prompt|
-        d = reinit ? Configuration[prompt[:section]][prompt[:key]] : prompt[:default]
+        d = reinit ? Configuration::send(prompt[:section].to_sym)[prompt[:key]] : prompt[:default]
         pref = CLIMessage::prompt(prompt[:prompt], d)
 
-        Configuration[prompt[:section]].merge!(prompt[:key] => File.expand_path(pref))
+        pref = File.expand_path(pref) if pref.start_with?('~')
+        Configuration::send(prompt[:section].to_sym).merge!(prompt[:key] => pref)
         CLIMessage::debug("Value for #{ prompt[:key] }: #{ pref }")
       end
     end

data/sifttter_redux.gemspec

@@ -1,27 +1,31 @@
-# Ensure we require the local version and not one we might have installed already
-require File.join([File.dirname(__FILE__), 'lib', 'sifttter_redux', 'version.rb'])
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'sifttter_redux/version'
 
-spec = Gem::Specification.new do |s| 
-  s.name = 'sifttter-redux'
-  s.version = SifttterRedux::VERSION
-  s.author = 'Aaron Bach'
-  s.email = 'bachya1208@gmail.com'
-  s.homepage = 'https://github.com/bachya/sifttter-redux'
-  s.platform = Gem::Platform::RUBY
-  s.summary = 'Automated IFTTT to Day One engine.'
-  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).'
+Gem::Specification.new do |spec|   
+  spec.name             = 'sifttter-redux'
+  spec.version          = SifttterRedux::VERSION
+  spec.authors          = ['Aaron Bach']
+  spec.email            = ['bachya1208@googlemail.com']
+  spec.summary          = SifttterRedux::SUMMARY
+  spec.description      = SifttterRedux::DESCRIPTION
+  spec.homepage         = 'https://github.com/bachya/sifttter-redux'
+  spec.license          = 'MIT'
+  spec.platform         = Gem::Platform::RUBY
 
-  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'
+  spec.require_paths    = ["lib"]
+  spec.files            = `git ls-files`.split("\n")
+  spec.executables      = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files       = spec.files.grep(%r{^(test|spec|features)/})
   
-  s.license = 'MIT'
-  s.rdoc_options = ['--charset=UTF-8']
-  s.extra_rdoc_files = %w[README.md HISTORY.md LICENSE.txt]
+  spec.license          = 'MIT'
+  spec.rdoc_options     = ['--charset=UTF-8']
+  spec.extra_rdoc_files = %w[README.md HISTORY.md LICENSE]
   
-  s.add_development_dependency('rake', '~> 0')
-  s.add_runtime_dependency('chronic', '0.10.2')
-  s.add_runtime_dependency('gli','2.9.0')
+  spec.add_development_dependency('rake', '~> 0')
+  spec.add_development_dependency('rdoc', '~> 0')
+  spec.add_development_dependency('aruba', '~> 0')
+  spec.add_runtime_dependency('chronic', '0.10.2')
+  spec.add_runtime_dependency('gli','2.9.0')
 end

data/test/cli_message_test.rb

@@ -50,20 +50,5 @@ class CLIMessageTest < Test::Unit::TestCase
   def test_warning_message
     assert_output('# test'.yellow + "\n") { SifttterRedux::CLIMessage::warning('test') }
   end
-  
-  # def test_prompt
-  #   with_stdin do |answer|
-  #     answer.puts 'default'
-  #     assert_equal(SifttterRedux::CLIMessage::prompt('Hit enter to give the default response', 'default'), 'default')
-  #   end
-  # end
-  # 
-  # def with_stdin
-  #   stdin = $stdin             # remember $stdin
-  #   $stdin, write = IO.pipe    # create pipe assigning its "read end" to $stdin
-  #   yield write                # pass pipe's "write end" to block
-  # ensure
-  #   write.close                # close pipe
-  #   $stdin = stdin             # restore $stdin
-  # end
+
 end

data/test/configuration_test.rb

@@ -12,26 +12,29 @@ class ConfigurationTest < Test::Unit::TestCase
   end
   
   def test_add_data
-    SifttterRedux::Configuration::add_section('section1')
-    SifttterRedux::Configuration['section1'] = { 'a' => 'test', 'b' => 'test' }
-    assert_equal(SifttterRedux::Configuration::dump, { 'section1' => { 'a' => 'test', 'b' => 'test' } })
+    SifttterRedux::Configuration::reset
+    SifttterRedux::Configuration::add_section(:section1)
+    SifttterRedux::Configuration::section1.merge!( a: 'test', b: 'test' )
+    assert_equal(SifttterRedux::Configuration::dump, { section1: { a: 'test', b: 'test' } })
     
-    SifttterRedux::Configuration['section1']['a'] = 'bigger test'
-    SifttterRedux::Configuration['section1']['c'] = 'little test'
-    assert_equal(SifttterRedux::Configuration::dump, { 'section1' => { 'a' => 'bigger test', 'b' => 'test', 'c' => 'little test' } })
+    SifttterRedux::Configuration::section1[:a] = 'bigger test'
+    SifttterRedux::Configuration::section1[:c] = 'little test'
+    assert_equal(SifttterRedux::Configuration::dump, { section1: { a: 'bigger test', b: 'test', c: 'little test' } })
   end
   
   def test_add_section
-    SifttterRedux::Configuration::add_section('section1')
-    SifttterRedux::Configuration::add_section('section2')
-    assert_equal(SifttterRedux::Configuration::dump, { 'section1' => {}, 'section2' => {} })
+    SifttterRedux::Configuration::reset
+    SifttterRedux::Configuration::add_section(:section1)
+    SifttterRedux::Configuration::add_section(:section2)
+    assert_equal(SifttterRedux::Configuration::dump, { section1: {}, section2: {} })
   end
   
   def test_add_section_duplicate
-    SifttterRedux::Configuration::add_section('section1')
-    SifttterRedux::Configuration::add_section('section2')
-    SifttterRedux::Configuration::add_section('section2')
-    assert_equal(SifttterRedux::Configuration::dump, { 'section1' => {}, 'section2' => {} })
+    SifttterRedux::Configuration::reset
+    SifttterRedux::Configuration::add_section(:section1)
+    SifttterRedux::Configuration::add_section(:section2)
+    SifttterRedux::Configuration::add_section(:section2)
+    assert_equal(SifttterRedux::Configuration::dump, { section1: {}, section2: {} })
   end
   
   def test_config_path
@@ -39,38 +42,37 @@ class ConfigurationTest < Test::Unit::TestCase
   end
   
   def test_delete_section
-    SifttterRedux::Configuration::add_section('section1')
-    SifttterRedux::Configuration::add_section('section2')
-    SifttterRedux::Configuration::delete_section('section2')
-    assert_equal(SifttterRedux::Configuration::dump, { 'section1' => {} })
+    SifttterRedux::Configuration::reset
+    SifttterRedux::Configuration::add_section(:section1)
+    SifttterRedux::Configuration::add_section(:section2)
+    SifttterRedux::Configuration::delete_section(:section2)
+    assert_equal(SifttterRedux::Configuration::dump, { section1: {} })
   end
   
   def test_delete_section_nonexistant
-    SifttterRedux::Configuration::add_section('section1')
+    SifttterRedux::Configuration::reset
+    SifttterRedux::Configuration::add_section(:section1)
     SifttterRedux::Configuration::delete_section('section12723762323')
-    assert_equal(SifttterRedux::Configuration::dump, { 'section1' => {} })
+    assert_equal(SifttterRedux::Configuration::dump, { section1: {} })
   end
   
   def test_reset
-    SifttterRedux::Configuration::add_section('section1')
-    SifttterRedux::Configuration::add_section('section2')
-    SifttterRedux::Configuration::add_section('section3')
+    SifttterRedux::Configuration::reset
+    SifttterRedux::Configuration::add_section(:section1)
+    SifttterRedux::Configuration::add_section(:section2)
+    SifttterRedux::Configuration::add_section(:section3)
     SifttterRedux::Configuration::reset
     assert_equal(SifttterRedux::Configuration::dump, {})
   end
   
   def test_save
-    SifttterRedux::Configuration::add_section('section1')
-    SifttterRedux::Configuration['section1'] = { 'a' => 'test', 'b' => 'test' }
+    SifttterRedux::Configuration::reset
+    SifttterRedux::Configuration::add_section(:section1)
+    SifttterRedux::Configuration.section1.merge!({ a: 'test', b: 'test' })
     SifttterRedux::Configuration::save
     
     File.open('/tmp/srd_config', 'r') do |f|
-      assert_output("---\nsection1:\n  a: test\n  b: test\n") { puts f.read }
+      assert_output("---\n:section1:\n  :a: test\n  :b: test\n") { puts f.read }
     end
   end
-  
-  def test_section_exists
-    SifttterRedux::Configuration::add_section('section1')
-    assert_equal(SifttterRedux::Configuration::section_exists?('section1'), true)
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sifttter-redux
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  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
+  name: aruba
+  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
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -54,20 +82,21 @@ dependencies:
         version: 2.9.0
 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
+email:
+- bachya1208@googlemail.com
 executables:
 - srd
 extensions: []
 extra_rdoc_files:
 - README.md
 - HISTORY.md
-- LICENSE.txt
+- LICENSE
 files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
 - HISTORY.md
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bin/srd
@@ -92,7 +121,6 @@ rdoc_options:
 - "--charset=UTF-8"
 require_paths:
 - lib
-- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="