gym 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e204c7647cdb4e93f202073ce9de6e9562083fb
-  data.tar.gz: eed4ff9f5e34840b4db990d668fa118e1e9e2d11
+  metadata.gz: 0c76a24f7879f86175a8a39ce9679116e669d9c5
+  data.tar.gz: ad0f0ce1ff3e9da26eea7a1e17754f6c6e4c1963
 SHA512:
-  metadata.gz: 2a32a4a2dab5887db302686da0762e75b90006a7c09494b4e053aad42ae28ce23c43236f6e4ce6b47c84746c04933a9c8b47de442ee5c1960438c8cf1b7fbbf1
-  data.tar.gz: a483b959adaaea510d7dadd96409cb092f5d1242c2b636b7895a930884d6563efe4a5c810db02e3e7d8afef18a0b61197892431f0c42d22a34da547f1586d2f8
+  metadata.gz: 04f9486f03e74325e53c66a3fcc21a2d60d4650e2eb530a28cd7592e2dcdc5573fe4c74fffd6b747617a516277279cae82d450db56010c50d04a12642c2b446a
+  data.tar.gz: 9f36f4679516d67dcf4fe49488bf58760ba226b1369fe13731c817cbf1f67092deee928d82c12e83e7c3bffd4d32e02c09d043084a2494c6f1db92c786ffb03f

data/lib/gym/build_command_generator.rb

@@ -76,6 +76,7 @@ module Gym
       end
 
       def archive_path
+        @archive_path ||= Gym.config[:archive_path]
         unless @archive_path
           file_name = [Gym.config[:output_name], Time.now.strftime("%F %H.%M.%S")] # e.g. 2015-08-07 14.49.12
           @archive_path = File.join(build_path, file_name.join(" ") + ".xcarchive")

data/lib/gym/detect_values.rb

@@ -170,6 +170,5 @@ module Gym
         end
       end
     end
-
   end
 end

data/lib/gym/manager.rb

@@ -17,6 +17,7 @@ module Gym
       rows << ["Workspace", config[:workspace]] if config[:workspace]
       rows << ["Scheme", config[:scheme]] if config[:scheme]
       rows << ["Configuration", config[:configuration]] if config[:configuration]
+      rows << ["Archive Path", config[:archive_path]] if config[:archive_path]
       rows << ["Platform", Gym.project.ios? ? "iOS" : "Mac"]
       rows << ["Xcode Path", Gym.xcode_path.gsub("/Contents/Developer", "")]
 

data/lib/gym/options.rb

@@ -9,7 +9,6 @@ module Gym
       @options = plain_options
     end
 
-    # rubocop:disable Metrics/MethodLength
     def self.plain_options
       [
         FastlaneCore::ConfigItem.new(key: :workspace,
@@ -50,6 +49,11 @@ module Gym
                                      env_name: "GYM_OUTPUT_DIRECTORY",
                                      description: "The directory in which the ipa file should be stored in",
                                      default_value: "."),
+        FastlaneCore::ConfigItem.new(key: :archive_path,
+                                     short_option: "-b",
+                                     env_name: "GYM_ARCHIVE_PATH",
+                                     description: "The directory in which the archive file should be stored in",
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :output_name,
                                      short_option: "-n",
                                      env_name: "GYM_OUTPUT_NAME",
@@ -77,7 +81,7 @@ module Gym
         FastlaneCore::ConfigItem.new(key: :codesigning_identity,
                                      short_option: "-i",
                                      env_name: "GYM_CODE_SIGNING_IDENTITY",
-                                     description: "The name of the code signing identity to use. It has to match the name exactly. You usually don't need this! e.g. 'iPhone Distribution: SunApps GmbH'",
+                                     description: "The name of the code signing identity to use. It has to match the name exactly. e.g. 'iPhone Distribution: SunApps GmbH'",
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :destination,
                                      short_option: "-d",
@@ -87,7 +91,7 @@ module Gym
         FastlaneCore::ConfigItem.new(key: :xcargs,
                                      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++\"",
+                                     description: "Pass additional arguments to xcodebuild. Be sure to quote the setting names and values e.g. OTHER_LDFLAGS=\"-ObjC -lstdc++\"",
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :xcconfig,
                                      short_option: "-y",
@@ -108,6 +112,5 @@ module Gym
 
       ]
     end
-    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/gym/version.rb

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

data/lib/gym/xcodebuild_fixes/swift_fix.rb

@@ -1,3 +1,5 @@
+require 'zip'
+
 module Gym
   class XcodebuildFixes
     class << self
@@ -6,11 +8,10 @@ module Gym
       def swift_library_fix
         require 'fileutils'
 
-        ipa_swift_frameworks = Dir["#{PackageCommandGenerator.appfile_path}/Frameworks/libswift*"]
-        Helper.log.info "Checking for Swift framework" if $verbose
+        return if check_for_swift PackageCommandGenerator
 
-        return if ipa_swift_frameworks.empty?
         Helper.log.info "Packaging up the Swift Framework as the current app is a Swift app" if $verbose
+        ipa_swift_frameworks = Dir["#{PackageCommandGenerator.appfile_path}/Frameworks/libswift*"]
 
         Dir.mktmpdir do |tmpdir|
           # Copy all necessary Swift libraries to a temporary "SwiftSupport" directory so that we can
@@ -40,6 +41,27 @@ module Gym
           end
         end
       end
+
+      # @param the PackageCommandGenerator
+      # @return true if swift
+      def check_for_swift(pcg)
+        Helper.log.info "Checking for Swift framework" if $verbose
+        default_swift_libs = "#{pcg.appfile_path}/Frameworks/libswift.*" # note the extra ., this is a string representation of a regexp
+        zip_entries_matching(pcg.ipa_path, /#{default_swift_libs}/).count > 0
+      end
+
+      # return the entries (files or directories) in the zip matching the pattern
+      # @param zipfile a zipfile
+      # @return the files or directories matching the pattern
+      def zip_entries_matching(zipfile, file_pattern)
+        files = []
+        Zip::File.open(zipfile) do |zip_file|
+          zip_file.each do |entry|
+            files << entry.name if entry.name.match file_pattern
+          end
+        end
+        files
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gym
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.16.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.16.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: xcpretty
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +90,16 @@ dependencies:
   name: fastlane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.25.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement