dev 2.1.153 → 2.1.154

data/lib/apps/nuget.rb

@@ -1,79 +1,77 @@
+# frozen_string_literal: true
+
 if defined?(DEBUG)
   puts DELIMITER
   puts __FILE__
   puts
-  puts 'nuget not found' if(!Command.executes?('nuget')) 
+  puts "nuget not found" unless Command.executes?("nuget")
   puts
 end
-#puts DELIMITER if defined?(DEBUG)
-#puts __FILE__ if defined?(DEBUG)
+# puts DELIMITER if defined?(DEBUG)
+# puts __FILE__ if defined?(DEBUG)
 
 class Nuget
-	  def self.get_build_commands nuspec_file
-      build_commands=nil
-      if(File.exists?(nuspec_file))
-      	build_commands=Array.new if build_commands.nil?
-      	if(defined?(INCLUDE_REFERENCED_PROJECTS))
-      		build_commands << "nuget pack #{nuspec_file} -IncludeReferencedProjects"
-      	else
-      	    build_commands << "nuget pack #{nuspec_file}"
-        end
+  def self.get_build_commands(nuspec_file)
+    build_commands = nil
+    if File.exist?(nuspec_file)
+      build_commands = [] if build_commands.nil?
+      build_commands << if defined?(INCLUDE_REFERENCED_PROJECTS)
+        "nuget pack #{nuspec_file} -IncludeReferencedProjects"
+      else
+        "nuget pack #{nuspec_file}"
       end
-      build_commands
     end
+    build_commands
+  end
 
-    def self.get_versions filename
-      versions=Hash.new
-      if(filename.include?('.nuspec'))
-        nuspec_text=File.read(filename,:encoding=>'UTF-8')
-        nuspec_text.scan(/<dependency[\s]+id="([\w\.]+)"[\s]+version="([\d\.]+[-\w]+)"/).each{|row|
-          versions[row[0]] = row[1]
-        }
-        return versions
+  def self.get_versions(filename)
+    versions = {}
+    if filename.include?(".nuspec")
+      nuspec_text = File.read(filename, encoding: "UTF-8")
+      nuspec_text.scan(/<dependency\s+id="([\w.]+)"\s+version="([\d.]+[-\w]+)"/).each do |row|
+        versions[row[0]] = row[1]
       end
-      if(filename.include?('packages.config'))
-        config_text=File.read(filename,:encoding=>'UTF-8')
-        config_text.scan(/<package[\s]+id="([\w\.]+)"[\s]+version="([\d\.]+[-\w]+)"/).each{|row|
-          versions[row[0]] = row[1]
-        }
-        return versions
+      return versions
+    end
+    if filename.include?("packages.config")
+      config_text = File.read(filename, encoding: "UTF-8")
+      config_text.scan(/<package\s+id="([\w.]+)"\s+version="([\d.]+[-\w]+)"/).each do |row|
+        versions[row[0]] = row[1]
       end
-      if(filename.include?('.csproj'))
-        config_text=File.read(filename,:encoding=>'UTF-8')
-        config_text.scan(/<PackageReference[\s]+Include="([\w\.]+)"[\s]+Version="([\d\.]+[-\w]+)"/).each{|row|
-          versions[row[0]] = row[1]
-        }
-        return versions
+      return versions
+    end
+    if filename.include?(".csproj")
+      config_text = File.read(filename, encoding: "UTF-8")
+      config_text.scan(/<PackageReference\s+Include="([\w.]+)"\s+Version="([\d.]+[-\w]+)"/).each do |row|
+        versions[row[0]] = row[1]
       end
-      versions
+      return versions
     end
+    versions
+  end
 
-    def self.set_versions filename,versions
-      text=File.read(filename,:encoding=>'UTF-8')
-      text_versions=text.scan(/id="[\w\.]+"[\s]+version="[\d\.]+[-\w]+"/)
-      text2=text
-      versions.each{|k,v|
-        text_versions.each{|line|
-          if(line.include?("\"#{k}\""))
-            new_line = "id=\"#{k}\" version=\"#{v}\""
-            text2 = text2.gsub(line,new_line)
-          end
-        }
-      }
-      unless text==text2
-          File.open(filename,"w") { |f| f.puts text2 }
+  def self.set_versions(filename, versions)
+    text = File.read(filename, encoding: "UTF-8")
+    text_versions = text.scan(/id="[\w.]+"\s+version="[\d.]+[-\w]+"/)
+    text2 = text
+    versions.each do |k, v|
+      text_versions.each do |line|
+        if line.include?("\"#{k}\"")
+          new_line = "id=\"#{k}\" version=\"#{v}\""
+          text2 = text2.gsub(line, new_line)
         end
+      end
     end
+    File.open(filename, "w") { |f| f.puts text2 } unless text == text2
+  end
 
-    def self.update_versions(source_filename,destination_filename)
-      old_versions=Nuget.get_versions(destination_filename)
-      source_versions=Nuget.get_versions(source_filename)
-      new_versions=Hash.new
-      old_versions.each{|k,v|
-        if(source_versions.has_key?(k))
-          new_versions[k]=source_versions[k]
-        end
-      }
-      Nuget.set_versions(destination_filename,new_versions)
+  def self.update_versions(source_filename, destination_filename)
+    old_versions = Nuget.get_versions(destination_filename)
+    source_versions = Nuget.get_versions(source_filename)
+    new_versions = {}
+    old_versions.each do |k, _v|
+      new_versions[k] = source_versions[k] if source_versions.key?(k)
     end
-end
+    Nuget.set_versions(destination_filename, new_versions)
+  end
+end

data/lib/apps/svn.rb

@@ -1,152 +1,146 @@
-require 'fileutils'
-require 'tmpdir'
-require_relative('../base/dir.rb')
-class Svn
+# frozen_string_literal: true
 
-	def self.latest_revision
-	    if(Dir.exists?(".svn"))
-	      `svn update`
-		  `svn info`.scan(/Last Changed Rev: ([\d]+)/).each{|m|
-		    return m.first.to_s
-		  }
-		end
-		"0"
-	end
-
-	def self.url
-		if(Dir.exists?(".svn"))
-		  `svn info`.scan(/URL: ([:\/\.\-\d\w]+)/).each{|m|
-		    return m.first.to_s
-		  }
-		end
-		''
-	end
-
-	def self.export url, destination
-		if(!File.exists?(destination.chomp('@')))
-			`svn export #{url} #{destination}`
-		end
-	end
-
-	def self.has_changes? directory=''
-        directory=Dir.pwd if directory.length==0
-        Dir.chdir(directory) do
-            if(File.exists?('.svn'))
-                return true if `svn status`.scan(/^[MA]/).length>0
-            end
-        end
-        false
+require "fileutils"
+require "tmpdir"
+require_relative("../base/dir")
+
+class Svn
+  def self.latest_revision
+    if Dir.exist?(".svn")
+      `svn update`
+      `svn info`.scan(/Last Changed Rev: (\d+)/).each do |m|
+        return m.first.to_s
+      end
     end
+    "0"
+  end
+
+  def self.url
+    if Dir.exist?(".svn")
+      `svn info`.scan(%r{URL: ([:/.\-\d\w]+)}).each do |m|
+        return m.first.to_s
+      end
+    end
+    ""
+  end
+
+  def self.export(url, destination)
+    `svn export #{url} #{destination}` unless File.exist?(destination.chomp("@"))
+  end
 
-    def self.add source, directory=''
-    	directory=Dir.pwd if directory.length < 1
-    	Dir.chdir(directory) do
-	      	source.each{|f|
-				puts `svn add #{f} --parents` if `svn status #{f}`.include?('?')
-				puts `svn add #{f} --parents` if !system("svn status #{f}")
-			}
-		end
+  def self.has_changes?(directory = "")
+    directory = Dir.pwd if directory.length.zero?
+    Dir.chdir(directory) do
+      return true if File.exist?(".svn") && `svn status`.scan(/^[MA]/).length.positive?
     end
+    false
+  end
+
+  def self.add(source, directory = "")
+    directory = Dir.pwd if directory.empty?
+    Dir.chdir(directory) do
+      source.each do |f|
+        puts `svn add #{f} --parents` if `svn status #{f}`.include?("?")
+        puts `svn add #{f} --parents` unless system("svn status #{f}")
+      end
+    end
+  end
 
-    def self.append_commit_message message,directory=''
-    	directory=Dir.pwd if directory.length < 1
-    	Dir.chdir(directory) do
-    		
-    	end
+  def self.append_commit_message(_message, directory = "")
+    directory = Dir.pwd if directory.empty?
+    Dir.chdir(directory) do
+    end
+  end
+
+  def self.commit(_message, directory = "")
+    directory = Dir.pwd if directory.empty?
+    Dir.chdir(directory) do
+      # svn commit -F commit_message_filename
+      puts `svn commit -m"commit all"`
+      `svn update`
+    end
+  end
+
+  # publish a directory to a new subversion path
+  # source_dir is the directory with the files to be published
+  # destination is the new subversion path URL
+  # source_glob is a string or array of glob directives to specify files in source_dir to be publish
+  # source_glob defaults to '**/*' to publish all files in the source_dir
+  def self.publish(destination, source_dir, source_filelist = FileList.new("**/*"))
+    # Support for legacy argument order
+    if source_dir.include?("svn:") || source_dir.include?("http:") || source_dir.include?("https:")
+      puts "warning arguments are in legacy order" if Environment.default.debug?
+      # swap arguments
+      tmp = source_dir
+      source_dir = destination
+      destination = tmp
     end
 
-    def self.commit message, directory=''
-    	directory=Dir.pwd if directory.length < 1
-    	Dir.chdir(directory) do
-    		# svn commit -F commit_message_filename
-    		puts `svn commit -m"commit all"`
-    		`svn update`
-    	end
+    unless source_filelist.is_a?(FileList)
+      puts "converting files array into FileList" if Environment.default.debug?
+      list = FileList.new
+      source_filelist.each { |item| list.include(item) }
+      source_fileList = list
     end
 
