gitkeep 0.2.1 → 0.2.2

data/bin/gitkeep

@@ -1,20 +1,19 @@
 #!/usr/bin/env ruby
 
-require 'find'
 require 'gitkeep'
 
 gitkeep = Gitkeep.new
 
+# set options
+gitkeep.dryrun = !ARGV.delete('-d').nil?
+gitkeep.interactive = !ARGV.delete('-i').nil?			
+
 if ARGV.size == 0
-	gitkeep.create(".")
+	# no options, create in current path
+	gitkeep.create(".") 
 else
-	if ARGV.size == 1 && ARGV[0] == "-d"
-		gitkeep.dryrun = true
-		gitkeep.create(".")
-	else
-		ARGV.sort.each do |arg|				
-			gitkeep.dryrun = true if arg == "-d"
-			gitkeep.create(arg) unless arg =~ /^-+/
-		end
+	# iterate over paths
+	ARGV.each do |arg|
+		gitkeep.create(arg) unless arg =~ /^-+/
 	end
 end

data/lib/gitkeep.rb

@@ -1,17 +1,23 @@
+require 'find'
+
 class Gitkeep	
 
-	attr_accessor :dryrun	
+	attr_accessor :dryrun, :interactive, :__test
+	attr_reader :file_count, :error_count
 
 	def initialize	
+		@__test = false
 		@dryrun = false
-		@filecount = 0			
+		@interactive = false
+		@file_count = 0	
+		@error_count = 0
 	end
 
 	def create(path)		
 		path = "." if path.empty?
 
 		unless File.directory?(path)
-			puts "error: directory \"#{path}\" not found! abort..."
+			puts red("[error] directory \"#{path}\" not found! abort...")
 			return false
 		end		
 
@@ -27,43 +33,54 @@ class Gitkeep
 			      Find.prune
 			  	else		  		
 						if Dir.entries(p).size == 2
-							createFile(p)				
+							save(p)				
 						end
 					end
 				else
 					puts red("[error] could not READ in #{p}/ -> check permissions")
+					@error_count += 1
 				end					
 		  end	   		   	   
 		end
 
-		puts "finished. #{@filecount} file(s) created!"
+		puts "finished. #{@file_count} file(s) created!"
+		puts red("#{@error_count} error(s)...") if @error_count > 0
+		true if @error_count == 0
 	end
 
-	protected
+	protected if @__test == false
 
-		def createFile(path)
+		def save(path)
 			gitkeep = "#{path}/.gitkeep"
 
 			unless File.writable?(path)
 				puts red("[error] could not WRITE in #{path}/ -> check permissions")
+				@error_count += 1
 				return false
 			end
 			
-			unless File.exists?(gitkeep)
-				unless @dryrun								
-					f = File.new(gitkeep, "w+")		
-					f.close			
-					puts green("created #{gitkeep}") 	    	    
-				else
-					puts blue("[dryrun] created #{gitkeep}")
-				end
+			return true if File.exists?(gitkeep)
+			
+			if @interactive
+				print "create #{gitkeep} ? [Yn]"
+				a = $stdin.gets # read from stdin to avoid collision with params ARGV
+				return false unless a == "\n" || a.downcase == "y\n"
 			end
 
-			@filecount += 1
-
+			@file_count += 1
+
+			unless @dryrun								
+				f = File.new(gitkeep, "w+")
+				f.close			
+				puts green("created #{gitkeep}")  	    
+				true
+			else
+				puts blue("[dryrun] created #{gitkeep}")
+				nil
+			end				
 		end
 
-	private
+	private if @__test == false
 
 		def colorize(text, color_code)
 		  "\e[#{color_code}m#{text}\e[0m"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitkeep
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-18 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies: []
 description: create .gitkeep files in all empty directories in your project
 email: arthurz.mobile@gmail.com