cocoapods 0.5.1 → 0.6.0.rc1

data/lib/cocoapods/specification/set.rb

@@ -1,22 +1,6 @@
 module Pod
   class Specification
     class Set
-      def self.sets
-        @sets ||= {}
-      end
-
-      def self.by_specification_name(name)
-        sets[name]
-      end
-
-      # This keeps an identity map of sets so that you always get the same Set
-      # instance for the same pod directory.
-      def self.by_pod_dir(pod_dir)
-        set = new(pod_dir)
-        sets[set.name] ||= set
-        sets[set.name]
-      end
-
       attr_reader :pod_dir
 
       def initialize(pod_dir)
@@ -25,6 +9,9 @@ module Pod
       end
 
       def required_by(specification)
+        # Skip subspecs because the can't require a different version of the top level parent
+        return if !specification.podfile? && specification.top_level_parent.name == name
+
         dependency = specification.dependency_by_top_level_spec_name(name)
         # TODO we don’t actually do anything in our Version subclass. Maybe we should just remove that.
         unless @required_by.empty? || dependency.requirement.satisfied_by?(Gem::Version.new(required_version.to_s))
@@ -37,16 +24,16 @@ module Pod
         @required_by << specification
       end
 
+      def specification_by_name(name)
+        specification.top_level_parent.subspec_by_name(name)
+      end
+
       def dependency
         @required_by.inject(Dependency.new(name)) do |previous, spec|
           previous.merge(spec.dependency_by_top_level_spec_name(name).to_top_level_spec_dependency)
         end
       end
 
-      def only_part_of_other_pod?
-        @required_by.all? { |spec| spec.dependency_by_top_level_spec_name(name).only_part_of_other_pod? }
-      end
-
       def name
         @pod_dir.basename.to_s
       end
@@ -56,7 +43,7 @@ module Pod
       end
 
       def specification
-        @specification ||= Specification.from_file(specification_path).tap { |spec| spec.defined_in_set = self }
+        @specification ||= Specification.from_file(specification_path)
       end
 
       # Return the first version that matches the current dependency.
@@ -70,7 +57,7 @@ module Pod
       end
 
       def to_s
-        "#<#{self.class.name} for `#{name}' with required version `#{required_version}'>"
+        "#<#{self.class.name} for `#{name}' with required version `#{required_version}' at `#{@pod_dir}'>"
       end
       alias_method :inspect, :to_s
 
@@ -86,12 +73,11 @@ module Pod
       class External < Set
         def initialize(specification)
           @specification = specification
-          @specification.defined_in_set = self
           @required_by = []
         end
 
         def name
-          @specification.name
+          @specification.top_level_parent.name
         end
 
         def ==(other)
@@ -105,10 +91,6 @@ module Pod
           @specification = before
         end
 
-        def only_part_of_other_pod?
-          false
-        end
-
         def specification_path
           raise "specification_path"
         end

data/lib/cocoapods/specification/statistics.rb

@@ -0,0 +1,112 @@
+require 'yaml'
+
+# This is to make sure Faraday doesn't warn the user about the `system_timer` gem missing.
+old_warn, $-w = $-w, nil
+begin
+  require 'faraday'
+ensure
+  $-w = old_warn
+end
+require 'octokit'
+
+module Pod
+  class Specification
+    class Statistics
+
+      def self.instance
+        @instance ||= new
+      end
+
+      def self.instance=(instance)
+        @instance = instance
+      end
+
+      attr_accessor :cache_file, :cache_expiration
+
+      def initialize
+        @cache_file = Config.instance.repos_dir + 'statistics.yml'
+        @cache_expiration = 60 * 60 * 24 * 3
+      end
+
+      def creation_date(set)
+        compute_creation_date(set)
+      end
+
+      def creation_dates(sets)
+        dates = {}
+        sets.each { |set| dates[set.name] = compute_creation_date(set, false) }
+        save_cache
+        dates
+      end
+
+      def github_watchers(set)
+        github_stats_if_needed(set)
+        get_value(set, :gh_watchers)
+      end
+
+      def github_forks(set)
+        github_stats_if_needed(set)
+        get_value(set, :gh_forks)
+      end
+
+      def github_pushed_at(set)
+        github_stats_if_needed(set)
+        get_value(set, :pushed_at)
+      end
+
+      private
+
+      def cache
+        @cache ||= cache_file && cache_file.exist? ? YAML::load(cache_file.read) : {}
+      end
+
+      def get_value(set, key)
+        if cache[set.name] && cache[set.name][key]
+          cache[set.name][key]
+        end
+      end
+
+      def set_value(set, key, value)
+          cache[set.name] ||= {}
+          cache[set.name][key] = value
+      end
+
+      def save_cache
+        File.open(cache_file, 'w') { |f| f.write(YAML::dump(cache)) } if cache_file
+      end
+
+      def compute_creation_date(set, save = true)
+        date = get_value(set, :creation_date)
+        unless date
+          Dir.chdir(set.pod_dir.dirname) do
+            date = Time.at(`git log --first-parent --format=%ct #{set.name}`.split("\n").last.to_i)
+          end
+          set_value(set, :creation_date, date)
+        end
+        save_cache if save
+        date
+      end
+
+      def github_stats_if_needed(set)
+        return if get_value(set, :gh_date) && get_value(set, :gh_date) > Time.now - cache_expiration
+        spec    = set.specification
+        url     = spec.source.reject {|k,_| k == :commit || k == :tag }.values.first
+        repo_id = url[/github.com\/([^\/\.]*\/[^\/\.]*)\.*/, 1]
+        return unless repo_id
+
+        begin
+          repo = Octokit.repo(repo_id)
+        rescue
+          return
+        end
+
+        cache[set.name] ||= {}
+        set_value(set, :gh_watchers,   repo['watchers'])
+        set_value(set, :gh_forks,      repo['forks'])
+        set_value(set, :pushed_at,     repo['pushed_at'])
+        set_value(set, :gh_date,       Time.now)
+        save_cache
+      end
+    end
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cocoapods
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  - rc1
+  version: 0.6.0.rc1
 platform: ruby
 authors: 
 - Eloy Duran
