gym 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbcb824805c7ee57886bb0a000719352b185e540
-  data.tar.gz: 8a61ea32da66fd658dd42fd19af16b8ff869ca7c
+  metadata.gz: 9fe3879a8123332988ecd29815ef12bbedb1d59a
+  data.tar.gz: bdf77254d90621d1fe30917b8d9d90a5cdbfbc9b
 SHA512:
-  metadata.gz: 4a833a0ddf354e75da612a6a834e2aa08346901af5b556faf8db5117fa693d693964cd7ff197915504e134f9e8222aff7f8ce8b5f94f4ae52dc39bbdd0097451
-  data.tar.gz: 6c3471f5ae11c9e5dfedbea0e9834d374a4730bda2e29f080d49544ba363fc0e704a5147affec28b0a3530d1584a775ba81c8e421012165d42cdb6d2f0537b54
+  metadata.gz: eb81ff95220d37fd96a521822a0b93cd3f33bcb708f44bd74e942daaf659e5bac5abf816b6af5cade11160c354a9fe8af7726b9e30261effe051ab3ca0ea64e6
+  data.tar.gz: d6dc93ddea1e7d0b9a203c93b8c10cd5578347fc8b0a6b73c452142071bf92dfeac2e51f5df423d2f67808e4b3143c900715d2540ff892d521fda93657655667

data/README.md

@@ -253,6 +253,9 @@ Download and install the [Provisioning Plugin](https://github.com/chockenberry/P
 # Need help?
 Please submit an issue on GitHub and provide information about your setup
 
+# Code of Conduct
+Help us keep `gym` open and inclusive. Please read and follow our [Code of Conduct](https://github.com/fastlane/code-of-conduct).
+
 # License
 This project is licensed under the terms of the MIT license. See the LICENSE file.
 

data/lib/gym/commands_generator.rb

@@ -6,6 +6,7 @@ HighLine.track_eof = false
 module Gym
   class CommandsGenerator
     include Commander::Methods
+    UI = FastlaneCore::UI
 
     FastlaneCore::CommanderGenerator.new.generate(Gym::Options.available_options)
 
@@ -48,7 +49,7 @@ module Gym
         c.action do |_args, options|
           containing = (File.directory?("fastlane") ? 'fastlane' : '.')
           path = File.join(containing, Gym.gymfile_name)
-          raise "Gymfile already exists".yellow if File.exist?(path)
+          UI.user_error! "Gymfile already exists" if File.exist?(path)
           template = File.read("#{Helper.gem_path('gym')}/lib/assets/GymfileTemplate")
           File.write(path, template)
           UI.success "Successfully created '#{path}'. Open the file using a code editor."

data/lib/gym/detect_values.rb

@@ -42,7 +42,7 @@ module Gym
           if profiles.count == 1
             profile = File.expand_path(profiles.last)
           elsif profiles.count > 1
-            puts "Found more than one provisioning profile in the project directory:"
+            UI.message "Found more than one provisioning profile in the project directory:"
             profile = choose(*(profiles))
           end
 
@@ -62,7 +62,13 @@ module Gym
     # Is it an iOS device or a Mac?
     def self.detect_platform
       return if Gym.config[:destination]
-      platform = Gym.project.mac? ? "OS X" : "iOS" # either `iOS` or `OS X`
+      platform = if Gym.project.mac?
+                   "OS X"
+                 elsif Gym.project.tvos?
+                   "tvOS"
+                 else
+                   "iOS"
+                 end
 
       Gym.config[:destination] = "generic/platform=#{platform}"
     end

data/lib/gym/error_handler.rb

@@ -99,7 +99,7 @@ module Gym
         print "For more information visit https://developer.apple.com/library/ios/technotes/tn2215/_index.html"
         print "Also, make sure to have a valid code signing identity and provisioning profile installed"
         print "Follow this guide to setup code signing https://github.com/fastlane/fastlane/blob/master/docs/CodeSigning.md"
-        raise "Archive invalid"
+        UI.user_error!("Archive invalid")
       end
 
       def find_standard_output_path(output)

data/lib/gym/generators/build_command_generator.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module Gym
   # Responsible for building the fully working xcodebuild command
   class BuildCommandGenerator
@@ -23,7 +25,7 @@ module Gym
       def project_path_array
         proj = Gym.project.xcodebuild_parameters
         return proj if proj.count > 0
-        raise "No project/workspace found"
+        UI.user_error!("No project/workspace found")
       end
 
       def options
@@ -36,6 +38,8 @@ module Gym
         options << "-destination '#{config[:destination]}'" if config[:destination]
         options << "-xcconfig '#{config[:xcconfig]}'" if config[:xcconfig]
         options << "-archivePath '#{archive_path}'"
+        options << "-derivedDataPath '#{config[:derived_data_path]}'" if config[:derived_data_path]
+        options << "-resultBundlePath '#{result_bundle_path}'" if config[:result_bundle]
         options << config[:xcargs] if config[:xcargs]
 
         options
@@ -59,7 +63,7 @@ module Gym
 
       def pipe
         pipe = []
-        pipe << "| tee '#{xcodebuild_log_path}' | xcpretty"
+        pipe << "| tee #{xcodebuild_log_path.shellescape} | xcpretty"
         pipe << "--no-color" if Helper.colors_disabled?
         pipe << "> /dev/null" if Gym.config[:suppress_xcode_output]
 
@@ -97,6 +101,13 @@ module Gym
         end
         return Gym.cache[:archive_path]
       end
+
+      def result_bundle_path
+        unless Gym.cache[:result_bundle_path]
+          Gym.cache[:result_bundle_path] = File.join(Gym.config[:output_directory], Gym.config[:output_name]) + ".result"
+        end
+        return Gym.cache[:result_bundle_path]
+      end
     end
   end
 end

data/lib/gym/options.rb

@@ -18,9 +18,9 @@ module Gym
                                      description: "Path the workspace file",
                                      verify_block: proc do |value|
                                        v = File.expand_path(value.to_s)
-                                       raise "Workspace file not found at path '#{v}'".red unless File.exist?(v)
-                                       raise "Workspace file invalid".red unless File.directory?(v)
-                                       raise "Workspace file is not a workspace, must end with .xcworkspace".red unless v.include?(".xcworkspace")
+                                       UI.user_error!("Workspace file not found at path '#{v}'") unless File.exist?(v)
+                                       UI.user_error!("Workspace file invalid") unless File.directory?(v)
+                                       UI.user_error!("Workspace file is not a workspace, must end with .xcworkspace") unless v.include?(".xcworkspace")
                                      end),
         FastlaneCore::ConfigItem.new(key: :project,
                                      short_option: "-p",
@@ -29,9 +29,9 @@ module Gym
                                      description: "Path the project file",
                                      verify_block: proc do |value|
                                        v = File.expand_path(value.to_s)
-                                       raise "Project file not found at path '#{v}'".red unless File.exist?(v)
-                                       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")
+                                       UI.user_error!("Project file not found at path '#{v}'") unless File.exist?(v)
+                                       UI.user_error!("Project file invalid") unless File.directory?(v)
+                                       UI.user_error!("Project file is not a project file, must end with .xcodeproj") unless v.include?(".xcodeproj")
                                      end),
         FastlaneCore::ConfigItem.new(key: :scheme,
                                      short_option: "-s",
@@ -103,7 +103,7 @@ module Gym
                                      optional: true,
                                      verify_block: proc do |value|
                                        av = %w(app-store ad-hoc package enterprise development developer-id)
-                                       raise "Unsupported export_method, must be: #{av}" unless av.include?(value)
+                                       UI.user_error!("Unsupported export_method, must be: #{av}") unless av.include?(value)
                                      end),
 
         # Very optional
@@ -112,6 +112,17 @@ module Gym
                                      env_name: "GYM_ARCHIVE_PATH",
                                      description: "The directory in which the archive file should be stored in",
                                      optional: true),
+        FastlaneCore::ConfigItem.new(key: :derived_data_path,
+                                     short_option: "-f",
+                                     env_name: "GYM_DERIVED_DATA_PATH",
+                                     description: "The directory where build products and other derived data will go",
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :result_bundle,
+                                     short_option: "-u",
+                                     env_name: "GYM_RESULT_BUNDLE",
+                                     is_string: false,
+                                     description: "Produce the result bundle describing what occurred will be placed",
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :buildlog_path,
                                      short_option: "-l",
                                      env_name: "GYM_BUILDLOG_PATH",
@@ -128,7 +139,7 @@ module Gym
                                      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)
+                                       UI.user_error!("Provisioning profile not found at path '#{File.expand_path(value)}'") unless File.exist?(value)
                                      end),
         FastlaneCore::ConfigItem.new(key: :destination,
                                      short_option: "-d",
@@ -151,7 +162,7 @@ module Gym
                                      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)
+                                       UI.user_error!("File not found at path '#{File.expand_path(value)}'") unless File.exist?(value)
                                      end),
         FastlaneCore::ConfigItem.new(key: :suppress_xcode_output,
                                      short_option: "-r",

data/lib/gym/runner.rb

@@ -8,10 +8,6 @@ module Gym
     def run
       clear_old_files
 
-      if Gym.project.tvos?
-        UI.user_error!("gym doesn't suppoort tvOS projects yet, we're working on adding this feature!")
-      end
-
       build_app
       verify_archive
 
@@ -24,7 +20,7 @@ module Gym
         move_ipa
       elsif Gym.project.mac?
         compress_and_move_dsym
-        move_mac_app
+        copy_mac_app
       end
     end
 
@@ -139,12 +135,12 @@ module Gym
       ipa_path
     end
 
-    # Move the .app from the archive into the output directory
-    def move_mac_app
+    # Copies the .app from the archive into the output directory
+    def copy_mac_app
       app_path = Dir[File.join(BuildCommandGenerator.archive_path, "Products/Applications/*.app")].last
       UI.crash!("Couldn't find application in '#{BuildCommandGenerator.archive_path}'") unless app_path
 
-      FileUtils.mv(app_path, File.expand_path(Gym.config[:output_directory]), force: true)
+      FileUtils.cp_r(app_path, File.expand_path(Gym.config[:output_directory]), remove_destination: true)
       app_path = File.join(Gym.config[:output_directory], File.basename(app_path))
 
       UI.success "Successfully exported the .app file:"

data/lib/gym/version.rb

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

data/lib/gym/xcodebuild_fixes/package_application_fix.rb

@@ -20,7 +20,7 @@ module Gym
           # If that location changes, search it using xcrun --sdk iphoneos -f PackageApplication
           package_application_path = "#{Xcode.xcode_path}/Platforms/iPhoneOS.platform/Developer/usr/bin/PackageApplication"
 
-          raise "Unable to patch the `PackageApplication` script bundled in XCode. This is not supported." unless expected_md5 == Digest::MD5.file(package_application_path).hexdigest
+          UI.crash!("Unable to patch the `PackageApplication` script bundled in Xcode. This is not supported.") unless expected_md5 == Digest::MD5.file(package_application_path).hexdigest
 
           # Duplicate PackageApplication script to PackageApplication4Gym
           FileUtils.copy_file(package_application_path, @patched_package_application_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gym
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.36.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.36.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -132,16 +132,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.35.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.35.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement