cocoapods-keys 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4065e1921e7109cb41050598e08f7154f4f7b9d
-  data.tar.gz: 2219c5f79674be0c1863b6ff882a6d37146db743
+  metadata.gz: 46fd2317903ff6b9b6d9117c6ba834e9ae6efe98
+  data.tar.gz: d8e127fdf8ab65eb8b446a011de5135db2057682
 SHA512:
-  metadata.gz: 18a796c11000f0c17b3815ccba9073e396e2d38805df055007acc393761748ca968da2ffb71e946c7bcd7d64b93076c07a3ddfa5944ee51e7dfebae3d286829e
-  data.tar.gz: 4b2812c4e8b24c605d3867e046493d3f9b45f0c24e93a939995375c2adebb54554951247bbb2684941b8dfbfe4117db202a197627f2a731454f7a6556e4e1dec
+  metadata.gz: fb52c1999ca9a2237615dd19fcd637535f8ccc26c0dc717625decb5cc5003adc39dbf46d19cdc65c4fc64f27f3272b6ea667615139b366d2e66fbd2c1205de46
+  data.tar.gz: e9b6925e32bf7ea4a19ad1c63ab51d29da2b89e94ff8860d47aaa253037658a6e83d64002dc8cfc4e25ea981c9d61c60debdb403334af404048bcae793003e4b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-keys (1.0.1)
+    cocoapods-keys (1.0.2)
       osx_keychain
 
 GEM

data/README.md

@@ -45,7 +45,7 @@ For example:
    └ redditAPIToken & mixpanelAPIToken
 ```
 
-After the next `pod install` or `pod update` keys will add a new `Keys` framework to your Pods project. This provides an API to your keys from Cocoa code. For example the application code above would look like:
+After the next `pod install` or `pod update` keys will add a new `Keys` pod to your Pods project, supporting both static libraries and frameworks. This provides an API to your keys from Cocoa code. For example the application code above would look like:
 
 ``` objc
 

data/lib/cocoapods_keys.rb

@@ -1,3 +1,3 @@
 module CocoaPodsKeys
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/key_master.rb

@@ -17,6 +17,7 @@ module CocoaPodsKeys
 
     def generate_data
 
+      return nil if @keys.empty?
       # Generate a base64 hash string that is ~25 times the length of all keys
 
       @data_length = @keys.values.map(&:length).reduce(:+) * (20 + rand(10))

data/lib/plugin.rb

@@ -3,12 +3,14 @@ require 'cocoapods-core'
 module CocoaPodsKeys
   class << self
     def podspec_for_current_project(spec_contents)
-      keyring = KeyringLiberator.get_keyring_named(user_options["project"]) || KeyringLiberator.get_keyring(Dir.getwd)
-      raise Informative, "Could not load keyring" unless keyring 
+      local_user_options = user_options || {}
+      project = local_user_options.fetch("project", CocoaPodsKeys::NameWhisperer.get_project_name)
+      keyring = KeyringLiberator.get_keyring_named(project) || KeyringLiberator.get_keyring(Dir.getwd)
+      raise Pod::Informative, "Could not load keyring" unless keyring 
       key_master = KeyMaster.new(keyring)
 
       spec_contents.gsub!(/%%SOURCE_FILES%%/, "#{key_master.name}.{h,m}")
-      spec_contents.gsub!(/%%PROJECT_NAME%%/, user_options["project"])
+      spec_contents.gsub!(/%%PROJECT_NAME%%/, project)
     end
 
     def setup

data/lib/preinstaller.rb

@@ -1,7 +1,7 @@
 module CocoaPodsKeys
   class PreInstaller
     def initialize(user_options)
-      @options = user_options
+      @user_options = user_options
     end
 
     def setup
@@ -11,13 +11,11 @@ module CocoaPodsKeys
 
       options = @user_options || {}
       current_dir = Dir.getwd
-      project = options.fetch('project', nil)
+      project = options.fetch('project', CocoaPodsKeys::NameWhisperer.get_project_name)
       keyring = KeyringLiberator.get_keyring_named(project) || KeyringLiberator.get_keyring(current_dir)
-      unless keyring
-        name = project || CocoaPodsKeys::NameWhisperer.get_project_name
-        keyring = CocoaPodsKeys::Keyring.new(name, current_dir, [])
-      end
-      
+
+      keyring = CocoaPodsKeys::Keyring.new(project, current_dir, []) unless keyring
+
       data = keyring.keychain_data
       has_shown_intro = false
       keys = options.fetch("keys", [])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-keys
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: osx_keychain