fastlane 2.74.0.beta.20180106010004 → 2.74.0.beta.20180107010004

data/screengrab/lib/screengrab/dependency_checker.rb

@@ -1,3 +1,5 @@
+require_relative 'module'
+
 module Screengrab
   class DependencyChecker
     def self.check(android_env)

data/screengrab/lib/screengrab/module.rb

@@ -0,0 +1,24 @@
+require 'fastlane_core/helper'
+require_relative 'detect_values'
+
+module Screengrab
+  # Use this to just setup the configuration attribute and set it later somewhere else
+  class << self
+    attr_accessor :config
+    attr_accessor :android_environment
+
+    def config=(value)
+      @config = value
+      DetectValues.set_additional_default_values
+    end
+
+    def screengrabfile_name
+      "Screengrabfile"
+    end
+  end
+
+  Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
+  UI = FastlaneCore::UI
+  ROOT = Pathname.new(File.expand_path('../../..', __FILE__))
+  DESCRIPTION = "Automated localized screenshots of your Android app on every device".freeze
+end

data/screengrab/lib/screengrab/options.rb

@@ -1,5 +1,6 @@
-require 'fastlane_core'
-require 'credentials_manager'
+require 'fastlane_core/configuration/config_item'
+require 'credentials_manager/appfile_config'
+require_relative 'module'
 
 module Screengrab
   class Options

data/screengrab/lib/screengrab/reports_generator.rb

@@ -1,7 +1,9 @@
-require 'erb'
+require_relative 'module'
 
 module Screengrab
   class ReportsGenerator
+    require 'erb'
+
     def generate
       UI.message "Generating HTML Report"
 

data/screengrab/lib/screengrab/runner.rb

@@ -1,3 +1,7 @@
+require 'fastlane_core/print_table'
+require 'fastlane_core/command_executor'
+require_relative 'reports_generator'
+require_relative 'module'
 
 module Screengrab
   class Runner

data/screengrab/lib/screengrab/setup.rb

@@ -1,3 +1,5 @@
+require_relative 'module'
+
 module Screengrab
   class Setup
     # This method will take care of creating a screengrabfile and other necessary files

data/sigh/lib/sigh.rb

@@ -1,19 +1,4 @@
-require 'fastlane_core'
-require 'sigh/resign'
-require 'sigh/manager'
-require 'sigh/options'
-require 'sigh/local_manage'
-
-module Sigh
-  # Use this to just setup the configuration attribute and set it later somewhere else
-  class << self
-    attr_accessor :config
-  end
-
-  Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
-  UI = FastlaneCore::UI
-  ROOT = Pathname.new(File.expand_path('../..', __FILE__))
-
-  ENV['FASTLANE_TEAM_ID'] ||= ENV["SIGH_TEAM_ID"]
-  ENV['DELIVER_USER'] ||= ENV["SIGH_USERNAME"]
-end
+require_relative 'sigh/resign'
+require_relative 'sigh/manager'
+require_relative 'sigh/options'
+require_relative 'sigh/local_manage'

data/sigh/lib/sigh/commands_generator.rb

@@ -1,6 +1,11 @@
 require 'commander'
 require 'fastlane/version'
 
+require_relative 'options'
+require_relative 'resign'
+require_relative 'local_manage'
+require_relative 'manager'
+
 HighLine.track_eof = false
 
 module Sigh

data/sigh/lib/sigh/download_all.rb

@@ -1,3 +1,8 @@
+require 'spaceship'
+
+require_relative 'manager'
+require_relative 'module'
+
 module Sigh
   class DownloadAll
     # Download all valid provisioning profiles

data/sigh/lib/sigh/local_manage.rb

@@ -1,3 +1,8 @@
+require 'plist'
+require 'fastlane_core/globals'
+
+require_relative 'module'
+
 module Sigh
   class LocalManage
     LIST = "list"

data/sigh/lib/sigh/manager.rb

@@ -1,5 +1,6 @@
-require 'plist'
-require 'sigh/runner'
+require 'fastlane_core/provisioning_profile'
+
+require_relative 'runner'
 
 module Sigh
   class Manager

data/sigh/lib/sigh/module.rb

@@ -0,0 +1,16 @@
+require 'fastlane_core/ui/ui'
+require 'fastlane_core/helper'
+
+module Sigh
+  # Use this to just setup the configuration attribute and set it later somewhere else
+  class << self
+    attr_accessor :config
+  end
+
+  Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
+  UI = FastlaneCore::UI
+  ROOT = Pathname.new(File.expand_path('../../..', __FILE__))
+
+  ENV['FASTLANE_TEAM_ID'] ||= ENV["SIGH_TEAM_ID"]
+  ENV['DELIVER_USER'] ||= ENV["SIGH_USERNAME"]
+end

data/sigh/lib/sigh/options.rb

@@ -1,5 +1,6 @@
-require 'fastlane_core'
-require 'credentials_manager'
+require 'fastlane_core/configuration/configuration'
+require 'credentials_manager/appfile_config'
+require_relative 'module'
 
 module Sigh
   class Options

data/sigh/lib/sigh/repair.rb

@@ -1,3 +1,7 @@
+require 'spaceship'
+
+require_relative 'module'
+
 module Sigh
   class Repair
     def repair_all

data/sigh/lib/sigh/resign.rb

@@ -1,4 +1,7 @@
 require 'shellwords'
+require 'fastlane_core/globals'
+
+require_relative 'module'
 
 module Sigh
   # Resigns an existing ipa file

data/sigh/lib/sigh/runner.rb

@@ -1,5 +1,9 @@
 require 'spaceship'
 
+require 'fastlane_core/print_table'
+require 'fastlane_core/cert_checker'
+require_relative 'module'
+
 module Sigh
   class Runner
     attr_accessor :spaceship

data/snapshot/lib/snapshot.rb

@@ -1,61 +1,19 @@
-require 'snapshot/runner'
-require 'snapshot/reports_generator'
-require 'snapshot/detect_values'
-require 'snapshot/screenshot_flatten'
-require 'snapshot/screenshot_rotate'
-require 'snapshot/dependency_checker'
-require 'snapshot/latest_os_version'
-require 'snapshot/test_command_generator'
-require 'snapshot/test_command_generator_xcode_8'
-require 'snapshot/error_handler'
-require 'snapshot/collector'
-require 'snapshot/options'
-require 'snapshot/update'
-require 'snapshot/fixes/simulator_zoom_fix'
-require 'snapshot/fixes/hardware_keyboard_fix'
-require 'snapshot/simulator_launchers/launcher_configuration'
-require 'snapshot/simulator_launchers/simulator_launcher'
-require 'snapshot/simulator_launchers/simulator_launcher_xcode_8'
-
-require 'fastlane_core'
-
-require 'open3'
-
-module Snapshot
-  # Use this to just setup the configuration attribute and set it later somewhere else
-  class << self
-    attr_accessor :config
-
-    attr_accessor :project
-
-    attr_accessor :cache
-
-    def config=(value)
-      @config = value
-      DetectValues.set_additional_default_values
-      @cache = {}
-    end
-
-    def snapfile_name
-      "Snapfile"
-    end
-
-    def kill_simulator
-      `killall 'iOS Simulator' &> /dev/null`
-      `killall Simulator &> /dev/null`
-    end
-  end
-
-  Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
-  UI = FastlaneCore::UI
-  ROOT = Pathname.new(File.expand_path('../..', __FILE__))
-  DESCRIPTION = "Automate taking localized screenshots of your iOS and tvOS apps on every device"
-  CACHE_DIR = File.join(Dir.home, "Library/Caches/tools.fastlane")
-  SCREENSHOTS_DIR = File.join(CACHE_DIR, 'screenshots')
-
-  Snapshot::DependencyChecker.check_dependencies
-
-  def self.min_xcode7?
-    xcode_version.split(".").first.to_i >= 7
-  end
-end
+require_relative 'snapshot/runner'
+require_relative 'snapshot/reports_generator'
+require_relative 'snapshot/detect_values'
+require_relative 'snapshot/screenshot_flatten'
+require_relative 'snapshot/screenshot_rotate'
+require_relative 'snapshot/dependency_checker'
+require_relative 'snapshot/latest_os_version'
+require_relative 'snapshot/test_command_generator'
+require_relative 'snapshot/test_command_generator_xcode_8'
+require_relative 'snapshot/error_handler'
+require_relative 'snapshot/collector'
+require_relative 'snapshot/options'
+require_relative 'snapshot/update'
+require_relative 'snapshot/fixes/simulator_zoom_fix'
+require_relative 'snapshot/fixes/hardware_keyboard_fix'
+require_relative 'snapshot/simulator_launchers/launcher_configuration'
+require_relative 'snapshot/simulator_launchers/simulator_launcher'
+require_relative 'snapshot/simulator_launchers/simulator_launcher_xcode_8'
+require_relative 'snapshot/module'

data/snapshot/lib/snapshot/collector.rb

@@ -1,3 +1,8 @@
+require 'plist'
+
+require_relative 'module'
+require_relative 'test_command_generator'
+
 module Snapshot
   # Responsible for collecting the generated screenshots and copying them over to the output directory
   class Collector

data/snapshot/lib/snapshot/commands_generator.rb

@@ -1,5 +1,8 @@
 require 'commander'
-require 'fastlane/version'
+
+require_relative 'module'
+require_relative 'runner'
+require_relative 'options'
 
 HighLine.track_eof = false
 

data/snapshot/lib/snapshot/dependency_checker.rb

@@ -1,7 +1,11 @@
+require 'fastlane_core/device_manager'
+require 'fastlane_core/helper'
+require_relative 'latest_os_version'
+
 module Snapshot
   class DependencyChecker
     def self.check_dependencies
-      return if Helper.test?
+      return if FastlaneCore::Helper.test?
 
       self.check_xcode_select
       self.check_simctl
@@ -9,41 +13,41 @@ module Snapshot
 
     def self.check_xcode_select
       unless `xcode-select -v`.include? "xcode-select version"
-        UI.error '#############################################################'
-        UI.error "# You have to install Xcode command line tools to use snapshot"
-        UI.error "# Install the latest version of Xcode from the AppStore"
-        UI.error "# Run xcode-select --install to install the developer tools"
-        UI.error '#############################################################'
-        UI.user_error!("Run 'xcode-select --install' and start snapshot again")
+        FastlaneCore::UI.error '#############################################################'
+        FastlaneCore::UI.error "# You have to install Xcode command line tools to use snapshot"
+        FastlaneCore::UI.error "# Install the latest version of Xcode from the AppStore"
+        FastlaneCore::UI.error "# Run xcode-select --install to install the developer tools"
+        FastlaneCore::UI.error '#############################################################'
+        FastlaneCore::UI.user_error!("Run 'xcode-select --install' and start snapshot again")
       end
 
       if Snapshot::LatestOsVersion.ios_version.to_f < 9 # to_f is bad, but should be good enough
-        UI.error '#############################################################'
-        UI.error "# Your xcode-select Xcode version is below 7.0"
-        UI.error "# To use snapshot 1.0 and above you need at least iOS 9"
-        UI.error "# Set the path to the Xcode version that supports UI Tests"
-        UI.error "# or downgrade to versions older than snapshot 1.0"
-        UI.error '#############################################################'
-        UI.user_error!("Run 'sudo xcode-select -s /Applications/Xcode-beta.app'")
+        FastlaneCore::UI.error '#############################################################'
+        FastlaneCore::UI.error "# Your xcode-select Xcode version is below 7.0"
+        FastlaneCore::UI.error "# To use snapshot 1.0 and above you need at least iOS 9"
+        FastlaneCore::UI.error "# Set the path to the Xcode version that supports UI Tests"
+        FastlaneCore::UI.error "# or downgrade to versions older than snapshot 1.0"
+        FastlaneCore::UI.error '#############################################################'
+        FastlaneCore::UI.user_error!("Run 'sudo xcode-select -s /Applications/Xcode-beta.app'")
       end
     end
 
     def self.check_simulators
-      UI.verbose("Found #{FastlaneCore::Simulator.all.count} simulators.")
+      FastlaneCore::UI.verbose("Found #{FastlaneCore::Simulator.all.count} simulators.")
       if FastlaneCore::Simulator.all.count == 0
-        UI.error '#############################################################'
-        UI.error "# You have to add new simulators using Xcode"
-        UI.error "# You can let snapshot create new simulators: 'fastlane snapshot reset_simulators'"
-        UI.error "# Manually: Xcode => Window => Devices"
-        UI.error "# Please run `instruments -s` to verify your xcode path"
-        UI.error '#############################################################'
-        UI.user_error!("Create the new simulators and run this script again")
+        FastlaneCore::UI.error '#############################################################'
+        FastlaneCore::UI.error "# You have to add new simulators using Xcode"
+        FastlaneCore::UI.error "# You can let snapshot create new simulators: 'fastlane snapshot reset_simulators'"
+        FastlaneCore::UI.error "# Manually: Xcode => Window => Devices"
+        FastlaneCore::UI.error "# Please run `instruments -s` to verify your xcode path"
+        FastlaneCore::UI.error '#############################################################'
+        FastlaneCore::UI.user_error!("Create the new simulators and run this script again")
       end
     end
 
     def self.check_simctl
       unless `xcrun simctl`.include? "openurl"
-        UI.user_error!("Could not find `xcrun simctl`. Make sure you have the latest version of Xcode and macOS installed.")
+        FastlaneCore::UI.user_error!("Could not find `xcrun simctl`. Make sure you have the latest version of Xcode and macOS installed.")
       end
     end
   end

data/snapshot/lib/snapshot/detect_values.rb

@@ -1,3 +1,6 @@
+require 'fastlane_core/project'
+require 'fastlane_core/device_manager'
+
 module Snapshot
   class DetectValues
     # This is needed as these are more complex default values
@@ -19,6 +22,10 @@ module Snapshot
         end
       end
 
+      if config[:test_without_building] == true && config[:derived_data_path].to_s.length == 0
+        UI.user_error!("Cannot use test_without_building option without a derived_data_path!")
+      end
+
       Snapshot.project.select_scheme(preferred_to_include: "UITests")
 
       # Devices

data/snapshot/lib/snapshot/error_handler.rb

@@ -1,3 +1,5 @@
+require_relative 'module'
+
 module Snapshot
   class ErrorHandler
     class << self

data/snapshot/lib/snapshot/fixes/hardware_keyboard_fix.rb

@@ -1,3 +1,5 @@
+require_relative '../module'
+
 module Snapshot
   module Fixes
     # Having "Connect Hardware Keyboard" enabled causes issues with entering text in secure textfields

data/snapshot/lib/snapshot/fixes/simulator_zoom_fix.rb

@@ -1,3 +1,5 @@
+require_relative '../module'
+
 module Snapshot
   module Fixes
     # This fix is needed due to a bug in UI Tests that creates invalid screenshots when the

data/snapshot/lib/snapshot/latest_os_version.rb

@@ -1,3 +1,6 @@
+require 'open3'
+require 'fastlane_core/ui/ui'
+
 module Snapshot
   class LatestOsVersion
     def self.ios_version
@@ -20,11 +23,11 @@ module Snapshot
 
       matched = output.match(/#{os} ([\d\.]+) \(.*/)
       if matched.nil?
-        UI.user_error!("Could not determine installed #{os} SDK version. Try running the _xcodebuild_ command manually to ensure it works.")
+        FastlaneCore::UI.user_error!("Could not determine installed #{os} SDK version. Try running the _xcodebuild_ command manually to ensure it works.")
       elsif matched.length > 1
         return matched[1]
       else
-        UI.user_error!("Could not determine installed #{os} SDK version. Please pass it via the environment variable 'SNAPSHOT_IOS_VERSION'")
+        FastlaneCore::UI.user_error!("Could not determine installed #{os} SDK version. Please pass it via the environment variable 'SNAPSHOT_IOS_VERSION'")
       end
     end
   end

data/snapshot/lib/snapshot/module.rb

@@ -0,0 +1,44 @@
+require 'fastlane_core/helper'
+require 'fastlane/boolean'
+require_relative 'detect_values'
+require_relative 'dependency_checker'
+
+module Snapshot
+  # Use this to just setup the configuration attribute and set it later somewhere else
+  class << self
+    attr_accessor :config
+
+    attr_accessor :project
+
+    attr_accessor :cache
+
+    def config=(value)
+      @config = value
+      DetectValues.set_additional_default_values
+      @cache = {}
+    end
+
+    def snapfile_name
+      "Snapfile"
+    end
+
+    def kill_simulator
+      `killall 'iOS Simulator' &> /dev/null`
+      `killall Simulator &> /dev/null`
+    end
+  end
+
+  Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
+  UI = FastlaneCore::UI
+  ROOT = Pathname.new(File.expand_path('../../..', __FILE__))
+  DESCRIPTION = "Automate taking localized screenshots of your iOS and tvOS apps on every device"
+  CACHE_DIR = File.join(Dir.home, "Library/Caches/tools.fastlane")
+  SCREENSHOTS_DIR = File.join(CACHE_DIR, 'screenshots')
+  Boolean = Fastlane::Boolean
+
+  Snapshot::DependencyChecker.check_dependencies
+
+  def self.min_xcode7?
+    xcode_version.split(".").first.to_i >= 7
+  end
+end