@@ -14,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-22 00:00:00 +01:00
+date: 2012-05-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: xcodeproj
+  name: faraday
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -26,15 +27,113 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
+        - 8
         - 1
-        - 0
-        version: 0.1.0
+        version: 0.8.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bacon
+  name: octokit
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: colored
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: escape
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 7
+        - 3
+        version: 1.7.3
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: open4
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: xcodeproj
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 0
+        - rc1
+        version: 0.2.0.rc1
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -43,7 +142,7 @@ dependencies:
         - 1
         version: "1.1"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id009
 description: |-
   CocoaPods manages library dependencies for your Xcode project.
   
@@ -58,8 +157,12 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/cocoapods/command/error_report.rb
 - lib/cocoapods/command/install.rb
 - lib/cocoapods/command/list.rb
+- lib/cocoapods/command/presenter/cocoa_pod.rb
+- lib/cocoapods/command/presenter.rb
+- lib/cocoapods/command/push.rb
 - lib/cocoapods/command/repo.rb
 - lib/cocoapods/command/search.rb
 - lib/cocoapods/command/setup.rb
@@ -68,23 +171,33 @@ files:
 - lib/cocoapods/config.rb
 - lib/cocoapods/dependency.rb
 - lib/cocoapods/downloader/git.rb
+- lib/cocoapods/downloader/http.rb
 - lib/cocoapods/downloader/mercurial.rb
 - lib/cocoapods/downloader/subversion.rb
 - lib/cocoapods/downloader.rb
 - lib/cocoapods/executable.rb
 - lib/cocoapods/file_list.rb
+- lib/cocoapods/generator/acknowledgements/markdown.rb
+- lib/cocoapods/generator/acknowledgements/plist.rb
+- lib/cocoapods/generator/acknowledgements.rb
 - lib/cocoapods/generator/bridge_support.rb
 - lib/cocoapods/generator/copy_resources_script.rb
+- lib/cocoapods/generator/documentation.rb
+- lib/cocoapods/generator/dummy_source.rb
 - lib/cocoapods/installer/target_installer.rb
+- lib/cocoapods/installer/user_project_integrator.rb
 - lib/cocoapods/installer.rb
+- lib/cocoapods/local_pod.rb
 - lib/cocoapods/platform.rb
 - lib/cocoapods/podfile.rb
+- lib/cocoapods/project.rb
 - lib/cocoapods/resolver.rb
+- lib/cocoapods/sandbox.rb
 - lib/cocoapods/source.rb
 - lib/cocoapods/specification/set.rb
+- lib/cocoapods/specification/statistics.rb
 - lib/cocoapods/specification.rb
 - lib/cocoapods/version.rb
-- lib/cocoapods/xcodeproj_pods.rb
 - lib/cocoapods.rb
 - bin/pod
 - README.md

data/lib/cocoapods/xcodeproj_pods.rb

@@ -1,111 +0,0 @@
-require 'xcodeproj/project'
-
-module Xcodeproj
-  class Project
-    # Shortcut access to the `Pods' PBXGroup.
-    def pods
-      groups.find { |g| g.name == 'Pods' } || groups.new({ 'name' => 'Pods' })
-    end
-
-    # Adds a group as child to the `Pods' group.
-    def add_pod_group(name)
-      pods.groups.new('name' => name)
-    end
-    
-    # Shortcut access to build configurations
-    def build_configurations
-      objects[root_object.attributes['buildConfigurationList']].buildConfigurations
-    end
-    
-    def build_configuration(name)
-      build_configurations.find { |c| c.name == name }
-    end
-
-    class PBXCopyFilesBuildPhase
-      def self.new_pod_dir(project, pod_name, path)
-        new(project, nil, {
-          "dstPath" => "Pods/#{path}",
-          "name"    => "Copy #{pod_name} Public Headers",
-        })
-      end
-    end
-
-    def self.for_platform(platform)
-      project = Xcodeproj::Project.new
-      project.main_group << project.groups.new({ 'name' => 'Pods' })
-      framework = project.add_system_framework(platform == :ios ? 'Foundation' : 'Cocoa')
-      framework.group = project.groups.new({ 'name' => 'Frameworks' })
-      project.main_group << framework.group
-      products = project.groups.new({ 'name' => 'Products' })
-      project.main_group << products
-      project.root_object.products = products
-      
-      project.root_object.attributes['buildConfigurationList'] = project.objects.add(Xcodeproj::Project::XCConfigurationList, {
-        'defaultConfigurationIsVisible' => '0',
-        'defaultConfigurationName' => 'Release',
-        'buildConfigurations' => [
-          project.objects.add(Xcodeproj::Project::XCBuildConfiguration, {
-            'name' => 'Debug',
-            'buildSettings' => build_settings(platform, :debug)
-          }),
-          project.objects.add(Xcodeproj::Project::XCBuildConfiguration, {
-            'name' => 'Release',
-            'buildSettings' => build_settings(platform, :release)
-          })
-        ].map(&:uuid)
-      }).uuid
-      project
-    end
-
-    private
-
-    COMMON_BUILD_SETTINGS = {
-      :all => {
-        'ALWAYS_SEARCH_USER_PATHS' => 'NO',
-        'GCC_C_LANGUAGE_STANDARD' => 'gnu99',
-        'INSTALL_PATH' => "$(BUILT_PRODUCTS_DIR)",
-        'GCC_WARN_ABOUT_MISSING_PROTOTYPES' => 'YES',
-        'GCC_WARN_ABOUT_RETURN_TYPE' => 'YES',
-        'GCC_WARN_UNUSED_VARIABLE' => 'YES',
-        'OTHER_LDFLAGS' => ''
-      },
-      :debug => {
-        'GCC_DYNAMIC_NO_PIC' => 'NO',
-        'GCC_PREPROCESSOR_DEFINITIONS' => ["DEBUG=1", "$(inherited)"],
-        'GCC_SYMBOLS_PRIVATE_EXTERN' => 'NO',
-        'GCC_OPTIMIZATION_LEVEL' => '0'
-      },
-      :ios => {
-        'ARCHS' => "$(ARCHS_STANDARD_32_BIT)",
-        'GCC_VERSION' => 'com.apple.compilers.llvmgcc42',
-        'IPHONEOS_DEPLOYMENT_TARGET' => '4.3',
-        'PUBLIC_HEADERS_FOLDER_PATH' => "$(TARGET_NAME)",
-        'SDKROOT' => 'iphoneos'
-      },
-      :osx => {
-        'ARCHS' => "$(ARCHS_STANDARD_64_BIT)",
-        'GCC_ENABLE_OBJC_EXCEPTIONS' => 'YES',
-        'GCC_WARN_64_TO_32_BIT_CONVERSION' => 'YES',
-        'GCC_VERSION' => 'com.apple.compilers.llvm.clang.1_0',
-        'MACOSX_DEPLOYMENT_TARGET' => '10.7',
-        'SDKROOT' => 'macosx'
-      }
-    }
-
-    def self.build_settings(platform, scheme)
-      settings = COMMON_BUILD_SETTINGS[:all].merge(COMMON_BUILD_SETTINGS[platform.name])
-      settings['COPY_PHASE_STRIP'] = scheme == :debug ? 'NO' : 'YES'
-      if platform.requires_legacy_ios_archs?
-        settings['ARCHS'] = "armv6 armv7"
-      end
-      if scheme == :debug
-        settings.merge!(COMMON_BUILD_SETTINGS[:debug])
-        settings['ONLY_ACTIVE_ARCH'] = 'YES' if platform == :osx
-      else
-        settings['VALIDATE_PRODUCT'] = 'YES' if platform == :ios
-        settings['DEBUG_INFORMATION_FORMAT'] = "dwarf-with-dsym" if platform == :osx
-      end
-      settings
-    end
-  end
-end