cocoapods-keys 1.2.1 → 1.3.0

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

@@ -1,14 +1,13 @@
-require "keyring_liberator"
-require "name_whisperer"
+require 'keyring_liberator'
+require 'name_whisperer'
 
 module Pod
   class Command
     class Keys
-
       class Set < Keys
         include Config::Mixin
 
-        self.summary = "A set values for keys."
+        self.summary = 'A set values for keys.'
 
         self.description = <<-DESC
             Save a environment key to be added to your project on the next pod install.
@@ -31,8 +30,8 @@ module Pod
         def validate!
           super
           verify_podfile_exists!
-          help! "A key name is required to save." unless @key_name
-          help! "A value is required for the key." unless @key_value
+          help! 'A key name is required to save.' unless @key_name
+          help! 'A value is required for the key.' unless @key_value
         end
 
         def run
@@ -40,16 +39,16 @@ module Pod
           # info "Saving into the keychain."
 
           keyring = current_keyring
-          keyring.keys << @key_name.gsub("-", "_")
+          keyring.keys << @key_name.tr('-', '_')
           CocoaPodsKeys::KeyringLiberator.save_keyring keyring
 
           keyring.save @key_name, @key_value
 
-          puts "Saved #{@key_name} to #{keyring.name}." unless config.silent?
+          UI.puts "Saved #{@key_name} to #{keyring.name}." unless config.silent?
         end
 
         def current_keyring
-          current_dir = Dir.getwd
+          current_dir = Pathname.pwd
           keyring = CocoaPodsKeys::KeyringLiberator.get_keyring current_dir
 
           unless keyring
@@ -59,7 +58,6 @@ module Pod
 
           keyring
         end
-
       end
     end
   end

data/lib/preinstaller.rb

@@ -8,9 +8,12 @@ module CocoaPodsKeys
       require 'key_master'
       require 'keyring_liberator'
       require 'pod/command/keys/set'
+      require 'cocoapods/user_interface'
+
+      ui = Pod::UserInterface
 
       options = @user_options || {}
-      current_dir = Dir.getwd
+      current_dir = Pathname.pwd
       project = options.fetch('project') { CocoaPodsKeys::NameWhisperer.get_project_name }
       keyring = KeyringLiberator.get_keyring_named(project) || KeyringLiberator.get_keyring(current_dir)
 
@@ -18,31 +21,30 @@ module CocoaPodsKeys
 
       data = keyring.keychain_data
       has_shown_intro = false
-      keys = options.fetch("keys", [])
+      keys = options.fetch('keys', [])
       keys.each do |key|
         unless data.keys.include? key
-          
+
           unless has_shown_intro
-            puts "\n CocoaPods-Keys has detected a keys mismatch for your setup."
+            ui.puts "\n CocoaPods-Keys has detected a keys mismatch for your setup."
             has_shown_intro = true
           end
-          
-          puts " What is the key for " + key.green
-          answer = ""
+
+          ui.puts ' What is the key for ' + key.green
+          answer = ''
           loop do
-            print " > "
-            answer = STDIN.gets.chomp
+            ui.print ' > '
+            answer = ui.gets.strip
             break if answer.length > 0
           end
-          
-          puts ""
+
+          UI.puts
           args = CLAide::ARGV.new([key, answer, keyring.name])
           setter = Pod::Command::Keys::Set.new(args)
           setter.run
-          
+
         end
       end
-      
     end
   end
 end

data/spec/functional_spec.rb

@@ -22,27 +22,27 @@ describe 'CocoaPodsKeys functional tests' do
         PODFILE
       end
 
-      system("pod keys set KeyWithData such-data --silent")
-      system("pod keys set AnotherKeyWithData other-data --silent")
-      system("pod keys set UnusedKey - --silent")
-      system("pod install --silent --no-repo-update --no-integrate")
+      system('pod keys set KeyWithData such-data --silent')
+      system('pod keys set AnotherKeyWithData other-data --silent')
+      system('pod keys set UnusedKey - --silent')
+      system('pod install --silent --no-repo-update --no-integrate')
     end
   end
 
-  it "does not directly encode the keys into the implementation file" do
+  it 'does not directly encode the keys into the implementation file' do
     source = File.read(File.join(@tmpdir, 'Pods/CocoaPodsKeys/TestProjectKeys.m'))
     expect(source).to_not include('such-data')
     expect(source).to_not include('other-data')
   end
 
-  it "is able to retrieve the correct keys from the command-line" do
+  it 'is able to retrieve the correct keys from the command-line' do
     Dir.chdir(@tmpdir) do
       expect(`pod keys get KeyWithData`.strip).to eq('such-data')
       expect(`pod keys get AnotherKeyWithData`.strip).to eq('other-data')
     end
   end
 
-  describe "with a built keys implementation" do
+  describe 'with a built keys implementation' do
     before :all do
       name = 'TestProjectKeys'
       dir = File.join(@tmpdir, 'Pods/CocoaPodsKeys')
@@ -52,15 +52,6 @@ describe 'CocoaPodsKeys functional tests' do
       @bundle = File.join(dir, "#{name}.bundle")
     end
 
-    it "produces an implementation that is able to return the correct keys" do
-      expect(fetch_key('keyWithData')).to eq('such-data')
-      expect(fetch_key('anotherKeyWithData')).to eq('other-data')
-    end
-
-    xit "does not include keys that were not specified in the Podfile" do
-      expect(lambda { fetch_key('unusedKey') }).to raise_error
-    end
-
     private
 
     def fetch_key(key)

data/spec/key_master_spec.rb

@@ -3,41 +3,9 @@ require 'key_master'
 require 'tmpdir'
 
 describe CocoaPodsKeys::KeyMaster do
-  let(:empty_keys_interface) {
-    File.read(fixture("Keys_empty.h"))
-  }
-  
-  let(:empty_keys_implementation) {
-    File.read(fixture("Keys_empty.m"))
-  }
-  
-  it "should work with an empty keyring" do
-    keyring = double("Keyring", keychain_data: [], code_name: "Fake")
-    keymaster = described_class.new(keyring, Time.new(2015, 3, 11))
-    expect(keymaster.name).to eq("FakeKeys")
-    expect(keymaster.interface).to eq(empty_keys_interface)
-    expect(keymaster.implementation).to eq(empty_keys_implementation)
-  end
-  
-  it "should generate valid empty objc files", requires_clang: true do
-    keyring = double("Keyring", keychain_data: [], code_name: "Fake")
-    keymaster = described_class.new(keyring, Time.new(2015, 3, 11))
-    expect(validate_syntax(keymaster)).to eq(true)
-  end
-
-  it "should escape backslashes" do
-    keyring = double("Keyring", keychain_data: [], code_name: "Fake")
-    keymaster = described_class.new(keyring, Time.new(2015, 3, 11))
-    keymaster.instance_variable_set(:@data, '\4')
-    expect(keymaster.generate_implementation).to include('"\\\4"')
-  end
-
-  it "should escape double-quotes" do
-    keyring = double("Keyring", keychain_data: [], code_name: "Fake")
-    keymaster = described_class.new(keyring, Time.new(2015, 3, 11))
-    keymaster.instance_variable_set(:@data, '"')
-    expect(keymaster.generate_implementation).to include('"\\""')
-  end
+  # Previous tests operated under assumption that
+  # empty keychains were OK. See for more info:
+  # github.com/orta/cocoapods-keys/pull/68
 
   private
 
@@ -52,7 +20,7 @@ describe CocoaPodsKeys::KeyMaster do
       IO.write(m_file, keymaster.implementation)
       # attempt to validate syntax with clang
       Dir.chdir(dir)
-      system(`xcrun --sdk macosx --find clang`.strip, "-fsyntax-only", m_file)
+      system(`xcrun --sdk macosx --find clang`.strip, '-fsyntax-only', m_file)
     end
   end
 end

data/spec/keyring_liberator_spec.rb

@@ -6,25 +6,24 @@ require 'keyring'
 include CocoaPodsKeys
 
 describe KeyringLiberator do
-  it "should get the keys directory" do
-    expect(KeyringLiberator.keys_dir).to end_with("cocoapods/keys")
+  it 'should get the keys directory' do
+    expect(KeyringLiberator.keys_dir.to_s).to end_with('cocoapods/keys')
   end
 
-  it "should append a sha + .yaml when getting the yaml path" do
-    expect(KeyringLiberator.yaml_path_for_path("test")).to include("cocoapods/keys/")
-    expect(KeyringLiberator.yaml_path_for_path("test")).to end_with("098f6bcd4621d373cade4e832627b4f6.yml")
+  it 'should append a sha + .yaml when getting the yaml path' do
+    expect(KeyringLiberator.yaml_path_for_path('test').to_s).to include('cocoapods/keys/')
+    expect(KeyringLiberator.yaml_path_for_path('test').to_s).to end_with('098f6bcd4621d373cade4e832627b4f6.yml')
   end
 
-  it "should find by name" do
-    keyring = Keyring.from_hash({ "name" => "test", "path" =>"testpath", "keys" => [] })
+  it 'should find by name' do
+    keyring = Keyring.from_hash('name' => 'test', 'path' => 'testpath', 'keys' => [])
     allow(KeyringLiberator).to receive(:get_all_keyrings).and_return([keyring])
-    expect(KeyringLiberator.get_keyring_named("test")).to equal(keyring)
+    expect(KeyringLiberator.get_keyring_named('test')).to equal(keyring)
   end
 
-  it "should be nil if nothing found find by name" do
-    keyring = Keyring.from_hash({ "name" => "test", "path" =>"testpath", "keys" => [] })
+  it 'should be nil if nothing found find by name' do
+    keyring = Keyring.from_hash('name' => 'test', 'path' => 'testpath', 'keys' => [])
     allow(KeyringLiberator).to receive(:get_all_keyrings).and_return([keyring])
-    expect(KeyringLiberator.get_keyring_named("not found")).to be_falsey
+    expect(KeyringLiberator.get_keyring_named('not found')).to be_falsey
   end
-
 end

data/spec/plugin_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'cocoapods'
 require 'cocoapods-core'
 require 'plugin'
-#
+
 # include Pod
 #
 # describe Installer do
@@ -12,3 +12,195 @@ require 'plugin'
 #   end
 #
 # end
+
+RSpec.configure do |config|
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+end
+
+describe CocoaPodsKeys, '#plugin' do
+  before(:each) do
+    @config = Pod::Config.instance
+    @podfile = double('Podfile')
+    allow(@config).to receive(:podfile).and_return(@podfile)
+
+    @target_defs = double('TargetDefinition')
+    @target_a = double('TargetDefinition')
+    @target_b = double('TargetDefinition')
+
+    allow(@target_a).to receive(:label).and_return('Pods-TargetA')
+    allow(@target_b).to receive(:label).and_return('Pods-TargetB')
+  end
+
+  context 'with no targets defined in the Podfile' do
+    before(:each) do
+      allow(@podfile).to receive(:root_target_definitions).and_return([])
+    end
+
+    it 'adds Keys to the global Pod' do
+      expect(@podfile).to receive(:pod).with('Keys', anything)
+
+      CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), {})
+    end
+
+    %w(target targets).each do |target_tag|
+      context "with a non-existant target specified as a string in '#{target_tag}'" do
+        it 'fails to assign the key to the tag' do
+          expect(@podfile).not_to receive(:pod).with('Keys', anything)
+          expect(Pod::UI).to receive(:puts).with('Could not find a target named \'TargetA\' in your Podfile. Stopping keys'.red)
+
+          CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), target_tag => 'TargetA')
+        end
+      end
+
+      context "with a non-existant target specified as an array in '#{target_tag}'" do
+        it 'fails to assign the key to the tag' do
+          expect(@podfile).not_to receive(:pod).with('Keys', anything)
+          expect(Pod::UI).to receive(:puts).with('Could not find a target named \'TargetA\' in your Podfile. Stopping keys'.red)
+
+          CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), target_tag => ['TargetA'])
+        end
+      end
+    end
+  end
+
+  context 'with a single target defined in the Podfile' do
+    before(:each) do
+      @config = Pod::Config.instance
+      @podfile = double('Podfile')
+      allow(@config).to receive(:podfile).and_return(@podfile)
+
+      allow(@podfile).to receive(:root_target_definitions).and_return([@target_defs])
+      allow(@target_defs).to receive(:children).and_return([@target_a])
+    end
+
+    context 'with no targets specified' do
+      it 'adds Keys to the global Pod' do
+        expect(@podfile).to receive(:pod).with('Keys', anything)
+        expect(@target_a).not_to receive(:store_pod).with('Keys', anything)
+
+        CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), {})
+      end
+    end
+
+    %w(target targets).each do |target_tag|
+      context "with a string specified in '#{target_tag}'" do
+        it 'adds Keys to the target' do
+          expect(@podfile).not_to receive(:pod).with('Keys', anything)
+          expect(@target_a).to receive(:store_pod).with('Keys', anything)
+
+          CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), target_tag => 'TargetA')
+        end
+      end
+
+      context "with an array specified in '#{target_tag}'" do
+        it 'adds Keys to the target' do
+          expect(@podfile).not_to receive(:pod).with('Keys', anything)
+          expect(@target_a).to receive(:store_pod).with('Keys', anything)
+
+          CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), target_tag => ['TargetA'])
+        end
+      end
+
+      context "with a non-existant target specified as a string in '#{target_tag}'" do
+        it 'fails to assign the key to the tag' do
+          expect(@podfile).not_to receive(:pod).with('Keys', anything)
+          expect(Pod::UI).to receive(:puts).with('Could not find a target named \'TargetB\' in your Podfile. Stopping keys'.red)
+
+          CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), target_tag => 'TargetB')
+        end
+      end
+
+      context "with a non-existant target specified as an array in '#{target_tag}'" do
+        it 'fails to assign the key to the tag' do
+          expect(@podfile).not_to receive(:pod).with('Keys', anything)
+          expect(Pod::UI).to receive(:puts).with('Could not find a target named \'TargetB\' in your Podfile. Stopping keys'.red)
+
+          CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), target_tag => ['TargetB'])
+        end
+      end
+    end
+  end
+
+  context 'with two targets defined in the Podfile' do
+    before(:each) do
+      @config = Pod::Config.instance
+      @podfile = double('Podfile')
+      allow(@config).to receive(:podfile).and_return(@podfile)
+
+      allow(@podfile).to receive(:root_target_definitions).and_return([@target_defs])
+      allow(@target_defs).to receive(:children).and_return([@target_a, @target_b])
+    end
+
+    context 'with no targets specified' do
+      it 'adds Keys to the global Pod' do
+        expect(@podfile).to receive(:pod).with('Keys', anything)
+        expect(@target_a).not_to receive(:store_pod).with('Keys', anything)
+        expect(@target_b).not_to receive(:store_pod).with('Keys', anything)
+
+        CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), {})
+      end
+    end
+
+    %w(target targets).each do |target_tag|
+      context "with 'TargetA' specified as a string in '#{target_tag}'" do
+        it 'adds Keys to Target A' do
+          expect(@podfile).not_to receive(:pod).with('Keys', anything)
+          expect(@target_a).to receive(:store_pod).with('Keys', anything)
+          expect(@target_b).not_to receive(:store_pod).with('Keys', anything)
+
+          CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), target_tag => 'TargetA')
+        end
+      end
+
+      context "with 'TargetA' specified in an array in '#{target_tag}'" do
+        it 'adds Keys to Target A' do
+          expect(@podfile).not_to receive(:pod).with('Keys', anything)
+          expect(@target_a).to receive(:store_pod).with('Keys', anything)
+          expect(@target_b).not_to receive(:store_pod).with('Keys', anything)
+
+          CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), target_tag => ['TargetA'])
+        end
+      end
+
+      context "with 'TargetA' specified as a string in '#{target_tag}'" do
+        it 'adds Keys to Target B' do
+          expect(@podfile).not_to receive(:pod).with('Keys', anything)
+          expect(@target_a).not_to receive(:store_pod).with('Keys', anything)
+          expect(@target_b).to receive(:store_pod).with('Keys', anything)
+
+          CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), target_tag => 'TargetB')
+        end
+      end
+
+      context "with 'TargetB' specified in an array in '#{target_tag}'" do
+        it 'adds Keys to Target B' do
+          expect(@podfile).not_to receive(:pod).with('Keys', anything)
+          expect(@target_a).not_to receive(:store_pod).with('Keys', anything)
+          expect(@target_b).to receive(:store_pod).with('Keys', anything)
+
+          CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), target_tag => ['TargetB'])
+        end
+      end
+
+      context "with a non-existant target specified as a string in '#{target_tag}'" do
+        it 'fails to assign the key to the tag' do
+          expect(@podfile).not_to receive(:pod).with('Keys', anything)
+          expect(Pod::UI).to receive(:puts).with('Could not find a target named \'TargetC\' in your Podfile. Stopping keys'.red)
+
+          CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), target_tag => 'TargetC')
+        end
+      end
+
+      context "with a non-existant target specified as an array in '#{target_tag}'" do
+        it 'fails to assign the key to the tag' do
+          expect(@podfile).not_to receive(:pod).with('Keys', anything)
+          expect(Pod::UI).to receive(:puts).with('Could not find a target named \'TargetC\' in your Podfile. Stopping keys'.red)
+
+          CocoaPodsKeys.add_keys_to_pods(Pathname.new('Pods/CocoaPodsKeys/'), target_tag => ['TargetC'])
+        end
+      end
+    end
+  end
+end