sifttter-redux 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48c3ee25e5aa975dfb797960ac5f442d174ff665
-  data.tar.gz: 86542233200617d91dea2ee56b34723a7a8e0901
+  metadata.gz: 3775e070fe18f1cf9c290b81ea98344482fb877e
+  data.tar.gz: b99739072ee074da6f951a48c257bf634e6ea347
 SHA512:
-  metadata.gz: e4e630389cb349d81d20f3f6ee0dc9042f74260b30fbb0642658f26e61afe08c9bb64b28c4363099e48c53d8162883b493bf7f8a4de2b3fdd6c6eab0371224a0
-  data.tar.gz: 5ef3c0388f1730d1f4633dcd3e4aac3c8e183a83de4a942431f2bc7849dd7a41fa296843aec4d7b65b53e5c530435b5961b9a4b26ddbaab33ce45b503c754bc7
+  metadata.gz: d9b75d13ddd3e3794930b21cba62a02be62398e3830d2e5abb72407eb155b31889b277b238ada6223ad37cad503d99b6e2a9f55ba34ca66d0624102d611cd34e
+  data.tar.gz: 132d7265b89e72dd7722b754cd65a4d6714352f4c3b7fe19bc1e380088ee9e242397c39aa5aface0b6e70c9649b5d3b91966d779211aac73948ee44167315d6a

data/.travis.yml

@@ -3,8 +3,4 @@ rvm:
   - 2.1.0
   - 2.0.0
   - 1.9.3
-  - 1.9.2
-  - 1.8.7
-  - jruby-19mode
-  - jruby-18mode
-  - rbx-19mode
+  - jruby-19mode

data/HISTORY.md

@@ -1,3 +1,9 @@
+# 0.4.1 (2014-02-26)
+
+* Added `-s` flag to `init` command for initialization from scratch
+* Added gem version to config file (for reference going forward)
+* Added message to prompt users to re-init on upgrade
+
 # 0.4.0 (2014-02-26)
 
 * Removed some hardcoded values

data/README.md

@@ -47,7 +47,7 @@ SYNOPSIS
     srd [global options] command [command options] [arguments...]
 
 VERSION
-    0.3.9
+    0.4.1
 
 GLOBAL OPTIONS
     --help         - Show this message
@@ -60,6 +60,27 @@ COMMANDS
     init - Install and initialize dependencies
 ```
 
+Note that each command's options can be revealed by adding the `--help` switch after the command. For example:
+
+```
+$ srd exec --help
+NAME
+    exec - Execute the script
+
+SYNOPSIS
+    srd [global options] exec [command options]
+
+COMMAND OPTIONS
+    -c             - Run catch-up mode from the beginning of the week to yesterday
+    -f arg         - Run catch-up mode with this start date (default: none)
+    -i             - Include today's date in catch-up
+    -n arg         - Run catch-up mode for the last N days (default: none)
+    -t arg         - Run catch-up mode with this end date (must also have -f) (default: none)
+    --[no-]verbose - Turns on verbose output
+    -w arg         - Run catch-up mode for the last N weeks (default: none)
+    -y             - Run catch-up mode for yesterday
+```
+
 ## Initialization
 
 ```

data/bin/srd

@@ -64,20 +64,33 @@ switch(
 #  ======================================================
 
 pre do |global, command, options, args|
+  
   # Load SifttterRedux configuration module.
-  Configuration.load(SRD_CONFIG_FILEPATH)
+  Configuration::load(SRD_CONFIG_FILEPATH)
 
   # Load Methadone CLILogging module.
-  Methadone::CLILogging.change_logger(Methadone::CLILogger.new(SRD_LOG_FILEPATH, SRD_LOG_FILEPATH))
+  Methadone::CLILogging::change_logger(Methadone::CLILogger.new(SRD_LOG_FILEPATH, SRD_LOG_FILEPATH))  
+
+  if File.exists?(SRD_CONFIG_FILEPATH)
+    # If the config file needs updating, force the user to do that first.
+    if Configuration['sifttter_redux']['version'].nil? || Gem::Version.new(Configuration['sifttter_redux']['version']) < Gem::Version.new(NEWEST_CONFIG_VERSION)
+      CLIMessage::info('This version needs to make some config changes.')
+      CLIMessage::info("Don't worry; when prompted, original values to existing config options will be presented.")
+      CLIMessage::prompt("Press enter to continue")
+
+      SifttterRedux::init
+      exit!
+    end
+  else
+    # Force the user to initialize if they try to execute first.
+    CLIMessage::info('You need to initialize Sifttter Redux first...') unless command.name_for_help[0] == 'init'
 
-  # Force the user to initialize if they try to execute first.
-  if command.name_for_help[0] == 'exec' && !File.exists?(SRD_CONFIG_FILEPATH)
-    CLIMessage.info('You need to initialize Sifttter Redux first...')
-    SifttterRedux.init
+    SifttterRedux::init
+    exit!
   end
   
   # Load Dropbox Uploader module.
-  DBU.load(File.join(Configuration['db_uploader']['local_filepath'], 'dropbox_uploader.sh')) if File.exists?(SRD_CONFIG_FILEPATH)
+  DBU.load(Configuration['db_uploader']['exe_filepath']) if File.exists?(SRD_CONFIG_FILEPATH)
   
   true
 end
@@ -139,7 +152,7 @@ command :exec do |c|
 
     SifttterRedux.verbose = global_options[:verbose] || options[:verbose]
 
-    CLIMessage.section_block('EXECUTING...') do
+    CLIMessage::section_block('EXECUTING...') do
       if options[:c] || options[:n] || options[:w] || options[:y] || options[:f] || options[:t]
 
         command_complete = false
@@ -174,11 +187,11 @@ command :exec do |c|
             dates = DateRangeMaker.range(options[:f], options[:t], options[:i])
 
             if dates.last > Date.today
-              CLIMessage.warning("Ignoring overextended end date and using today's date (#{ Date.today })")
+              CLIMessage::warning("Ignoring overextended end date and using today's date (#{ Date.today })")
               dates = (dates.first..Date.today)
             end
           rescue ArgumentError => e
-            CLIMessage.error(e)
+            CLIMessage::error(e)
           end
         end
       else
@@ -191,10 +204,10 @@ command :exec do |c|
 
         if first_date == second_date
           date_string = first_date.strftime('%B %d, %Y')
-          CLIMessage.info("Creating entry for #{ date_string }...")
+          CLIMessage::info("Creating entry for #{ date_string }...")
         else
           date_string = "#{ first_date.strftime('%B %d, %Y') } to #{ second_date.strftime('%B %d, %Y') }"
-          CLIMessage.info("Creating entries for dates from #{ date_string }...")
+          CLIMessage::info("Creating entries for dates from #{ date_string }...")
         end
 
         DBU.local_target = Configuration['sifttter_redux']['sifttter_local_filepath']
@@ -208,7 +221,7 @@ command :exec do |c|
 
         # 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.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...'
           DBU.upload
@@ -220,7 +233,7 @@ command :exec do |c|
           Configuration['sifttter_redux']['sifttter_local_filepath']
         ]
 
-        CLIMessage.info_block('Removing temporary local files...') { dirs.each { |d| FileUtils.rm_rf(d) } }
+        CLIMessage::info_block('Removing temporary local files...') { dirs.each { |d| FileUtils.rm_rf(d) } }
       end
     end
   end
@@ -234,12 +247,18 @@ end
 #  ------------------------------------------------------
 desc 'Install and initialize dependencies'
 command :init do |c|
+  
+  c.switch(
+    [:s],
+    desc: 'Run init from scratch (i.e., clear out all values from configuration)'
+  )
+  
   c.action do |global_options, options, args|
-    CLIMessage.section_block('INITIALIZING...') do
-      if File.exists?(Configuration.config_path)
-        SifttterRedux.init if CLIMessage.prompt("It looks like you've already initialized Sifttter Redux. Do you want to re-initialize?", 'N').downcase == 'y'
+    CLIMessage::section_block('INITIALIZING...') do
+      if File.exists?(Configuration::config_path) && !options[:s]
+        SifttterRedux::init(true) if CLIMessage::prompt("It looks like you've already initialized Sifttter Redux. Do you want to re-initialize?", 'N').downcase == 'y'
       else
-        SifttterRedux.init
+        SifttterRedux::init
       end
     end
   end

data/lib/sifttter_redux/cli_message.rb

@@ -70,14 +70,17 @@ module SifttterRedux
     #  @param default The default option
     #  @return String
     #  ----------------------------------------------------
-    def self.prompt(prompt, default)
-      print "#{ prompt } [default: #{ default }]: "
+    def self.prompt(prompt, default = nil, log = true)
+      print "#{ prompt } #{ default.nil? ? '' : "[default: #{ default }]:" } ".blue
       choice = $stdin.gets.chomp
       if choice.empty?
-        return default
+        r = default
       else
-        return choice
+        r = choice
       end
+
+      Methadone::CLILogging.info("Answer to '#{ prompt }': #{r}") if log
+      r
     end
 
     #  ----------------------------------------------------

data/lib/sifttter_redux/configuration.rb

@@ -19,7 +19,7 @@ module SifttterRedux
       if section_exists?(section_name)
         @data[section_name]
       else
-        error = "Section does not exist: #{section_name}"
+        error = "Section does not exist: #{ section_name }"
         Methadone::CLILogging.error(error)
         fail ArgumentError, error
       end
@@ -39,7 +39,7 @@ module SifttterRedux
         @data[section_name] = {}
         @data[section_name].merge!(hash)
       else
-        error = "Parameter is not a Hash: #{hash}"
+        error = "Parameter is not a Hash: #{ hash }"
         Methadone::CLILogging.error(error)
         fail ArgumentError, error
       end
@@ -56,7 +56,7 @@ module SifttterRedux
       if !self.section_exists?(section_name)
         @data[section_name] = {}
       else
-        CLIMessage.warning("Can't create already-existing section: #{section_name}")
+        CLIMessage::warning("Can't create already-existing section: #{ section_name }")
       end
     end
 
@@ -81,7 +81,7 @@ module SifttterRedux
       if self.section_exists?(section_name)
         @data.delete(section_name)
       else
-        CLIMessage.warning("Can't delete non-existing section: #{section_name}")
+        CLIMessage::warning("Can't delete non-existing section: #{ section_name }")
       end
     end
     

data/lib/sifttter_redux/dbu.rb

@@ -17,7 +17,7 @@ module SifttterRedux
     #  ----------------------------------------------------
     def self.download
       if !@local_path.nil? && !@remote_path.nil?
-        CLIMessage.info_block(@message ||= DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
+        CLIMessage::info_block(@message ||= DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
           if SifttterRedux.verbose
             system "#{ @dbu } download #{ @remote_path } #{ @local_path }"
           else
@@ -38,37 +38,32 @@ module SifttterRedux
     #  local filesystem.
     #  @return Void
     #  ----------------------------------------------------
-    def self.install_wizard
-      valid_directory_chosen = false
+    def self.install_wizard(already_initialized = false)
+      CLIMessage::section_block('CONFIGURING DROPBOX UPLOADER...') do
+        # Prompt the user for a location to save Dropbox Uploader. '
+        path = CLIMessage::prompt('Location for Dropbox-Uploader', already_initialized ? Configuration['db_uploader']['base_filepath'] : DBU_LOCAL_FILEPATH)
+        path.chop! if path.end_with?('/')
 
-      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)
+          dbu_path = File.join(path, 'Dropbox-Uploader')
+          executable_path = File.join(dbu_path, 'dropbox_uploader.sh')
 
-          # 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
+          if File.directory?(dbu_path)
+            CLIMessage::warning("Using pre-existing Dropbox Uploader at #{ dbu_path }...")
+          else
+            CLIMessage::info_block("Downloading Dropbox Uploader to #{ dbu_path }...", 'Done.', true) do
+              system "git clone https://github.com/andreafabrizi/Dropbox-Uploader.git #{ dbu_path }"
             end
+          end
 
-            # If the user has never configured Dropbox Uploader, have them do it here.
-            CLIMessage.info_block('Initializing Dropbox Uploader...') { system "#{ File.join(path, 'dropbox_uploader.sh') }" } unless File.exists?(CONFIG_FILEPATH)
+          # If the user has never configured Dropbox Uploader, have them do it here.
+          CLIMessage::info_block('Initializing Dropbox Uploader...') { system "#{ executable_path }" } unless File.exists?(CONFIG_FILEPATH)
 
-            Configuration.add_section('db_uploader')
-            Configuration['db_uploader'].merge!('local_filepath' => path)
-          else
-            puts "Sorry, but #{ path } isn't a valid directory."
-          end
+          Configuration::add_section('db_uploader') unless Configuration::section_exists?('db_uploader')
+          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
       end
     end
@@ -129,7 +124,7 @@ module SifttterRedux
     #  ----------------------------------------------------
     def self.upload
       if !@local_path.nil? && !@remote_path.nil?
-        CLIMessage.info_block(@message ||= DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
+        CLIMessage::info_block(@message ||= DEFAULT_MESSAGE, 'Done.', SifttterRedux.verbose) do
           if SifttterRedux.verbose
             system "#{ @dbu } upload #{ @local_path } #{ @remote_path }"
           else

data/lib/sifttter_redux/sifttter.rb

@@ -77,7 +77,7 @@ module SifttterRedux
       end
 
       if projects.length <=0
-      	CLIMessage.warning('No entries found...')
+      	CLIMessage::warning('No entries found...')
       end
 
       if projects.length > 0
@@ -91,7 +91,7 @@ module SifttterRedux
       	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 }...")
+      	CLIMessage::success("Entry logged for #{ date_for_title }...")
       end
     end
   end

data/lib/sifttter_redux/string_extensions.rb

@@ -10,7 +10,7 @@ class String
   #  @return Void
   #  ----------------------------------------------------
   def colorize(color_code)
-    "\e[#{color_code}m#{self}\e[0m"
+    "\e[#{ color_code }m#{ self }\e[0m"
   end
 
   #  ----------------------------------------------------

data/lib/sifttter_redux/version.rb

@@ -1,3 +1,4 @@
 module SifttterRedux
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
+  NEWEST_CONFIG_VERSION = '0.4.1'
 end

data/lib/sifttter_redux.rb

@@ -34,53 +34,52 @@ module SifttterRedux
   #  collecting all necessary items and info.
   #  @return Void
   #  ----------------------------------------------------
-  def self.init
+  def self.init(already_initialized = false)
     # Re-initialize the configuration data.
-    Configuration.reset
-    Configuration.add_section('sifttter_redux')
-    Configuration['sifttter_redux'].merge!('config_location' => Configuration.config_path)
+    Configuration::add_section('sifttter_redux') unless Configuration::section_exists?('sifttter_redux')
+    Configuration['sifttter_redux'].merge!('version' => VERSION, 'config_location' => Configuration::config_path)
 
     # Run the wizard to download Dropbox Uploader.
-    DBU::install_wizard
+    DBU::install_wizard(already_initialized = already_initialized)
 
     # Collect other misc. preferences.
-    CLIMessage.section_block('COLLECTING PREFERENCES...') do
+    CLIMessage::section_block('COLLECTING PREFERENCES...') do
       pref_prompts = [
         {
           prompt: 'Location for downloaded Sifttter files from Dropbox',
-          default: SFT_LOCAL_FILEPATH,
+          default: already_initialized ? Configuration['sifttter_redux']['sifttter_local_filepath'] : SFT_LOCAL_FILEPATH,
           key: 'sifttter_local_filepath',
           section: 'sifttter_redux'
         },
         {
           prompt: 'Location of Sifttter files in Dropbox',
-          default: SFT_REMOTE_FILEPATH,
+          default: already_initialized ? Configuration['sifttter_redux']['sifttter_remote_filepath'] : SFT_REMOTE_FILEPATH,
           key: 'sifttter_remote_filepath',
           section: 'sifttter_redux'
         },
         {
           prompt: 'Location for downloaded Day One files from Dropbox',
-          default: DO_LOCAL_FILEPATH,
+          default: already_initialized ? Configuration['sifttter_redux']['dayone_local_filepath'] : DO_LOCAL_FILEPATH,
           key: 'dayone_local_filepath',
           section: 'sifttter_redux'
         },
         {
           prompt: 'Location of Day One files in Dropbox',
-          default: DO_REMOTE_FILEPATH,
+          default: already_initialized ? Configuration['sifttter_redux']['dayone_remote_filepath'] : DO_REMOTE_FILEPATH,
           key: 'dayone_remote_filepath',
           section: 'sifttter_redux'
         }
       ]
 
       pref_prompts.each do |prompt|
-        pref = CLIMessage.prompt(prompt[:prompt], prompt[:default])
+        pref = CLIMessage::prompt(prompt[:prompt], prompt[:default])
         Configuration[prompt[:section]].merge!(prompt[:key] => pref)
       end
     end
     
-    Methadone::CLILogging.info("Configuration values: #{ Configuration.dump }")
+    Methadone::CLILogging.info("Configuration values: #{ Configuration::dump }")
     
-    Configuration.save
+    Configuration::save
   end
 
   #  ----------------------------------------------------

data/test/cli_message_test.rb

@@ -6,50 +6,62 @@ include Methadone::CLILogging
 
 class CLIMessageTest < Test::Unit::TestCase
   def test_error_message
-    assert_output('---> ERROR: test'.red + "\n") { SifttterRedux::CLIMessage.error('test', false) }
+    assert_output('---> ERROR: test'.red + "\n") { SifttterRedux::CLIMessage::error('test', false) }
   end
 
   def test_info_message
-    assert_output('---> INFO: test'.blue + "\n") { SifttterRedux::CLIMessage.info('test', false) }
+    assert_output('---> INFO: test'.blue + "\n") { SifttterRedux::CLIMessage::info('test', false) }
   end
 
   def test_info_block_single_line
     assert_output("---> INFO: start".blue + "body\n" + 'end'.blue + "\n") do
-      SifttterRedux::CLIMessage.info_block('start', 'end', false, false) { puts 'body' }
+      SifttterRedux::CLIMessage::info_block('start', 'end', false, false) { puts 'body' }
     end
   end
 
   def test_info_block_multiline
     assert_output("---> INFO: start".blue + "\nbody\n" + '---> INFO: end'.blue + "\n") do
-      SifttterRedux::CLIMessage.info_block('start', 'end', true, false) { puts 'body' }
+      SifttterRedux::CLIMessage::info_block('start', 'end', true, false) { puts 'body' }
     end
   end
   
   def test_info_block_no_block
     assert_raise ArgumentError do
-      SifttterRedux::CLIMessage.info_block('start', 'end', true, false)
+      SifttterRedux::CLIMessage::info_block('start', 'end', true, false)
     end
   end
 
-  # def test_prompt
-  #   assert_equal(SifttterRedux::CLIMessage.prompt('Pick the default option', 'default'), 'default')
-  # end
-
   def test_section_message
-    assert_output('#### test'.purple + "\n") { SifttterRedux::CLIMessage.section('test', false) }
+    assert_output('#### test'.purple + "\n") { SifttterRedux::CLIMessage::section('test', false) }
   end
 
   def test_section_block_single_line
     assert_output("#### section".purple + "\nbody\n") do
-      SifttterRedux::CLIMessage.section_block('section', true, false) { puts 'body' }
+      SifttterRedux::CLIMessage::section_block('section', true, false) { puts 'body' }
     end
   end
 
   def test_success_message
-    assert_output('---> SUCCESS: test'.green + "\n") { SifttterRedux::CLIMessage.success('test', false) }
+    assert_output('---> SUCCESS: test'.green + "\n") { SifttterRedux::CLIMessage::success('test', false) }
   end
 
   def test_warning_message
-    assert_output('---> WARNING: test'.yellow + "\n") { SifttterRedux::CLIMessage.warning('test', false) }
+    assert_output('---> WARNING: test'.yellow + "\n") { SifttterRedux::CLIMessage::warning('test', false) }
+  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

@@ -4,7 +4,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib/sifttter_redux/configuratio
 class ConfigurationTest < Test::Unit::TestCase
   
   def setup
-    SifttterRedux::Configuration.load('/tmp/srd_config')
+    SifttterRedux::Configuration::load('/tmp/srd_config')
   end
 
   def teardown
@@ -12,57 +12,57 @@ class ConfigurationTest < Test::Unit::TestCase
   end
   
   def test_add_data
-    SifttterRedux::Configuration.add_section('section1')
+    SifttterRedux::Configuration::add_section('section1')
     SifttterRedux::Configuration['section1'] = { 'a' => 'test', 'b' => 'test' }
-    assert_equal(SifttterRedux::Configuration.dump, { 'section1' => { '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' } })
+    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::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::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
-    assert_equal(SifttterRedux::Configuration.config_path, '/tmp/srd_config')
+    assert_equal(SifttterRedux::Configuration::config_path, '/tmp/srd_config')
   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::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.delete_section('section12723762323')
-    assert_equal(SifttterRedux::Configuration.dump, { 'section1' => {} })
+    SifttterRedux::Configuration::add_section('section1')
+    SifttterRedux::Configuration::delete_section('section12723762323')
+    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
-    assert_equal(SifttterRedux::Configuration.dump, {})
+    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::add_section('section1')
     SifttterRedux::Configuration['section1'] = { 'a' => 'test', 'b' => 'test' }
-    SifttterRedux::Configuration.save
+    SifttterRedux::Configuration::save
     
     File.open('/tmp/srd_config', 'r') do |f|
       assert_output("---\nsection1:\n  a: test\n  b: test\n") { puts f.read }
@@ -70,7 +70,7 @@ class ConfigurationTest < Test::Unit::TestCase
   end
   
   def test_section_exists
-    SifttterRedux::Configuration.add_section('section1')
-    assert_equal(SifttterRedux::Configuration.section_exists?('section1'), true)
+    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.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake