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

data/fastlane_core/lib/fastlane_core/pkg_file_analyser.rb

@@ -1,5 +1,7 @@
 require 'rexml/document'
 
+require_relative 'helper'
+
 module FastlaneCore
   class PkgFileAnalyser
     def self.fetch_app_identifier(path)

data/fastlane_core/lib/fastlane_core/pkg_upload_package_builder.rb

@@ -1,5 +1,9 @@
 require 'digest/md5'
 
+require_relative 'globals'
+require_relative 'ui/ui'
+require_relative 'module'
+
 module FastlaneCore
   # Builds a package for the pkg ready to be uploaded with the iTunes Transporter
   class PkgUploadPackageBuilder

data/fastlane_core/lib/fastlane_core/print_table.rb

@@ -1,3 +1,6 @@
+require_relative 'configuration/configuration'
+require_relative 'helper'
+
 module FastlaneCore
   class PrintTable
     class << self

data/fastlane_core/lib/fastlane_core/project.rb

@@ -1,3 +1,6 @@
+require_relative 'xcodebuild_list_output_parser'
+require_relative 'helper'
+
 module FastlaneCore
   # Represents an Xcode project
   class Project # rubocop:disable Metrics/ClassLength

data/fastlane_core/lib/fastlane_core/provisioning_profile.rb

@@ -1,3 +1,5 @@
+require_relative 'ui/ui'
+
 module FastlaneCore
   class ProvisioningProfile
     class << self

data/fastlane_core/lib/fastlane_core/swag.rb

@@ -1,4 +1,7 @@
 require "stringio"
+
+require_relative 'helper'
+
 module FastlaneCore
   class Swag
     # rubocop:disable LineLength

data/fastlane_core/lib/fastlane_core/test_parser.rb

@@ -1,3 +1,10 @@
+require 'plist'
+
+require 'fastlane/junit_generator'
+
+require_relative 'ui/ui'
+require_relative 'print_table'
+
 module FastlaneCore
   class TestParser
     attr_accessor :data

data/fastlane_core/lib/fastlane_core/tool_collector.rb

@@ -1,3 +1,5 @@
+require_relative 'helper'
+
 module FastlaneCore
   class ToolCollector
     # Learn more at https://docs.fastlane.tools/#metrics

data/fastlane_core/lib/fastlane_core/ui/errors.rb

@@ -0,0 +1 @@
+Dir[File.dirname(__FILE__) + "/errors/*.rb"].each { |f| require_relative f }

data/fastlane_core/lib/fastlane_core/ui/errors/fastlane_common_error.rb

@@ -1,3 +1,5 @@
+require_relative 'fastlane_exception'
+
 module FastlaneCore
   class Interface
     # Super class for exception types that we do not want to record

data/fastlane_core/lib/fastlane_core/ui/errors/fastlane_crash.rb

@@ -1,3 +1,5 @@
+require_relative 'fastlane_exception'
+
 module FastlaneCore
   class Interface
     class FastlaneCrash < FastlaneException

data/fastlane_core/lib/fastlane_core/ui/errors/fastlane_error.rb

@@ -1,3 +1,5 @@
+require_relative 'fastlane_exception'
+
 module FastlaneCore
   class Interface
     class FastlaneError < FastlaneException

data/fastlane_core/lib/fastlane_core/ui/errors/fastlane_shell_error.rb

@@ -1,3 +1,5 @@
+require_relative 'fastlane_exception'
+
 module FastlaneCore
   class Interface
     class FastlaneShellError < FastlaneException

data/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb

@@ -18,6 +18,15 @@ unless Object.const_defined?("OpenSSL")
   end
 end
 
+require 'commander'
+
+require_relative '../env'
+require_relative '../globals'
+require_relative '../analytics/action_completion_context'
+require_relative '../analytics/action_launch_context'
+require_relative '../crash_reporter/crash_reporter'
+require_relative 'errors'
+
 module Commander
   # This class override the run method with our custom stack trace handling
   # In particular we want to distinguish between user_error! and crash! (one with, one without stack trace)
@@ -67,7 +76,7 @@ module Commander
 
         action_completed(@program[:name], status: FastlaneCore::ActionCompletionStatus::SUCCESS)
         return return_value
-      rescue InvalidCommandError => e
+      rescue Commander::Runner::InvalidCommandError => e
         # calling `abort` makes it likely that tests stop without failing, so
         # we'll disable that during tests.
         if FastlaneCore::Helper.test?

data/fastlane_core/lib/fastlane_core/ui/github_issue_inspector_reporter.rb

@@ -1,3 +1,6 @@
+require_relative '../helper'
+require_relative '../globals'
+
 module Fastlane
   # Adds all the necessary emojis (obv)
   #
@@ -53,7 +56,7 @@ module Fastlane
 
     def print_open_link_hint(newline = false)
       puts "" if newline
-      puts "🔗  You can ⌘ + double-click on links to open them directly in your browser." if Helper.mac?
+      puts "🔗  You can ⌘ + double-click on links to open them directly in your browser." if FastlaneCore::Helper.mac?
     end
   end
 end

data/fastlane_core/lib/fastlane_core/ui/implementations/shell.rb

@@ -1,3 +1,9 @@
+require_relative '../../helper'
+require_relative '../../globals'
+require_relative '../../env'
+
+require_relative '../interface'
+
 module FastlaneCore
   # Shell is the terminal output of things
   # For documentation for each of the methods open `interface.rb`

data/fastlane_core/lib/fastlane_core/ui/interface.rb

@@ -1,3 +1,5 @@
+require_relative 'errors'
+
 module FastlaneCore
   # Abstract super class
   class Interface
@@ -178,6 +180,7 @@ module FastlaneCore
     # @!group Helpers
     #####################################################
     def not_implemented(method_name)
+      require_relative 'ui'
       UI.user_error!("Current UI '#{self}' doesn't support method '#{method_name}'")
     end
 

data/fastlane_core/lib/fastlane_core/ui/ui.rb

@@ -2,13 +2,15 @@ module FastlaneCore
   class UI
     class << self
       def current
+        require_relative 'implementations/shell'
         @current ||= Shell.new
       end
     end
 
     def self.method_missing(method_sym, *args, &_block)
       # not using `responds` because we don't care about methods like .to_s and so on
-      interface_methods = Interface.instance_methods - Object.instance_methods
+      require_relative 'interface'
+      interface_methods = FastlaneCore::Interface.instance_methods - Object.instance_methods
       UI.user_error!("Unknown method '#{method_sym}', supported #{interface_methods}") unless interface_methods.include?(method_sym)
 
       self.current.send(method_sym, *args)
@@ -16,9 +18,7 @@ module FastlaneCore
   end
 end
 
-require 'fastlane_core/ui/interface'
-
 # Import all available implementations
-Dir[File.expand_path('implementations/*.rb', File.dirname(__FILE__))].each do |file|
-  require file
+Dir[File.dirname(__FILE__) + '/implementations/*.rb'].each do |file|
+  require_relative file
 end

data/fastlane_core/lib/fastlane_core/update_checker/changelog.rb

@@ -3,7 +3,7 @@ require 'excon'
 module FastlaneCore
   class Changelog
     class << self
-      def show_changes(gem_name, current_version)
+      def show_changes(gem_name, current_version, update_gem_command: "bundle update")
         did_show_changelog = false
 
         self.releases(gem_name).each_with_index do |release, index|
@@ -20,7 +20,7 @@ module FastlaneCore
         end
 
         puts ""
-        puts "Please update using `#{UpdateChecker.update_command(gem_name: gem_name)}`".green if did_show_changelog
+        puts "Please update using `#{update_gem_command}`".green if did_show_changelog
       rescue
         # Something went wrong, we don't care so much about this
       end

data/fastlane_core/lib/fastlane_core/update_checker/update_checker.rb

@@ -1,8 +1,10 @@
 require 'excon'
 require 'digest'
 
-require 'fastlane_core/update_checker/changelog'
-require 'fastlane_core/analytics/app_identifier_guesser'
+require_relative 'changelog'
+require_relative '../analytics/app_identifier_guesser'
+require_relative '../helper'
+require_relative '../ui/ui'
 
 module FastlaneCore
   # Verifies, the user runs the latest version of this gem
@@ -80,7 +82,7 @@ module FastlaneCore
         puts "# Run `sudo gem cleanup` from time to time to speed up fastlane".green
       end
       puts '#######################################################################'.green
-      Changelog.show_changes(gem_name, current_version) unless FastlaneCore::Env.truthy?("FASTLANE_HIDE_CHANGELOG")
+      Changelog.show_changes(gem_name, current_version, update_gem_command: UpdateChecker.update_command(gem_name: gem_name)) unless FastlaneCore::Env.truthy?("FASTLANE_HIDE_CHANGELOG")
 
       ensure_rubygems_source
     end

data/frameit/lib/frameit.rb

@@ -1,4 +1,3 @@
-require 'mini_magick'
 require 'frameit/frame_downloader'
 require 'frameit/device_types'
 require 'frameit/runner'
@@ -12,42 +11,3 @@ require 'frameit/mac_editor'
 require 'frameit/dependency_checker'
 require 'frameit/options'
 require 'frameit/trim_box'
-
-require 'fastlane_core'
-
-module Frameit
-  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__))
-
-  # Defaults to latest, might be a time stamp if defined in the Framefile.json
-  def self.frames_version
-    return @frames_version if @frames_version
-    @frames_version = "latest"
-
-    config_files = Dir["./**/Framefile.json"]
-    if config_files.count > 0
-      config = ConfigParser.new.load(config_files.first)
-      if config.data["device_frame_version"].to_s.length > 0
-        @frames_version = config.data["device_frame_version"]
-      end
-    end
-
-    UI.success("Using device frames version '#{@frames_version}'")
-
-    return @frames_version
-  end
-end
-
-# rubocop:disable all
-class ::Hash
-  def fastlane_deep_merge(second)
-    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-    self.merge(second, &merger)
-  end
-end
-# rubocop:enable all

data/frameit/lib/frameit/commands_generator.rb

@@ -1,5 +1,12 @@
 require 'commander'
 require 'fastlane/version'
+require 'fastlane_core/globals'
+require 'fastlane_core/configuration/configuration'
+
+require_relative 'device_types'
+require_relative 'runner'
+require_relative 'options'
+require_relative 'dependency_checker'
 
 HighLine.track_eof = false
 

data/frameit/lib/frameit/config_parser.rb

@@ -1,3 +1,5 @@
+require_relative 'module'
+
 module Frameit
   class ConfigParser
     attr_reader :data

data/frameit/lib/frameit/dependency_checker.rb

@@ -1,3 +1,5 @@
+require_relative 'module'
+
 module Frameit
   class DependencyChecker
     def self.check_dependencies

data/frameit/lib/frameit/editor.rb

@@ -1,3 +1,12 @@
+require 'mini_magick'
+
+require_relative 'template_finder'
+require_relative 'trim_box'
+require_relative 'module'
+require_relative 'offsets'
+require_relative 'config_parser'
+require_relative 'strings_parser'
+
 module Frameit
   # Currently the class is 2 lines too long. Reevaluate refactoring when it's length changes significantly
   class Editor # rubocop:disable Metrics/ClassLength

data/frameit/lib/frameit/frame_downloader.rb

@@ -1,3 +1,7 @@
+require 'fastlane_core/module'
+
+require_relative 'module'
+
 module Frameit
   class FrameDownloader
     HOST_URL = "https://fastlane.github.io/frameit-frames"
@@ -66,6 +70,7 @@ module Frameit
 
     def download_file(path, txt: "file")
       require 'uri'
+      require 'excon'
 
       url = File.join(HOST_URL, Frameit.frames_version, URI.escape(path))
       UI.message("Downloading #{txt} from '#{url}' ...")

data/frameit/lib/frameit/mac_editor.rb

@@ -1,3 +1,6 @@
+require 'mini_magick'
+require_relative 'editor'
+
 module Frameit
   # Responsible for framing Mac Screenshots
   class MacEditor < Editor

data/frameit/lib/frameit/module.rb

@@ -0,0 +1,40 @@
+require 'fastlane_core/helper'
+
+require_relative 'config_parser'
+
+module Frameit
+  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__))
+
+  # Defaults to latest, might be a time stamp if defined in the Framefile.json
+  def self.frames_version
+    return @frames_version if @frames_version
+    @frames_version = "latest"
+
+    config_files = Dir["./**/Framefile.json"]
+    if config_files.count > 0
+      config = ConfigParser.new.load(config_files.first)
+      if config.data["device_frame_version"].to_s.length > 0
+        @frames_version = config.data["device_frame_version"]
+      end
+    end
+
+    UI.success("Using device frames version '#{@frames_version}'")
+
+    return @frames_version
+  end
+end
+
+# rubocop:disable all
+class ::Hash
+  def fastlane_deep_merge(second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+    self.merge(second, &merger)
+  end
+end
+# rubocop:enable all

data/frameit/lib/frameit/offsets.rb

@@ -1,3 +1,6 @@
+require_relative 'module'
+require_relative 'frame_downloader'
+
 module Frameit
   class Offsets
     # Returns the image offset needed for a certain device type for a given orientation

data/frameit/lib/frameit/options.rb

@@ -1,3 +1,7 @@
+require 'fastlane_core/configuration/config_item'
+
+require_relative 'module'
+
 module Frameit
   class Options
     def self.available_options

data/frameit/lib/frameit/runner.rb

@@ -1,6 +1,10 @@
-require 'deliver'
 require 'fastimage'
 
+require_relative 'frame_downloader'
+require_relative 'module'
+require_relative 'screenshot'
+require_relative 'device_types'
+
 module Frameit
   class Runner
     def initialize

data/frameit/lib/frameit/screenshot.rb

@@ -1,3 +1,10 @@
+require 'deliver/app_screenshot'
+
+require_relative 'editor'
+require_relative 'mac_editor'
+require_relative 'device_types'
+require_relative 'module'
+
 module Frameit
   # Represents one screenshot
   class Screenshot
@@ -19,6 +26,7 @@ module Frameit
 
     # Device name for a given screen size. Used to use the correct template
     def device_name
+      # rubocop:disable Lint/MissingRequireStatement
       sizes = Deliver::AppScreenshot::ScreenSize
       case @screen_size
       when sizes::IOS_58
@@ -40,6 +48,7 @@ module Frameit
       else
         UI.error "Unknown device type for size #{@screen_size} for path '#{path}'"
       end
+      # rubocop:enable Lint/MissingRequireStatement
     end
 
     def color