gym 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecdf543565a216c0837ae272dbebead624abef24
-  data.tar.gz: f14774d2d1fa01982560de4cb21d1f78bb4f391f
+  metadata.gz: bf26634ab793249948b9e36f367550963d0b07c9
+  data.tar.gz: 40851f4916c70e076a92bbc1fa50381f50319a90
 SHA512:
-  metadata.gz: f3f8e0538f17a22c9deaf007d008ffb369ec8e1502bcbff5656653710717a46d16885691defab16d04fa986ce46e5f05241193510365d9d8e5245959fd88326e
-  data.tar.gz: 90b2dd43c1b4da294623218796562a4833bc1c09b4b4ee50fe1124e83bc774a9c7ea26cd2ac6c63c2ee283fa0da757723fe6a8917e15ef815695f0e8e0a6f123
+  metadata.gz: e91d31c0692ca53442ecf995b0c2c98628fdf2c108752d83a82013c084effc38792866c3cd6efba15aafc86406c4b11237dc344bec74f62957a098b86adbb782
+  data.tar.gz: 3a0bececf832ad42db19978cfa2b78d29393ee89dd823677056bc58435523664dfd9dbd82c1fe82ea938119ad628a82a45cf4d730f6c0c6af4676251aff51bf6

data/lib/gym/build_command_generator.rb

@@ -36,9 +36,10 @@ module Gym
 
         options = []
         options += project_path_array
-        options << "-configuration '#{config[:configuration]}'" # We need `Release` to export the DSYM file as well
+        options << "-configuration '#{config[:configuration]}'" if config[:configuration]
         options << "-sdk '#{config[:sdk]}'" if config[:sdk]
         options << "-destination '#{config[:destination]}'" if config[:destination]
+        options << "-xcconfig '#{config[:xcconfig]}'" if config[:xcconfig]
         options << "-archivePath '#{archive_path}'"
         options << config[:xcargs] if config[:xcargs]
 

data/lib/gym/detect_values.rb

@@ -25,6 +25,7 @@ module Gym
       end
 
       detect_scheme
+      detect_configuration
 
       config[:output_name] ||= Gym.project.app_name
 
@@ -96,31 +97,66 @@ module Gym
 
     def self.detect_scheme
       config = Gym.config
+      proj_schemes = Gym.project.schemes
+
       if config[:scheme].to_s.length > 0
         # Verify the scheme is available
-        unless Gym.project.schemes.include?(config[:scheme].to_s)
+        unless proj_schemes.include?(config[:scheme].to_s)
           Helper.log.error "Couldn't find specified scheme '#{config[:scheme]}'.".red
           config[:scheme] = nil
         end
       end
 
-      if config[:scheme].to_s.length == 0
-        proj_schemes = Gym.project.schemes
-        if proj_schemes.count == 1
-          config[:scheme] = proj_schemes.last
-        elsif proj_schemes.count > 1
-          if Helper.is_ci?
-            Helper.log.error "Multiple schemes found but you haven't specified one.".red
-            Helper.log.error "Since this is a CI, please pass one using the `scheme` option".red
-            raise "Multiple schemes found".red
-          else
-            puts "Select Scheme: "
-            config[:scheme] = choose(*(proj_schemes))
-          end
+      return if config[:scheme].to_s.length > 0
+
+      if proj_schemes.count == 1
+        config[:scheme] = proj_schemes.last
+      elsif proj_schemes.count > 1
+        if Helper.is_ci?
+          Helper.log.error "Multiple schemes found but you haven't specified one.".red
+          Helper.log.error "Since this is a CI, please pass one using the `scheme` option".red
+          raise "Multiple schemes found".red
+        else
+          puts "Select Scheme: "
+          config[:scheme] = choose(*(proj_schemes))
+        end
+      else
+        raise "Couldn't find any schemes in this project".red
+      end
+    end
+
+    # Detects the available configurations (e.g. Debug, Release)
+    def self.detect_configuration
+      config = Gym.config
+      configurations = Gym.project.configurations
+      if config[:configuration]
+        # Verify the configuration is available
+        unless configurations.include?(config[:configuration])
+          Helper.log.error "Couldn't find specified configuration '#{config[:configuration]}'.".red
+          config[:configuration] = nil
+        end
+      end
+
+      # Usually we want `Release`
+      # We prefer `Release` to export the DSYM file as well
+      config[:configuration] ||= "Release" if configurations.include?("Release")
+
+      return if config[:configuration].to_s.length > 0
+      return if configurations.count == 0 # this is an optional value anyway
+
+      if configurations.count == 1
+        config[:configuration] = configurations.last
+      else
+        if Helper.is_ci?
+          Helper.log.error "Multiple configurations found but you haven't specified one.".red
+          Helper.log.error "Since this is a CI, please pass one using the `configuration` option".red
+          raise "Multiple configurations found".red
         else
