credentials_manager 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d6ff9dc2af11593ae49731751920d7a7afce656
-  data.tar.gz: 977a5df300bc4b5432a057faadf28f2610101cb3
+  metadata.gz: bde8f7bd1ba5585cdc09b030cf1a935ecb739b73
+  data.tar.gz: 11c73c6983ec77346a8bc1a3121344c09cc8bda8
 SHA512:
-  metadata.gz: b834015d4b6264222aa4a24298d96ed674ad4c210ca81a431a1ef1d36b74dc2fb3da1338b7f78864571060e49b36f2f460f6311a16961a63944d6cac290bdd36
-  data.tar.gz: 786be1a4dadf3eeea22ec908fcd9edd620ec3e8ee8a9b56cb67da3c27deaef4aed48740c446b95161d2251359e3c67a74269f4601916b6d4efac1c2b8aaff1e1
+  metadata.gz: 909d88cb900f568044e9c527a00c71eb3edaa78cdf981c7e41dd2dab3d48c3c7db256067d7ddcc25314706012c97af7d9c1a33ba9dec6e8a26eb38f84fed3e7f
+  data.tar.gz: 5ece03d37c9779e87827c6c7105086ee46cc9660b43b5016baeccfac2a6a4a4aec18cf9c7df34fb0b104ea9d22c0d1a974b0190a891808cd091299be9301b98f

data/lib/credentials_manager.rb

@@ -1,8 +1,8 @@
 require 'credentials_manager/password_manager'
+require 'credentials_manager/account_manager'
 
 # Third Party code
 require 'colored'
 
 module CredentialsManager
-  
 end

data/lib/credentials_manager/account_manager.rb

@@ -0,0 +1,73 @@
+require 'security'
+require 'highline/import' # to hide the entered password
+
+module CredentialsManager
+  class AccountManager
+    def initialize(user: nil, password: nil)
+      @user = user
+      @password = password
+    end
+
+    def user
+      @user ||= ENV["FASTLANE_USER"]
+      @user ||= ENV["DELIVER_USER"]
+      @user ||= AppfileConfig.try_fetch_value(:apple_id)
+      ask_for_login if @user.to_s.length == 0
+      return @user
+    end
+
+    def password
+      @password ||= ENV["FASTLANE_PASSWORD"]
+      @password ||= ENV["DELIVER_PASSWORD"]
+      unless @password
+        item = Security::InternetPassword.find(server: server_name)
+        @password ||= item.password if item
+      end
+      ask_for_login if @password.to_s.length == 0
+      return @password
+    end
+
+    # Call this method to ask the user to re-enter the credentials
+    # @param force: if false the user is asked before it gets deleted
+    def invalid_credentials(force: false)
+      puts "The login credentials for '#{user}' seem to be wrong".red
+      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
+        ask_for_login
+      end
+    end
+
+    private
+
+    def ask_for_login
+      puts "-------------------------------------------------------------------------------------".green
+      puts "The login information you enter will be stored in your Mac OS Keychain".green
+      puts "More information about it on GitHub: https://github.com/fastlane/CredentialsManager".green
+      puts "-------------------------------------------------------------------------------------".green
+
+      @user = ask("Username: ") while @user.to_s.length == 0
+      while @password.to_s.length == 0
+        @password = ask("Password (for #{@user}): ") { |q| q.echo = "*" }
+      end
+
+      return true if ENV["FASTLANE_DONT_STORE_PASSWORD"]
+
+      # Now we store this information in the keychain
+      if Security::InternetPassword.add(server_name, user, password)
+        return true
+      else
+        puts "Could not store password in keychain".red
+        return false
+      end
+    end
+
+    def remove_from_keychain
+      Security::InternetPassword.delete(server: server_name)
+    end
+
+    def server_name
+      "deliver.#{user}"
+    end
+  end
+end

data/lib/credentials_manager/appfile_config.rb

@@ -16,20 +16,28 @@ module CredentialsManager
 
     def self.default_path
       ["./fastlane/Appfile", "./Appfile"].each do |current|
-        return current if File.exists?current
+        return current if File.exist? current
       end
       nil
     end
 
     def initialize(path = nil)
-      path ||= self.class.default_path      
+      path ||= self.class.default_path
 
-      raise "Could not find Appfile at path '#{path}'".red unless File.exists?(path)
+      raise "Could not find Appfile at path '#{path}'".red unless File.exist?(path)
 
       full_path = File.expand_path(path)
       Dir.chdir(File.expand_path('..', path)) do
+        # rubocop:disable Lint/Eval
         eval(File.read(full_path))
+        # rubocop:enable Lint/Eval
       end
+
+      fallback_to_default_values
+    end
+
+    def fallback_to_default_values
+      data[:apple_id] ||= ENV["FASTLANE_USER"] || ENV["DELIVER_USER"]
     end
 
     def data
@@ -39,39 +47,19 @@ module CredentialsManager
     # Setters
 
     def app_identifier(*args, &block)
-      if block_given?
-        value = yield
-      else
-        value = args.shift
-      end
-      data[:app_identifier] = value if value
+      setter(:app_identifier, *args, &block)
     end
 
     def apple_id(*args, &block)
-      if block_given?
-        value = yield
-      else
-        value = args.shift
-      end
-      data[:apple_id] = value if value
+      setter(:apple_id, *args, &block)
     end
 
     def team_id(*args, &block)
-      if block_given?
-        value = yield
-      else
-        value = args.shift
-      end
-      data[:team_id] = value if value
+      setter(:team_id, *args, &block)
     end
 
     def team_name(*args, &block)
-      if block_given?
-        value = yield
-      else
-        value = args.shift
-      end
-      data[:team_name] = value if value
+      setter(:team_name, *args, &block)
     end
 
     # Override Appfile configuration for a specific lane.
@@ -109,5 +97,16 @@ module CredentialsManager
         block.call
       end
     end
+
+    private
+
+    def setter(key, *args, &_block)
+      if block_given?
+        value = yield
+      else
+        value = args.shift
+      end
+      data[key] = value if value
+    end
   end
 end

data/lib/credentials_manager/password_manager.rb

@@ -35,14 +35,13 @@ module CredentialsManager
     end
 
     # A new instance of PasswordManager.
-    # 
+    #
     # This already check the Keychain if there is a username and password stored.
     # If that's not the case, it will ask for login data via stdin
     # @param id_to_use (String) Apple ID (e.g. user@apple.com) which should be used for this upload.
     #  if given, only the password will be asked/loaded.
     # @param ask_if_missing (boolean) true by default: if no credentials are found, should the user be asked?
     def initialize(id_to_use = nil, ask_if_missing = true)
-      
       self.username ||= id_to_use || ENV["DELIVER_USER"] || AppfileConfig.try_fetch_value(:apple_id) || load_from_keychain[0]
       self.password ||= ENV["DELIVER_PASSWORD"] || load_from_keychain[1]
 
@@ -65,56 +64,55 @@ module CredentialsManager
     end
 
     private
-      def ask_for_login
-        puts "-------------------------------------------------------------------------------------".green
-        puts "The login information you enter will be stored in your Mac OS Keychain".green
-        puts "More information about that on GitHub: https://github.com/fastlane/CredentialsManager".green
-        puts "-------------------------------------------------------------------------------------".green
 
-        username_was_there = self.username
+    def ask_for_login
+      puts "-------------------------------------------------------------------------------------".green
+      puts "The login information you enter will be stored in your Mac OS Keychain".green
+      puts "More information about that on GitHub: https://github.com/fastlane/CredentialsManager".green
+      puts "-------------------------------------------------------------------------------------".green
 
-        while (self.username || '').length == 0
-          self.username = ask("Username: ")
-        end
+      username_was_there = self.username
 
-        self.password ||= load_from_keychain[1] # maybe there was already something stored in the keychain
+      self.username = ask("Username: ") while (self.username || '').length == 0
 
-        if (self.password || '').length > 0
-          return true
-        else
-          while (self.password || '').length == 0
-            text = "Password: "
-            text = "Password (for #{self.username}): " if username_was_there
-            self.password = ask(text) { |q| q.echo = "*" }
-          end
+      self.password ||= load_from_keychain[1] # maybe there was already something stored in the keychain
 
-          # Now we store this information in the keychain
-          # Example usage taken from https://github.com/nomad/cupertino/blob/master/lib/cupertino/provisioning_portal/commands/login.rb
-          unless ENV["FASTLANE_DONT_STORE_PASSWORD"]
-            if Security::InternetPassword.add(hostname, self.username, self.password)
-              return true
-            else
-              puts "Could not store password in keychain".red
-              return false
-            end
+      if (self.password || '').length > 0
+        return true
+      else
+        while (self.password || '').length == 0
+          text = "Password: "
+          text = "Password (for #{self.username}): " if username_was_there
+          self.password = ask(text) { |q| q.echo = "*" }
+        end
+
+        # Now we store this information in the keychain
+        # Example usage taken from https://github.com/nomad/cupertino/blob/master/lib/cupertino/provisioning_portal/commands/login.rb
+        unless ENV["FASTLANE_DONT_STORE_PASSWORD"]
+          if Security::InternetPassword.add(hostname, self.username, self.password)
+            return true
+          else
+            puts "Could not store password in keychain".red
+            return false
           end
         end
       end
+    end
 
-      def remove_from_keychain
-        puts "Removing keychain item: #{hostname}".yellow
-        Security::InternetPassword.delete(:server => hostname)
-      end
-    
-      def load_from_keychain
-        pass = Security::InternetPassword.find(:server => hostname)
-        
-        return [pass.attributes['acct'], pass.password] if pass
-        return [nil, nil]
-      end
+    def remove_from_keychain
+      puts "Removing keychain item: #{hostname}".yellow
+      Security::InternetPassword.delete(server: hostname)
+    end
 
-      def hostname
-        [HOST, self.username].join('.')
-      end
+    def load_from_keychain
+      pass = Security::InternetPassword.find(server: hostname)
+
+      return [pass.attributes['acct'], pass.password] if pass
+      return [nil, nil]
+    end
+
+    def hostname
+      [HOST, self.username].join('.')
+    end
   end
 end

data/lib/credentials_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: credentials_manager
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-22 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -118,6 +118,7 @@ files:
 - LICENSE
 - README.md
 - lib/credentials_manager.rb
+- lib/credentials_manager/account_manager.rb
 - lib/credentials_manager/appfile_config.rb
 - lib/credentials_manager/password_manager.rb
 - lib/credentials_manager/version.rb