fileorganizer 0.0.4 → 0.0.5

data/lib/organize.rb

@@ -5,14 +5,11 @@ class Organize
 	attr_accessor :directory_path
 
 	def initialize
-		# create tests
-		# what does "full documentation" mean?
-		# integrate with Travic CI 
 		@directory_path = '/Users/brianward/Sites/fileorganizer/lib/testfiles/'
 	end
 
 	def directory_files
-		files_sorted_by_time = Dir["#{directory_path}**/*.*"].sort_by{ |f| File.mtime(f) }
+		files_sorted_by_time = Dir["#{@directory_path}**/*.*"].sort_by{ |f| File.mtime(f) }
 	end
 
 	def show_new_names
@@ -25,12 +22,14 @@ class Organize
 		int = 100000
 		directory_files.each do |filename|
 			file_date = File.mtime(filename).to_s
+			# check that file doesn't already have a date name
 			if !/\d{4}\-\d{2}\-\d{2}/.match(filename[10])
-				if File.exist?(directory_path + file_date + filename[-4,4])
-			    	File.rename(filename, directory_path + file_date + '_' + int.to_s + filename[-4,4])
+				# check if a file with this date name doesn't alreday exist, and add number to end of filename if so
+				if File.exist?(@directory_path + file_date + filename[-4,4])
+			    	File.rename(filename, @directory_path + file_date + '_' + int.to_s + filename[-4,4])
 			    	int += 1
 			    else
-			    	File.rename(filename, directory_path + file_date + filename[-4,4])
+			    	File.rename(filename, @directory_path + file_date + filename[-4,4])
 			    end
 			end
 		end
@@ -40,14 +39,14 @@ class Organize
 		# loop over the file dates and run "mkdir" for those dates that don't have a folder yet
 		directory_files.each do |filename|
 			folder_name = filename.split('/').last[0,10]
-			Dir.mkdir(directory_path + folder_name) unless Dir.exists?(directory_path + folder_name)
-			FileUtils.copy_file(filename, directory_path + folder_name + "/" + filename.split('/').last, preserve = true)
+			Dir.mkdir(@directory_path + folder_name) unless Dir.exists?(@directory_path + folder_name)
+			FileUtils.copy_file(filename, @directory_path + folder_name + "/" + filename.split('/').last, preserve = true)
 			FileUtils.remove_file(filename, force = true)
 		end
 	end
 
 	def delete_non_date_folders
-		Dir["#{directory_path}**/**"].each do |folder_name|
+		Dir["#{@directory_path}**/**"].each do |folder_name|
 			if !/\d{4}\-\d{2}\-\d{2}/.match(folder_name)
 				FileUtils.remove_dir(folder_name, force = false)
 			end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fileorganizer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -54,7 +54,6 @@ files:
 - bin/fileorganizer
 - lib/fileorganizer.rb
 - lib/organize.rb
-- lib/organize_spec.rb
 - lib/testfiles/4471473910_14e267969c.jpg
 - lib/testfiles/4474268581_2b1ebba1c1.jpg
 - lib/testfiles/4477744959_27ba8a402b_z.jpg

data/lib/organize_spec.rb

@@ -1,43 +0,0 @@
-require './organize.rb'
-
-describe Organize do
-
-	before :all do
-		@newTask = Organize.new
-		@newTask.directory_path = Dir.pwd + "/testfiles/"
-	end
-
-	after(:all) do
-	    FileUtils.rm_rf(@newTask.directory_path)
-	    current_directory = Dir.pwd
-	    FileUtils.cp_r current_directory + '/testfiles_copy', current_directory + '/testfiles/', :preserve => true
-	 end
-
-	it "should have a directory path" do
-		@newTask.should respond_to "directory_path"
-	end
-
-	it "should return a list of existing files in directory" do
-		existing_files = Dir[@newTask.directory_path + '**/*.*'].map { |a| File.basename(a) }
-		existing_files.should eq ["4471473910_14e267969c.jpg", "4474268581_2b1ebba1c1.jpg", "4477744959_27ba8a402b_z.jpg", "5241024543_4d024eaa09_b.jpg", "5241024587_9ce803aafe_b.jpg", "5241619844_a02287bb21_b.jpg", "5241620170_91d55ef233_o.jpg", "5384868249_80bcb10aa2_b.jpg", "photo (1).JPG", "photo (2).JPG", "photo.JPG", "0f8109ddc4c5d699bbf4d9fbef2bcfcb.jpg", "3e54bfc519c423f3aa3b67d46d2684f4.jpg"]
-	end
-
-	it "should rename the existing files in directory" do
-		@newTask.rename_files
-		new_files = Dir[@newTask.directory_path + '**/*.*'].map { |a| File.basename(a) }
-		new_files.should eq ["2011-02-04 14:31:58 -0800.jpg", "2011-02-04 14:34:42 -0800.jpg", "2011-02-04 14:35:32 -0800.jpg", "2011-02-04 14:35:48 -0800.jpg", "2011-02-04 14:35:56 -0800.jpg", "2011-02-04 14:37:02 -0800.jpg", "2011-02-04 14:37:26 -0800.jpg", "2011-02-04 14:37:58 -0800.jpg", "2011-02-21 10:55:15 -0800.jpg", "2011-02-21 10:56:09 -0800.jpg", "2011-03-19 22:24:33 -0700.JPG", "2011-03-19 22:24:45 -0700.JPG", "2011-03-19 22:24:56 -0700.JPG"]
-	end
-
-	it "should create new folders from dates" do
-		@newTask.move_files
-		new_folders = Dir[@newTask.directory_path + '*/'].map { |a| File.basename(a) }
-		new_folders.should eq ["2011-02-04", "2011-02-21", "2011-03-19", "testfolder"]
-	end
-
-	it "should delete old folders that are now dates" do
-		@newTask.delete_non_date_folders
-		new_folders = Dir[@newTask.directory_path + '*/'].map { |a| File.basename(a) }
-		new_folders.should eq ["2011-02-04", "2011-02-21", "2011-03-19"]
-	end
-
-end