cocoapods-keys 2.0.5 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 635f4e1b61f52669ce98378592e4eb6eefb0d879
-  data.tar.gz: d6ff4f21c5c32b58880d7a83e3ce48d988420d83
+SHA256:
+  metadata.gz: 86d06ce794bdfa758b1001238ec11e6ae635274623f72ca9722ff33b7b11ae4c
+  data.tar.gz: bd2d607a2b0956d7c2e0fc620fc2bd115861dbc041fe297c474a1b63c33b49b1
 SHA512:
-  metadata.gz: b7f6572ebacd2b6cfb9e0823b9befa6169d6ef0a2579b0338b1abb406d282e230a5124603dd3b66691e0d66f1281285dc13f9e1196aa7705d57ff768e2470339
-  data.tar.gz: a0609ef4cee14a1b12c689ad2b92be5c4b4d91a3542c4d6ea7c7f48dca0cd2cc2f25274ab1bf726ca6c567287f21cd32bbbaa5603949cccbaf5022c23af1c0d6
+  metadata.gz: fea1b50b535fedd2326333f297620ec467d2de7416a7bae36af2cfe7414f85edf9b69b30cc08648adcd4294718e14ccab7c3d37cbffca2f687290f3e2d452fc8
+  data.tar.gz: dfb7ce7bd1ff9648f802357c32acf44579ae76b1e035d1b526f73b7b1b901b314ab3eacd9fc739b0d137e3c61455dfb6f23a1f9c85e2084b56a3f542860e7a0a

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 ## Master
 
+## 2.2.1
+
+* Fixed Keys.m generation when there are empty-string keys. [rogerluan]
+
+## 2.2.0
+
+* Revised template which doesn't allow for secrets to appear in the binaries in modern Xcode builds. [ashfurrow]
+
+## 2.1.0
+
+* Add the ability to manually specify keys when running `pod keys generate`. [fwal]
+
+## 2.0.7
+
+* Fix keys not recorded in YML on first run. [ileitch]
+
+## 2.0.6
+
+* Makes list of keys unique on the yaml file [leoformaggio]
+
 ## 2.0.4 - 2.0.5
 
 * Handles more CIs [SlaunchaMan]
@@ -10,15 +30,15 @@
 
 ## 2.0.2
 
-* Sets a minimum iOS target of 8.0 [orta] 
+* Sets a minimum iOS target of 8.0 [orta]
 
 ## 2.0.1
 
-* Handles more CI types [m-ruhl] 
+* Handles more CI types [m-ruhl]
 
 ## 2.0.0
 
-* Handles casing correctly in generated key names [breaking] [marcelofabri] 
+* Handles casing correctly in generated key names [breaking] [marcelofabri]
 * Adds Nullability notations to default erb template [Skogetroll]
 * Use properties for accessing key values instead of functions [breaking, for swift] [Skogetroll]
 * Don't ask for keys on the command line when running on CI. [dantoml]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-keys (2.0.5)
+    cocoapods-keys (2.1.0)
       dotenv
       osx_keychain
 
@@ -11,7 +11,7 @@ GEM
     CFPropertyList (2.3.5)
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
-    ZenTest (4.11.1)
+    ZenTest (4.11.2)
     activesupport (4.2.9)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -53,7 +53,7 @@ GEM
     colored (1.2)
     colored2 (3.1.2)
     diff-lcs (1.3)
-    dotenv (2.2.1)
+    dotenv (2.6.0)
     escape (0.0.4)
     fourflusher (0.3.2)
     fuzzy_match (2.0.4)
@@ -116,4 +116,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

data/README.md

@@ -42,23 +42,23 @@ Then running `pod install` will prompt for the keys not yet set and you can ensu
 
 You can save keys on a per-project basis by running the command:
 
-    $ pod keys set KEY VALUE
+    $ bundle exec pod keys set KEY VALUE
 
 You can list all known keys by running:
 
-    $ pod keys
+    $ bundle exec pod keys
 
 For example:
 
 ``` sh
   $ cd MyApplication
-  $ pod keys set "NetworkAPIToken" "AH2ZMiraGQbyUd9GkNTNfWEdxlwXcmHciEOH"
+  $ bundle exec pod keys set "NetworkAPIToken" "AH2ZMiraGQbyUd9GkNTNfWEdxlwXcmHciEOH"
   Saved NetworkAPIToken to MyApplication.
 
-  $ pod keys set "AnalyticsToken" "6TYKGVCn7sBSBFpwfSUCclzDoSBtEXw7"
+  $ bundle exec pod keys set "AnalyticsToken" "6TYKGVCn7sBSBFpwfSUCclzDoSBtEXw7"
   Saved AnalyticsToken to MyApplication.
 
-  $ pod keys
+  $ bundle exec pod keys
   Keys for MyApplication
    ├  NetworkAPIToken - AH2ZMiraGQbyUd9GkNTNfWEdxlwXcmHciEOH
    └  AnalyticsToken - 6TYKGVCn7sBSBFpwfSUCclzDoSBtEXw7
@@ -95,16 +95,16 @@ Some documentation is also available to [use cocoapods-keys in Swift projects](S
 
 CocoaPods-keys has 3 other commands:
 
- * `pod keys get [key] [optional project]`
+ * `bundle exec pod keys get [key] [optional project]`
    Which will output the value of the key to STDOUT, useful for scripting.
 
- * `pod keys rm [key] [optional project]`
-   Will remove a key from a project.  
+ * `bundle exec pod keys rm [key] [optional project]`
+   Will remove a key from a project.
 
-   If Wildcards are included, it will remove the keys matching the pattern. E.g.: `pod keys rm "G*og*"` will remove *all* the keys that begin with 'G', have 'og' in the middle and end with anything.  
-	To nuke all the keys, run either `pod keys rm "*"` or `pod keys rm --all`
+   If Wildcards are included, it will remove the keys matching the pattern. E.g.: `bundle exec pod keys rm "G*og*"` will remove *all* the keys that begin with 'G', have 'og' in the middle and end with anything.
+	To nuke all the keys, run either `bundle exec pod keys rm "*"` or `bundle exec pod keys rm --all`
 
- * `pod keys generate [optional project]`
+ * `bundle exec pod keys generate [optional project]`
    Will generate the obfuscated Objective-C keys class (mainly used internally).
 
 #### Continuous Integration

data/SWIFT_PROJECTS.md

@@ -1,7 +1,7 @@
 # Using CocoaPods-Keys in Swift projects
 
 Once you've followed the setup instructions described in the [Usage](README.md#usage)
-section of the README, you have two choices.
+section of the README, you are ready to use `Keys` from Swift.
 
 ## Importing the framework
 

data/lib/cocoapods_keys.rb

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

data/lib/key_master.rb

@@ -84,7 +84,7 @@ module CocoaPodsKeys
     end
 
     def key_data_arrays
-      Hash[@indexed_keys.map { |key, value| [key, value.map { |i| name + "Data[#{i}]" }.join(', ')] }]
+      Hash[@indexed_keys.map { |key, value| [key, value.map { |i| '[' + name + "Data characterAtIndex:#{i}]" }.join(', ')] }]
     end
   end
 end

data/lib/pod/command/keys/generate.rb

@@ -16,14 +16,19 @@ module Pod
 
         self.arguments = [CLAide::Argument.new('project_name', false)]
 
+        def self.options
+          [['--keys=key1,key2...', 'An array of keys to add if no keyring is found']].concat(super)
+        end
+
         def initialize(argv)
           @project_name = argv.shift_argument
+          @keys = argv.option('keys', '').split(',')
           super
         end
 
         def run
           Dotenv.load
-          keyring = get_current_keyring
+          keyring = get_current_keyring || CocoaPodsKeys::Keyring.new(@project_name, '/', @keys)
 
           if keyring
 

data/lib/pod/command/keys/set.rb

@@ -40,6 +40,7 @@ module Pod
 
           keyring = get_current_keyring || create_keyring
           keyring.keys << @key_name.tr('-', '_')
+          keyring.keys.uniq!
           CocoaPodsKeys::KeyringLiberator.save_keyring keyring
 
           keyring.save @key_name, @key_value

data/lib/preinstaller.rb

@@ -65,7 +65,6 @@ module CocoaPodsKeys
           setter.run
         end
       end
-      CocoaPodsKeys::KeyringLiberator.save_keyring(keyring)
 
       existing_keyring || !keys.empty?
     end

data/templates/Keys.m.erb

@@ -4,51 +4,43 @@
 // For more information see https://github.com/orta/cocoapods-keys
 //
 
-#import <objc/runtime.h>
 #import <Foundation/NSDictionary.h>
 #import "<%= @name %>.h"
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wincomplete-implementation"
+@interface <%= @name %> ()
 
-@implementation <%= @name %>
-<% @keys.each do |key, value| %>
-  @dynamic <%= key %>;<% end %>
+<% @keys.each do |key, value| %>@property (nonatomic, copy) NSString *<%= key %>;
+<% end %>
 
-#pragma clang diagnostic pop
+@end
 
-+ (BOOL)resolveInstanceMethod:(SEL)name
-{
-  NSString *key = NSStringFromSelector(name);
-  NSString * (*implementation)(<%= name %> *, SEL) = NULL;
-<% @keys.each do |key, value| %>
-  if ([key isEqualToString:@"<%= key %>"]) {
-    implementation = _podKeys<%= Digest::MD5.hexdigest(key) %>;
-  }
-<% end %>
-  if (!implementation) {
-    return [super resolveInstanceMethod:name];
-  }
+@implementation <%= @name %>
 
-  return class_addMethod([self class], name, (IMP)implementation, "@@:");
-}
-<% @keys.each do |key, value| %>
-static NSString *_podKeys<%= Digest::MD5.hexdigest(key) %>(<%= name %> *self, SEL _cmd)
+- (instancetype)init
 {
-  <% if @indexed_keys.length > 0 %>
+    if (!(self = [super init])) { return nil; }
+
+    <% @keys.each do |key, value| %>
     <% if @indexed_keys[key].length > 0 %>
-      char cString[<%= @indexed_keys[key].length + 1 %>] = { <%= key_data_arrays[key] %>, '\0' };
+      char <%= key %>CString[<%= @indexed_keys[key].length + 1 %>] = { <%= key_data_arrays[key] %>, '\0' };
     <% else %>
-      char cString[1] = { '\0' };
+      char <%= key %>CString[<%= @indexed_keys[key].length + 1 %>] = { '\0' };
+    <% end %>
+    _<%= key %> = <% if @indexed_keys.length > 0 %>
+        <% if @indexed_keys[key].length > 0 %>
+          [NSString stringWithCString:<%= key %>CString encoding:NSUTF8StringEncoding];
+        <% else %>
+          @"";
+        <% end %>
+      <% else %>
+        @"";
+      <% end %>
     <% end %>
-    return [NSString stringWithCString:cString encoding:NSUTF8StringEncoding];
-  <% else %>
-    return @"";
-  <% end %>
+
+    return self;
 }
-<% end %>
 
-static char <%= name %>Data[<%= @data_length %>] = "<%= @data.gsub('\\', '\\\\\\').gsub('"', '\\"') if @data %>";
+static NSString *<%= name %>Data = @"<%= @data.gsub('\\', '\\\\\\').gsub('"', '\\"') if @data %>";
 
 - (NSString *)description
 {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-keys
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.2.1
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: osx_keychain
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: CocoaPods Keys will store sensitive data in your Mac's keychain. Then on