credentials_manager 0.15.1 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7aa6450b02a05cf3cd8ea07c390bf9df24f6152
-  data.tar.gz: 269ec6a5a925266cfd86789f679a52a7ef657b27
+  metadata.gz: 6eee55d49f41c211199559e3d44365130b764dbd
+  data.tar.gz: 125ef8b4502e4a9e15871769298ef4ac4235cca5
 SHA512:
-  metadata.gz: ce6a0c73ad2e691abab04d1401b83059078cdcaa8cfe91c34874037d9fcf8c8828eb81ff9e6c3701fb6dde1de596f9df5eec500602345e93426908ce8bee5535
-  data.tar.gz: 56b068930c538d96859f698592391423aa10963f1f536c6759d81387148672108e52373778f493a4de380553eba1c4984ea4e1b2deec18cf4aaf3297756caa1f
+  metadata.gz: b4188b66c8c8e9bf4d90e132dbb4ae75112b2604a8f8583d6c67eb8cc06ec661add5d0c18ebbefb4be3d60e9474d2721de0023788b5687d2331492415df4291b
+  data.tar.gz: de5a4725b24bd66913193daa4777498752fb2fcdc98d44e15b58c647517b5f66b5e898ea3bf791a66599e4e3970398aa03436b0a4a6168a11d2009937afb73b3

data/README.md

@@ -23,7 +23,7 @@ password has been deleted.
 
 ## Storing in the keychain
 
-By default, your Apple credentials are stored in the OS X Keychain.
+By default, your Apple credentials are stored in the macOS Keychain.
 
 Your password is only stored locally on your computer.
 

data/lib/credentials_manager.rb

@@ -8,4 +8,5 @@ require 'security'
 require 'highline/import' # to hide the entered password
 
 module CredentialsManager
+  ROOT = Pathname.new(File.expand_path('../..', __FILE__))
 end

data/lib/credentials_manager/account_manager.rb

@@ -3,7 +3,11 @@ require 'highline/import' # to hide the entered password
 
 module CredentialsManager
   class AccountManager
-    def initialize(user: nil, password: nil)
+    # @param prefix [String] Very optional, is used for the
+    #   iTunes Transporter which uses application specofic passwords
+    def initialize(user: nil, password: nil, prefix: nil)
+      @prefix = prefix || "deliver"
+
       @user = user
       @password = password
     end
@@ -16,9 +20,12 @@ module CredentialsManager
       return @user
     end
 
+    def fetch_password_from_env
+      ENV["FASTLANE_PASSWORD"] || ENV["DELIVER_PASSWORD"]
+    end
+
     def password(ask_if_missing: true)
-      @password ||= ENV["FASTLANE_PASSWORD"]
-      @password ||= ENV["DELIVER_PASSWORD"]
+      @password ||= fetch_password_from_env
       unless @password
         item = Security::InternetPassword.find(server: server_name)
         @password ||= item.password if item
@@ -32,6 +39,13 @@ module CredentialsManager
     # @return: Did the user decide to remove the old entry and enter a new password?
     def invalid_credentials(force: false)
       puts "The login credentials for '#{user}' seem to be wrong".red
+
+      if fetch_password_from_env
+        puts "The password was taken from the environment variable"
+        puts "Please make sure it is correct"
+        return false
+      end
+
       if force || agree("Do you want to re-enter your password? (y/n)", true)
         puts "Removing Keychain entry for user '#{user}'...".yellow
         remove_from_keychain
@@ -50,22 +64,28 @@ module CredentialsManager
       @password = nil
     end
 
+    def server_name
+      "#{@prefix}.#{user}"
+    end
+
     private
 
     def ask_for_login
       puts "-------------------------------------------------------------------------------------".green
       puts "The login information you enter will be stored in your Mac OS Keychain".green
-      puts "You can also pass the password using the `FASTLANE_PASSWORD` env variable".green
+      puts "You can also pass the password using the `FASTLANE_PASSWORD` environment variable".green
       puts "More information about it on GitHub: https://github.com/fastlane/fastlane/tree/master/credentials_manager".green
       puts "-------------------------------------------------------------------------------------".green
 
       if @user.to_s.length == 0
+        raise "Missing username, and running in non-interactive shell" if $stdout.isatty == false
         @user = ask("Username: ") while @user.to_s.length == 0
         # we return here, as only the username was asked for now, we'll get called for the pw again anyway
         return
       end
 
       while @password.to_s.length == 0
+        raise "Missing password for user #{@user}, and running in non-interactive shell" if $stdout.isatty == false
         @password = ask("Password (for #{@user}): ") { |q| q.echo = "*" }
       end
 
@@ -80,9 +100,5 @@ module CredentialsManager
         return false
       end
     end
-
-    def server_name
-      "deliver.#{user}"
-    end
   end
 end

data/lib/credentials_manager/appfile_config.rb

@@ -1,8 +1,9 @@
 module CredentialsManager
   # Access the content of the app file (e.g. app identifier and Apple ID)
   class AppfileConfig
-
     def self.try_fetch_value(key)
+      # We need to load the file every time we call this method
+      # to support the `for_lane` keyword
       begin
         return self.new.data[key]
       rescue => ex
@@ -21,7 +22,7 @@ module CredentialsManager
 
     def initialize(path = nil)
       if path
-        raise "Could not find Appfile at path '#{path}'".red unless File.exist?(path)
+        raise "Could not find Appfile at path '#{path}'".red unless File.exist?(File.expand_path(path))
       end
 
       path ||= self.class.default_path
@@ -42,12 +43,35 @@ module CredentialsManager
           # rubocop:disable Lint/Eval
           eval(content)
           # rubocop:enable Lint/Eval
+
+          print_debug_information(path: full_path) if $verbose
         end
       end
 
       fallback_to_default_values
     end
 
+    def print_debug_information(path: nil)
+      self.class.already_printed_debug_information ||= {}
+      return if self.class.already_printed_debug_information[self.data]
+      # self.class.already_printed_debug_information is a hash, we use to detect if we already printed this data
+      # this is necessary, as on the course of a fastlane run, the values might change, e.g. when using
+      # the `for_lane` keyword.
+
+      puts "Successfully loaded Appfile at path '#{path}'".yellow
+
+      self.data.each do |key, value|
+        puts "- #{key.to_s.cyan}: '#{value.to_s.green}'"
+      end
+      puts "-------"
+
+      self.class.already_printed_debug_information[self.data] = true
+    end
+
+    def self.already_printed_debug_information
+      @already_printed_debug_information ||= {}
+    end
+
     def fallback_to_default_values
       data[:apple_id] ||= ENV["FASTLANE_USER"] || ENV["DELIVER_USER"]
     end

data/lib/credentials_manager/version.rb

@@ -1,3 +1,3 @@
 module CredentialsManager
-  VERSION = "0.15.1"
+  VERSION = "0.16.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: credentials_manager
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.4
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -84,16 +84,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.44.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.44.0
 description: Password manager used in fastlane.tools
 email:
 - fastlane@krausefx.com
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Password manager used in fastlane.tools