shenzhen 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shenzhen (0.2.1)
+    shenzhen (0.2.2)
       commander (~> 4.1.2)
       faraday (~> 0.8.0)
       faraday_middleware (~> 0.8.7)

data/lib/shenzhen.rb

@@ -1,5 +1,5 @@
 module Shenzhen
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end
 
 require 'shenzhen/agvtool'

data/lib/shenzhen/commands/build.rb

@@ -14,24 +14,18 @@ command :build do |c|
   c.action do |args, options|
     validate_xcode_version!
 
-    @xcodebuild_info = Shenzhen::XcodeBuild.info
-
     @workspace = options.workspace
-    @project = options.project
+    @project = options.project unless @workspace
+
+    @xcodebuild_info = Shenzhen::XcodeBuild.info(:workspace => @workspace, :project => @project)
+
     @scheme = options.scheme
     @configuration = options.configuration
 
     determine_workspace_or_project! unless @workspace || @project
 
-    if @workspace
-      unless @configuration
-        say_warning "Configuration was not passed, defaulting to Debug" unless @configuration
-        @configuration = "Debug"
-      end
-    else
-      determine_configuration! unless @configuration
-      say_error "Configuration #{@configuration} not found" and abort unless @xcodebuild_info.build_configurations.include?(@configuration)
-    end
+    determine_configuration! unless @configuration
+    say_error "Configuration #{@configuration} not found" and abort unless @xcodebuild_info.build_configurations.include?(@configuration)
     
     determine_scheme! unless @scheme
     say_error "Scheme #{@scheme} not found" and abort unless @xcodebuild_info.schemes.include?(@scheme)
@@ -55,7 +49,9 @@ command :build do |c|
     ENV['CC'] = nil # Fix for RVM
     abort unless system %{xcodebuild #{flags.join(' ')} #{actions.join(' ')} 1> /dev/null}
 
-    @xcodebuild_settings = Shenzhen::XcodeBuild.settings(flags)
+    @target, @xcodebuild_settings = Shenzhen::XcodeBuild.settings(*flags).detect{|target, settings| settings['WRAPPER_EXTENSION'] == "app"}
+    say_error "App settings could not be found." and abort unless @xcodebuild_settings
+
     @app_path = File.join(@xcodebuild_settings['BUILT_PRODUCTS_DIR'], @xcodebuild_settings['PRODUCT_NAME']) + ".app"
     @dsym_path = @app_path + ".dSYM"
     @dsym_filename = "#{@xcodebuild_settings['PRODUCT_NAME']}.app.dSYM"
@@ -108,10 +104,17 @@ command :build do |c|
   end
 
   def determine_configuration!
-    if @xcodebuild_info.build_configurations.length == 1
-      @configuration = @xcodebuild_info.build_configurations.first
+    configurations = @xcodebuild_info.build_configurations
+    if configurations.include?("Debug")
+      @configuration = "Debug"
+    elsif configurations.length == 1
+      @configuration = configurations.first
+    end
+
+    if @configuration
+      say_warning "Configuration was not passed, defaulting to #{@configuration}"
     else
-      @configuration = choose "Select a configuration:", *@xcodebuild_info.build_configurations
+      @configuration = choose "Select a configuration:", *configurations
     end
   end
 end

data/lib/shenzhen/xcodebuild.rb

@@ -1,63 +1,97 @@
 require 'ostruct'
+require 'shellwords'
 
 module Shenzhen::XcodeBuild
   class Info < OpenStruct; end
+  class Settings < OpenStruct
+    include Enumerable
 
+    def initialize(hash = {})
+      super
+      self.targets = hash.keys
+    end
+
+    def members
+      self.targets
+    end
+
+    def each
+      members.each do |target|
+        yield target, send(target)
+      end
+
+      self
+    end
+  end
+  
   class Error < StandardError; end
   class NilOutputError < Error; end
 
   class << self
-    def info
-      output = `xcodebuild -list 2> /dev/null`
+    def info(*args)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      output = `xcodebuild -list #{Shellwords.join(args + args_from_options(options))} 2>&1`
       raise Error.new $1 if /^xcodebuild\: error\: (.+)$/ === output
       raise NilOutputError unless /\S/ === output
 
       lines = output.split(/\n/)
-      hash = {}
-      group = nil
+      info, group = {}, nil
 
-      hash[:project] = lines.shift.match(/\"(.+)\"\:/)[1]
+      info[:project] = lines.shift.match(/\"(.+)\"\:/)[1]
 
       lines.each do |line|
         if /\:$/ === line
           group = line.strip[0...-1].downcase.gsub(/\s+/, '_')
-          hash[group] = []
+          info[group] = []
           next
         end
 
         unless group.nil? or /\.$/ === line
-          hash[group] << line.strip
+          info[group] << line.strip
         end
       end
 
-      hash.each do |group, values|
+      info.each do |group, values|
         next unless Array === values
         values.delete("") and values.uniq! 
       end
 
-      Info.new(hash)
+      Info.new(info)
     end
 
-    def settings(flags = [])
-      output = `xcodebuild #{flags.join(' ')} -showBuildSettings 2> /dev/null`
+    def settings(*args)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      output = `xcodebuild #{(args + args_from_options(options)).join(" ")} -showBuildSettings 2> /dev/null`
       raise Error.new $1 if /^xcodebuild\: error\: (.+)$/ === output
       raise NilOutputError unless /\S/ === output
 
       lines = output.split(/\n/)
       lines.shift
 
-      hash = {}
+      settings, target = {}, nil
       lines.each do |line|
-        key, value = line.split(/\=/).collect(&:strip)
-        hash[key] = value
+        case line
+        when /Build settings for action build and target (\w+)/
+          target = $1
+          settings[target] = {}
+        else
+          key, value = line.split(/\=/).collect(&:strip)
+          settings[target][key] = value if target
+        end
       end
 
-      hash
+      Settings.new(settings)
     end
 
     def version
       output = `xcodebuild -version`
-      output.scan(/([\d\.?]+)/).flatten.first rescue nil
+      output.scan(/([\d+\.?]+)/).flatten.first rescue nil
+    end
+
+    private
+
+    def args_from_options(options = {})
+      options.reject{|key, value| value.nil?}.collect{|key, value| "-#{key} #{value}"}
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shenzhen
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70347826429040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70347826429040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70347826428160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70347826428160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70347826426800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 4.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70347826426800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.2
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70347826426200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 1.7.3
   type: :runtime
   prerelease: false
-  version_requirements: *70347826426200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70347826425360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70347826425360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70347826424640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +101,12 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *70347826424640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 description: CLI for Building & Distributing iOS Apps (.ipa Files)
 email: m@mattt.me
 executables:
@@ -97,8 +127,6 @@ files:
 - ./LICENSE
 - ./Rakefile
 - ./README.md
-- ./shenzhen-0.1.0.gem
-- ./shenzhen-0.2.0.gem
 - ./shenzhen.gemspec
 - bin/ipa
 homepage: http://github.com/mattt/shenzhen
@@ -115,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 706871174290220069
+      hash: -365862781933133346
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,10 +152,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 706871174290220069
+      hash: -365862781933133346
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Shenzhen