fastlane_core 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36c410576fea3a0fd2d9c81f5f310944ce594cfc
-  data.tar.gz: d5fd0b3f2d9c694a28a886570993056a1c867e0a
+  metadata.gz: 846d4304cc09efca10ff15c3df3da67cd768f9a4
+  data.tar.gz: 6631f360eae684b31bd71577cc9bdbf32ed7736d
 SHA512:
-  metadata.gz: 71b506675cd3dee7c198d4d8bf7474c1f6f69c414d69c01ccee44f767e3986a2ce37e9b36f514087057d4064bceb9350b5bcda4718c1748cec1e6c2814adede5
-  data.tar.gz: 2b9b7dcf00f6310ba554e4e5f26f74344a15e09d0b35cb40b17f6326e2ce1d95356a6397d52e47fdff5d2fe034ac8fbcbcaf0ad769fef2561dae8899ffa0204e
+  metadata.gz: fa20228043bbbdf42d0865b11c9d8fa1fd3550ab9d49c1c3a7f5316a9d7c6e9334be5aedd0085f15c1326f6e02631cf14c67136b6791ff3e1c960af86cb31967
+  data.tar.gz: 10cff7760c63f6277458709114e5ec56e9d4a995aa0ddb78c78f340807a26fdd472e9306178a3ec275ce00ffdbaac8edb0e8c4451544d704621ec4e0ba336c12

data/README.md

@@ -13,11 +13,14 @@
   <a href="https://github.com/KrauseFx/sigh">sigh</a> &bull; 
   <a href="https://github.com/KrauseFx/produce">produce</a> &bull;
   <a href="https://github.com/KrauseFx/cert">cert</a> &bull;
-  <a href="https://github.com/KrauseFx/codes">codes</a>
+  <a href="https://github.com/KrauseFx/codes">codes</a> &bull;
+  <a href="https://github.com/fastlane/spaceship">spaceship</a> &bull;
+  <a href="https://github.com/fastlane/pilot">pilot</a> &bull;
+  <a href="https://github.com/fastlane/boarding">boarding</a>
 </p>
 -------
 
-Fastlane Core
+FastlaneCore
 ============
 
 [![Twitter: @KauseFx](https://img.shields.io/badge/contact-@KrauseFx-blue.svg?style=flat)](https://twitter.com/KrauseFx)
@@ -45,6 +48,8 @@ This gem contains all shared classes and code:
 # License
 This project is licensed under the terms of the MIT license. See the LICENSE file.
 
+> This project and all fastlane tools are in no way affiliated with Apple Inc. This project is open source under the MIT license, which means you have full access to the source code and can modify it to fit your own needs. All fastlane tools run on your own computer or server, so your credentials or other sensitive information will never leave your own computer. You are responsible for how you use fastlane tools.
+
 # Contributing
 
 1. Create an issue to start a discussion about your idea

data/lib/fastlane_core.rb

@@ -1,7 +1,7 @@
 require 'json'
 require 'fastlane_core/version'
 require 'fastlane_core/helper'
-require 'fastlane_core/configuration'
+require 'fastlane_core/configuration/configuration'
 require 'fastlane_core/update_checker'
 require 'fastlane_core/languages'
 require 'fastlane_core/itunes_search_api'

data/lib/fastlane_core/configuration/commander_generator.rb

@@ -5,10 +5,16 @@ module FastlaneCore
     include Commander::Methods
 
     def generate(options)
+      short_codes = []
       options.each do |option|
         appendix = (option.is_string ? "STRING" : "")
         type = (option.is_string ? String : nil)
         short_option = option.short_option || "-#{option.key.to_s[0]}"
+
+        raise "Short option #{short_option} already taken for key #{option.key}".red if short_codes.include?short_option
+        raise "-v is already used for the version (key #{option.key})".red if short_option == "-v"
+        
+        short_codes << short_option
         global_option short_option, "--#{option.key} #{appendix}", type, (option.description + " (#{option.env_name})")
       end
     end

data/lib/fastlane_core/{configuration.rb → configuration/configuration.rb}

@@ -1,30 +1,43 @@
 require 'fastlane_core/configuration/config_item'
 require 'fastlane_core/configuration/commander_generator'
+require 'fastlane_core/configuration/configuration_file'
 
 module FastlaneCore
   class Configuration
-    def self.create(available_options, values)
-      Configuration.new(available_options, values)
-    end
 
-    # Setting up
+    attr_accessor :available_options
 
-    def values
-      # As the user accesses all values, we need to iterate through them to receive all the values
-      @available_options.each do |option|
-        @values[option.key] = fetch(option.key) unless @values[option.key]
-      end
-      @values
+    attr_accessor :values
+
+    # @return [Array] An array of symbols which are all available keys
+    attr_reader :all_keys
+
+    # @return [String] The name of the configuration file (not the path). Optional!
+    attr_accessor :config_file_name
+
+    # @param config_file_name [String] The name of the configuration file to use (optional)
+    # @param block_for_missing [Block] A ruby block that is called when there is an unkonwn method
+    #   in the configuration file
+    def self.create(available_options, values, config_file_name = nil, block_for_missing = nil)
+      Configuration.new(available_options, values, config_file_name, block_for_missing)
     end
 
-    def initialize(available_options, values)
-      @available_options = available_options || []
-      @values = values || {}
+    #####################################################
+    # @!group Setting up the configuration
+    #####################################################
+    
+    def initialize(available_options, values, config_file_name = nil, block_for_missing = nil)
+      self.available_options = available_options || []
+      self.values = values || {}
+      self.config_file_name = config_file_name
+      @block_for_missing = block_for_missing
 
       verify_input_types      
       verify_value_exists
       verify_no_duplicates
       verify_default_value_matches_verify_block
+
+      load_configuration_file
     end
 
     def verify_input_types
@@ -42,7 +55,7 @@ module FastlaneCore
         if option
           option.verify!(value) # Call the verify block for it too
         else
-          raise "Could not find available option '#{key}' in the list of available options: #{@available_options.collect { |a| a.key }.join(', ')}".red
+          raise "Could not find option '#{key}' in the list of available options: #{@available_options.collect { |a| a.key }.join(', ')}".red
         end
       end
     end
@@ -74,7 +87,19 @@ module FastlaneCore
       end
     end
 
-    # Using the class
+    def load_configuration_file
+      return unless self.config_file_name
+      paths = Dir["./fastlane/#{self.config_file_name}"] + Dir["./#{self.config_file_name}"]
+      paths = paths + Dir["./spec/fixtures/#{self.config_file_name}"] if Helper.is_test?
+      return if paths.count == 0
+
+      path = paths.first
+      ConfigurationFile.new(self, path, @block_for_missing)
+    end
+
+    #####################################################
+    # @!group Actually using the class
+    #####################################################
 
     # Returns the value for a certain key. fastlane_core tries to fetch the value from different sources
     def fetch(key)
@@ -122,12 +147,13 @@ module FastlaneCore
     end
 
     # Overwrites or sets a new value for a given key
+    # @param key [Symbol] Must be a symbol
     def set(key, value)
       raise "Key '#{key}' must be a symbol. Example :#{key}.".red unless key.kind_of?Symbol
       option = option_for_key(key)
       
       unless option
-        raise "Could not find available option '#{key}' in the list of available options #{@available_options.collect { |a| a.key }.join(', ')}".red
+        raise "Could not find option '#{key}' in the list of available options: #{@available_options.collect { |a| a.key }.join(', ')}".red
       end
 
       option.verify!(value)
@@ -136,6 +162,18 @@ module FastlaneCore
       true
     end
 
+    def values
+      # As the user accesses all values, we need to iterate through them to receive all the values
+      @available_options.each do |option|
+        @values[option.key] = fetch(option.key) unless @values[option.key]
+      end
+      @values
+    end
+
+    def all_keys
+      @available_options.collect { |o| o.key }
+    end
+
     # Returns the config_item object for a given key
     def option_for_key(key)
       @available_options.find { |o| o.key == key }

data/lib/fastlane_core/configuration/configuration_file.rb

@@ -0,0 +1,35 @@
+module FastlaneCore
+  # Responsible for loading configuration files
+  class ConfigurationFile
+    # A reference to the actual configuration
+    attr_accessor :config
+
+    # @param config [FastlaneCore::Configuration] is stored to save the resulting values
+    # @param path [String] The path to the configuration file to use
+    def initialize(config, path, block_for_missing)
+      self.config = config
+      @block_for_missing = block_for_missing
+
+      eval(File.read(path))
+    end
+
+    def method_missing(method_sym, *arguments, &block)
+      # First, check if the key is actually available
+      if self.config.all_keys.include?method_sym
+        value = arguments.first || (block.call if block_given?) # this is either a block or a value
+        if value
+          self.config[method_sym] = value
+        end
+      else
+        # We can't set this value, maybe the tool using this configuration system has its own
+        # way of handling this block, as this might be a special block (e.g. ipa block) that's only
+        # executed on demand
+        if @block_for_missing
+          @block_for_missing.call(method_sym, arguments, block)
+        else
+          self.config[method_sym] = '' # important, since this will raise a good exception for free
+        end
+      end
+    end
+  end
+end

data/lib/fastlane_core/helper.rb

@@ -54,10 +54,13 @@ module FastlaneCore
       self.test?
     end
 
-    # @return true if building in a known CI environment
+    # @return [boolean] true if building in a known CI environment
     def self.is_ci?
       # Check for Jenkins, Travis CI, ... environment variables
-      ENV.has_key?("JENKINS_URL") || ENV.has_key?("TRAVIS") || ENV.has_key?("CIRCLECI") || ENV.has_key?("CI")
+      ['JENKINS_URL', 'TRAVIS', 'CIRCLECI', 'CI'].each do |current|
+        return true if ENV.has_key?(current)
+      end
+      return false
     end
 
     # @return the full path to the Xcode developer tools of the currently

data/lib/fastlane_core/update_checker.rb

@@ -34,6 +34,7 @@ module FastlaneCore
         begin
           finished_running(gem_name)
         rescue
+           # we don't want to show a stack trace if something goes wrong
         end
       end
 

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -287,9 +287,10 @@ files:
 - README.md
 - lib/fastlane_core.rb
 - lib/fastlane_core/cert_checker.rb
-- lib/fastlane_core/configuration.rb
 - lib/fastlane_core/configuration/commander_generator.rb
 - lib/fastlane_core/configuration/config_item.rb
+- lib/fastlane_core/configuration/configuration.rb
+- lib/fastlane_core/configuration/configuration_file.rb
 - lib/fastlane_core/developer_center/developer_center.rb
 - lib/fastlane_core/developer_center/developer_center_helper.rb
 - lib/fastlane_core/developer_center/developer_center_login.rb