xcode_trash_remover 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8957b6d71bcb59728b829fa9efccdd5c2d3b52c5
-  data.tar.gz: 10524f0399e4b2917653030bb0661e4c7197c7f1
+  metadata.gz: d3c72775a83912269e2693ae6e92bdc9f3348b25
+  data.tar.gz: 45f7699e65f58b13ae9c5b707a503144b519de50
 SHA512:
-  metadata.gz: 2797adc81d580c7a3e151ebe1ed39f05e809840d61ee28a3e4f8ae260be98b7c9cb6ffbfe53caeb0f765cb8bd35118e4c8d42588c780116ece8098727f37b692
-  data.tar.gz: f8aef68032dba7e4b150c56458530d2053f42f0dd03198db085e484dc20788e565ef9beaf4ea752e2103f9eecefeb4fa4854d66136048a6d7065af1d0013e668
+  metadata.gz: af045fa7f8fd3c588093194512ff2a7c8be199b347987a9b2828830a3c2f69b667103a8af8a76914cabda9822489ae7d5dbd7f4fa088dc68d1f35578c2c100ef
+  data.tar.gz: b8870396bbebe5e4e28b79d79ad07685d18c37b8d189f23647285fc353cf433c2d4ec62bcc86af846c28ca9aae5fd41e35ee23a692662d95fbb657b9cb7c2851

data/Gemfile.lock

@@ -2,10 +2,12 @@ PATH
   remote: .
   specs:
     xcode_trash_remover (2.0.0)
+      filesize (~> 0.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    filesize (0.1.1)
     rake (10.4.2)
 
 PLATFORMS

data/README.md

@@ -8,4 +8,10 @@ This is a simple script to remove Xcode's trash files that are generated under d
 
 ## Usage
 
-    $ xcodert
+Simply run `$ xcclean` to check your directories. And run:
+
+    $ xcclean -rm
+
+To remove the files. You'll see something like the following:
+
+<img src = https://raw.githubusercontent.com/FrankKair/xcode-trash-remover/master/assets/output.png width="30%" height="30%"/>

data/bin/xcclean

@@ -3,4 +3,11 @@ require 'xcode_trash_remover'
 
 puts '== Xcode Trash Remover =='
 XcodeTrashRemover::Core.check_volumes
-XcodeTrashRemover::Core.remove_trash
+
+input = ARGV[0]
+case input
+when '-rm'
+  XcodeTrashRemover::Core.remove_trash
+else
+  XcodeTrashRemover::Core.show_options
+end

data/lib/xcode_trash_remover.rb

@@ -1,3 +1,5 @@
 require 'xcode_trash_remover/version'
 require 'xcode_trash_remover/core'
+require 'xcode_trash_remover/int_pretty_size'
 require 'xcode_trash_remover/size_helper'
+require 'xcode_trash_remover/xcode_dir'

data/lib/xcode_trash_remover/core.rb

@@ -1,34 +1,47 @@
 require 'fileutils'
-require 'find'
 
 module XcodeTrashRemover
   module Core
     extend self
 
     def check_volumes
-      puts 'Dir             bytes'
+      puts 'Dir             size'
       puts
-      puts "DerivedData     #{derived_data_size}"
-      puts "Archives        #{archives_size}"
-      puts "XCPGDevices     #{playground_devices_size}"
-      puts "CoreSimulator   #{core_simulator_size}"
+      puts "DerivedData     #{derived_data_size.pretty}"
+      puts "Archives        #{archives_size.pretty}"
+      puts "XCPGDevices     #{playground_devices_size.pretty}"
+      puts "CoreSimulator   #{core_simulator_size.pretty}"
       puts
     end
 
     def remove_trash
       total = total_size
-      puts "Total           #{total}"
+      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.'
+    end
+
+    private
+
+    def print_total_size(size)
+      puts "Total           #{size.pretty}"
       puts '-'
-      if total.zero?
+      if size.zero?
         puts 'The directories are empty. No trash files.'
         exit(0)
       end
+    end
 
+    def remove_dirs
       dirs = [
-        Dir.glob("#{File.expand_path('~')}/Library/Developer/Xcode/DerivedData/*"),
-        Dir.glob("#{File.expand_path('~')}/Library/Developer/Xcode/Archives/*"),
-        Dir.glob("#{File.expand_path('~')}/Library/Developer/XCPGDevices/*"),
-        Dir.glob("#{File.expand_path('~')}/Library/Developer/CoreSimulator/Devices/*")
+        XcodeDir.derived_data, XcodeDir.archives,
+        XcodeDir.playground_devices, XcodeDir.core_simulator
       ]
 
       dirs.each do |dir|
@@ -36,43 +49,36 @@ module XcodeTrashRemover
           remove_dir(subdir)
         end
       end
-      puts "#{total} bytes removed!"
-    end
-
-    private
-
-    def total_size
-      total = 0
-      total += derived_data_size
-      total += archives_size
-      total += playground_devices_size
-      total += core_simulator_size
-      total
     end
 
     def derived_data_size
-      dir = Dir.glob("#{File.expand_path('~')}/Library/Developer/Xcode/DerivedData/*")
-      trash_size(dir)
+      trash_size(XcodeDir.derived_data)
     end
 
     def archives_size
-      dir = Dir.glob("#{File.expand_path('~')}/Library/Developer/Xcode/Archives/*")
-      trash_size(dir)
+      trash_size(XcodeDir.archives)
     end
 
     def playground_devices_size
-      dir = Dir.glob("#{File.expand_path('~')}/Library/Developer/XCPGDevices/*")
-      trash_size(dir)
+      trash_size(XcodeDir.playground_devices)
     end
 
     def core_simulator_size
-      dir = Dir.glob("#{File.expand_path('~')}/Library/Developer/CoreSimulator/Devices/*")
-      trash_size(dir)
+      trash_size(XcodeDir.core_simulator)
+    end
+
+    def total_size
+      total = 0
+      total += derived_data_size
+      total += archives_size
+      total += playground_devices_size
+      total += core_simulator_size
+      total
     end
 
     def trash_size(dir)
+      return 0 if dir.empty?
       size = 0
-      return size if dir.empty?
       dir.each do |subdir|
         size += SizeHelper.dir_size(subdir)
       end

data/lib/xcode_trash_remover/int_pretty_size.rb

@@ -0,0 +1,8 @@
+require 'filesize'
+
+class Integer
+  def pretty
+    s = to_s + ' B'
+    Filesize.from(s).pretty
+  end
+end

data/lib/xcode_trash_remover/size_helper.rb

@@ -1,12 +1,9 @@
 require 'fileutils'
-require 'find'
 
 module XcodeTrashRemover
   module SizeHelper
     extend self
 
-    # TODO: function to return best size (MB or GB).
-
     def dir_size(dir_path)
       dir_path << '/' unless dir_path.end_with?('/')
       total_size = 0

data/lib/xcode_trash_remover/version.rb

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

data/lib/xcode_trash_remover/xcode_dir.rb

@@ -0,0 +1,27 @@
+module XcodeTrashRemover
+  module XcodeDir
+    extend self
+
+    def derived_data
+      root('Xcode/DerivedData')
+    end
+
+    def archives
+      root('Xcode/Archives')
+    end
+
+    def playground_devices
+      root('XCPGDevices')
+    end
+
+    def core_simulator
+      root('CoreSimulator/Devices')
+    end
+
+    private
+
+    def root(dir)
+      Dir.glob("#{File.expand_path('~')}/Library/Developer/#{dir}/*")
+    end
+  end
+end

data/xcode_trash_remover.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_runtime_dependency 'filesize', '~> 0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode_trash_remover
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Frank Kair
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-25 00:00:00.000000000 Z
+date: 2018-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: filesize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: Script to remove trash files that Xcode generates
 email:
 - frankkair@gmail.com
@@ -52,12 +66,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- assets/output.png
 - bin/xcclean
 - lib/xcode_trash_remover.rb
 - lib/xcode_trash_remover/core.rb
-- lib/xcode_trash_remover/core_simulator.rb
+- lib/xcode_trash_remover/int_pretty_size.rb
 - lib/xcode_trash_remover/size_helper.rb
 - lib/xcode_trash_remover/version.rb
+- lib/xcode_trash_remover/xcode_dir.rb
 - xcode_trash_remover.gemspec
 homepage: https://www.github.com/FrankKair/xcode-trash-remover
 licenses:

data/lib/xcode_trash_remover/core_simulator.rb

@@ -1,26 +0,0 @@
-require 'fileutils'
-require 'find'
-
-module XcodeTrashRemover
-  module CoreSimulator
-    extend self
-    def core_simulator_folders
-      dirs = []
-
-      # TODO: Select which version to delete (8, 9, Watch, TV...)
-      os = ['iOS-8', 'iOS-9', 'watchOS', 'tvOS']
-
-      core_simulator_dir = "#{File.expand_path('~')}/Library/Developer/CoreSimulator/Devices/*/*"
-
-      Dir.glob(core_simulator_dir).each do |dir|
-        next unless dir.include?('plist')
-        device_plist = "/#{dir}"[1..-1]
-
-        os.each do |os|
-          dirs.push(File.dirname(dir)) if File.read(device_plist).include?(os)
-        end
-      end
-      dirs
-    end
-  end
-end