credentials_manager 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97431490785318228eea05f8bf2e3089a348b5a1
-  data.tar.gz: 800e2b37b97a60c7ac89ead4cabbc68b11b282ef
+  metadata.gz: 5d6ff9dc2af11593ae49731751920d7a7afce656
+  data.tar.gz: 977a5df300bc4b5432a057faadf28f2610101cb3
 SHA512:
-  metadata.gz: ca4ddee3bc9b8a7df5ec9ef6295a3ff6f95c5b1e9b56d5ab0bf4a6ee2e1841bc3537c8d07a5d1c1befd0f21e9965a0d829901fd83a8887dd4970515261919095
-  data.tar.gz: 2dbc8450ad76febbd15440f47a0d466fea0c6be0dc718d63d89950f986db9b7b4c7cdf2efb29adea813654df2abb0b5bc49fb34a67452eb70f7ff40318cdd399
+  metadata.gz: b834015d4b6264222aa4a24298d96ed674ad4c210ca81a431a1ef1d36b74dc2fb3da1338b7f78864571060e49b36f2f460f6311a16961a63944d6cac290bdd36
+  data.tar.gz: 786be1a4dadf3eeea22ec908fcd9edd620ec3e8ee8a9b56cb67da3c27deaef4aed48740c446b95161d2251359e3c67a74269f4601916b6d4efac1c2b8aaff1e1

data/lib/credentials_manager/appfile_config.rb

@@ -30,34 +30,6 @@ module CredentialsManager
       Dir.chdir(File.expand_path('..', path)) do
         eval(File.read(full_path))
       end
-
-      # If necessary override per lane configuration
-      #
-      # Appfile can specify different rules per:
-      # - Platform
-      # - Lane
-      #
-      # It is forbidden to specify multiple configuration for the same platform. It will raise an exception.
-
-      if for_platform_configuration?(blocks)
-        # Plaform specified.
-        blocks[ENV["FASTLANE_PLATFORM_NAME"]].call
-        inner_block = blocks[ENV["FASTLANE_PLATFORM_NAME"]]
-        if for_lane_configuration?(inner_block)
-          # .. Lane specified
-          inner_block[ENV["FASTLANE_LANE_NAME"]].call
-        end
-      else
-        # Platform not specified
-        if for_lane_configuration?(blocks)
-          # .. Lane specified
-          blocks[ENV["FASTLANE_LANE_NAME"]].call
-        end
-      end
-    end
-
-    def blocks
-      @blocks ||= {}
     end
 
     def data
@@ -104,27 +76,24 @@ module CredentialsManager
 
     # Override Appfile configuration for a specific lane.
     #
-    # lane_name  - Symbol representing a lane name.
+    # lane_name  - Symbol representing a lane name. (Can be either :name, 'name' or 'platform name')
     # block - Block to execute to override configuration values.
     #
     # Discussion If received lane name does not match the lane name available as environment variable, no changes will
     #             be applied.
     def for_lane(lane_name, &block)
-      raise "Configuration for lane '#{lane_name}' is defined multiple times!".red if blocks[lane_name]
-      if ENV["FASTLANE_PLATFORM_NAME"].to_s.strip.empty?
-        # No platform specified, assigned configuration by lane name
-        blocks[lane_name.to_s] = block
-      else
-        if ENV["FASTLANE_LANE_NAME"]
-          # The for_lane could be formatted as:
-          #   - only {lane_name} (i.e. 'for_lane beta ...')
-          #   - {platform_name} {lane_name} (i.e. 'for_lane "ios beta" ...')
-          #
-          # Either case it is a valid configuration to run the overwriting of the settings.
-          if lane_name.to_s == "#{ENV["FASTLANE_PLATFORM_NAME"]} #{ENV["FASTLANE_LANE_NAME"]}" || lane_name.to_s == ENV["FASTLANE_LANE_NAME"]
-             blocks[ENV["FASTLANE_LANE_NAME"]] = block
-          end
-        end
+      if lane_name.to_s.split(" ").count > 1
+        # That's the legacy syntax 'platform name'
+        puts "You use deprecated syntax '#{lane_name}' in your Appfile.".yellow
+        puts "Please follow the Appfile guide: https://github.com/KrauseFx/fastlane/blob/master/docs/Appfile.md".yellow
+        platform, lane_name = lane_name.split(" ")
+
+        return unless platform == ENV["FASTLANE_PLATFORM_NAME"]
+        # the lane name will be verified below
+      end
+
+      if ENV["FASTLANE_LANE_NAME"] == lane_name.to_s
+        block.call
       end
     end
 
@@ -136,20 +105,9 @@ module CredentialsManager
     # Discussion If received paltform name does not match the platform name available as environment variable, no changes will
     #             be applied.
     def for_platform(platform_name, &block)
-      raise "Configuration for platform '#{platform_name}' is defined multiple times!".red if blocks[platform_name]
-      blocks[platform_name.to_s] = block
-    end
-
-    # Private helpers
-
-    def for_lane_configuration?(block)
-      return block[ENV["FASTLANE_LANE_NAME"].to_s] if ENV["FASTLANE_LANE_NAME"]
-      false
-    end
-
-    def for_platform_configuration?(block)
-      return block[ENV["FASTLANE_PLATFORM_NAME"].to_s] if ENV["FASTLANE_PLATFORM_NAME"]
-      false
+      if ENV["FASTLANE_PLATFORM_NAME"] == platform_name.to_s
+        block.call
+      end
     end
   end
 end

data/lib/credentials_manager/password_manager.rb

@@ -10,7 +10,7 @@ module CredentialsManager
     # @return [String] The password of the currently logged in user
     attr_accessor :password
 
-    HOST = "deliver" # there might be a string appended, if user has multiple accounts
+    HOST = "deliver" # there *is* a string appended
     private_constant :HOST
 
     # A singleton object, which also makes sure, to use the correct Apple ID

data/lib/credentials_manager/version.rb

@@ -1,3 +1,3 @@
 module CredentialsManager
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: credentials_manager
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Password manager used in fastlane.tools