cocoapods-keys 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b01fd13b64082cf9a456e3375e5265921e5d146a
-  data.tar.gz: e46f5ad08f13973adf790f97683c3e1907018298
+  metadata.gz: 8ac337ab98b12595508bac423ffda68ece2123fd
+  data.tar.gz: de8a32d1e0cd7e17ce9e17d94c71c47d023908ec
 SHA512:
-  metadata.gz: 0814c7e535af3237cc3d3aa7419056554c2e79029af71615c87d3b617aaa923c5ff0b04c9dac651169f692d68794323a45b059f009fbf1f0b9fee1026adab851
-  data.tar.gz: 60820ab391f39b05d571ffee200735bdc31fa6a97bcc4617322385122cb10af7524dc12618231b6196d4a752f5e0bfd07e1af33b2ebda8f3b35815088773f2bf
+  metadata.gz: 40b176b7705d9099c50e341e4501c8b40705e3b147bfc6c49c34df4796c17e07178f9a6bde10f6d69753dd7a1bb99023af1d33573009531f06aaf382e5dc9de2
+  data.tar.gz: 80ad890268300ad76f1d5cf4e4e516ed707b50939a5770b2084ada4e7b99b5700e0f65cc65ca5bf3f35c3f06e260a4829fec8f606e89d135a52393ce2b803af0

data/.rubocop.yml

@@ -8,3 +8,12 @@ Style/FileName:
   Exclude:
     - bin/*
     - Rakefile
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+
+#- cocoapods-keys support for Ruby 2.0.0 -------------------------------------#
+
+Security/YAMLLoad:
+  Enabled: false

data/.rubocop_cocoapods.yml

@@ -37,7 +37,7 @@ SingleLineBlockParams:
 Encoding:
   Enabled: false
 
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
 # Clashes with CLAide Command#validate!

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Master
 
+## 2.0.1
+
+* Handles more CI types [m-ruhl] 
+
 ## 2.0.0
 
 * Handles casing correctly in generated key names [breaking] [marcelofabri] 

data/Gemfile

@@ -3,4 +3,5 @@ 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'
+gem 'activesupport', '< 5'

data/Gemfile.lock

@@ -1,24 +1,24 @@
 PATH
   remote: .
   specs:
-    cocoapods-keys (1.7.0)
+    cocoapods-keys (2.0.1)
       dotenv
       osx_keychain
 
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.3.5)
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
-    ZenTest (4.11.0)
-    activesupport (4.2.6)
+    ZenTest (4.11.1)
+    activesupport (4.2.9)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ast (2.2.0)
-    claide (1.0.0.beta.3)
+    ast (2.3.0)
+    claide (1.0.2)
     cocoapods (1.0.0.beta.6)
       activesupport (>= 4.0.2)
       claide (>= 1.0.0.beta.3, < 2.0)
@@ -40,68 +40,74 @@ GEM
       activesupport (>= 4.0.2)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.0.beta.1)
-    cocoapods-downloader (1.0.0.beta.2)
-    cocoapods-plugins (1.0.0.beta.1)
+    cocoapods-deintegrate (1.0.1)
+    cocoapods-downloader (1.1.3)
+    cocoapods-plugins (1.0.0)
       nap
-    cocoapods-search (1.0.0.beta.1)
-    cocoapods-stats (1.0.0.beta.3)
-    cocoapods-trunk (1.0.0.beta.2)
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.0.0)
+    cocoapods-trunk (1.2.0)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
-    cocoapods-try (1.0.0.beta.3)
+    cocoapods-try (1.1.0)
     colored (1.2)
-    diff-lcs (1.2.5)
-    dotenv (2.1.1)
+    colored2 (3.1.2)
+    diff-lcs (1.3)
+    dotenv (2.2.1)
     escape (0.0.4)
-    fourflusher (0.3.0)
+    fourflusher (0.3.2)
     fuzzy_match (2.0.4)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.8.4)
-    molinillo (0.4.4)
+    i18n (0.8.4)
+    minitest (5.10.2)
+    molinillo (0.4.5)
+    nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.7.8)
     osx_keychain (1.0.1)
       RubyInline (~> 3)
-    parser (2.3.0.7)
+    parallel (1.11.2)
+    parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
-    rainbow (2.1.0)
-    rake (11.1.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rainbow (2.2.2)
+      rake
+    rake (12.0.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubocop (0.39.0)
-      parser (>= 2.3.0.7, < 3.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.7.5)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    ruby-progressbar (1.8.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    unicode-display_width (1.0.3)
-    xcodeproj (1.0.0.beta.3)
-      activesupport (>= 3)
-      claide (>= 1.0.0.beta.1, < 2.0)
-      colored (~> 1.2)
+    unicode-display_width (1.3.0)
+    xcodeproj (1.5.0)
+      CFPropertyList (~> 2.3.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (< 5)
   bundler (~> 1.3)
   cocoapods (= 1.0.0.beta.6)
   cocoapods-keys!
@@ -110,4 +116,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.12.5
+   1.15.4

data/lib/cocoapods_keys.rb

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

data/lib/name_whisperer.rb

@@ -25,7 +25,7 @@ module CocoaPodsKeys
       if xcodeprojects.length == 1
         Pathname(xcodeprojects.first).basename('.xcodeproj')
       else
-        error_message = (xcodeprojects.length > 1) ? 'found too many' : "couldn't find any"
+        error_message = xcodeprojects.length > 1 ? 'found too many' : "couldn't find any"
         projects = xcodeprojects.map(&:basename).join(' ')
         ui.puts 'CocoaPods-Keys ' + error_message + ' Xcode projects (' + projects + '). Please give a name for this project.'
 

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

@@ -10,8 +10,17 @@ module Pod
 
         self.description = <<-DESC
           Generates the obfuscated Objective-C h/m files using the current key values.
+
+          An optional operator can be done to force a project name.
         DESC
 
+        self.arguments = [CLAide::Argument.new('project_name', false)]
+
+        def initialize(argv)
+          @project_name = argv.shift_argument
+          super
+        end
+
         def run
           Dotenv.load
           keyring = get_current_keyring

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

@@ -30,7 +30,7 @@ module Pod
           UI.puts "Keys for #{keyring.name}"
           data = keyring.keychain_data
           data.each_with_index do |(key, value), index|
-            prefix = (index == data.length - 1) ? ' └ ' : ' ├ '
+            prefix = index == data.length - 1 ? ' └ ' : ' ├ '
             UI.puts prefix + " #{key} - #{value}"
           end
           UI.puts
@@ -38,7 +38,9 @@ module Pod
 
         def display_keyring(keyring)
           UI.puts "#{keyring.name} - #{keyring.path}"
-          if keyring.keys.length == 1
+          if keyring.keys.empty?
+            # Skip
+          elsif keyring.keys.length == 1
             UI.puts ' └ ' + keyring.keys[0]
           else
             UI.puts ' └ ' + keyring.keys[0...-1].join(' ') + ' & ' + keyring.keys[-1]

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

@@ -81,9 +81,9 @@ module Pod
 
         def matches(keys)
           if @key_name.include? '*'
-            return keys.select { |e| e =~ create_regex(@key_name) }
+            keys.select { |e| e =~ create_regex(@key_name) }
           else
-            return keys.select { |e| e == @key_name }
+            keys.select { |e| e == @key_name }
           end
         end
 

data/lib/preinstaller.rb

@@ -42,8 +42,8 @@ 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}"
+          if ci?
+            raise Pod::Informative, "CocoaPods-Keys could not find a key named: #{key}"
           end
 
           unless has_shown_intro
@@ -71,7 +71,7 @@ module CocoaPodsKeys
     end
 
     def check_for_multiple_keyrings(project, current_dir)
-      if !ENV['TRAVIS'] && !ENV['TEAMCITY_VERSION'] && !ENV['CIRCLECI']
+      unless ci?
         ui = Pod::UserInterface
         keyrings = KeyringLiberator.get_all_keyrings_named(project)
         if keyrings.count > 1
@@ -85,5 +85,12 @@ module CocoaPodsKeys
         end
       end
     end
+
+    def ci?
+      %w([JENKINS_HOME TRAVIS CIRCLECI CI TEAMCITY_VERSION GO_PIPELINE_NAME bamboo_buildKey GITLAB_CI XCS]).each do |current|
+        return true if ENV.key?(current)
+      end
+      false
+    end
   end
 end

data/spec/functional_spec.rb

@@ -53,10 +53,10 @@ describe 'CocoaPodsKeys functional tests' do
 
   it 'is able to export the correct keys from the command-line' do
     Dir.chdir(@tmpdir) do
-      exported_keys = <<-EOS
-pod keys set KeyWithData "such-data" TestProject
-pod keys set AnotherKeyWithData "other-data" TestProject
-pod keys set UnusedKey "-" TestProject
+      exported_keys = <<-EOS.strip_heredoc
+  pod keys set KeyWithData "such-data" TestProject
+  pod keys set AnotherKeyWithData "other-data" TestProject
+  pod keys set UnusedKey "-" TestProject
 EOS
       expect(`pod keys export`.strip).to eq(exported_keys.strip)
     end

data/spec/plugin_spec.rb

@@ -44,7 +44,7 @@ describe CocoaPodsKeys, '#plugin' do
       CocoaPodsKeys.add_keys_to_pods(@podfile, Pathname.new('Pods/CocoaPodsKeys/'), {})
     end
 
-    %w(target targets).each do |target_tag|
+    %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)
@@ -84,7 +84,7 @@ describe CocoaPodsKeys, '#plugin' do
       end
     end
 
-    %w(target targets).each do |target_tag|
+    %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)
@@ -143,7 +143,7 @@ describe CocoaPodsKeys, '#plugin' do
       end
     end
 
-    %w(target targets).each do |target_tag|
+    %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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-keys
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: osx_keychain
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: CocoaPods Keys will store sensitive data in your Mac's keychain. Then on