xcode-install 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82276c486f016d15325b027bac509063ef807cba
-  data.tar.gz: 12791f86b6e6d6a43ff5f179381c6c44d7649bb3
+  metadata.gz: ff9a825792c85a007a8c6436cdf95d80218039b5
+  data.tar.gz: 3d908af8cb1cfd488e598097ab1e4855f430a044
 SHA512:
-  metadata.gz: 9c75ef419ed9ffe50f16716c642114c99ce294baf2343455f1fe5de79ed9bb2099df340d48cd9621f797f52b43bfdbfbd9f4b94a83ce3741ec18dd08eda1be92
-  data.tar.gz: f956fc36418324bb1f55c2afda840d314b569135bbbdd6bd83e45c635347b46f6731439397febbb3d91c13ead6735dc3e96d21422e645da010d6f2132cd14605
+  metadata.gz: 21bde96d3a74753b3da4cda7a734098910c9c376de969e00b436ea01deb32d294005aa43cdbd983bfc9d1787e85222afd128a4602736a58431f9024f684074ed
+  data.tar.gz: 8a94316af2ec67a3a696805d2f1a9885c13795d84426eb10a4b410b590fbe573454683283cad6093b5c8c1c569c5b8d8e3299b14e5e7a6d3c3eb344c2b2d3b74

data/README.md

@@ -70,7 +70,8 @@ versions on unindexed volumes.
 ## Thanks
 
 [This][3] downloading script which has been used for some inspiration, also [this][4]
-for doing the installation.
+for doing the installation. Additionally, many thanks to everyone who has contributed to this
+project, especially [@henrikhodne][6] and [@lacostej][7] for making XcodeInstall C extension free.
 
 ## Contributing
 
@@ -86,3 +87,5 @@ for doing the installation.
 [3]: http://atastypixel.com/blog/resuming-adc-downloads-cos-safari-sucks/
 [4]: https://github.com/magneticbear/Jenkins_Bootstrap
 [5]: http://www.openradar.me/22001810
+[6]: https://github.com/henrikhodne
+[7]: https://github.com/lacostej

data/lib/xcode/install.rb

@@ -9,7 +9,7 @@ module XcodeInstall
   class Curl
     COOKIES_PATH = Pathname.new('/tmp/curl-cookies.txt')
 
-    def fetch(url, directory = nil, cookies = nil, output = nil)
+    def fetch(url, directory = nil, cookies = nil, output = nil, progress = true)
       options = cookies.nil? ? '' : "-b '#{cookies}' -c #{COOKIES_PATH}"
       # options += ' -vvv'
 
@@ -17,7 +17,8 @@ module XcodeInstall
       output ||= File.basename(uri.path)
       output = (Pathname.new(directory) + Pathname.new(output)) if directory
 
-      command = "curl #{options} -L -C - -# -o #{output} #{url}"
+      progress = progress ? '-#' : '-s'
+      command = "curl #{options} -L -C - #{progress} -o #{output} #{url}"
       IO.popen(command).each do |fd|
         puts(fd)
       end
@@ -43,12 +44,12 @@ module XcodeInstall
       File.symlink?(SYMLINK_PATH) ? SYMLINK_PATH : nil
     end
 
-    def download(version)
+    def download(version, progress)
       return unless exist?(version)
       xcode = seedlist.find { |x| x.name == version }
       dmg_file = Pathname.new(File.basename(xcode.path))
 
-      result = Curl.new.fetch(xcode.url, CACHE_DIR, spaceship.cookie, dmg_file)
+      result = Curl.new.fetch(xcode.url, CACHE_DIR, spaceship.cookie, dmg_file, progress)
       result ? CACHE_DIR + dmg_file : nil
     end
 
@@ -104,9 +105,9 @@ HELP
       FileUtils.rm_f(dmgPath) if clean
     end
 
-    def install_version(version, switch = true, clean = true, install = true)
+    def install_version(version, switch = true, clean = true, install = true, progress = true)
       return if version.nil?
-      dmg_path = get_dmg(version)
+      dmg_path = get_dmg(version, progress)
       fail Informative, "Failed to download Xcode #{version}." if dmg_path.nil?
 
       install_dmg(dmg_path, "-#{version.split(' ')[0]}", switch, clean) if install
@@ -143,6 +144,9 @@ HELP
         begin
           Spaceship.login(ENV["XCODE_INSTALL_USER"], ENV["XCODE_INSTALL_PASSWORD"])
         rescue Spaceship::Client::InvalidUserCredentialsError
+          $stderr.puts 'The specified Apple developer account credentials are incorrect.'
+          exit(1)
+        rescue Spaceship::Client::NoUserCredentialsError
           $stderr.puts <<-HELP
 Please provide your Apple developer account credentials via the
 XCODE_INSTALL_USER and XCODE_INSTALL_PASSWORD environment variables.
@@ -167,13 +171,13 @@ HELP
       `sudo /usr/sbin/dseditgroup -o edit -t group -a staff _developer`
     end
 
-    def get_dmg(version)
+    def get_dmg(version, progress = true)
       if ENV.key?('XCODE_INSTALL_CACHE_DIR')
         cache_path = Pathname.new(ENV['XCODE_INSTALL_CACHE_DIR']) + Pathname.new("xcode-#{version}.dmg")
         return cache_path if cache_path.exist?
       end
 
-      download(version)
+      download(version, progress)
     end
 
     def fetch_seedlist

data/lib/xcode/install/command.rb

@@ -8,7 +8,7 @@ module XcodeInstall
 
   class Informative < PlainInformative
     def message
-      "[!] #{super}".red
+      "[!] #{super}".ansi.red
     end
   end
 

data/lib/xcode/install/install.rb

@@ -11,6 +11,7 @@ module XcodeInstall
       def self.options
         [['--no-switch', 'Don’t switch to this version after installation'],
          ['--no-install', 'Only download DMG, but do not install it.'],
+         ['--no-progress', 'Don’t show download progress.'],
          ['--no-clean', 'Don’t delete DMG after installation.']].concat(super)
       end
 
@@ -20,6 +21,7 @@ module XcodeInstall
         @should_clean = argv.flag?('clean', true)
         @should_install = argv.flag?('install', true)
         @should_switch = argv.flag?('switch', true)
+        @progress = argv.flag?('progress', true)
         super
       end
 
@@ -33,7 +35,7 @@ module XcodeInstall
 
       def run
         return if @version.nil?
-        @installer.install_version(@version, @should_switch, @should_clean, @should_install)
+        @installer.install_version(@version, @should_switch, @should_clean, @should_install, @progress)
       end
     end
   end

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/spec/install_spec.rb

@@ -11,15 +11,21 @@ module XcodeInstall
     end
 
     it 'downloads and installs' do
-      Installer.any_instance.expects(:download).with('6.3').returns('/some/path')
+      Installer.any_instance.expects(:download).with('6.3', true).returns('/some/path')
       Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', true, true)
       Command::Install.run(['6.3'])
     end
 
     it 'downloads and installs and does not switch if --no-switch given' do
-      Installer.any_instance.expects(:download).with('6.3').returns('/some/path')
+      Installer.any_instance.expects(:download).with('6.3', true).returns('/some/path')
       Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', false, true)
       Command::Install.run(['6.3', '--no-switch'])
     end
+
+    it 'downloads without progress if switch --no-progress is given' do
+      Installer.any_instance.expects(:download).with('6.3', false).returns('/some/path')
+      Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', true, true)
+      Command::Install.run(['6.3', '--no-progress'])
+    end
   end
 end

data/xcode-install.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'claide', '~> 0.8.1'
-  spec.add_dependency 'spaceship', '~> 0.3.2'
+  spec.add_dependency 'spaceship', '~> 0.3.3'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-26 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement