curate_tumblr 1.0.6 → 1.0.7

data/README.md

@@ -225,13 +225,16 @@ and *reblog_post_key* to reblog it in CurateTumblr::Publish::Reblog
 
 ## Versions ##
 
-### v1.0.6 ###
+v1.0.7
+* Better check config file
+
+v1.0.6
 * Better error messages if no oauth in config file
 
-### v1.0.5 ###
+v1.0.5
 * Stop if Tumblr error "Not Authorized" (bad oauth)
 
-### v1.0.4 ###
+v1.0.4
 * Better error messages if problem with directories or config file
 
 

data/curate_tumblr.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |gem|
 	gem.add_dependency 'tumblr_client'
 	gem.add_dependency 'logger'
 	gem.name = 'curate_tumblr'
-	gem.version = '1.0.6'
+	gem.version = '1.0.7'
 	gem.authors = ['David Tysman']
 	gem.description = 'CurateTumblr - reblog and follow Tumblr links, extract infos from the posts, add tags and links'
 	gem.summary = 'Reblog and follow Tumblr'

data/lib/curate_tumblr/curator.rb

@@ -88,24 +88,12 @@ module CurateTumblr
     end      
 
     def check_config_files
-      if !Dir.exists?( @directory )
-        return error_config( "The directory #{@directory} doesn't exist", "You need it for your tumblrs subdirectories. \nPlease create it or change the path." )
-      end
-      if !Dir.exists?( get_path_tumblr )
-        return error_config( "The directory #{get_path_tumblr} doesn't exist", "You need it for your tumblr links and config. \nPlease create it or change the path." )
-      end    
-      if !Dir.exists?( get_path_links )
-        return error_config( "The directory #{get_path_links} doesn't exist", "You need it for set the links to follow and reblog. \nPlease create it or change the path." )
-      end    
-      if !Dir.exists?( get_path_logs )
-        return error_config( "The directory #{get_path_logs} doesn't exist", "The application needs it for write logs. \nPlease create it or change the path." )
-      end    
-      if !File.exists?( get_filename_config )
-        return error_config( "The config file #{get_filename_config} doesn't exist", "You need it for set oauth tokens. \nPlease create it or change the path." )
-      end 
-      if !File.exists?( get_filename_links )
-        return error_config( "The file #{get_filename_links} doesn't exist", "You need it for set the links to reblog. \nPlease create it or change the path." )
-      end   
+      return false if !check_config_dir( @directory, "You need it for your tumblrs subdirectories." )
+      return false if !check_config_dir( get_path_tumblr, "You need it for your tumblr links and config." )
+      return false if !check_config_dir( get_path_links, "You need it for set the links to follow and reblog." )
+      return false if !check_config_dir( get_path_logs, "The application needs it for write logs." )
+      return false if !check_config_file( get_filename_config, "You need it for set oauth tokens." )
+      return false if !check_config_file( get_filename_links, "You need it for set the links to reblog." )
       return false if !check_config_key( Tumblr::Client::HASH_CONFIG_CLIENT_OAUTH, "you need to write it in config file to write inside the oauth tokens to send requests to Tumblr", false )
       return false if !check_config_key( Tumblr::Client::HASH_CONFIG_CLIENT_OAUTH_CONSUMER_KEY, "you need to write it inside '#{Tumblr::Client::HASH_CONFIG_CLIENT_OAUTH}' in config file to send requests to Tumblr" )
       return false if !check_config_key( Tumblr::Client::HASH_CONFIG_CLIENT_OAUTH_CONSUMER_SECRET, "you need to write it inside '#{Tumblr::Client::HASH_CONFIG_CLIENT_OAUTH}' in config file to send requests to Tumblr" )
@@ -114,6 +102,20 @@ module CurateTumblr
       true      
     end
 
+    def check_config_dir( dir, about )
+      if !Dir.exists?( dir )
+        return error_config( "The directory #{dir} doesn't exist", about + "\nPlease create it or change the path." )
+      end
+      true
+    end
+
+    def check_config_file( file, about )
+      if !File.exists?( file )
+        return error_config( "The file #{file} doesn't exist", about + "\nPlease create it or change the path." )
+      end
+      true
+    end    
+
     def check_config_key( key, about, is_check_empty=true )
       ar_key = []
       File.open( get_filename_config, "r" ) do |file_config|

data/spec/factories.rb

@@ -1,7 +1,7 @@
 require 'factory_girl'
 
 def get_tumblr_name
-  "testitnowyeah14"
+  "testcuratetumblr2
 end
 
 def get_tumblr_directory

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curate_tumblr
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors: