cocoapods-stats 1.0.0.beta.2 → 1.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f83f2c32f2b11b9f98a6b33d73b1447d9c96826d
-  data.tar.gz: 79ba9a9b409484c8af70056b3b0b185c75bde286
+  metadata.gz: e9ddf8b9591fb258c991c29b51905f3c2464c914
+  data.tar.gz: 0a4a17dc4b4b90b1e0182706ae70c8157ab1dc19
 SHA512:
-  metadata.gz: e1ce9b9bf7efadf1c30a6fcd685d7f9cec66235d5e894eafe3d526a7d35bd9f372e2ad50b27116793a42ec15ec191886c39536a5287a76f4e9be377f4784f4e1
-  data.tar.gz: 809721de765a386814dd70829445e93a60f889910b3ec73d739a9ea007d90189b378ba6e162d2670a261bbcaf76e8e18f60c7c8878fa91d37c0fca065dd4399c
+  metadata.gz: 09ae1d7747773271cc65ac1a11235869c7a7dd522796c5bac9d653f3aa4062e9d870e36ce73a05906cbe724bc12a76044e80652c5e0953751d77b53d05b53528
+  data.tar.gz: 060d875ebb6a0a8e8803c541f70fbf217f3d593501ca3abb3f9bf7d337fde76645fbcaf793af7199f2d130dbe863194aebbc50ae1b4bcdcc4bb57533466d6e05

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CocoaPods Stats CHANGELOG
 
+## 1.0.0.beta.3 (2016-01-16)
+
+##### Bug Fixes
+
+* Introduce a compatibility shim for CocoaPods 0.39.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [CocoaPods#4741](https://github.com/CocoaPods/CocoaPods/issues/4741)
+
+
 ## 1.0.0.beta.2 (2016-01-05)
 
 ##### Enhancements

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-stats (1.0.0.beta.2)
+    cocoapods-stats (1.0.0.beta.3)
 
 GEM
   remote: https://rubygems.org/
@@ -17,24 +17,24 @@ GEM
       parser (>= 2.2.0.pre.3, < 3.0)
     bacon (1.2.0)
     claide (1.0.0.beta.1)
-    cocoapods (1.0.0.beta.1)
+    cocoapods (1.0.0.beta.2)
       activesupport (>= 4.0.2)
       claide (>= 1.0.0.beta.1, < 2.0)
-      cocoapods-core (= 1.0.0.beta.1)
+      cocoapods-core (= 1.0.0.beta.2)
       cocoapods-deintegrate (>= 1.0.0.beta.1, < 2.0)
       cocoapods-downloader (>= 1.0.0.beta.1, < 2.0)
       cocoapods-plugins (>= 1.0.0.beta.1, < 2.0)
       cocoapods-search (>= 1.0.0.beta.1, < 2.0)
-      cocoapods-stats (>= 1.0.0.beta.1, < 2.0)
+      cocoapods-stats (>= 1.0.0.beta.2, < 2.0)
       cocoapods-trunk (>= 1.0.0.beta.1, < 2.0)
-      cocoapods-try (>= 1.0.0.beta.1, < 2.0)
+      cocoapods-try (>= 1.0.0.beta.2, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
       fourflusher (~> 0.3.0)
       molinillo (~> 0.4.1)
       nap (~> 1.0)
       xcodeproj (>= 1.0.0.beta.1, < 2.0)
-    cocoapods-core (1.0.0.beta.1)
+    cocoapods-core (1.0.0.beta.2)
       activesupport (>= 4.0.2)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -46,7 +46,7 @@ GEM
     cocoapods-trunk (1.0.0.beta.1)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
-    cocoapods-try (1.0.0.beta.1)
+    cocoapods-try (1.0.0.beta.2)
     colored (1.2)
     escape (0.0.4)
     fourflusher (0.3.0)

data/lib/cocoapods_stats/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsStats
-  VERSION = '1.0.0.beta.2'.freeze
+  VERSION = '1.0.0.beta.3'.freeze
 end

data/lib/cocoapods_stats/target_mapper.rb

@@ -17,7 +17,7 @@ module CocoaPodsStats
           map { |spec| { :name => spec.name, :version => spec.version.to_s } }
 
         # This will be an empty array for `integrate_targets: false` Podfiles
-        target.user_targets.map do |user_target|
+        user_targets(target).map do |user_target|
           # Send in a digested'd UUID anyway, a second layer
           # of misdirection can't hurt
           {
@@ -29,5 +29,16 @@ module CocoaPodsStats
         end
       end
     end
+
+    private
+
+    # @todo remove this once everyone has migrated to CocoaPods 1.0, see
+    #       https://github.com/CocoaPods/CocoaPods/issues/4741
+    def user_targets(target)
+      return target.user_targets if target.respond_to?(:user_targets)
+      project = Xcodeproj::Project.open(target.user_project_path) if target.user_project_path
+      return [] unless project
+      target.user_target_uuids.map { |uuid| project.objects_by_uuid[uuid] }.compact
+    end
   end
 end

data/spec/target_mapper_spec.rb

@@ -4,65 +4,56 @@ require 'cocoapods_stats/target_mapper'
 describe CocoaPodsStats::TargetMapper do
   describe 'pods_from_project' do
     before do
-      @user_target = mock('PBXNativeTarget')
-      @user_target.stubs(:product_type).returns('testing')
-      @user_target.stubs(:platform_name).returns('test platform')
+      @user_project = Xcodeproj::Project.new('App.xcodeproj')
+      @user_target = @user_project.new_target(:application, 'App', :ios)
       @user_target.stubs(:uuid).returns('111222333')
+
+      @spec = Pod::Specification.new do |spec|
+        spec.name = 'ORStackView'
+        spec.version = '1.1.1'
+      end
+
+      @sandbox = stub('Sandbox',
+                      :root => Pathname('Pods/'),
+                      :project => Pod::Project.new('Pods/Pods.xcodeproj'))
+      aggregate_target = stub('AggregateTarget',
+                              :specs => [@spec],
+                              :platform => Pod::Platform.new('test platform', '9.3'),
+                              :user_targets => [@user_target],
+                              :user_project => @user_project,
+                              :label => 'Pods-App')
+      @context = Pod::Installer::PostInstallHooksContext.generate(@sandbox, [aggregate_target])
     end
 
     it 'returns expected data' do
       master_pods  = Set.new(['ORStackView'])
 
-      spec = Pod::Specification.new
-      spec.name = 'ORStackView'
-      spec.version = '1.1.1'
-
-      target = mock('AggregateTarget')
-      target.stubs(:specs).returns([spec])
-      target.stubs(:user_targets).returns([@user_target])
-      target.stubs(:user_project).returns(mock('Project'))
-
-      context = mock('Context')
-      context.stubs(:umbrella_targets).returns([target])
-
       mapper = CocoaPodsStats::TargetMapper.new
-      pods = mapper.pods_from_project(context, master_pods)
+      pods = mapper.pods_from_project(@context, master_pods)
 
       pods.should == [
         {
           :uuid => 'da5511d2baa83c2e753852f1f2fba11003ed0c46c96820c7589b243a8ddb787a',
-          :type => 'testing',
+          :type => 'com.apple.product-type.application',
           :pods => [
             { :name => 'ORStackView', :version => '1.1.1' },
           ],
-          :platform => 'test platform',
+          :platform => :ios,
         }]
     end
 
     it 'returns no pods if it cannot find them in the master_pods set' do
       master_pods  = Set.new([''])
 
-      spec = Pod::Specification.new
-      spec.name = 'ORStackView'
-      spec.version = '1.1.1'
-
-      target = mock('AggregateTarget')
-      target.stubs(:specs).returns([spec])
-      target.stubs(:user_targets).returns([@user_target])
-      target.stubs(:user_project).returns(mock('Project'))
-
-      context = mock('Context')
-      context.stubs(:umbrella_targets).returns([target])
-
       mapper = CocoaPodsStats::TargetMapper.new
-      pods = mapper.pods_from_project(context, master_pods)
+      pods = mapper.pods_from_project(@context, master_pods)
 
       pods.should == [
         {
           :uuid => 'da5511d2baa83c2e753852f1f2fba11003ed0c46c96820c7589b243a8ddb787a',
-          :type => 'testing',
+          :type => 'com.apple.product-type.application',
           :pods => [],
-          :platform => 'test platform',
+          :platform => :ios,
         },
       ]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-stats
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.2
+  version: 1.0.0.beta.3
 platform: ruby
 authors:
 - Orta Therox
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Uploads statistics for Pod Analytics.
@@ -47,10 +47,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .rubocop_cocoapods.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_cocoapods.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -78,12 +78,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []