sifttter-redux 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e19b289fe78eeb98bf8d7690e232251277e6911
-  data.tar.gz: 00a579af73904367f8c8f842301104c05a209a31
+  metadata.gz: ac0c51854f8d85fe836c9bec7be780a4d149ef55
+  data.tar.gz: 83c7b28fe6fae8fae9c55d1e95c9b845a1fa5817
 SHA512:
-  metadata.gz: 79470d813b0eaa664823049b2a7bff6f3ef63b81970c04a4d28d4ae375faf6c1b087cb7e36ecf3372d75a7cc8f74fe3cad365777f3d1b03155c416c0af3b239d
-  data.tar.gz: fe6c117183db7faabbe057c5a46c3cc7cf2830d95d7142db7eb03be2ec80356722d4c053af1bd5acd10c5a339e77be559825272c01030da69390e9642fc03b1b
+  metadata.gz: 952c9d9cc4d4e68ced1d567278d4294fb5551ad7c5f9ff11f9fc4ba1a8ec847137dad74f29124ae45d3d3bf6db51cf13e6a6ceb6857f96d49a3e02b6b2895b3f
+  data.tar.gz: 3f8c244c3a6872727f775a2973ecbadfdbb1ad46730cae3f05f742bab981b0f6835cd8af6dc641f86fee6447f3c599852700fae9b58f4f827491f3d6ef2c84ef

data/HISTORY.md

@@ -1,3 +1,7 @@
+# 0.5.4 (2014-03-19)
+
+* Fixed several bugs related to configuration management
+
 # 0.5.3 (2014-03-18)
 
 * Fixed regression with gemspec

data/README.md

@@ -39,7 +39,7 @@ SYNOPSIS
     srd [global options] command [command options] [arguments...]
 
 VERSION
-    0.5.3
+    0.5.4
 
 GLOBAL OPTIONS
     --help         - Show this message
@@ -456,6 +456,6 @@ THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 # Credits
 
 * Craig Eley for [Sifttter](http://craigeley.com/post/72565974459/sifttter-an-ifttt-to-day-one-logger "Sifttter") and for giving me the idea for Sifttter Redux
-* Dave Copeland for [GLI](https://github.com/davetron5000/gli "GLI") and [Methadone]("https://github.com/davetron5000/methadone" Methadone)
+* Dave Copeland for [GLI](https://github.com/davetron5000/gli "GLI")
 * Andrea Fabrizi for [Dropbox Uploader](https://github.com/andreafabrizi/Dropbox-Uploader "Dropbox Uploader")
-* Tom Preston-Werner and Lee Jarvis for [Chronic](https://github.com/mojombo/chronic "Chronic")
+* ~~Tom Preston-Werner~~ (sorry: can't support [harrassment](http://www.businessinsider.com/github-co-founder-suspended-2014-3 "GitHub Founder Tom Preston-Werner Suspended After Harassment Allegations")) ~~and~~ Lee Jarvis for [Chronic](https://github.com/mojombo/chronic "Chronic")

data/Rakefile

@@ -41,44 +41,4 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['test/*_test.rb']
 end
 
-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]
+task :default => [:test]

data/bin/srd

@@ -77,14 +77,13 @@ pre do |global, command, options, args|
       CLIMessage::info("Don't worry; when prompted, your current values for")
       CLIMessage::info("existing config options will be presented (so it'll")
       CLIMessage::info('be easier to fly through the upgrade).')
-      CLIMessage::prompt('Press enter to continue: ')
+      CLIMessage::prompt('Press enter to continue')
       SifttterRedux::init(true)
       exit!(0)
     end
   else
     # Force the user to init if they try to run any command other than `init` first.
-    CLIMessage::info('Initializing Sifttter Redux first...') unless command.name_for_help[0] == 'init'
-    SifttterRedux::init
+    SifttterRedux::init(true)
     exit!(0)
   end
 
@@ -173,11 +172,11 @@ command :init do |c|
 
   c.action do |global_options, options, args|
     CLIMessage::section_block('INITIALIZING...') do
-      if File.exists?(Configuration::config_path) && !options[:s]
-        long_message = "You've already initialized Sifttter Redux. Do it again?"
-        SifttterRedux::init(true) if CLIMessage::prompt(long_message, 'N').downcase == 'y'
+      if options[:s]
+        SifttterRedux::init(true)
       else
-        SifttterRedux::init
+        long_message = "You've already initialized Sifttter Redux. Do it again?"
+        SifttterRedux::init if CLIMessage::prompt(long_message, 'N').downcase == 'y'
       end
     end
   end

data/lib/sifttter_redux/cli_message.rb

@@ -130,7 +130,7 @@ module SifttterRedux
           map { |f| File.expand_path(f) }.
           map { |f| File.directory?(f) ? f + "/" : f }
       end
-      choice = Readline.readline("# #{ prompt } #{ default.nil? ? '' : "[default: #{ default }]:" } ".green)
+      choice = Readline.readline("# #{ prompt }#{ default.nil? ? ':' : " [default: #{ default }]:" } ".green)
       if choice.empty?
         r = default
       else

data/lib/sifttter_redux/configuration.rb

@@ -29,7 +29,7 @@ module SifttterRedux
     end
     
     def method_missing(name, *args, &block)
-      @_data[name.to_sym] || {}
+      @_data[name.to_sym] || @_data.merge!(name.to_sym => {})
     end
 
     def self.add_section(section_name)

data/lib/sifttter_redux/version.rb

@@ -1,6 +1,6 @@
 module SifttterRedux
   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.3'
-  NEWEST_CONFIG_VERSION = '0.5.3'
+  VERSION = '0.5.4'
+  NEWEST_CONFIG_VERSION = '0.5.4'
 end

data/lib/sifttter_redux.rb

@@ -59,13 +59,13 @@ module SifttterRedux
   #  local filesystem.
   #  @return Void
   #  ----------------------------------------------------
-  def self.dbu_install_wizard(reinit = false)
+  def self.dbu_install_wizard(init_from_scratch = false)
     valid_path_chosen = false
     
     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?
+        if init_from_scratch && !Configuration::db_uploader[:base_filepath].nil?
           default = Configuration::db_uploader[:base_filepath]
         else
           default = DBU_LOCAL_FILEPATH
@@ -94,7 +94,7 @@ module SifttterRedux
             CLIMessage::info_block('Initializing Dropbox Uploader...') { system "#{ executable_path }" }
           end
 
-          Configuration::add_section(:db_uploader) unless reinit
+          Configuration::add_section(:db_uploader) unless init_from_scratch
           Configuration::db_uploader.merge!({
             base_filepath: path, 
             dbu_filepath: dbu_path,
@@ -158,10 +158,10 @@ module SifttterRedux
   #  collecting all necessary items and info.
   #  @return Void
   #  ----------------------------------------------------
-  def self.init(reinit = false)
-    unless reinit
+  def self.init(init_from_scratch = false)
+    if init_from_scratch
       Configuration::reset
-      Configuration::add_section('sifttter_redux')
+      Configuration::add_section(:sifttter_redux)
     end
 
     Configuration::sifttter_redux.merge!({
@@ -171,7 +171,7 @@ module SifttterRedux
     })
 
     # Run the wizard to download Dropbox Uploader.
-    dbu_install_wizard(reinit = reinit)
+    dbu_install_wizard(init_from_scratch = init_from_scratch)
 
     # Collect other misc. preferences.
     CLIMessage::section_block('COLLECTING PREFERENCES...') do
@@ -203,11 +203,11 @@ module SifttterRedux
       ]
 
       pref_prompts.each do |prompt|
-        d = reinit ? Configuration::send(prompt[:section].to_sym)[prompt[:key]] : prompt[:default]
+        d = init_from_scratch ? prompt[:default] : Configuration::send(prompt[:section])[prompt[:key]]
         pref = CLIMessage::prompt(prompt[:prompt], d)
-
         pref = File.expand_path(pref) if pref.start_with?('~')
-        Configuration::send(prompt[:section].to_sym).merge!(prompt[:key] => pref)
+
+        Configuration::send(prompt[:section]).merge!(prompt[:key] => pref)
         CLIMessage::debug("Value for #{ prompt[:key] }: #{ pref }")
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sifttter-redux
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Aaron Bach