gym 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 132ed6450917f319a13d735ca3eec8e6e0008098
-  data.tar.gz: 3d60b04f50697c5350c8de2b32ca656d1f9ee467
+  metadata.gz: b10cc2e463895aae84301abdfff342aecdfd98ff
+  data.tar.gz: b7032609daac7cca71fb70ced86a7df2bb5fd555
 SHA512:
-  metadata.gz: 305c7384722dca916e947d1967884bea07c5e53e4e6169022bca5fe2916f286709358621ab2836fc5d27178a8f858a1ba2b0b94ec7b608926dd8aa9725308a0c
-  data.tar.gz: 8b44624aeff6c7eaae300dfbeaf15138dc688324e4a7b746fcfcd5a5f5701943099126abe7f1c3001c82e873459c1a8ccd9cb3d45be2c3abe0f9626536996fdf
+  metadata.gz: 013a309cb2f63cb0662c895afc71028e12f5e2f34fc4172f95823c49b746f29dc65378010f2fd8fccc0e882ddd6c7615b6f5bc37b4559558e3a7f0490463b60b
+  data.tar.gz: ff749e5ec91d619bfde150c445717f9a5319ec7c3e301a55b33be74dc230aa99bf4cb18b4dcf7987df05e8226defc3435dcbab2097f7d226abefabb304fc14b3

data/lib/gym.rb

@@ -40,6 +40,7 @@ module Gym
   end
 
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
+  UI = FastlaneCore::UI
 
   Gym.init_libs
 end

data/lib/gym/commands_generator.rb

@@ -51,7 +51,7 @@ module Gym
           raise "Gymfile already exists".yellow if File.exist?(path)
           template = File.read("#{Helper.gem_path('gym')}/lib/assets/GymfileTemplate")
           File.write(path, template)
-          Helper.log.info "Successfully created '#{path}'. Open the file using a code editor.".green
+          UI.success "Successfully created '#{path}'. Open the file using a code editor."
         end
       end
 

data/lib/gym/detect_values.rb

@@ -6,12 +6,15 @@ module Gym
     def self.set_additional_default_values
       config = Gym.config
 
-      FastlaneCore::Project.detect_projects(config)
+      # First, try loading the Gymfile from the current directory
+      config.load_configuration_file(Gym.gymfile_name)
 
+      # Detect the project
+      FastlaneCore::Project.detect_projects(config)
       Gym.project = FastlaneCore::Project.new(config)
       detect_provisioning_profile
 
-      # Go into the project's folder
+      # Go into the project's folder, as there might be a Gymfile there
       Dir.chdir(File.expand_path("..", Gym.project.path)) do
         config.load_configuration_file(Gym.gymfile_name)
       end
@@ -73,7 +76,7 @@ module Gym
       if config[:configuration]
         # Verify the configuration is available
         unless configurations.include?(config[:configuration])
-          Helper.log.error "Couldn't find specified configuration '#{config[:configuration]}'.".red
+          UI.error "Couldn't find specified configuration '#{config[:configuration]}'."
           config[:configuration] = nil
         end
       end

data/lib/gym/error_handler.rb

@@ -49,7 +49,7 @@ module Gym
           print "For more information visit this stackoverflow answer:"
           print "https://stackoverflow.com/a/17031697/445598"
         end
-        raise "Error building the application - see the log above".red
+        UI.user_error!("Error building the application - see the log above")
       end
 
       # @param [Array] The output of the errored build (line by line)
@@ -83,11 +83,14 @@ module Gym
           print "https://openradar.appspot.com/radar?id=4952000420642816"
           print "You can temporary use the :use_legacy_build_api option to get the build to work again"
         when /IDEDistributionErrorDomain error 1/
+        when /Error Domain=IDEDistributionErrorDomain Code=/
+          standard_output = read_standard_output output
+          print standard_output if standard_output
           print "There was an error exporting your application"
           print "Unfortunately the new Xcode export API is unstable and causes problems on some project"
           print "You can temporary use the :use_legacy_build_api option to get the build to work again"
         end
-        raise "Error packaging up the application".red
+        UI.user_error!("Error packaging up the application")
       end
 
       def handle_empty_archive
@@ -99,11 +102,21 @@ module Gym
         raise "Archive invalid"
       end
 
+      def find_standard_output_path(output)
+        m = /Created bundle at path '(.*)'/.match(output)
+        return File.join(m[1], 'IDEDistribution.standard.log') unless m.nil?
+      end
+
       private
 
+      def read_standard_output(output)
+        path = find_standard_output_path output
+        return File.read(path) if File.exist?(path)
+      end
+
       # Just to make things easier
       def print(text)
-        Helper.log.error text.red
+        UI.error text
       end
     end
   end

data/lib/gym/generators/build_command_generator.rb

@@ -60,6 +60,7 @@ module Gym
       def pipe
         pipe = []
         pipe << "| tee '#{xcodebuild_log_path}' | xcpretty"
+        pipe << "--no-color" if Helper.colors_disabled?
         pipe << "> /dev/null" if Gym.config[:suppress_xcode_output]
 
         pipe

data/lib/gym/generators/package_command_generator_xcode7.rb

@@ -78,8 +78,8 @@ module Gym
 
       def print_legacy_information
         if Gym.config[:provisioning_profile_path]
-          Helper.log.info "You're using Xcode 7, the `provisioning_profile_path` value will be ignored".yellow
-          Helper.log.info "Please follow the Code Signing Guide: https://github.com/KrauseFx/fastlane/blob/master/docs/CodeSigning.md".yellow
+          UI.important "You're using Xcode 7, the `provisioning_profile_path` value will be ignored"
+          UI.important "Please follow the Code Signing Guide: https://github.com/KrauseFx/fastlane/blob/master/docs/CodeSigning.md"
         end
       end
     end

data/lib/gym/manager.rb

@@ -3,15 +3,11 @@ module Gym
     def work(options)
       Gym.config = options
 
-      print_summary
+      FastlaneCore::PrintTable.print_values(config: Gym.config,
+                                         hide_keys: [],
+                                             title: "Summary for gym #{Gym::VERSION}")
 
       return Runner.new.run
     end
-
-    private
-
-    def print_summary
-      FastlaneCore::PrintTable.print_values(config: Gym.config, hide_keys: [], title: "Summary for gym #{Gym::VERSION}")
-    end
   end
 end

data/lib/gym/options.rb

@@ -92,7 +92,7 @@ module Gym
                                      is_string: false,
                                      verify_block: proc do |value|
                                        if value
-                                         Helper.log.info "Using legacy build system - waiting for radar to be fixed: https://openradar.appspot.com/radar?id=4952000420642816".red
+                                         UI.important "Using legacy build system - waiting for radar to be fixed: https://openradar.appspot.com/radar?id=4952000420642816"
                                        end
                                      end),
         FastlaneCore::ConfigItem.new(key: :export_method,

data/lib/gym/runner.rb

@@ -7,6 +7,11 @@ module Gym
     # @return (String) The path to the resulting ipa
     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
 
@@ -81,8 +86,8 @@ module Gym
                                                 ErrorHandler.handle_build_error(output)
                                               end)
 
-      Helper.log.info("Successfully stored the archive. You can find it in the Xcode Organizer.".green)
-      Helper.log.info("Stored the archive in: ".green + BuildCommandGenerator.archive_path) if $verbose
+      UI.success "Successfully stored the archive. You can find it in the Xcode Organizer."
+      UI.verbose("Stored the archive in: " + BuildCommandGenerator.archive_path)
     end
 
     # Makes sure the archive is there and valid
@@ -112,18 +117,15 @@ module Gym
       containing_directory = File.expand_path("..", PackageCommandGenerator.dsym_path)
 
       available_dsyms = Dir.glob("#{containing_directory}/*.dSYM")
-
-      Helper.log.info "Compressing #{available_dsyms.count} dSYM(s)"
+      UI.message "Compressing #{available_dsyms.count} dSYM(s)" unless Gym.config[:silent]
 
       output_path = File.expand_path(File.join(Gym.config[:output_directory], Gym.config[:output_name] + ".app.dSYM.zip"))
       command = "cd '#{containing_directory}' && zip -r '#{output_path}' *.dSYM"
-      Helper.log.info command.yellow unless Gym.config[:silent]
-      command_result = `#{command}`
-      Helper.log.info command_result if $verbose
+      Helper.backticks(command, print: !Gym.config[:silent])
 
       puts "" # new line
 
-      Helper.log.info "Successfully exported and compressed dSYM file".green
+      UI.success "Successfully exported and compressed dSYM file"
     end
 
     # Moves over the binary and dsym file to the output directory
@@ -132,21 +134,21 @@ module Gym
       FileUtils.mv(PackageCommandGenerator.ipa_path, File.expand_path(Gym.config[:output_directory]), force: true)
       ipa_path = File.expand_path(File.join(Gym.config[:output_directory], File.basename(PackageCommandGenerator.ipa_path)))
 
-      Helper.log.info "Successfully exported and signed the ipa file:".green
-      Helper.log.info ipa_path
+      UI.success "Successfully exported and signed the ipa file:"
+      UI.message ipa_path
       ipa_path
     end
 
     # Move the .app from the archive into the output directory
     def move_mac_app
       app_path = Dir[File.join(BuildCommandGenerator.archive_path, "Products/Applications/*.app")].last
-      raise "Couldn't find application in '#{BuildCommandGenerator.archive_path}'".red unless app_path
+      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)
       app_path = File.join(Gym.config[:output_directory], File.basename(app_path))
 
-      Helper.log.info "Successfully exported the .app file:".green
-      Helper.log.info app_path
+      UI.success "Successfully exported the .app file:"
+      UI.message app_path
       app_path
     end
 

data/lib/gym/version.rb

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

data/lib/gym/xcodebuild_fixes/package_application_fix.rb

@@ -27,7 +27,7 @@ module Gym
 
           # Apply patches to PackageApplication4Gym from patches folder
           Dir[File.join(Helper.gem_path("gym"), "lib/assets/package_application_patches/*.diff")].each do |patch|
-            Helper.log.info "Applying Package Application patch: #{File.basename(patch)}" if $verbose
+            UI.verbose "Applying Package Application patch: #{File.basename(patch)}"
             command = ["patch '#{@patched_package_application_path}' < '#{patch}'"]
             Runner.new.print_command(command, "Applying Package Application patch: #{File.basename(patch)}") if $verbose
 

data/lib/gym/xcodebuild_fixes/swift_fix.rb

@@ -14,7 +14,7 @@ module Gym
 
         return if check_for_swift PackageCommandGenerator
 
-        Helper.log.info "Packaging up the Swift Framework as the current app is a Swift app" if $verbose
+        UI.verbose "Packaging up the Swift Framework as the current app is a Swift app"
         ipa_swift_frameworks = Dir["#{PackageCommandGenerator.appfile_path}/Frameworks/libswift*"]
 
         Dir.mktmpdir do |tmpdir|
@@ -49,7 +49,7 @@ module Gym
       # @param the PackageCommandGenerator
       # @return true if swift
       def check_for_swift(pcg)
-        Helper.log.info "Checking for Swift framework" if $verbose
+        UI.verbose "Checking for Swift framework"
         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

data/lib/gym/xcodebuild_fixes/watchkit2_fix.rb

@@ -5,7 +5,7 @@ module Gym
       def watchkit2_fix
         return unless watchkit2?
 
-        Helper.log.info "Adding WatchKit2 support" if $verbose
+        UI.verbose "Adding WatchKit2 support"
 
         Dir.mktmpdir do |tmpdir|
           # Make watchkit support directory
@@ -20,7 +20,7 @@ module Gym
             abort unless system %(zip --recurse-paths "#{PackageCommandGenerator.ipa_path}" "WatchKitSupport2" > /dev/null)
           end
 
-          Helper.log.info "Successfully added WatchKit2 support" if $verbose
+          UI.verbose "Successfully added WatchKit2 support"
         end
       end
 

data/lib/gym/xcodebuild_fixes/watchkit_fix.rb

@@ -5,7 +5,7 @@ module Gym
       def watchkit_fix
         return unless should_apply_watchkit1_fix?
 
-        Helper.log.info "Adding WatchKit support" if $verbose
+        UI.verbose "Adding WatchKit support"
 
         Dir.mktmpdir do |tmpdir|
           # Make watchkit support directory
@@ -20,7 +20,7 @@ module Gym
             abort unless system %(zip --recurse-paths "#{PackageCommandGenerator.ipa_path}" "WatchKitSupport" > /dev/null)
           end
 
-          Helper.log.info "Successfully added WatchKit support" if $verbose
+          UI.verbose "Successfully added WatchKit support"
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gym
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2016-01-09 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.25.0
+        version: 0.32.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.32.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0