-          raise "Couldn't find any schemes in this project".red
+          puts "Select Configuration: "
+          config[:configuration] = choose(*(configurations))
         end
       end
     end
+
   end
 end

data/lib/gym/options.rb

@@ -34,14 +34,6 @@ module Gym
                                        raise "Project file invalid".red unless File.directory?(v)
                                        raise "Project file is not a project file, must end with .xcodeproj".red unless v.include?(".xcodeproj")
                                      end),
-        FastlaneCore::ConfigItem.new(key: :provisioning_profile_path,
-                                     short_option: "-e",
-                                     env_name: "GYM_PROVISIONING_PROFILE_PATH",
-                                     description: "The path to the provisioning profile (found automatically when located in current folder)",
-                                     optional: true,
-                                     verify_block: proc do |value|
-                                       raise "Provisioning profile not found at path '#{File.expand_path(value)}'".red unless File.exist?(value)
-                                     end),
         FastlaneCore::ConfigItem.new(key: :scheme,
                                      short_option: "-s",
                                      optional: true,
@@ -78,7 +70,7 @@ module Gym
                                      short_option: "-q",
                                      env_name: "GYM_CONFIGURATION",
                                      description: "The configuration to use when building the app. Defaults to 'Release'",
-                                     default_value: "Release"),
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :silent,
                                      short_option: "-t",
                                      env_name: "GYM_SILENT",
@@ -99,7 +91,23 @@ module Gym
                                      short_option: "-x",
                                      env_name: "GYM_XCARGS",
                                      description: "Pass additional arguments to xcodebuild when building the app. Be sure to quote the setting names and values e.g. OTHER_LDFLAGS=\"-ObjC -lstdc++\"",
-                                     optional: true)
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :xcconfig,
+                                     short_option: "-y",
+                                     env_name: "GYM_XCCONFIG",
+                                     description: "Use an extra XCCONFIG file to build your app",
+                                     optional: true,
+                                     verify_block: proc do |value|
+                                       raise "File not found at path '#{File.expand_path(value)}'".red unless File.exist?(value)
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :provisioning_profile_path,
+                                     short_option: "-e",
+                                     env_name: "GYM_PROVISIONING_PROFILE_PATH",
+                                     description: "The path to the provisioning profile (optional)",
+                                     optional: true,
+                                     verify_block: proc do |value|
+                                       raise "Provisioning profile not found at path '#{File.expand_path(value)}'".red unless File.exist?(value)
+                                     end)
 
       ]
     end

data/lib/gym/project.rb

@@ -29,6 +29,27 @@ module Gym
       results
     end
 
+    # Get all available configurations in an array
+    def configurations
+      results = []
+      splitted = raw_info.split("Configurations:")
+      return [] if splitted.count != 2 # probably a CocoaPods project
+
+      output = splitted.last.split(":").first
+      output.split("\n").each_with_index do |current, index|
+        current = current.strip
+
+        if current.length == 0
+          next if index == 0
+          break # as we want to break on the empty line
+        end
+
+        results << current
+      end
+
+      results
+    end
+
     def app_name
       # WRAPPER_NAME: Example.app
       # WRAPPER_SUFFIX: .app
@@ -60,7 +81,10 @@ module Gym
     end
 
     def raw_info
-      # e.g.
+      # Examples:
+
+      # Standard:
+      #
       # Information about project "Example":
       #     Targets:
       #         Example
@@ -76,6 +100,15 @@ module Gym
       #         Example
       #         ExampleUITests
 
+      # CococaPods
+      #
+      # Example.xcworkspace
+      # Information about workspace "Example":
+      #     Schemes:
+      #         Example
+      #         HexColors
+      #         Pods-Example
+
       return @raw if @raw
 
       # Unfortunately since we pass the workspace we also get all the

data/lib/gym/version.rb

@@ -1,4 +1,4 @@
 module Gym
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
   DESCRIPTION = "Building your iOS apps has never been easier"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gym
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core