cocoapods-keys 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b910f42524934e5ca46ff37fb36c23bce9846bed
-  data.tar.gz: 1458df4292c8c09cff10d8092aa7b0e9965fc1dd
+SHA256:
+  metadata.gz: b6c9529f911bc1da54b3bf5acecaab6c1e10922f0a662bf3e0301e336667c685
+  data.tar.gz: 83217559e14d12d768810cc1e294c3eafebbdac70a349091b80d914a031f22b7
 SHA512:
-  metadata.gz: a427fd01d8dfd2903c50d7a2721f1475601400e068a3a1dcb6bf172dd19d6542fcbdca5f7979e81c03a0c9aac2df7bb7c01968d14404982d19a4dd313df3cbd5
-  data.tar.gz: 53442f6c071284a8f1690cb3968a4c53197d5d02006350d2be68b6546115731148d74be7a9decebf49fcf1b1857cb6d8861b2b00e6db10ba78b43f5e3cb2813c
+  metadata.gz: befbe6c59cfe87a18bef30ef6b175efdb282e018728e521a36c305047901cc6cb1ceb0e203acdbabfa6d10cbf8a789faeb0b6d55556fdcbf2f06efaf5070ee7d
+  data.tar.gz: f2b9a7a591e40a8b689e6989a9e00cd23e2ed8d8ea65b8bfcadb7b8768b3ce84c2e38f42fb47c176ffe9fc619868ead02fa15d456f3747f1daf80f46d3118c06

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Master
 
+## 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]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-keys (2.1.0)
+    cocoapods-keys (2.2.0)
       dotenv
       osx_keychain
 
@@ -53,7 +53,7 @@ GEM
     colored (1.2)
     colored2 (3.1.2)
     diff-lcs (1.3)
-    dotenv (2.6.0)
+    dotenv (2.7.4)
     escape (0.0.4)
     fourflusher (0.3.2)
     fuzzy_match (2.0.4)
@@ -116,4 +116,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.16.4
+   1.17.3

data/lib/cocoapods_keys.rb

@@ -1,3 +1,3 @@
 module CocoaPodsKeys
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.2.0'.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/templates/Keys.m.erb

@@ -4,51 +4,39 @@
 // 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 @indexed_keys[key].length > 0 %>
-      char cString[<%= @indexed_keys[key].length + 1 %>] = { <%= key_data_arrays[key] %>, '\0' };
-    <% else %>
-      char cString[1] = { '\0' };
+    if (!(self = [super init])) { return nil; }
+
+    <% @keys.each do |key, value| %>
+    char <%= key %>CString[<%= @indexed_keys[key].length + 1 %>] = { <%= key_data_arrays[key] %>, '\0' };
+    _<%= 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.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: osx_keychain
@@ -163,8 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: CocoaPods Keys will store sensitive data in your Mac's keychain. Then on