cocoapods-keys 2.2.1 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86d06ce794bdfa758b1001238ec11e6ae635274623f72ca9722ff33b7b11ae4c
-  data.tar.gz: bd2d607a2b0956d7c2e0fc620fc2bd115861dbc041fe297c474a1b63c33b49b1
+  metadata.gz: 78371f27d0e48b3ef58b647ac8ca3dea76a8db2095328e1a9fb48ebfe750d46f
+  data.tar.gz: 874d93b1080cce4d1e2b949deffbc5c8ab6ffa02b5df5ca3deb686203dc87627
 SHA512:
-  metadata.gz: fea1b50b535fedd2326333f297620ec467d2de7416a7bae36af2cfe7414f85edf9b69b30cc08648adcd4294718e14ccab7c3d37cbffca2f687290f3e2d452fc8
-  data.tar.gz: dfb7ce7bd1ff9648f802357c32acf44579ae76b1e035d1b526f73b7b1b901b314ab3eacd9fc739b0d137e3c61455dfb6f23a1f9c85e2084b56a3f542860e7a0a
+  metadata.gz: fe9601680a55615c50a9bba79ef2e474aee093f74bb0c17afd2a4fa298b2f001a2fc68df25ba69a779bce2083d80343128b6bbe151b445fee71b61258efc6246
+  data.tar.gz: 9289245b26a3164fa94e35c1e3661c1f33a07ca9b5af99bc07bf11e595ebdb7a2d6d8e63c1969fe8b78517c189d2918703e7d75589a09bb4e97c264f22b94c8a

data/.gitignore

@@ -5,3 +5,4 @@ spec/fixtures/dump-key
 vendor
 install
 .bundle
+*.gem

data/.rubocop.yml

@@ -4,7 +4,7 @@ inherit_from:
 
 #- cocoapods-keys -------------------------------------------------------------
 
-Style/FileName:
+Naming/FileName:
   Exclude:
     - bin/*
     - Rakefile

data/.rubocop_cocoapods.yml

@@ -1,4 +1,6 @@
 AllCops:
+  NewCops: enable
+  SuggestExtensions: false
   Include:
     - ./Rakefile
     - ./Gemfile
@@ -8,44 +10,47 @@ AllCops:
 
 # At the moment not ready to be used
 # https://github.com/bbatsov/rubocop/issues/947
-Documentation:
+Style/Documentation:
   Enabled: false
 
 #- CocoaPods -----------------------------------------------------------------#
 
 # We adopted raise instead of fail.
-SignalException:
+Style/SignalException:
   EnforcedStyle: only_raise
 
 # They are idiomatic
-AssignmentInCondition:
+Lint/AssignmentInCondition:
   Enabled: false
 
 # Allow backticks
-AsciiComments:
+Style/AsciiComments:
   Enabled: false
 
 # Indentation clarifies logic branches in implementations
-IfUnlessModifier:
+Style/IfUnlessModifier:
   Enabled: false
 
 # No enforced convention here.
-SingleLineBlockParams:
+Style/SingleLineBlockParams:
   Enabled: false
 
 # We only add the comment when needed.
-Encoding:
+Style/Encoding:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
   Enabled: false
 
 Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
 # Clashes with CLAide Command#validate!
-GuardClause:
+Style/GuardClause:
   Enabled: false
 
 # Not always desirable: lib/claide/command/plugins_helper.rb:12:15
-Next:
+Style/Next:
   Enabled: false
 
 # Arbitrary max lengths for classes simply do not work and enabling this will
@@ -74,16 +79,16 @@ Metrics/CyclomaticComplexity:
 
 #- CocoaPods support for Ruby 1.8.7 ------------------------------------------#
 
-HashSyntax:
+Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
-Lambda:
+Style/Lambda:
   Enabled: false
 
-DotPosition:
+Layout/DotPosition:
   EnforcedStyle: trailing
 
-EachWithObject:
+Style/EachWithObject:
   Enabled: false
 
 Style/SpecialGlobalVars:
@@ -92,20 +97,20 @@ Style/SpecialGlobalVars:
 #- CocoaPods specs -----------------------------------------------------------#
 
 # Allow for `should.match /regexp/`.
-AmbiguousRegexpLiteral:
+Lint/AmbiguousRegexpLiteral:
   Exclude:
     - spec/**/*
 
 # Allow `object.should == object` syntax.
-Void:
+Lint/Void:
   Exclude:
     - spec/**/*
 
-ClassAndModuleChildren:
+Style/ClassAndModuleChildren:
   Exclude:
     - spec/**/*
 
-UselessComparison:
+Lint/BinaryOperatorWithIdenticalOperands:
   Exclude:
     - spec/**/*
 

data/.rubocop_todo.yml

@@ -23,7 +23,7 @@ Lint/Void:
 
 # Offense count: 38
 # Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
+Layout/LineLength:
   Max: 173
 
 # Offense count: 1
@@ -31,7 +31,7 @@ Metrics/PerceivedComplexity:
   Max: 9
 
 # Offense count: 4
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Enabled: false
 
 # Offense count: 1

data/.travis.yml

@@ -1,3 +1,3 @@
 language: objective-c
-install: bundle install --deployment
+install: bundle install
 script: bundle exec rake spec

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Master
 
+## 2.3.1
+
+* Crash fix. [tritter]
+
+## 2.3.0
+
+* Switched dependencies for the keychain, should fix m-class OS issues. [tritter]
+
 ## 2.2.1
 
 * Fixed Keys.m generation when there are empty-string keys. [rogerluan]

data/Gemfile

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in cocoapods-keys.gemspec
 gemspec
 
-gem 'cocoapods', '1.0.0.beta.6'
-gem 'activesupport', '< 5'
+gem 'cocoapods', '>= 1.11'
+gem 'activesupport', '>= 5'
+gem 'ruby-keychain', :require => 'keychain'

data/Gemfile.lock

@@ -1,119 +1,157 @@
 PATH
   remote: .
   specs:
-    cocoapods-keys (2.1.0)
+    cocoapods-keys (2.2.1)
       dotenv
-      osx_keychain
+      keychain
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.5)
-    RubyInline (3.12.4)
-      ZenTest (~> 4.3)
-    ZenTest (4.11.2)
-    activesupport (4.2.9)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    ast (2.3.0)
-    claide (1.0.2)
-    cocoapods (1.0.0.beta.6)
-      activesupport (>= 4.0.2)
-      claide (>= 1.0.0.beta.3, < 2.0)
-      cocoapods-core (= 1.0.0.beta.6)
-      cocoapods-deintegrate (>= 1.0.0.beta.1, < 2.0)
-      cocoapods-downloader (>= 1.0.0.beta.2, < 2.0)
-      cocoapods-plugins (>= 1.0.0.beta.1, < 2.0)
-      cocoapods-search (>= 1.0.0.beta.1, < 2.0)
-      cocoapods-stats (>= 1.0.0.beta.3, < 2.0)
-      cocoapods-trunk (>= 1.0.0.beta.2, < 2.0)
-      cocoapods-try (>= 1.0.0.beta.3, < 2.0)
-      colored (~> 1.2)
+    CFPropertyList (3.0.5)
+      rexml
+    activesupport (6.1.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    ast (2.4.2)
+    atomos (0.1.3)
+    claide (1.1.0)
+    cocoapods (1.11.3)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.11.3)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 0.3.0)
-      molinillo (~> 0.4.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
       nap (~> 1.0)
-      xcodeproj (>= 1.0.0.beta.3, < 2.0)
-    cocoapods-core (1.0.0.beta.6)
-      activesupport (>= 4.0.2)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-core (1.11.3)
+      activesupport (>= 5.0, < 7)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.3)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (1.6.3)
     cocoapods-plugins (1.0.0)
       nap
-    cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.2.0)
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
       nap (>= 0.8, < 2.0)
-      netrc (= 0.7.8)
-    cocoapods-try (1.1.0)
-    colored (1.2)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    diff-lcs (1.3)
-    dotenv (2.6.0)
+    concurrent-ruby (1.1.10)
+    crypt (2.2.1)
+    diff-lcs (1.5.0)
+    dotenv (2.8.1)
     escape (0.0.4)
-    fourflusher (0.3.2)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.5)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
-    i18n (0.8.4)
-    minitest (5.10.2)
-    molinillo (0.4.5)
-    nanaimo (0.2.3)
+    gh_inspector (1.1.3)
+    highline (2.0.3)
+    httpclient (2.8.3)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.2)
+    keychain (0.2.3)
+      crypt (>= 1.1.4)
+      highline (>= 1.4.0)
+    minitest (5.16.3)
+    molinillo (0.8.0)
+    nanaimo (0.3.0)
     nap (1.1.0)
-    netrc (0.7.8)
-    osx_keychain (1.0.2)
-      RubyInline (~> 3)
-    parallel (1.11.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rainbow (2.2.2)
-      rake
-    rake (12.0.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    netrc (0.11.0)
+    og-corefoundation (0.2.3)
+      ffi
+    parallel (1.22.1)
+    parser (3.1.3.0)
+      ast (~> 2.4.1)
+    public_suffix (4.0.7)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.6.1)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.49.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.39.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      parser (>= 3.1.2.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-    xcodeproj (1.5.0)
-      CFPropertyList (~> 2.3.3)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.24.0)
+      parser (>= 3.1.1.0)
+    ruby-keychain (0.4.0)
+      ffi
+      og-corefoundation (~> 0.2.0)
+    ruby-macho (2.5.1)
+    ruby-progressbar (1.11.0)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.3.0)
+    xcodeproj (1.22.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.3)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    zeitwerk (2.6.6)
 
 PLATFORMS
-  ruby
+  arm64-darwin-22
 
 DEPENDENCIES
-  activesupport (< 5)
-  bundler (~> 1.3)
-  cocoapods (= 1.0.0.beta.6)
+  activesupport (>= 5)
+  bundler (~> 2.3)
+  cocoapods (>= 1.11)
   cocoapods-keys!
   rake
   rspec
-  rubocop
+  rubocop (> 1.38)
+  ruby-keychain
 
 BUNDLED WITH
-   1.16.4
+   2.3.26

data/README.md

@@ -1,9 +1,13 @@
-![Build Status](https://travis-ci.org/orta/cocoapods-keys.svg)
+[![Build Status](https://travis-ci.org/orta/cocoapods-keys.svg?branch=master)](https://travis-ci.org/orta/cocoapods-keys)
 
 A key value store for enviroment and application keys.
 
 Its good security practice to keep production keys out of developer hands. CocoaPods-keys makes it easy to have per-user config settings stored securely in the developer's keychain, and not in the application source. It is a plugin that once installed will run on every `pod install` or `pod update`.
 
+## Alternatives
+
+CocoaPods Keys has had a great run since its creation in 2014, and still works perfectly fine today. If you're interested in a fresh re-think of the concept, check out https://github.com/rogerluan/arkana 
+
 ## Requirements
 
 Requires CocoaPods 0.36+
@@ -34,6 +38,9 @@ plugin 'cocoapods-keys', {
     ...
   ]}
 ```
+> Please do not use dash in key names ([Reason why here in this issue #197](https://github.com/orta/cocoapods-keys/issues/197)).
+> 
+> For example convert any key like this `WRONGLY-DEFINED-KEY` to `CorrectlyDefinedKey`.
 
 Then running `pod install` will prompt for the keys not yet set and you can ensure everyone has the same setup.
 

data/cocoapods_keys.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "osx_keychain"
+  spec.add_runtime_dependency "ruby-keychain"
   spec.add_runtime_dependency "dotenv"
   # spec.add_runtime_dependency "cocoapods", "> 1"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 2.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop", "> 1.38"
 end

data/lib/cocoapods_keys.rb

@@ -1,3 +1,3 @@
 module CocoaPodsKeys
-  VERSION = '2.2.1'.freeze
+  VERSION = '2.3.1'.freeze
 end

data/lib/key_master.rb

@@ -80,7 +80,7 @@ module CocoaPodsKeys
 
     def render_erb(erb_template)
       erb = (Pathname(__dir__).parent + 'templates' + erb_template).read
-      ERB.new(erb, nil, '-').result(binding)
+      ERB.new(erb, trim_mode: '-').result(binding)
     end
 
     def key_data_arrays

data/lib/keyring.rb

@@ -1,4 +1,6 @@
-require 'osx_keychain'
+require 'keychain'
+require 'base64'
+require 'json'
 
 module CocoaPodsKeys
   class Keyring
@@ -27,11 +29,17 @@ module CocoaPodsKeys
     end
 
     def keychain
-      @keychain ||= OSXKeychain.new
+      @keychain ||= Keychain.generic_passwords
     end
 
     def save(key, value)
-      keychain[self.class.keychain_prefix + name, key] = value
+      item = keychain.where(service: self.class.keychain_prefix + name, account: key).first
+      if item
+        item.password = value
+        item.save!
+      else
+        keychain.create(service: self.class.keychain_prefix + name, password: value, account: key)
+      end
     end
 
     def keychain_data
@@ -53,7 +61,7 @@ module CocoaPodsKeys
     end
 
     def keychain_value(key)
-      ENV[key] || keychain[self.class.keychain_prefix + name, key]
+      ENV[key] || keychain.where(service: self.class.keychain_prefix + name, account: key).first&.password
     end
 
     def camel_cased_keys

data/spec/fixtures/Podfile

@@ -4,5 +4,5 @@ plugin 'cocoapods-keys', {
     :keys => [
         'KeyWithData',
         'KeyWithoutData',
-    ]
+    ],
 }

data/spec/keyring_spec.rb

@@ -17,7 +17,7 @@ describe KeyringLiberator do
     expect(keyring.keychain_data).to eq('ARMyKey' => 'Hello')
   end
 
-  it 'looks up keys from the OSXKeychain' do
+  it 'looks up keys from Keychain Access' do
     keyring = Keyring.new('test', '/', ['ARMyKey'])
     keyring.instance_variable_set(:@keychain, FakeKeychain.new('KeychainKey' => 'abcde'))
     expect(keyring.keychain_has_key?('KeychainKey')).to be_truthy

data/spec/spec_helper.rb

@@ -16,12 +16,22 @@ RSpec.configure do |c|
   c.color = true
 end
 
+class FakeKeychainItem
+  attr_accessor :password
+
+  def initialize(password)
+    @password = password
+  end
+end
+
 class FakeKeychain
   def initialize(data)
     @data = data
   end
 
-  def [](_, key)
-    @data[key]
+  def where(conditions)
+    password = @data[conditions[:account]]
+    item = FakeKeychainItem.new(password)
+    [item]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-keys
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.1
 platform: ruby
 authors:
 - Orta Therox
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: osx_keychain
+  name: ruby-keychain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -85,16 +85,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.38'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.38'
 description: A key value store for environment settings in Cocoa Apps.
 email:
 - orta.therox@gmail.com
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: CocoaPods Keys will store sensitive data in your Mac's keychain. Then on