-	# publish a directory to a new subversion path
-	# source_dir is the directory with the files to be published
-	# destination is the new subversion path URL
-	# source_glob is a string or array of glob directives to specify files in source_dir to be publish
-	# source_glob defaults to '**/*' to publish all files in the source_dir
-	def self.publish destination, source_dir, source_filelist=FileList.new('**/*')
-
-		# Support for legacy argument order
-		if(source_dir.include?('svn:') || source_dir.include?('http:') || source_dir.include?('https:'))
-			puts 'warning arguments are in legacy order' if Environment.default.debug?
-			# swap arguments
-			tmp=source_dir
-			source_dir=destination
-			destination=tmp
-		end
-
-		if(!source_filelist.kind_of?(FileList))
-			puts 'converting files array into FileList' if Environment.default.debug?
-			list=FileList.new
-			source_filelist.each{|item|list.include(item)}
-			source_fileList=list
-		end
-
-		output = "\n"
-		if(`svn info #{destination} 2>&1`.include?('Revision:'))
-			puts "Svn.publish: destination #{destination} already exists" 
-		else
-			# create subversion directory
-			output = output + "svn mkdir #{destination} --parents --message mkdir_for_publishing"
-			if(!`svn mkdir #{destination} --parents --message mkdir_for_publishing`.include?('Committed'))
-				raise "failure 'svn mkdir #{destination} --parents --message mkdir_for_publishing'"
-			end
-
-			Dir.chdir(source_dir) do
-				files = source_filelist.to_a
-			end
-			files=source_filelist
-			output = output + "\nfiles: "
-			files.each{|f|
-				output = output + f + " "
-			}
-			pwd=Dir.pwd
-
-			dir="#{Environment.default.tmp_dir}/svn_publish"
-			Dir.remove dir if File.exists? dir
-			FileUtils.mkdir dir
-			Dir.chdir(dir) do
-			#Dir.mktmpdir{|dir|
-
-				# checkout new subversion directory
-				output = output + "\nsvn checkout #{destination} #{dir}/to_publish_checkout"
-				if(!`svn checkout #{destination} #{dir}/to_publish_checkout`.include?('Checked out'))
-					raise "failure 'svn checkout #{destination} #{dir}/to_publish_checkout'"
-				end
-
-				# copy files into the checkout out subversion directory to_publish
-				raise "#{dir}/to_publish_checkout does not exist" if(!File.exists?("#{dir}/to_publish_checkout"))
-				Dir.chdir("#{dir}/to_publish_checkout") do
-					File.open('add.txt','w'){|add_file|
-
-						files.each{|f|
-							fdir=File.dirname(f)
-							FileUtils.mkdir_p(fdir) if(fdir.length > 0 && !File.exists?(fdir))
-							FileUtils.cp("#{source_dir}/#{f}","#{f}")
-							add_file.puts f
-						}
-						add_file.close
-					}
-
-					output = output + "\nsvn add --parents --targets add.txt 2>&1"
-	                `svn add --parents --targets add.txt 2>&1`
-					commit_output = `svn commit -m"add" 2>&1`
-					output = output + "\n#{commit_output}"
-					if(!commit_output.include?("Committed"))
-						raise "failure 'svn commit -m'added files''" + output
-					end
-				end
-				
-				#begin
-				#Dir.remove "#{dir}/to_publish_checkout"
-				output
-			end
-			Dir.remove(dir)
-		end
-	end
-end
+    output = "\n"
+    if `svn info #{destination} 2>&1`.include?("Revision:")
+      puts "Svn.publish: destination #{destination} already exists"
+    else
+      # create subversion directory
+      output += "svn mkdir #{destination} --parents --message mkdir_for_publishing"
+      unless `svn mkdir #{destination} --parents --message mkdir_for_publishing`.include?("Committed")
+        raise "failure 'svn mkdir #{destination} --parents --message mkdir_for_publishing'"
+      end
+
+      Dir.chdir(source_dir) do
+        files = source_filelist.to_a
+      end
+      files = source_filelist
+      output = "#{output}\nfiles: "
+      files.each do |f|
+        output = "#{output}#{f} "
+      end
+      pwd = Dir.pwd
+
+      dir = "#{Environment.default.tmp_dir}/svn_publish"
+      Dir.remove dir if File.exist? dir
+      FileUtils.mkdir dir
+      Dir.chdir(dir) do
+        # Dir.mktmpdir{|dir|
+
+        # checkout new subversion directory
+        output += "\nsvn checkout #{destination} #{dir}/to_publish_checkout"
+        unless `svn checkout #{destination} #{dir}/to_publish_checkout`.include?("Checked out")
+          raise "failure 'svn checkout #{destination} #{dir}/to_publish_checkout'"
+        end
+
+        # copy files into the checkout out subversion directory to_publish
+        raise "#{dir}/to_publish_checkout does not exist" unless File.exist?("#{dir}/to_publish_checkout")
+
+        Dir.chdir("#{dir}/to_publish_checkout") do
+          File.open("add.txt", "w") do |add_file|
+            files.each do |f|
+              fdir = File.dirname(f)
+              FileUtils.mkdir_p(fdir) if fdir.length.positive? && !File.exist?(fdir)
+              FileUtils.cp("#{source_dir}/#{f}", f.to_s)
+              add_file.puts f
+            end
+            add_file.close
+          end
+
+          output = "#{output}\nsvn add --parents --targets add.txt 2>&1"
+          `svn add --parents --targets add.txt 2>&1`
+          commit_output = `svn commit -m"add" 2>&1`
+          output += "\n#{commit_output}"
+          raise "failure 'svn commit -m'added files''#{output}" unless commit_output.include?("Committed")
+        end
+
+        # begin
+        # Dir.remove "#{dir}/to_publish_checkout"
+        output
+      end
+      Dir.remove(dir)
+    end
+  end
+end

data/lib/apps/wix.rb

@@ -1,57 +1,54 @@
+# frozen_string_literal: true
+
 if defined?(DEBUG)
-      puts DELIMITER
-      puts __FILE__
-      puts
-      puts 'candle not found' if(!Command.executes?('candle')) 
-      puts 'light not found' if(!Command.executes?('light')) 
-      puts
-    end
+  puts DELIMITER
+  puts __FILE__
+  puts
+  puts "candle not found" unless Command.executes?("candle")
+  puts "light not found" unless Command.executes?("light")
+  puts
+end
 
-#
-# 
-#
 class Wix
-      def self.get_build_commands wxs_file
-            build_commands=nil
-            if(File.exists?(wxs_file) && !defined?(NO_WIX))
-            if(Environment.windows?)
-                  ext='msi'
-                  ext='exe' if(IO.read(wxs_file).include?('<Bundle'))
-                  extensions=''
-                  ['WixNetFxExtension','WixBalExtension','WixUtilExtension','WixUiExtension'].each{|e|
-                        extensions="#{extensions}-ext #{e} "
-                  }
-                  build_commands=Array.new if build_commands.nil?
-                  build_commands << "candle #{wxs_file} #{extensions}"
-                  
-                  if(defined?(VERSION))
-                        build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.#{ext} #{extensions}"
-                  else
-                        build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj #{extensions}"
-                  end
-            end
-            end
-            build_commands
+  def self.get_build_commands(wxs_file)
+    build_commands = nil
+    if File.exist?(wxs_file) && !defined?(NO_WIX) && Environment.windows?
+      ext = "msi"
+      ext = "exe" if IO.read(wxs_file).include?("<Bundle")
+      extensions = ""
+      %w[WixNetFxExtension WixBalExtension WixUtilExtension WixUiExtension].each do |e|
+        extensions = "#{extensions}-ext #{e} "
       end
+      build_commands = [] if build_commands.nil?
+      build_commands << "candle #{wxs_file} #{extensions}"
 
-      def self.get_wix_with_files wxs_template_text, component_id, filenames
-            # <Component[-\s\w="]+Id="ApplicationFiles"[-"\s\w=]+>([-<="\/.>\s\w]+)<\/C
-            search=wxs_template_text.scan(/<Component[-\s\w="]+Id="ApplicationFiles"[-"\s\w=]+>([-<="\/.>\s\w]+)<\/C/)[0][0]
-            replace=""
-            index = 0
-            filenames.each{|f|
-                  replace += "\n                 <File Id=\"#{component_id}#{index}\" Source=\"#{f}\"/>"
-                  index += 1
-            }
-            replace += "\n"
-            wxs_template_text.gsub(search,replace)
-      end
-      
-      def self.update_wix_files wxs_filename, component_id, filenames
-            wix_text = IO.read(wxs_filename)
-            new_text = get_wix_with_files(wix_text, component_id,filenames)
-            if(wix_text != new_text)
-                  File.open(wxs_filename,'w'){|f| f.write(new_text) }
-            end
+      if defined?(VERSION)
+        build_commands << "light #{File.basename(wxs_file,
+                                                 ".*")}.wixobj -out #{File.basename(wxs_file,
+                                                                                    ".*")}-#{VERSION}.#{ext} #{extensions}"
+      else
+        build_commands << "light #{File.basename(wxs_file, ".*")}.wixobj #{extensions}"
       end
+    end
+    build_commands
+  end
+
+  def self.get_wix_with_files(wxs_template_text, component_id, filenames)
+    # <Component[-\s\w="]+Id="ApplicationFiles"[-"\s\w=]+>([-<="\/.>\s\w]+)<\/C
+    search = wxs_template_text.scan(%r{<Component[-\s\w="]+Id="ApplicationFiles"[-"\s\w=]+>([-<="/.>\s\w]+)</C})[0][0]
+    replace = ""
+    index = 0
+    filenames.each do |f|
+      replace += "\n                 <File Id=\"#{component_id}#{index}\" Source=\"#{f}\"/>"
+      index += 1
+    end
+    replace += "\n"
+    wxs_template_text.gsub(search, replace)
+  end
+
+  def self.update_wix_files(wxs_filename, component_id, filenames)
+    wix_text = IO.read(wxs_filename)
+    new_text = get_wix_with_files(wix_text, component_id, filenames)
+    File.open(wxs_filename, "w") { |f| f.write(new_text) } if wix_text != new_text
+  end
 end

data/lib/apps/xcodebuild.rb

@@ -1,16 +1,18 @@
-#COMMANDS[:build]=['xcodebuild clean -scheme Hydrogen -destination "name=iPhone 6"',
+# frozen_string_literal: true
+
+# COMMANDS[:build]=['xcodebuild clean -scheme Hydrogen -destination "name=iPhone 6"',
 #                    'xcodebuild build -scheme Hydrogen -destination "name=iPhone 6"']
 #  COMMANDS[:test]=['xcodebuild test -scheme Hydrogen -destination "name=iPhone 6"'] if RUBY_PLATFORM.include?('darwin')
 
 class XCodeBuild < Hash
-	def self.get_build_commands xcodeproj_filename
-        #build_commands=Array.new 
-        #build_command=Command.new('xcodebuild build')
-        #build_command[:directory] = File.dirname(xcodeproj_filename)
+  def self.get_build_commands(xcodeproj_filename)
+    # build_commands=Array.new
+    # build_command=Command.new('xcodebuild build')
+    # build_command[:directory] = File.dirname(xcodeproj_filename)
 
-        #name=xcodeproj_filename.gsub('.xcodeproj','')
-        #build_commands << "xcodebuild clean -scheme #{name} -destination \"name=iPhone 6\""
-        #build_commands << "xcodebuild build -scheme #{name} -destination \"name=iPhone 6\""  
-        #build_commands << build_command
-    end
-end
+    # name=xcodeproj_filename.gsub('.xcodeproj','')
+    # build_commands << "xcodebuild clean -scheme #{name} -destination \"name=iPhone 6\""
+    # build_commands << "xcodebuild build -scheme #{name} -destination \"name=iPhone 6\""
+    # build_commands << build_command
+  end
+end

data/lib/apps/zip.rb

@@ -1,18 +1,19 @@
+# frozen_string_literal: true
+
 puts __FILE__ if defined?(DEBUG)
 
-require 'zip'
-require 'fileutils'
+require "zip"
+require "fileutils"
 
 module Zip
-  extend self
   # exports a zip file to a destination directory
   # zip_file full path to a zip file to be exported
   # destination directory where the zip file contents are to be placed
-  def self.export zip_file, destination
-    raise "#{zip_file} does not exist." unless(::File.exists?(zip_file))
+  def self.export(zip_file, destination)
+    raise "#{zip_file} does not exist." unless ::File.exist?(zip_file)
 
-    unzip(zip_file, destination) unless(Dir.exists?(destination))
-    sleep(0.5)  # I guess we need to give the OS some time to get things in order?    
+    unzip(zip_file, destination) unless Dir.exist?(destination)
+    sleep(0.5) # I guess we need to give the OS some time to get things in order?
   end
 
   # publish a directory to a file path
@@ -20,40 +21,39 @@ module Zip
   # destination is the zip file path
   # source_glob is a string or array of glob directives to specify files in source_dir to be publish
   # source_glob defaults to '**/*' to publish all files in the source_dir
-  def self.publish source_dir, destination, source_filelist=FileList.new('**/*')
-    Dir.mktmpdir do |dir|           # Build zip file locally
+  def self.publish(source_dir, destination, source_filelist = FileList.new("**/*"))
+    Dir.mktmpdir do |dir| # Build zip file locally
       tmp_file_name = "#{dir}/#{::File.basename(destination)}"
-      
+
       zip(source_dir, source_filelist, tmp_file_name)
-      
+
       destination_dir = ::File.dirname(destination)
-      FileUtils.mkpath(destination_dir) unless(Dir.exists?(destination_dir))
-      
+      FileUtils.mkpath(destination_dir) unless Dir.exist?(destination_dir)
+
       FileUtils.cp(tmp_file_name, destination)
     end
   end
 
-  private
-  def self.zip(base_directory, files_to_archive, zip_file) 
-    FileUtils.mkpath(::File.dirname(zip_file)) unless(Dir.exists?(::File.dirname(zip_file)))
-    io = Zip::File.open(zip_file, Zip::File::CREATE); 
-  
+  def self.zip(base_directory, files_to_archive, zip_file)
+    FileUtils.mkpath(::File.dirname(zip_file)) unless Dir.exist?(::File.dirname(zip_file))
+    io = Zip::File.open(zip_file, Zip::File::CREATE)
+
     files_to_archive.each do |file|
-      io.get_output_stream(file) { |f| f.puts(::File.open("#{base_directory}/#{file}", "rb").read())} 
+      io.get_output_stream(file) { |f| f.puts(::File.open("#{base_directory}/#{file}", "rb").read) }
     end
-  
-    io.close(); 
-  end 		
+
+    io.close
+  end
 
   def self.unzip(zip_file, destination)
-    FileUtils.mkpath(destination) unless(Dir.exists?(destination))
+    FileUtils.mkpath(destination) unless Dir.exist?(destination)
     Zip::File.open(zip_file) do |files|
       files.each do |entry|
         destination_file = "#{destination}/#{entry.name}"
 
         directory = ::File.dirname(destination_file)
-        FileUtils.mkpath(directory) unless(Dir.exists?(directory))        
-        
+        FileUtils.mkpath(directory) unless Dir.exist?(directory)
+
         entry.extract(destination_file)
       end
     end