xcode-installer 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2VmNDYyM2JlYWVmMGM0NGQyNTY5Zjc1NmE1ZmJjZjEyM2VkY2YwZA==
+    N2RmZDI1MzgyMjhhZjkxMGYzM2E1YjliODcwOGJmYzk3ODc5YTNiZA==
   data.tar.gz: !binary |-
-    NmY3NzQyZDExOTU5OTIyY2I1NDRhNjYyYTJmMDk5NmM3ZWEyYjE5NQ==
+    YmQ0YmI4NjAyMDhlMWI2OTJhZjdiY2UxNGZhNzcyMWFmNzVkNDk3OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDE0ODU0YThhMjZhZDQxMDg1MzA5ZGYwNGM2NmU0ZWQ1ZGU5NmIyYzg2OGM0
-    ZWEzNDNhNDk1YTA0OTkxNGYxZjg1ZWM2MTliNGRlZGUzZTg5ZjI5N2MyYzNm
-    YjMxMDgxNWFjY2UyZWEzMDRmN2JiZTk5Yzc4YTE4NmViOTgzOTI=
+    ZDI3MTcyYWFjYjRjNTIzZmVhNGQxMDhiYjIyM2U4YmE0NTdiYWNjODZlMzdl
+    ZGRiNjg5ZDdmMGRhZDFjODdhNzNlYzA4ZDBhZmE1YjZhNGQ4ZDcwODViNmJj
+    NGZhZjk2MjIzY2NhNzJmNmEyZGM4ODBiMDlhZDlhN2JlYzYwMWE=
   data.tar.gz: !binary |-
-    MmVmY2Q2NmZkZDBkNjIwMDE5NTQxZmE0ZDYwMGY0ODljYjMzZTA2MGI2Yjc3
-    ODhhOThhZGJjYmUyMWU0ZjA0ZGQ1OWYwMDY2NmFlYWM3ODNmYjNjYWE4ODEw
-    NDYxNjg4NTdlMjU0ZDVkNjE4MzU2MmVkYWE2YjViZTUyMjU2OWE=
+    MzI5NTY1NjEzMzYxOTVlZjM5OGY3ZWViZjkzYjhjZDM5MGMzMWUyMmExODEz
+    YjA2NTlmNWMyODVlZDdlY2FhZTE1MDYyOTcwYzYzYTE5YjUzZjI3MDIxNjcw
+    YjFlYjgxMGRjNDA4MTQ2YWNkNDNiOWNmYjdkN2IwZWRkMTQ3ZTY=

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 0.2.1 (2013-10-24)
+
+* faster file copy (and working progress bar) for install command
+
 ## 0.2.0 (2013-10-22)
 
 * install command working (shows progress bar)

data/lib/xcode-installer/install.rb

@@ -14,13 +14,14 @@ require 'ruby-progressbar'
 
 module XcodeInstaller
   class Install
-    attr_accessor :release, :version_suffix, :copied_kb, :copied_file_count, :progress_bar
+    attr_accessor :release, :version_suffix, :copied_kb, :copied_file_count, :progress_bar, :verbose
 
     def initialize
       @copied_kb = 0
     end
 
     def action(args, options)
+      @verbose = options.verbose
       mgr = XcodeInstaller::ReleaseManager.new
       @release = mgr.get_release(options.release, options.pre_release)
       @version_suffix = "-#{@release['version']}"
@@ -34,8 +35,7 @@ module XcodeInstaller
         return
       end
       dmg_file = files[0]
-      # TODO: if verbose...
-      # puts dmg_file
+      puts dmg_file if @verbose
 
       # Mount disk image
       mountpoint = '/Volumes/Xcode'
@@ -49,7 +49,7 @@ module XcodeInstaller
       # TODO: Dynamically determine .app file name (DP releases have the version embedded)
       copy("#{mountpoint}/Xcode.app", destination)
 
-      # system "hdiutil detach -quiet #{mountpoint}"
+      system "hdiutil detach -quiet #{mountpoint}"
     end
 
     def dmg_file_name
@@ -59,45 +59,14 @@ module XcodeInstaller
     def copy(source_path, destination_path)
       # Copy into /Applications
       # puts 'Copying Xcode.app into Applications directory (this can take a little while)'
-      # TODO: wrap debug output with verbose checks
       puts "#{source_path} -> #{destination_path}"
-      # system "cp -R #{source_path} #{destination_path}"
 
-      total_kb = dir_size(source_path)
-      # puts total_kb
-
-      # puts File.stat(source_path).size
-
-      @progress_bar = ProgressBar.create(:title => "Copying", :starting_at => 0, :total => @release['app_size_extracted'])
+      total_files = `find #{source_path} -print | wc -l`
+      puts "total_files: #{total_files}" if @verbose
+      @progress_bar = ProgressBar.create(:title => "Copying", :starting_at => 0, :total => total_files.to_i)
       @copied_file_count = 0
       cp_r(source_path, destination_path, {})
       @progress_bar.finish
-
-      # block_size = File.stat(source_path).blksize
-      # puts @copied_kb
-
-      # in_name     = "src_file.txt"
-      # out_name    = "dest_file.txt"
-
-      # in_file     = File.new(in_name, "r")
-      # out_file    = File.new(out_name, "w")
-
-      # in_size     = File.size(in_name)
-      # batch_bytes = ( in_size / 100 ).ceil
-      # total       = 0
-      # p_bar       = ProgressBar.new('Copying', 100)
-
-      # buffer      = in_file.sysread(batch_bytes)
-      # while total < in_size do
-      #  out_file.syswrite(buffer)
-      #  p_bar.inc
-      #  total += batch_bytes
-      #  if (in_size - total) < batch_bytes
-      #    batch_bytes = (in_size - total)
-      #  end
-      #  buffer = in_file.sysread(batch_bytes)
-      # end
-      # p_bar.finish
     end
 
     # Exmaple output of the du command:
@@ -108,13 +77,8 @@ module XcodeInstaller
     end
 
     def accumulate_kbytes(path)
-      # @progress_bar.log path
-      # @progress_bar.increment
-      # @copied_kb += File.stat(path).size if File.exists?(path)
-      @copied_file_count++
-      if @copied_file_count.modulo(10000) == 0
-        @progress_bar.progress = dir_size("/Applications/Xcode-5.app")
-      end
+      @copied_file_count = copied_file_count + 1
+      @progress_bar.progress = @copied_file_count.to_i
     end
 
     ##########################################################################

data/lib/xcode-installer.rb

@@ -1,5 +1,5 @@
 module XcodeInstaller
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 
   class UnsuccessfulAuthenticationError < RuntimeError; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-installer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ben Chatelain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander