fastlane 2.115.0.beta.20190122200028 → 2.115.0.beta.20190123200015

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18333ce234db59b1dc874e80cc15bf8e2a46942c
-  data.tar.gz: 97ea917834d62c0d752a24fd688bab5b34d4c9ab
+  metadata.gz: 2b06c7d529f1dc8ce6f27f2a42c3b445b7093699
+  data.tar.gz: '0609a51d0ddf48e924d17435417977c3c7c411fe'
 SHA512:
-  metadata.gz: f962858566020af36501fc9880ffddd716029b0efd8cd00aa50aa25bc88115d3e233e4227400595fb60d471efbb2b0ef1ee5ad4562d89231a0dfd9d6ecb0e521
-  data.tar.gz: 4e87dbea376e26d290670dbe9dc253ad44078df7ffc738446f79bff1a600b4c42f0990f75002f75794c45a9740e848a66af553602e21a0ccc90feb04781f970d
+  metadata.gz: a692370d2bea19d670ec29f1bef085339fbf04f3b92da7dff212d179f1beaef85c34b6aac25888af4ff5943e805cd9cb1ac71acce68642c7788cab99dfbda72c
+  data.tar.gz: 88a74034e9493413e66e3ca96e2fc25f1f2d5caeab88afefbd642edfa8d5773e0ddb981994e3f3cea1108c25b7633ebc9f22a0c86ebb2045a4d61cf61cf1f26a

data/fastlane/lib/fastlane/actions/get_version_number.rb

@@ -113,7 +113,7 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :xcodeproj,
                              env_name: "FL_VERSION_NUMBER_PROJECT",
-                             description: "optional, you must specify the path to your main Xcode project if it is not in the project root directory",
+                             description: "Path to the main Xcode project to read version number from, optional. By default will use the first Xcode project found within the project root directory",
                              optional: true,
                              verify_block: proc do |value|
                                UI.user_error!("Please pass the path to the project, not the workspace") if value.end_with?(".xcworkspace")
@@ -121,11 +121,11 @@ module Fastlane
                              end),
           FastlaneCore::ConfigItem.new(key: :target,
                              env_name: "FL_VERSION_NUMBER_TARGET",
-                             description: "Specify a specific target if you have multiple per project, optional",
+                             description: "Target name, optional. Will be needed if you have more than one non-test target to avoid being prompted to select one",
                              optional: true),
           FastlaneCore::ConfigItem.new(key: :configuration,
                              env_name: "FL_VERSION_NUMBER_CONFIGURATION",
-                             description: "Specify a specific configuration if you have multiple per target, optional",
+                             description: "Configuration name, optional. Will be needed if you have altered the configurations from the default or your version number depends on the configuration selected",
                              optional: true)
         ]
       end
@@ -146,7 +146,11 @@ module Fastlane
 
       def self.example_code
         [
-          'version = get_version_number(xcodeproj: "Project.xcodeproj")'
+          'version = get_version_number(xcodeproj: "Project.xcodeproj")',
+          'version = get_version_number(
+            xcodeproj: "Project.xcodeproj",
+            target: "App"
+          )'
         ]
       end
 

data/fastlane/lib/fastlane/actions/pod_lib_lint.rb

@@ -12,6 +12,8 @@ module Fastlane
           command << "--verbose"
         end
 
+        command << params[:podspec] if params[:podspec]
+
         if params[:sources]
           sources = params[:sources].join(",")
           command << "--sources='#{sources}'"
@@ -54,6 +56,10 @@ module Fastlane
                                        description: "Use bundle exec when there is a Gemfile presented",
                                        is_string: false,
                                        default_value: true),
+          FastlaneCore::ConfigItem.new(key: :podspec,
+                                       description: "Path of spec to lint",
+                                       optional: true,
+                                       is_string: true),
           FastlaneCore::ConfigItem.new(key: :verbose,
                                        description: "Allow output detail in console",
                                        optional: true,

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.115.0.beta.20190122200028'.freeze
+  VERSION = '2.115.0.beta.20190123200015'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/frameit/lib/frameit/editor.rb

@@ -16,8 +16,11 @@ module Frameit
     attr_accessor :image # the current image used for editing
     attr_accessor :space_to_device
 
-    def frame!(screenshot)
-      self.screenshot = screenshot
+    def initialize(screenshot)
+      @screenshot = screenshot
+    end
+
+    def frame!
       prepare_image
 
       frame = load_frame
@@ -31,7 +34,7 @@ module Frameit
         return
       end
 
-      if should_add_title?
+      if is_complex_framing_mode?
         @image = complex_framing
       else
         # easy mode from 1.0 - no title or background
@@ -59,6 +62,10 @@ module Frameit
       return 0
     end
 
+    def should_skip?
+      return is_complex_framing_mode? && !fetch_text(:title)
+    end
+
     private
 
     def store_result
@@ -117,7 +124,7 @@ module Frameit
     end
 
     # Do we add a background and title as well?
-    def should_add_title?
+    def is_complex_framing_mode?
       return (fetch_config['background'] and (fetch_config['title'] or fetch_config['keyword']))
     end
 
@@ -484,12 +491,6 @@ module Frameit
 
       # No string files, fallback to Framefile config
       text = fetch_config[type.to_s]['text'] if fetch_config[type.to_s] && fetch_config[type.to_s]['text'] && fetch_config[type.to_s]['text'].length > 0 # Ignore empty string
-
-      if type == :title && !text
-        # title is mandatory
-        UI.user_error!("Could not get title for screenshot #{screenshot.path}. Please provide one in your Framefile.json or title.strings")
-      end
-
       return text
     end
 

data/frameit/lib/frameit/mac_editor.rb

@@ -24,7 +24,7 @@ module Frameit
       nil # Macs don't need frames - backgrounds only
     end
 
-    def should_add_title?
+    def is_complex_framing_mode?
       true # Mac screenshots always need a background
     end
 

data/frameit/lib/frameit/runner.rb

@@ -35,11 +35,19 @@ module Frameit
             next # we don't care about watches right now
           end
 
-          Helper.show_loading_indicator("Framing screenshot '#{full_path}'")
-
           begin
             screenshot = Screenshot.new(full_path, color)
-            screenshot.frame!
+            if screenshot.mac?
+              editor = MacEditor.new(screenshot)
+            else
+              editor = Editor.new(screenshot)
+            end
+            if editor.should_skip?
+              UI.message("Skipping framing of screenshot #{screenshot.path}.  No title provided in your Framefile.json or title.strings.")
+            else
+              Helper.show_loading_indicator("Framing screenshot '#{full_path}'")
+              editor.frame!
+            end
           rescue => ex
             UI.error(ex.to_s)
             UI.error("Backtrace:\n\t#{ex.backtrace.join("\n\t")}") if FastlaneCore::Globals.verbose?

data/frameit/lib/frameit/screenshot.rb

@@ -122,14 +122,5 @@ module Frameit
     def to_s
       self.path
     end
-
-    # Add the device frame, this will also call the method that adds the background + title
-    def frame!
-      if self.mac?
-        MacEditor.new.frame!(self)
-      else
-        Editor.new.frame!(self)
-      end
-    end
   end
 end

data/snapshot/lib/snapshot/reports_generator.rb

@@ -17,7 +17,6 @@ module Snapshot
         language = File.basename(language_folder)
         Dir[File.join(language_folder, '*.png')].sort.each do |screenshot|
           file_name = File.basename(screenshot)
-          screen_name = file_name[/#{Regexp.escape("-")}(.*?)#{Regexp.escape(".png")}/m, 1]
           available_devices.each do |key_name, output_name|
             next unless file_name.include?(key_name)
             # This screenshot is from this device
@@ -25,6 +24,7 @@ module Snapshot
             @data_by_language[language] ||= {}
             @data_by_language[language][output_name] ||= []
 
+            screen_name = file_name.sub(key_name + '-', '').sub('.png', '')
             @data_by_screen[screen_name] ||= {}
             @data_by_screen[screen_name][output_name] ||= {}
 

data/spaceship/lib/spaceship/tunes/member.rb

@@ -56,10 +56,11 @@ module Spaceship
 
       def selected_apps
         parsed_apps = []
+        all_apps = Application.all
         raw_data["userSoftwares"]["value"]["grantedSoftwareAdamIds"].each do |app_id|
-          parsed_apps << Application.find(app_id)
+          parsed_apps << all_apps.select { |app| app.apple_id == app_id }
         end
-        return parsed_apps
+        return parsed_apps.flatten
       end
 
       def not_accepted_invitation

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.115.0.beta.20190122200028
+  version: 2.115.0.beta.20190123200015
 platform: ruby
 authors:
 - Danielle Tomlinson
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1687,24 +1687,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
+- fastlane_core/lib
+- pilot/lib
 - fastlane/lib
+- precheck/lib
 - deliver/lib
-- fastlane_core/lib
 - frameit/lib
-- snapshot/lib
-- pem/lib
-- precheck/lib
-- match/lib
-- gym/lib
+- credentials_manager/lib
 - screengrab/lib
-- spaceship/lib
-- sigh/lib
+- match/lib
 - scan/lib
-- credentials_manager/lib
-- cert/lib
 - supply/lib
-- pilot/lib
+- gym/lib
+- cert/lib
+- sigh/lib
+- spaceship/lib
+- pem/lib
 - produce/lib
+- snapshot/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="