cocoapods-keys 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfeb86756e80df052b99475db7380a3b4801d4fd
-  data.tar.gz: 3a7db4640787b9daf6cf98a3a7764759425ab908
+  metadata.gz: c5cc6251eb10bbe87ceee4a1f3643dfe4b7506da
+  data.tar.gz: c243d7584efda5c4c4693c090ba4b50bd7228857
 SHA512:
-  metadata.gz: e8d025668c6ce05268a8b908c4a0e8d737725f74ab1d7e5b8b1a94afac977c1fdcde767ea02c02c4a2b2f2a1b13dce964ae25d913437f7b76e596ca4694b5989
-  data.tar.gz: 6e403a3dac62f4b1f0e89a2bbf6659d740a8fe3ec202eb6929475db609f5ac87b83f3401a33f9cd080710dfc08dca6e1503e91d6d284a33456a0d26180ec2662
+  metadata.gz: 252122f84b76036ad1ad0ec68ae54673f8e76d3c2b02d7305b0a63ffcb4729ade9f8f6736441f8b29635975d82941291b0215f86430ddd47ce6173ffc190a139
+  data.tar.gz: e46843504016015797d39a682b6a23fb53ccbb1b2e330f07bd0481b9b2e86e833e7ac61752d9b0845e451f81acd027a7f3c12c7f1ee40741e5e36cc49cdddefb

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Master
 
+## 1.4.0
+
+* Adds support for ENV VAR based keys, this makes CI much easier to work with [alloy, orta]
+
 ## 1.3.2
 
 * Use relative paths for generated Podspec [segiddins]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-keys (1.3.2)
+    cocoapods-keys (1.4.0)
       osx_keychain
 
 GEM
@@ -102,4 +102,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.10.0
+   1.10.5

data/lib/cocoapods_keys.rb

@@ -1,3 +1,3 @@
 module CocoaPodsKeys
-  VERSION = '1.3.2'
+  VERSION = '1.4.0'
 end

data/lib/key_master.rb

@@ -9,8 +9,9 @@ module CocoaPodsKeys
 
     def initialize(keyring, time = Time.now)
       @time = time
-      @keys = Hash[keyring.keychain_data.map { |(key, value)| [key[0].downcase + key[1..-1], value] }]
-      @name = keyring.code_name + 'Keys'
+      @keys = keyring.camel_cased_keys
+      @name = keyring.code_name.capitalize + 'Keys'
+
       @used_indexes = Set.new
       @indexed_keys = {}
       @data = generate_data

data/lib/keyring.rb

@@ -34,8 +34,12 @@ module CocoaPodsKeys
     def keychain_data
       keychain = OSXKeychain.new
       Hash[
-        @keys.map { |key| [key, keychain[self.class.keychain_prefix + name, key]] }
+        @keys.map { |key| [key, ENV[key] || keychain[self.class.keychain_prefix + name, key]] }
       ]
     end
+
+    def camel_cased_keys
+      Hash[keychain_data.map { |(key, value)| [key[0].downcase + key[1..-1], value] }]
+    end
   end
 end

data/lib/name_whisperer.rb

@@ -7,15 +7,15 @@ module CocoaPodsKeys
       if podfile
         user_xcodeproj = xcodeproj_from_podfile(podfile)
       end
-      user_xcodeproj ||= search_folders_for_xcodeproj
-      user_xcodeproj.basename('.xcodeproj')
+      user_xcodeproj || search_folders_for_xcodeproj
     end
 
     private
 
     def self.xcodeproj_from_podfile(podfile)
       unless podfile.target_definition_list.empty?
-        return podfile.target_definition_list.first.user_project_path
+        project_path = podfile.target_definition_list.first.user_project_path
+        File.basename(project_path, '.xcodeproj') if project_path
       end
     end
 
@@ -23,7 +23,7 @@ module CocoaPodsKeys
       ui = Pod::UserInterface
       xcodeprojects = Pathname.glob('**/*.xcodeproj')
       if xcodeprojects.length == 1
-        Pathname(xcodeprojects.first).basename
+        Pathname(xcodeprojects.first).basename('.xcodeproj')
       else
         error_message = (xcodeprojects.length > 1) ? 'found too many' : "couldn't find any"
         ui.puts 'CocoaPods-Keys ' + error_message + ' Xcode projects. Please give a name for this project.'

data/lib/plugin.rb

@@ -9,10 +9,12 @@ module CocoaPodsKeys
     def setup
       require 'preinstaller'
 
-      PreInstaller.new(user_options).setup
+      unless PreInstaller.new(user_options).setup
+        raise Pod::Informative, 'Could not load key data'
+      end
 
       installation_root = Pod::Config.instance.installation_root
-      keys_path = installation_root.+('Pods/CocoaPodsKeys/').relative_path_from(installation_root)
+      keys_path = installation_root.+('Pods/CocoaPodsKeys/')
 
       # move our podspec in to the Pods
       mkdir_p keys_path
@@ -22,7 +24,11 @@ module CocoaPodsKeys
       # Get all the keys
       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(Pathname.pwd)
+
+      keyring = KeyringLiberator.get_keyring_named(project) ||
+        KeyringLiberator.get_keyring(Dir.getwd) ||
+        Keyring.new(project, Dir.getwd, local_user_options['keys'])
+
       raise Pod::Informative, 'Could not load keyring' unless keyring
 
       # Create the h & m files in the same folder as the podspec
@@ -34,7 +40,7 @@ module CocoaPodsKeys
       File.write(implementation_file, key_master.implementation)
 
       # Add our template podspec
-      add_keys_to_pods(keys_path, user_options)
+      add_keys_to_pods(keys_path.relative_path_from(installation_root), user_options)
     end
 
     def add_keys_to_pods(keys_path, options)

data/lib/pod/command/keys.rb

@@ -1,6 +1,8 @@
 module Pod
   class Command
     class Keys < Command
+      include ProjectDirectory
+
       require 'pod/command/keys/list'
       require 'pod/command/keys/set'
       require 'pod/command/keys/get'

data/lib/preinstaller.rb

@@ -4,6 +4,8 @@ module CocoaPodsKeys
       @user_options = user_options
     end
 
+    # Returns `true` if all keys specified by the user are satisfied by either an existing keyring or environment
+    # variables.
     def setup
       require 'key_master'
       require 'keyring_liberator'
@@ -17,14 +19,14 @@ module CocoaPodsKeys
       project = options.fetch('project') { CocoaPodsKeys::NameWhisperer.get_project_name }
       keyring = KeyringLiberator.get_keyring_named(project) || KeyringLiberator.get_keyring(current_dir)
 
+      existing_keyring = !keyring.nil?
       keyring = CocoaPodsKeys::Keyring.new(project, current_dir, []) unless keyring
 
       data = keyring.keychain_data
       has_shown_intro = false
       keys = options.fetch('keys', [])
       keys.each do |key|
-        unless data.keys.include? key
-
+        unless ENV[key] || data.keys.include?(key)
           unless has_shown_intro
             ui.puts "\n CocoaPods-Keys has detected a keys mismatch for your setup."
             has_shown_intro = true
@@ -42,9 +44,10 @@ module CocoaPodsKeys
           args = CLAide::ARGV.new([key, answer, keyring.name])
           setter = Pod::Command::Keys::Set.new(args)
           setter.run
-
         end
       end
+
+      existing_keyring || !keys.empty?
     end
   end
 end

data/spec/keyring_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'keyring'
+
+include CocoaPodsKeys
+
+describe KeyringLiberator do
+  before(:each) do
+    ENV['ARMyKey'] = 'Hello'
+  end
+
+  after(:each) do
+    ENV['ARMyKey'] = nil
+  end
+
+  it 'can get keys from ENV' do
+    keyring = Keyring.new('test', '/', ['ARMyKey'])
+    expect(keyring.keychain_data).to eq('ARMyKey' => 'Hello')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-keys
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: osx_keychain
@@ -122,6 +122,7 @@ files:
 - spec/functional_spec.rb
 - spec/key_master_spec.rb
 - spec/keyring_liberator_spec.rb
+- spec/keyring_spec.rb
 - spec/plugin_spec.rb
 - spec/spec_helper.rb
 - templates/Keys.h.erb
@@ -161,5 +162,6 @@ test_files:
 - spec/functional_spec.rb
 - spec/key_master_spec.rb
 - spec/keyring_liberator_spec.rb
+- spec/keyring_spec.rb
 - spec/plugin_spec.rb
 - spec/spec_helper.rb