cocoapods-keys 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39ae79101ea526c3926a8784e5d6d6295e938935
-  data.tar.gz: 8fc024b7c0579f1e20bb42f3141ae90cb5e60cf7
+  metadata.gz: b330e00d3cefb813db3d9f85d6cd525e5f91640b
+  data.tar.gz: 6dc6e660a1ba8dafc1dbb72c82f9a65e253ba3e8
 SHA512:
-  metadata.gz: 44c690a96ab0ef9f44ad4746d39d36acec11808cb23e9463eefed5d3bef4eed6787eb5acc2ab4c593a8eee805d4a82096c87a31424413d74991c8856f0639a72
-  data.tar.gz: a70cddc692258d4d9005b41817beb0230dbd32b9f80fa393756822e0807226eff04bffcc2ca953c42aeaa0d1989b408a64ecccfee44e03934a266ef103f087bb
+  metadata.gz: fdb14a117059a366d5721c5015136f0765b85924c925b975679d062398f9c2c8cfd7d95c72d420258c8672bdc84cd6e9853ca35788a7087b0ae17230631b0550
+  data.tar.gz: e55bb7961a64c205e968bb7715add640629ca7ca29bd43669c87e6652df5df2ac4d14b42946d713ec95b9dc1bb5be392013ca2e81040357cffdd676ff8ba1108

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Master
 
+## 1.7.0
+
+* Fixes undefined method '*' for nil:NilClass issue on first run [rpassis]
+
 ## 1.6.1
 
 * Uses CocoaPods 0.37's pre-install plugins hooks, this fixes issues with migrations to 1.0 [orta]

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in cocoapods-keys.gemspec
 gemspec
 
-gem 'cocoapods', '1.0.0.beta.6'
+gem 'cocoapods', '1.0.0.beta.6'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-keys (1.6.1)
+    cocoapods-keys (1.7.0)
       dotenv
       osx_keychain
 
@@ -110,4 +110,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/lib/cocoapods_keys.rb

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

data/lib/key_master.rb

@@ -28,8 +28,7 @@ module CocoaPodsKeys
       verify_keychain_integrity
 
       # 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_length = @keys.values.map(&:length).reduce(0, :+) * (20 + rand(10))
       data = SecureRandom.base64(@data_length)
       data += '\\"'
       @data_length = data.length

data/lib/pod/command/keys.rb

@@ -8,8 +8,9 @@ module Pod
       require 'pod/command/keys/get'
       require 'pod/command/keys/rm'
       require 'pod/command/keys/export'
+      require 'pod/command/keys/generate'
 
-      self.summary = 'A key value store for environment settings in Cocoa Apps.'
+      self.summary = 'A key value store for environment settings in Cocoa Apps'
 
       self.description = <<-DESC
         CocoaPods Keys will store sensitive data in your Mac's keychain. Then on running pod install they will be installed into your app's source code via the Pods library.

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

@@ -0,0 +1,41 @@
+require 'keyring_liberator'
+require 'key_master'
+require 'dotenv'
+
+module Pod
+  class Command
+    class Keys
+      class Generate < Keys
+        self.summary = 'Generates the obfuscated class.'
+
+        self.description = <<-DESC
+          Generates the obfuscated Objective-C h/m files using the current key values.
+        DESC
+
+        def run
+          Dotenv.load
+          keyring = get_current_keyring
+
+          if keyring
+
+            # Create the h & m files in the same folder as the podspec
+
+            installation_root = Pod::Config.instance.installation_root
+            keys_path = installation_root.+('Pods/CocoaPodsKeys/')
+
+            key_master = CocoaPodsKeys::KeyMaster.new(keyring)
+            interface_file = keys_path + (key_master.name + '.h')
+            implementation_file = keys_path + (key_master.name + '.m')
+
+            File.write(interface_file, key_master.interface)
+            UI.puts "Generated #{interface_file}"
+
+            File.write(implementation_file, key_master.implementation)
+            UI.puts "Generated #{implementation_file}"
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/preinstaller.rb

@@ -31,6 +31,15 @@ module CocoaPodsKeys
 
       has_shown_intro = false
       keys = options.fetch('keys', [])
+
+      # Remove keys from the keyring that no longer exist
+      original_keyring_keys = keyring.keys.clone
+      original_keyring_keys.each do |key|
+        keyring.keychain_has_key?(key)
+      end
+
+      # Add keys to the keyring that have been added,
+      # and prompt for their value if needed.
       keys.each do |key|
         unless keyring.keychain_has_key?(key)
           unless has_shown_intro

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-keys
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: osx_keychain
@@ -125,6 +125,7 @@ files:
 - lib/plugin.rb
 - lib/pod/command/keys.rb
 - lib/pod/command/keys/export.rb
+- lib/pod/command/keys/generate.rb
 - lib/pod/command/keys/get.rb
 - lib/pod/command/keys/list.rb
 - lib/pod/command/keys/rm.rb
@@ -163,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: CocoaPods Keys will store sensitive data in your Mac's keychain. Then on
@@ -180,3 +181,4 @@ test_files:
 - spec/keyring_spec.rb
 - spec/plugin_spec.rb
 - spec/spec_helper.rb
+has_rdoc: