cocoapods-keys 1.7.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b330e00d3cefb813db3d9f85d6cd525e5f91640b
-  data.tar.gz: 6dc6e660a1ba8dafc1dbb72c82f9a65e253ba3e8
+  metadata.gz: b01fd13b64082cf9a456e3375e5265921e5d146a
+  data.tar.gz: e46f5ad08f13973adf790f97683c3e1907018298
 SHA512:
-  metadata.gz: fdb14a117059a366d5721c5015136f0765b85924c925b975679d062398f9c2c8cfd7d95c72d420258c8672bdc84cd6e9853ca35788a7087b0ae17230631b0550
-  data.tar.gz: e55bb7961a64c205e968bb7715add640629ca7ca29bd43669c87e6652df5df2ac4d14b42946d713ec95b9dc1bb5be392013ca2e81040357cffdd676ff8ba1108
+  metadata.gz: 0814c7e535af3237cc3d3aa7419056554c2e79029af71615c87d3b617aaa923c5ff0b04c9dac651169f692d68794323a45b059f009fbf1f0b9fee1026adab851
+  data.tar.gz: 60820ab391f39b05d571ffee200735bdc31fa6a97bcc4617322385122cb10af7524dc12618231b6196d4a752f5e0bfd07e1af33b2ebda8f3b35815088773f2bf

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Master
 
+## 2.0.0
+
+* 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]
+
 ## 1.7.0
 
 * Fixes undefined method '*' for nil:NilClass issue on first run [rpassis]

data/README.md

@@ -6,7 +6,7 @@ Its good security practice to keep production keys out of developer hands. Cocoa
 
 ## Requirements
 
-Requires CocoaPods 0.36
+Requires CocoaPods 0.36+
 
 ## Installation
 
@@ -22,7 +22,7 @@ The generated Objective-C classes are stored in the `Pods/CocoaPodsKeys` directo
 
 Using the new Plugin API in CocoaPods we can automate a lot of the fiddly bits away. You define what keys you want inside your [Podfile](https://github.com/artsy/eidolon/blob/0a9f5947914eb637fd4abf364fa3532b56da3c52/Podfile#L6-L21) and Keys will detect what keys are not yet set. If you need to specify a different project name from the target name, use the key `:target` to specify it.
 
-```
+```ruby
 plugin 'cocoapods-keys', {
   :project => "Eidolon",
   :keys => [
@@ -111,6 +111,10 @@ CocoaPods-keys has 3 other commands:
 
 It's rarely a good idea to mess around with the keychain in your CI, so keys will look for an environment var with the same string before looking in the keychain. Also you could create a `.env` file in your project folder.
 
+#### Maintainance State
+
+CocoaPods Keys is effectively "done" software from Artsy's perspective. It has done everything we've needed for years. So, I wouldn't recommend making issues requesting new features, simply because we won't be building them ourselves. We'll definitely continue making sure it works etc though, we use it in production.
+
 #### Security
 
 Key security is difficult. Right now even the biggest apps get their keys [leaked](https://threatpost.com/twitter-oauth-api-keys-leaked-030713/77597). This is neatly summed up by John Adams of the Twitter Security Team on [Quora](http://www.quora.com/Twitter-1/How-were-the-Twitter-iPhone-and-Android-OAuth-keys-leaked).
@@ -125,4 +129,4 @@ So in summary, the ideal way to store keys is to not store keys. In reality thou
 
 #### Thanks
 
-This was built with a lot of help from [@segiddins](https://github.com/segiddins) and [@ashfurrow](http://github.com/ashfurrow).
+This was built with a lot of help from [@segiddins](https://github.com/segiddins), [@ashfurrow](http://github.com/ashfurrow) and [@marcelofabri](https://github.com/marcelofabri).

data/SWIFT_PROJECTS.md

@@ -1,6 +1,6 @@
-# Using Cocoapods-Keys in Swift projects
+# Using CocoaPods-Keys in Swift projects
 
-Once you've followed the setup instructions described in the [Usage](/orta/cocoapods-keys#usage)
+Once you've followed the setup instructions described in the [Usage](README.md#usage)
 section of the README, you have two choices.
 
 ## Importing the framework
@@ -18,3 +18,9 @@ import Keys
 let keys = MyApplicationKeys()
 ARAnalytics.setupWithAnalytics(keys.analyticsToken)
 ```
+
+### Troubleshooting
+
+You can get into a situation where you have an existing integrated project but when you add a new key it isn't recognized in the file(s) you `import Keys` in, although your project is configured properly (you can check by verifying it's shown with a `pod keys` and/or manually viewing the generated `*.h/*.m` files). 
+
+The fix: clear out your Xcode's Derived Data finder folder and rebuilding should generate a proper swift class in the Keys module.

data/lib/cocoapods_keys.rb

@@ -1,3 +1,3 @@
 module CocoaPodsKeys
-  VERSION = '1.7.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/lib/key_master.rb

@@ -10,7 +10,7 @@ module CocoaPodsKeys
     def initialize(keyring, time = Time.now)
       @time = time
       @keys = keyring.camel_cased_keys
-      @name = keyring.code_name.capitalize + 'Keys'
+      @name = keyring.code_name + 'Keys'
       if /^\d/ =~ @name
         @name = '_' + @name
       end

data/lib/preinstaller.rb

@@ -42,6 +42,10 @@ module CocoaPodsKeys
       # and prompt for their value if needed.
       keys.each do |key|
         unless keyring.keychain_has_key?(key)
+          if ENV['CI']
+            raise Informative, "CocoaPods-Keys could not find a key named: #{key}"
+          end
+
           unless has_shown_intro
             ui.puts "\n CocoaPods-Keys has detected a keys mismatch for your setup."
             has_shown_intro = true

data/spec/key_master_spec.rb

@@ -34,11 +34,26 @@ describe CocoaPodsKeys::KeyMaster do
       key_master = KeyMaster.new(keyring)
       expect(key_master.name).to eq('_500pxKeys')
     end
+
     it 'takes keyring with proper name returns proper Keys file' do
       keyring = Keyring.new('Artsy', '/', ['ARMyKey'])
       keyring.instance_variable_set(:@keychain, FakeKeychain.new('ARMyKey' => 'secretkey'))
       key_master = KeyMaster.new(keyring)
       expect(key_master.name).to eq('ArtsyKeys')
     end
+
+    it 'takes keyring with multiple words returns proper Keys file' do
+      keyring = Keyring.new('ArtsyExample', '/', ['ARMyKey'])
+      keyring.instance_variable_set(:@keychain, FakeKeychain.new('ARMyKey' => 'secretkey'))
+      key_master = KeyMaster.new(keyring)
+      expect(key_master.name).to eq('ArtsyExampleKeys')
+    end
+
+    it 'takes keyring with lowercase name returns proper Keys file' do
+      keyring = Keyring.new('artsy', '/', ['ARMyKey'])
+      keyring.instance_variable_set(:@keychain, FakeKeychain.new('ARMyKey' => 'secretkey'))
+      key_master = KeyMaster.new(keyring)
+      expect(key_master.name).to eq('ArtsyKeys')
+    end
   end
 end

data/templates/Keys.h.erb

@@ -6,8 +6,12 @@
 
 #import <Foundation/NSString.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface <%= @name %> : NSObject
 <% @keys.each do |key, value| %>
-- (NSString *)<%= key %>;<% end %>
+@property (readonly) NSString *<%= key %>;<% end %>
 
 @end
+
+NS_ASSUME_NONNULL_END

data/templates/Keys.m.erb

@@ -12,6 +12,8 @@
 #pragma clang diagnostic ignored "-Wincomplete-implementation"
 
 @implementation <%= @name %>
+<% @keys.each do |key, value| %>
+  @dynamic <%= key %>;<% end %>
 
 #pragma clang diagnostic pop
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-keys
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: osx_keychain
@@ -181,4 +181,3 @@ test_files:
 - spec/keyring_spec.rb
 - spec/plugin_spec.rb
 - spec/spec_helper.rb
-has_rdoc: