xcode-installer 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzZhZjIyMzZkMzVjY2E4ZTZkYTViOGY1NmQwYjA1NGU1ZGM3MzE5OA==
+    ZmZhM2ZjMmIxYjg2ZjkzNjg4OGQwMWRjMjBkYzdhMjFkOGM4NjdmMQ==
   data.tar.gz: !binary |-
-    ZjNkZDZkZDA3OTFkZjU4YTY2ZWI4ZDFhZjM5MjU3NTJmOWE1NzU2YQ==
+    NmU2ZWVjOTM3YWRjZTExM2JmZTk2OWMxMGRhMjg4NmI2NWI2ZGNmOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDM5YTVjMDljNTkwMDE0ZjA1OWUzOTg4MjJhOWQyMmM2YzAyNThkMjgyNzhj
-    NWFlOWZmYzA0MTQ3MjE5OWVkN2ZjY2IwZjE2NWEyMWE5MDdkYzFhYzEzZTU1
-    MzEwNDU3YzQ2NDU4Zjc1Yjc5MzdjYTNmMmE3Mzk1YTlkOWY5ZWY=
+    YjhhODNhYzUzYzVlZTdlZjIzYTE4YzcwNTJlMTQ1NTUxYzYyNTg3ZmFjMDFj
+    NjlmMGYxYmIwNmEzMTQyYTdiYmM4NGMxMjZmZWZkNTE5ZDJkMTA5MjZiNTQ0
+    Zjk0MDcwYmZjMmMzZWFhNzliM2NkOTNkYjc3MTA3ZjIwM2Q3NDE=
   data.tar.gz: !binary |-
-    OTg4OTNkMjk1M2RiYjIwYzBhZGZjZDI2Y2E4YTU5YjY3MzE0OGJhMzU4NDBj
-    ZDQxZTc2MjA4NzNkZjI0MDNjZTM3NGVkMWYwMGJiNDIwMTM0MDg5NGMyMzNk
-    MDExOWU2MzFhOWZlY2NlNjQyM2EwOGQzODljNzA1NGY1NTZjMDY=
+    ZmQ0MWJkMzc4NmQzNzg5N2NhNjA5ODk5MTdjMjJjYmFkYmE4MDBmMzY5MWI1
+    ZGU3OWQ2ZWZmOWU4MjkwODkxNGM2NjBmODljZDVlNWY5OGUzMDNlODg5Zjkx
+    YzdkNzZkYjI5NzhmNzM4MGU4OTE5ZGUyMWUzODk1YWYyYWJhNTI=

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 0.3.1 (2014-03-10)
+
+* enable cli download and install
+
 ## 0.3.0 (2014-03-10)
 
 * add xcode 5.1

data/lib/xcode-installer.rb

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

data/lib/xcode-installer/commands/download.rb

@@ -1,12 +1,12 @@
 require 'xcode-installer/download'
 
 command :'download' do |c|
-  c.syntax = 'xcode-installer download [options]'
+  c.syntax = 'xcode-installer download [options] [gui|cli]'
   c.option '--dry-run', 'Enables a HEAD request instead of downloading the file'
   c.option '--release STRING', 'Used to specify an old or pre-release version of Xcode. Otherwise, latest GA release of Xcode is downloaded.'
   c.option '--pre-release', 'Specifies to download the latest pre-release version of Xcode.'
-  c.summary = 'Initiates the download'
-  c.description = ''
+  c.summary = 'Initiates the download of the Xcode .dmg file.'
+  c.description = 'Specify "cli" to download command-line tools (gui is the default)'
 
   c.action XcodeInstaller::Download, :action
 end

data/lib/xcode-installer/commands/install.rb

@@ -1,12 +1,12 @@
 require 'xcode-installer/install'
 
 command :'install' do |c|
-  c.syntax = 'xcode-installer install [options]'
+  c.syntax = 'xcode-installer install [options] [gui|cli]'
   c.option '--no-trash', 'Prevents trashing .dmg after install'
   c.option '--release STRING', 'Used to specify an old or pre-release version of Xcode. Otherwise, latest GA release of Xcode is downloaded.'
   c.option '--pre-release', 'Specifies to download the latest pre-release version of Xcode.'
-  c.summary = 'Installs xcode from a .dmg file, downloading it if not already present'
-  c.description = 'NEEDS SOME WORK - Use download and mount .dmg manually for now'
+  c.summary = 'Installs Xcode (or the command-line tools) from a .dmg file, downloading it if not already present'
+  c.description = 'NEEDS SOME WORK - Use download and mount .dmg manually for now. Specify "cli" to install command-line tools (gui is the default)'
 
   c.action XcodeInstaller::Install, :action
 end

data/lib/xcode-installer/download.rb

@@ -9,10 +9,12 @@ module XcodeInstaller
     attr_accessor :release
 
     def action(args, options)
+      download_type = (args.include? 'cli') ? 'cli' : 'gui'
+
       mgr = XcodeInstaller::ReleaseManager.new
-      @release = mgr.get_release(options.release, options.pre_release)
+      @release = mgr.get_release(options.release, options.pre_release, download_type)
 
-      if release
+      if @release
         xcode_url = @release['download_url']
       else
         puts "No Xcode release with number #{options.release}. Use the 'list' command to see a list of known releases."

data/lib/xcode-installer/install.rb

@@ -21,9 +21,11 @@ module XcodeInstaller
     end
 
     def action(args, options)
+      install_type = (args.include? 'cli') ? 'cli' : 'gui'
+
       @verbose = options.verbose
       mgr = XcodeInstaller::ReleaseManager.new
-      @release = mgr.get_release(options.release, options.pre_release)
+      @release = mgr.get_release(options.release, options.pre_release, install_type)
       @version_suffix = "-#{@release['version']}"
 
       files = Dir.glob(dmg_file_name)
@@ -42,14 +44,23 @@ module XcodeInstaller
       # system "hdid '#{dmg_file}' -mountpoint #{mountpoint}"
       system "hdiutil attach -quiet #{dmg_file}"
 
-      app_bundle_name = @release['app_bundle_name'] ||= "Xcode.app"
+      #
+      # Install
+      #
+      if (install_type == 'gui')
+        app_bundle_name = @release['app_bundle_name'] ||= "Xcode.app"
 
-      # Trash existing install (so command is rerunnable)
-      destination = "/Applications/Xcode#{version_suffix}.app"
-      Trash.new.throw_out(destination)
+        # Trash existing install (so command is rerunnable)
+        destination = "/Applications/Xcode#{version_suffix}.app"
+        Trash.new.throw_out(destination)
 
-      # TODO: Dynamically determine .app file name (DP releases have the version embedded)
-      copy("#{mountpoint}/#{app_bundle_name}", destination)
+        # TODO: Dynamically determine .app file name (DP releases have the version embedded)
+        copy("#{mountpoint}/#{app_bundle_name}", destination)
+      else
+        # CLI install
+        mountpoint = '/Volumes/Command\ Line\ Developer\ Tools'
+        system "sudo installer -package #{mountpoint}/*.pkg -target /"
+      end
 
       system "hdiutil detach -quiet #{mountpoint}"
     end

data/lib/xcode-installer/list.rb

@@ -35,13 +35,19 @@ module XcodeInstaller
       # Extra line between tables
       puts if show_all
 
+      os_version = `sw_vers -productVersion`
+      # Drop the patch number
+      os_version = os_version.match(/\d+\.\d+/)[0]
+
       if show_all || show_cli
         title = 'Xcode Command-Line'
         table = Terminal::Table.new :title => title do |t|
           t << ['Version', 'Release Date', 'Download URL']
           cli_versions.each do |release|
-            t << :separator
+            # Skip releases for a different OS version
+            next unless release['os_version'].to_s == os_version
 
+            t << :separator
             row = [release['version'], release['release_date'], release['download_url']]
             t << row
           end

data/lib/xcode-installer/release-manager.rb

@@ -15,7 +15,7 @@ module XcodeInstaller
       return list
     end
 
-    def get_release(version, include_beta)
+    def get_release(version, include_beta, interface_type)
       version ||= 'latest'
       include_beta ||= false
       interface_type ||= 'gui'
@@ -26,8 +26,13 @@ module XcodeInstaller
       elsif version == 'latest'
         version = LATEST_GA
       end
+
+      os_version = `sw_vers -productVersion`
+      # Drop the patch number
+      os_version = os_version.match(/\d+\.\d+/)[0]
+
       list.each { |release|
-        if release['version'] == version
+        if release['version'].to_s == version && release['os_version'].to_s == os_version
           return release
         end
       }

data/lib/xcode-installer/xcode-versions.yml

@@ -121,62 +121,17 @@ gui:
   download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/xcode_4.6/xcode460417218a.dmg
   interface_type: gui
 cli:
-- version: 5-GM
-  download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_os_x_mountain_lion_for_xcode__september_2013/command_line_tools_os_x_mountain_lion_for_xcode__september_2013.dmg
-  release_date: 2013-09-10
-  interface_type: cli
-  os_version: 10.8
-# - version: 5-DP6
-#   download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_for_os_x_mavericks_developer_preview_6/command_line_tools_for_os_x_mavericks_developer_preview_6.dmg
-#   release_date: 2013-08-16
-#   interface_type: cli
-#   os_version: 10.9
-- version: 5-DP6
-  download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_for_os_x_mountain_lion_developer_preview_6/command_line_tools_for_os_x_mountain_lion_developer_preview_6.dmg
-  release_date: 2013-08-21
-  interface_type: cli
-  os_version: 10.8
-# - version: 5-DP5
-#   download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_for_os_x_mavericks_developer_preview_5/command_line_tools_for_os_x_mavericks_developer_preview_5.dmg
-#   release_date: 2013-08-06
-#   interface_type: cli
-#   os_version: 10.9
-- version: 5-DP5
-  download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_for_os_x_mountain_lion_developer_preview_5/command_line_tools_for_os_x_mountain_lion_developer_preview_5.dmg
-  release_date: 2013-08-06
-  interface_type: cli
-  os_version: 10.8
-# - version: 5-DP4
-#   download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_for_os_x_mavericks_developer_preview_4/command_line_tools_for_os_x_mavericks_developer_preview_4.dmg
-#   release_date: 2013-07-29
-#   interface_type: cli
-#   os_version: 10.9
-- version: 5-DP4
-  download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_for_os_x_mountain_lion_developer_preview_4/command_line_tools_for_os_x_mountain_lion_developer_preview_4.dmg
-  release_date: 2013-07-29
+- version: 5.1
+  os_version: 10.9
+  description: Command Line Tools (OS X Mavericks) for Xcode - March 2014
+  download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_os_x_mavericks_for_xcode__march_2014/commandline_tools_os_x_mavericks_for_xcode__march_2014.dmg
+  release_date: 2014-03-10
+  last_modified: 'Mon, 10 Mar 2014 19:03:18 GMT'
   interface_type: cli
+- version: 5.1
   os_version: 10.8
-- version: 5-DP3
-  download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_os_x_mountain_lion_for_xcode_5__july_2013/command_line_tools_os_x_mountain_lion_for_xcode_5__july_2013.dmg
-  release_date: 2013-07-08
-  interface_type: cli
-- version: 5-DP
-  download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_os_x_mountain_lion_for_xcode_5__june_2013/command_line_tools_mountain_lion_for_xcode_5_june_2013.dmg
-  release_date: 2013-06-10
-  interface_type: cli
-- version: 4.6.3
-  download_url: https://developer.apple.com/downloads/download.action?path=wwdc_2013/command_line_tools_os_x_v10.9_for_xcode_5__june_2013/command_line_tools_os_x_v10.9_for_xcode_5_developer_preview.dmg
-  interface_type: cli
-- version: 4.6.2
-  download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_os_x_mountain_lion_for_xcode__april_2013/xcode462_cltools_10_86938259a.dmg
-  release_date: 2013-04-15
-  interface_type: cli
-- version: 4.6.1
-  download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_os_x_mountain_lion_for_xcode__march_2013/xcode461_cltools_10_86938245a.dmg
-  release_date: 2013-03-14
-  interface_type: cli
-- version: 4.6
-  download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_os_x_mountain_lion_for_xcode__january_2013/xcode46cltools_10_86938131a.dmg
-  release_date: 2013-02-19
+  description: Command Line Tools (OS X Mountain Lion) for Xcode - March 2014
+  download_url: https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_os_x_mountain_lion_for_xcode__march_2014/commandline_tools_os_x_mountain_lion_for_xcode__march_2014.dmg
+  release_date: 2014-03-10
+  last_modified:
   interface_type: cli
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcode-installer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ben Chatelain