xcode_trash_remover 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3c72775a83912269e2693ae6e92bdc9f3348b25
-  data.tar.gz: 45f7699e65f58b13ae9c5b707a503144b519de50
+  metadata.gz: 43d44a018d892666abf6d4f94e8c211377157960
+  data.tar.gz: d9aefd7b01fb1c8b4a7b8878383721510860212e
 SHA512:
-  metadata.gz: af045fa7f8fd3c588093194512ff2a7c8be199b347987a9b2828830a3c2f69b667103a8af8a76914cabda9822489ae7d5dbd7f4fa088dc68d1f35578c2c100ef
-  data.tar.gz: b8870396bbebe5e4e28b79d79ad07685d18c37b8d189f23647285fc353cf433c2d4ec62bcc86af846c28ca9aae5fd41e35ee23a692662d95fbb657b9cb7c2851
+  metadata.gz: f19d75a95f3a2ccacc04cefaa004cc7af5647211ec4d7bbbbc21a837e686b3ecce78848f7253d9591d0b87be0bcc4e422352dc80d26d76292bc3fc825b4649d7
+  data.tar.gz: f2e4f1d1658cf5058bdfc7b237dfa0bfd90addf5cc3d502911f521bb883531b3851c3014b31e6bcec94cd0399cf1bb93d5020d9a80c1e559e1375aeb16628dc8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xcode_trash_remover (2.0.0)
+    xcode_trash_remover (2.0.1)
       filesize (~> 0.1.1)
 
 GEM

data/README.md

@@ -8,10 +8,23 @@ This is a simple script to remove Xcode's trash files that are generated under d
 
 ## Usage
 
-Simply run `$ xcclean` to check your directories. And run:
+`$ xcclean` to check your directories.
 
-    $ xcclean -rm
+`$ xcclean -rm` to **remove** the files.
 
-To remove the files. You'll see something like the following:
+<img src = https://raw.githubusercontent.com/FrankKair/xcode-trash-remover/master/assets/output2.png width="45%" height="45%"/>
+
+## Directories
+
+- `Derived Data`: Intermediate build information.
+
+- `Archives`: Info about the target. Used for debbuging deployd applications.
+
+- `XCPGDevices`: Xcode Playground files.
+
+- `CoreSimulator/Devices`: Simulators and devices. That's where Xcode stores the apps' data.
+
+## Warning
+
+You should only use this program if you're sure you're not going to use the information contained in these folders.
 
-<img src = https://raw.githubusercontent.com/FrankKair/xcode-trash-remover/master/assets/output.png width="30%" height="30%"/>

data/bin/xcclean

@@ -1,13 +1,34 @@
 #!/usr/bin/env ruby
+require 'optparse'
 require 'xcode_trash_remover'
 
-puts '== Xcode Trash Remover =='
-XcodeTrashRemover::Core.check_volumes
 
-input = ARGV[0]
-case input
-when '-rm'
-  XcodeTrashRemover::Core.remove_trash
-else
-  XcodeTrashRemover::Core.show_options
+ARGV[0] = '--help' if ARGV.empty?
+unless ARGV[0].include?('--') || ARGV[0].include?('-')
+  puts "invalid option: #{ARGV[0]}"
+end
+
+options = {}
+opt_parser = OptionParser.new do |opt|
+  opt.on('--check', 'Checks the volumes') do |o|
+    options[:check] = o
+  end
+  opt.on('--remove', 'Removes the files from your system') do |o|
+    options[:remove] = o
+  end
+end
+
+begin
+  opt_parser.parse!
+  options.keys.each do |k|
+    case k
+    when :check
+      XcodeTrashRemover::Core.check_volumes
+    when :remove
+      XcodeTrashRemover::Core.check_volumes
+      XcodeTrashRemover::Core.remove_trash
+    end
+  end
+rescue StandardError => e
+  puts e.to_s unless e.message == 'exit'
 end

data/lib/xcode_trash_remover/core.rb

@@ -7,41 +7,29 @@ module XcodeTrashRemover
     def check_volumes
       puts 'Dir             size'
       puts
-      puts "DerivedData     #{derived_data_size.pretty}"
+      puts "DerivedData     #{deriveddata_size.pretty}"
       puts "Archives        #{archives_size.pretty}"
-      puts "XCPGDevices     #{playground_devices_size.pretty}"
-      puts "CoreSimulator   #{core_simulator_size.pretty}"
+      puts "XCPGDevices     #{xcpgdevices_size.pretty}"
+      puts "CoreSimulator   #{coresimulator_devices_size.pretty}"
       puts
     end
 
     def remove_trash
       total = total_size
-      print_total_size(total)
       remove_dirs
-      puts "#{total.pretty} removed!"
-    end
 
-    def show_options
-      puts 'Run:'
-      puts '$ xcclean -rm'
-      puts 'To remove the files from your system.'
+      puts "Total           #{total.pretty}"
+      puts '-'
+      puts 'The directories are empty. No trash files.' if total.zero?
+      puts "#{total.pretty} removed!" unless total.zero?
     end
 
     private
 
-    def print_total_size(size)
-      puts "Total           #{size.pretty}"
-      puts '-'
-      if size.zero?
-        puts 'The directories are empty. No trash files.'
-        exit(0)
-      end
-    end
-
     def remove_dirs
       dirs = [
-        XcodeDir.derived_data, XcodeDir.archives,
-        XcodeDir.playground_devices, XcodeDir.core_simulator
+        XcodeDir.deriveddata, XcodeDir.archives,
+        XcodeDir.xcpgdevices, XcodeDir.coresimulator_devices
       ]
 
       dirs.each do |dir|
@@ -51,38 +39,38 @@ module XcodeTrashRemover
       end
     end
 
-    def derived_data_size
-      trash_size(XcodeDir.derived_data)
-    end
-
-    def archives_size
-      trash_size(XcodeDir.archives)
-    end
-
-    def playground_devices_size
-      trash_size(XcodeDir.playground_devices)
-    end
+    dirs = %w[
+      deriveddata
+      archives
+      xcpgdevices
+      coresimulator_devices
+    ]
 
-    def core_simulator_size
-      trash_size(XcodeDir.core_simulator)
+    dirs.each do |dir|
+      define_method("#{dir}_size") do
+        case dir
+        when 'deriveddata'
+          trash_size(XcodeDir.deriveddata)
+        when 'archives'
+          trash_size(XcodeDir.archives)
+        when 'xcpgdevices'
+          trash_size(XcodeDir.xcpgdevices)
+        when 'coresimulator_devices'
+          trash_size(XcodeDir.coresimulator_devices)
+        end
+      end
     end
 
     def total_size
-      total = 0
-      total += derived_data_size
-      total += archives_size
-      total += playground_devices_size
-      total += core_simulator_size
-      total
+      [deriveddata_size,
+       archives_size,
+       xcpgdevices_size,
+       coresimulator_devices_size].reduce(:+)
     end
 
     def trash_size(dir)
       return 0 if dir.empty?
-      size = 0
-      dir.each do |subdir|
-        size += SizeHelper.dir_size(subdir)
-      end
-      size
+      dir.reduce(0) { |size, subdir| size += SizeHelper.dir_size(subdir) }
     end
 
     def remove_dir(dir)

data/lib/xcode_trash_remover/size_helper.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 
 module XcodeTrashRemover
   module SizeHelper
-    extend self
+    module_function
 
     def dir_size(dir_path)
       dir_path << '/' unless dir_path.end_with?('/')

data/lib/xcode_trash_remover/version.rb

@@ -1,3 +1,3 @@
 module XcodeTrashRemover
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.0.2'.freeze
 end

data/lib/xcode_trash_remover/xcode_dir.rb

@@ -2,20 +2,24 @@ module XcodeTrashRemover
   module XcodeDir
     extend self
 
-    def derived_data
-      root('Xcode/DerivedData')
-    end
+    # Creates:
+    # deriveddata, archives
+    # xcpgdevices and coresimulator_devices
+    # methods.
 
-    def archives
-      root('Xcode/Archives')
-    end
+    dir_names = %w[
+      Xcode/DerivedData
+      Xcode/Archives
+      XCPGDevices
+      CoreSimulator/Devices
+    ]
 
-    def playground_devices
-      root('XCPGDevices')
-    end
+    dir_names.each do |dir|
+      trimmed_dir_name = dir.downcase.tr('/', '_').to_s.gsub('xcode_', '')
 
-    def core_simulator
-      root('CoreSimulator/Devices')
+      define_method(trimmed_dir_name) do
+        root(dir)
+      end
     end
 
     private

data/xcode_trash_remover.gemspec

@@ -1,5 +1,5 @@
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'xcode_trash_remover/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode_trash_remover
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Frank Kair
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- assets/output.png
+- assets/.DS_Store
+- assets/output2.png
 - bin/xcclean
 - lib/xcode_trash_remover.rb
 - lib/xcode_trash_remover/core.rb