gym 1.12.1 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75864b84915d5e3c5635f47646c5a52b93c5b864
-  data.tar.gz: d4e5481e0583592fa053b3413dc026ca2558f0f1
+  metadata.gz: 366fc6d933a59ad6d42cfc03babb3c08134db0cc
+  data.tar.gz: f6076df50f79da5966c1063ced7a126a51547942
 SHA512:
-  metadata.gz: b6e543c1149bb8e97ddf7b323cb7cd07b9804af50b1942ac239ece109bcd0e22ed99c93617e2bacf56cb1c8e111abfb906cd6863008205d1bdf54119e853037e
-  data.tar.gz: 50bc17ce8838a81692c052fc7e3459637902ec4a945bce0d29fe1a3e446b0bfbbc003d352762d2044560b6d88329002963e0df74983c0cc1f44445484f77dfab
+  metadata.gz: b94813086c81dee801be0743520aaf37cee5caf8d32d1c0aac907aac03e4b1bdfa1b873f76dbec05fc7c06aa9ce39a404eb06305c545f19a269f85ea6d173ffb
+  data.tar.gz: e391a874ccbbad6fdba674480ed3127e09ae78c09c87fb3501743b5853d5fe98da697c3c90dcaa065931051e8e0396ed9683d6883c102bdc2fcb08a7e4b1a2fc

data/lib/gym/commands_generator.rb

@@ -24,6 +24,7 @@ module Gym
     end
 
     def run
+      program :name, 'gym'
       program :version, Gym::VERSION
       program :description, Gym::DESCRIPTION
       program :help, "Author", "Felix Krause <gym@krausefx.com>"

data/lib/gym/error_handler.rb

@@ -90,8 +90,7 @@ module Gym
           print "    gym(use_legacy_build_api: true)"
           print "On the command line:"
           print "    gym --use_legacy_build_api"
-        when /IDEDistributionErrorDomain error 1/
-        when /Error Domain=IDEDistributionErrorDomain Code=/
+        when /Error Domain=IDEDistributionErrorDomain Code=/, /IDEDistributionErrorDomain error 1/
           standard_output = read_standard_output output
           print standard_output if standard_output
           print "There was an error exporting your application"

data/lib/gym/generators/build_command_generator.rb

@@ -50,7 +50,8 @@ module Gym
 
         actions = []
         actions << :clean if config[:clean]
-        actions << :archive
+        actions << :archive unless Gym.project.library? || Gym.project.framework?
+        actions << :build if Gym.project.library? || Gym.project.framework?
 
         actions
       end

data/lib/gym/runner.rb

@@ -11,26 +11,37 @@ module Gym
         clear_old_files
         build_app
       end
-      verify_archive
-
+      verify_archive if Gym.project.produces_archive?
       FileUtils.mkdir_p(File.expand_path(Gym.config[:output_directory]))
 
       if Gym.project.ios? || Gym.project.tvos?
         fix_generic_archive # See https://github.com/fastlane/fastlane/pull/4325
-        package_app
+        package_app if Gym.project.produces_archive?
         fix_package
         compress_and_move_dsym
-        path = move_ipa
+        path = move_ipa if Gym.project.produces_archive?
         move_manifest
         move_app_thinning
         move_app_thinning_size_report
         move_apps_folder
-
-        path
       elsif Gym.project.mac?
+        path = File.expand_path(Gym.config[:output_directory])
         compress_and_move_dsym
-        copy_mac_app
+        if Gym.project.mac_app?
+          copy_mac_app
+          return path
+        end
+        copy_files_from_path(File.join(BuildCommandGenerator.archive_path, "Products/usr/local/bin/*")) if Gym.project.command_line_tool?
+      end
+
+      if Gym.project.library? || Gym.project.framework?
+        base_framework_path = Gym.project.build_settings(key: "BUILD_ROOT")
+        base_framework_path = Gym.config[:derived_data_path] + "/Build/Products/" if Gym.config[:derived_data_path]
+
+        copy_files_from_path("#{base_framework_path}/*/*")
+        path = base_framework_path
       end
+      path
     end
 
     #####################################################
@@ -86,6 +97,7 @@ module Gym
     end
 
     def mark_archive_as_built_by_gym(archive_path)
+      return if Gym.project.library? || Gym.project.framework?
       escaped_archive_path = archive_path.shellescape
       system("xattr -w info.fastlane.generated_by_gym 1 #{escaped_archive_path}")
     end
@@ -155,14 +167,31 @@ module Gym
       ipa_path
     end
 
+    # copys framework from temp folder:
+
+    def copy_files_from_path(path)
+      UI.success "Exporting Files:"
+      Dir[path].each do |f|
+        existing_file = File.join(File.expand_path(Gym.config[:output_directory]), File.basename(f))
+        # If the target file already exists in output directory
+        # we have to remove it first, otherwise cp_r fails even with remove_destination
+        # e.g.: there are symlinks in the .framework
+        if File.exist?(existing_file)
+          UI.important "Removing #{File.basename(f)} from output directory" if $verbose
+          FileUtils.rm_rf(existing_file)
+        end
+        FileUtils.cp_r(f, File.expand_path(Gym.config[:output_directory]), remove_destination: true)
+        UI.message "\t ▸ #{File.basename(f)}"
+      end
+    end
+
     # 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
-
+      exe_name = Gym.project.build_settings(key: "EXECUTABLE_NAME")
+      app_path = File.join(BuildCommandGenerator.archive_path, "Products/Applications/#{exe_name}.app")
+      UI.crash!("Couldn't find application in '#{BuildCommandGenerator.archive_path}'") unless File.exist?(app_path)
       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:"
       UI.message app_path
       app_path

data/lib/gym/version.rb

@@ -1,4 +1,4 @@
 module Gym
-  VERSION = "1.12.1"
+  VERSION = "1.13.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: 1.12.1
+  version: 1.13.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-12-13 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.57.0
+        version: 0.60.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.57.0
+        version: 0.60.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -136,16 +136,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -302,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Building your iOS apps has never been easier