motion-cocoapods 1.3.7 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d03a62fa181ba305ae74b453108a2e5a22774293
-  data.tar.gz: f06e706c4d317d22dd527082a2aa6420529112a1
+  metadata.gz: b763eae72ff22dc16f112c56c334712927a268c2
+  data.tar.gz: d33fb42510b1aabd3ee3898121d8872833d58603
 SHA512:
-  metadata.gz: b5641b33a7b7aae45b1842e2555db2d276ab7f6f07599cb760dc731a9bfc67617962400b7d88a4201e2000117994d318866a3fe06f6c0b15bd987461f10f90a5
-  data.tar.gz: 8d4a8bbb18d4d296aef5e35e5d009475fe2e982617bb0e84e7087f34c597cca6dee6defcbf3aa3836bf81e73bcdfe497cd816d3ec1112f5491866155be83849f
+  metadata.gz: 523db5f80d68402f1a7109ad58ada92d4faf3fd37a478c16e19fc5e752cfeb64b406cd4344c402ce67c9972a6c9b5f8ecc8ea9b8750db815523e4a697cd99a82
+  data.tar.gz: 2f5037a251bc4d2072baced390d552755a3cca1e42f414ae0c294a84ef2f0cccc1812029f3ff07a640d7ee0ae71fba6f3a4a9158fc548680049cd58fa6c88ca5

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012, Laurent Sansonetti <lrz@hipbyte.com>
+Copyright (c) 2012-2013, Laurent Sansonetti <lrz@hipbyte.com>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -0,0 +1,131 @@
+# motion-cocoapods
+
+motion-cocoapods allows RubyMotion projects to integrate with the
+[CocoaPods](http://cocoapods.org) dependency manager.
+
+
+## Installation
+
+```
+$ [sudo] gem install motion-cocoapods
+```
+
+Or if you use Bundler:
+
+```ruby
+gem 'motion-cocoapods', '~> 1.4.0'
+```
+
+
+## Setup
+
+1. Edit the `Rakefile` of your RubyMotion project and add the following require
+   line:
+
+   ```ruby
+   require 'rubygems'
+   require 'motion-cocoapods'
+   ```
+
+2. Still in the `Rakefile`, set your dependencies using the same language as
+   you would do in [Podfiles](http://docs.cocoapods.org/podfile.html).
+
+   ```ruby
+   Motion::Project::App.setup do |app|
+     # ...
+     app.pods do
+       pod 'AFNetworking'
+     end
+   end
+   ```
+
+3. If this is the first time using CocoaPods on your machine, you'll need to
+   let CocoaPods do some setup work with the following command:
+
+   ```
+   $ [bundle exec] pod setup
+   ```
+
+
+## Tasks
+
+To tell motion-cocoapods to download your dependencies, run the following rake
+task:
+
+```
+$ rake pod:install
+```
+
+That’s all. The build system will properly download the given pods and their
+dependencies. On the next build of your application it will pod the pods and
+link them to your application executable.
+
+If the `vendor/Podfile.lock` file exists, this will be used to install specific
+versions. To update the versions, use the following rake task:
+
+```
+$ rake pod:update
+```
+
+## Options
+
+By default the output of CocoaPods doing its work is silenced. If, however, you
+would like to see the output, you can set the `COCOAPODS_VERBOSE` env variable:
+
+```
+$ rake pod:install COCOAPODS_VERBOSE=1
+```
+
+As part of the install and update tasks, the specification repostories will get
+updated. You can disable this with the `COCOAPODS_NO_REPO_UPDATE` env variable:
+
+```
+$ rake pod:install COCOAPODS_NO_REPO_UPDATE=1
+```
+
+
+## Contribute
+
+1. Setup a local development environment.
+
+   ```
+   $ git clone git://github.com/HipByte/motion-cocoapods.git
+   $ cd motion-cocoapods
+   $ rake bootstrap
+   ```
+
+2. Verify that all the tests are passing.
+
+   ```
+   $ rake spec
+   ```
+
+3. Create your patch and send a
+   [pull-request](http://help.github.com/send-pull-requests/).
+
+
+## License
+
+  Copyright (c) 2012-2013, Laurent Sansonetti <lrz@hipbyte.com>
+  All rights reserved.
+  
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met: 
+  
+  1. Redistributions of source code must retain the above copyright notice, this
+     list of conditions and the following disclaimer. 
+  2. Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution. 
+  
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

data/lib/motion/project/cocoapods.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012, Laurent Sansonetti <lrz@hipbyte.com>
+# Copyright (c) 2012-2013, Laurent Sansonetti <lrz@hipbyte.com>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -46,23 +46,10 @@ module Motion::Project
   class App
     class << self
       def build_with_cocoapods(platform, opts = {})
-        _config = config
-        pods = _config.pods
-        # We run the update/install commands only if necessary.
-        cp_config = Pod::Config.instance
-        analyzer = Pod::Installer::Analyzer.new(cp_config.sandbox, pods.podfile, cp_config.lockfile)
-        begin
-          need_install = analyzer.needs_install?
-        rescue
-          need_install = true
-        end
-        if ENV['COCOCAPODS_UPDATE']
-          pods.install!(true)
-        else
-          pods.install! if need_install
+        unless File.exist?(CocoaPods::PODS_ROOT)
+          $stderr.puts "[!] No CocoaPods dependencies found in #{CocoaPods::PODS_ROOT}, run the `rake pod:install` task."
+          exit 1
         end
-        pods.link_project
-
         build_without_cocoapods(platform, opts)
       end
 
@@ -84,16 +71,51 @@ module Motion::Project
       @podfile = Pod::Podfile.new {}
       @podfile.platform((App.respond_to?(:template) ? App.template : :ios), config.deployment_target)
       cp_config.podfile = @podfile
-
-      cp_config.skip_repo_update = ENV['COCOAPODS_NO_UPDATE']
-      if ENV['COCOAPODS_VERBOSE']
-        cp_config.verbose = true
-      else
-        cp_config.silent = true
-      end
-
+      cp_config.skip_repo_update = true
+      cp_config.verbose = !!ENV['COCOAPODS_VERBOSE']
       cp_config.integrate_targets = false
       cp_config.installation_root = Pathname.new(File.expand_path(config.project_dir)) + 'vendor'
+
+      configure_project
+    end
+
+    # Adds the Pods project to the RubyMotion config as a vendored project and
+    #
+    def configure_project
+      @config.vendor_project(PODS_ROOT, :xcode,
+        :target => 'Pods',
+        :headers_dir => 'Headers',
+        :products => %w{ libPods.a }
+      )
+
+      @config.resources_dirs << resources_dir.to_s
+
+      # TODO replace this all once Xcodeproj has the proper xcconfig parser.
+      if (xcconfig = self.pods_xcconfig) && ldflags = xcconfig.to_hash['OTHER_LDFLAGS']
+        lib_search_paths = xcconfig.to_hash['LIBRARY_SEARCH_PATHS'] || ""
+        lib_search_paths.gsub!('$(PODS_ROOT)', "-L#{@config.project_dir}/#{PODS_ROOT}")
+
+        framework_search_paths = xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS']
+        if framework_search_paths
+          framework_search_paths.scan(/\"([^\"]+)\"/) do |search_path|
+            path = search_path.first.gsub!(/(\$\(PODS_ROOT\))|(\$\{PODS_ROOT\})/, "#{@config.project_dir}/#{PODS_ROOT}")
+            @config.framework_search_paths << path if path
+          end
+        end
+
+        @config.frameworks.concat(ldflags.scan(/-framework\s+([^\s]+)/).map { |m| m[0] })
+        @config.frameworks.uniq!
+        @config.libs.concat(ldflags.scan(/-l([^\s]+)/).map { |m|
+          if lib_search_paths.length == 0 || File.exist?("/usr/lib/lib#{m[0]}.dylib")
+            "/usr/lib/lib#{m[0]}.dylib"
+          else
+            "#{lib_search_paths} -ObjC -l#{m[0]}"
+          end
+        })
+        @config.weak_frameworks.concat(ldflags.scan(/-weak_framework\s+([^\s]+)/).map { |m| m[0] })
+        @config.weak_frameworks.uniq!
+        @config.libs.uniq!
+      end
     end
 
     # DSL
@@ -112,7 +134,7 @@ module Motion::Project
       @podfile.post_install(&block)
     end
 
-    # Installation & Linking
+    # Installation
     #-------------------------------------------------------------------------#
 
     def pods_installer
@@ -127,68 +149,32 @@ module Motion::Project
     # Let RubyMotion re-generate the BridgeSupport file whenever the list of
     # installed pods changes.
     #
-    def install!(update=false)
+    def install!(update)
       pods_installer.update_mode = update
       pods_installer.install!
       if bridgesupport_file.exist? && !pods_installer.installed_specs.empty?
         bridgesupport_file.delete
       end
-    end
 
-    # Adds the Pods project to the RubyMotion config as a vendored project.
-    #
-    def link_project
       install_resources
-      copy_headers
-
-      @config.vendor_project(PODS_ROOT, :xcode,
-        :target => 'Pods',
-        :headers_dir => 'Headers',
-        :products => %w{ libPods.a }
-      )
-
-      if ldflags = pods_xcconfig.to_hash['OTHER_LDFLAGS']
-        lib_search_paths = pods_xcconfig.to_hash['LIBRARY_SEARCH_PATHS'] || ""
-        lib_search_paths.gsub!('$(PODS_ROOT)', "-L#{@config.project_dir}/#{PODS_ROOT}")
-
-        framework_search_paths = pods_xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS']
-        if framework_search_paths
-          framework_search_paths.scan(/\"([^\"]+)\"/) do |search_path|
-            path = search_path.first.gsub!(/(\$\(PODS_ROOT\))|(\$\{PODS_ROOT\})/, "#{@config.project_dir}/#{PODS_ROOT}")
-            @config.framework_search_paths << path if path
-          end
-        end
-
-        @config.frameworks.concat(ldflags.scan(/-framework\s+([^\s]+)/).map { |m| m[0] })
-        @config.frameworks.uniq!
-        @config.libs.concat(ldflags.scan(/-l([^\s]+)/).map { |m|
-          if lib_search_paths.length == 0 || File.exist?("/usr/lib/lib#{m[0]}.dylib")
-            "/usr/lib/lib#{m[0]}.dylib"
-          else
-            "#{lib_search_paths} -all_load -l#{m[0]}"
-          end
-        })
-        @config.weak_frameworks.concat(ldflags.scan(/-weak_framework\s+([^\s]+)/).map { |m| m[0] })
-        @config.weak_frameworks.uniq!
-        @config.libs.uniq!
-      end
+      copy_cocoapods_env_and_prefix_headers
     end
 
+    # TODO this probably breaks in cases like resource bundles etc, need to test.
     def install_resources
       FileUtils.mkdir_p(resources_dir)
       resources.each do |file|
         begin
-          FileUtils.cp_r file, resources_dir
+          FileUtils.cp_r file, resources_dir if file.exist?
         rescue ArgumentError => exc
           unless exc.message =~ /same file/
             raise
           end
         end
       end
-      @config.resources_dirs << resources_dir.to_s
     end
 
-    def copy_headers
+    def copy_cocoapods_env_and_prefix_headers
       headers = Dir.glob(["#{PODS_ROOT}/*.h", "#{PODS_ROOT}/*.pch"])
       headers.each do |header|
         src = File.basename(header)
@@ -206,13 +192,18 @@ module Motion::Project
       Pod::Config.instance
     end
 
+    def analyzer
+      cp_config = Pod::Config.instance
+      Pod::Installer::Analyzer.new(cp_config.sandbox, @podfile, cp_config.lockfile)
+    end
+
     def bridgesupport_file
       Pathname.new(@config.project_dir) + PODS_ROOT + 'Pods.bridgesupport'
     end
 
     def pods_xcconfig
       path = Pathname.new(@config.project_dir) + PODS_ROOT + 'Pods.xcconfig'
-      Xcodeproj::Config.new(path)
+      Xcodeproj::Config.new(path) if path.exist?
     end
 
     def resources
@@ -221,6 +212,7 @@ module Motion::Project
         f.each_line do |line|
           if matched = line.match(/install_resource\s+(.*)/)
             path = (matched[1].strip)[1..-2]
+            path.sub!("${BUILD_DIR}/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}", ".build")
             resources << Pathname.new(@config.project_dir) + PODS_ROOT + path
           end
         end
@@ -231,17 +223,44 @@ module Motion::Project
     def resources_dir
       Pathname.new(@config.project_dir) + PODS_ROOT + 'Resources'
     end
+  end
+end
+
+namespace :pod do
+  task :update_spec_repos do
+    if ENV['COCOCAPODS_NO_UPDATE']
+      $stderr.puts '[!] The COCOCAPODS_NO_UPDATE env variable has been deprecated, use COCOAPODS_NO_REPO_UPDATE instead.'
+      ENV['COCOAPODS_NO_REPO_UPDATE'] = '1'
+    end
+    Pod::SourcesManager.update(nil, true) unless ENV['COCOAPODS_NO_REPO_UPDATE']
+  end
 
-    def inspect
-      ''
+  desc "Download and integrate newly added pods"
+  task :install => :update_spec_repos do
+    pods = App.config.pods
+    begin
+      need_install = pods.analyzer.needs_install?
+    rescue
+      # TODO fix this, see https://github.com/HipByte/motion-cocoapods/issues/57#issuecomment-17810809
+      need_install = true
     end
+    pods.install!(false) if need_install
+  end
+
+  desc "Update outdated pods"
+  task :update => :update_spec_repos do
+    pods = App.config.pods
+    pods.install!(true)
   end
 end
 
-namespace :pod do
-  desc "Update outdated pods and build objects"
-  task :update do
-    ENV['COCOCAPODS_UPDATE'] = "true"
-    Rake::Task["build"].invoke
+namespace :clean do
+  # This gets appended to the already existing clean:all task.
+  task :all do
+    dir = Motion::Project::CocoaPods::PODS_ROOT
+    if File.exist?(dir)
+      App.info 'Delete', dir
+      rm_rf dir
+    end
   end
-end
+end

data/lib/motion/project/version.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012, Laurent Sansonetti <lrz@hipbyte.com>
+# Copyright (c) 2012-2013, Laurent Sansonetti <lrz@hipbyte.com>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,6 +24,6 @@
 
 module Motion::Project
   class CocoaPods
-    VERSION   = '1.3.7'
+    VERSION = '1.4.0'
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.4.0
 platform: ruby
 authors:
 - Laurent Sansonetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.26.2
 description: motion-cocoapods allows RubyMotion projects to have access to the CocoaPods
   dependency manager.
 email: lrz@hipbyte.com
@@ -34,10 +34,11 @@ files:
 - lib/motion/project/cocoapods.rb
 - lib/motion/project/version.rb
 - lib/motion-cocoapods.rb
-- README.rdoc
+- README.md
 - LICENSE
 homepage: http://www.rubymotion.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -55,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: CocoaPods integration for RubyMotion projects

data/README.rdoc

@@ -1,98 +0,0 @@
-= motion-cocoapods
-
-motion-cocoapods allows RubyMotion projects to integrate with the CocoaPods
-dependency manager.
-
-
-== Requirements
-
-* CocoaPods (see http://cocoapods.org).
-
-* RubyMotion 1.0 or greater (see http://www.rubymotion.com).
-
-
-== Installation
-
-  $ sudo gem install motion-cocoapods
-
-
-== Setup
-
-1. Edit the +Rakefile+ of your RubyMotion project and add the following require
-   line.
-
-     require 'rubygems'
-     require 'motion-cocoapods'
-
-2. Still in the +Rakefile+, set your dependencies using the same language as
-   you would do in Podfiles.
-
-     Motion::Project::App.setup do |app|
-       # ...
-       app.pods do
-         pod 'JSONKit'
-       end
-     end
-
-That's all. The build system will properly download the given pods and their
-dependencies, build them and link them to your application executable.
-
-
-== Options
-
-If a Podfile.lock file exists, this will be used to install specific versions.
-To update the versions, you can set the +COCOCAPODS_UPDATE+ env variable.
-
-    $ rake COCOCAPODS_UPDATE=1
-
-By default the output of CocoaPods doing its work is silenced. If, however, you
-would like to see the output, you can set the +COCOAPODS_VERBOSE+ env variable.
-
-    $ rake COCOAPODS_VERBOSE=1
-
-On every build, CocoaPods will try to update the specification repos in
-+~/.cocoapods+, if you want to skip this then set the +COCOAPODS_NO_UPDATE+ env
-variable.
-
-    $ rake COCOAPODS_NO_UPDATE=1
-
-
-== Contribute
-
-1. Setup a local development environment.
-
-     $ git clone git://github.com/HipByte/motion-cocoapods.git
-     $ cd motion-cocoapods
-     $ rake bootstrap
-
-2. Verify that all the tests are passing.
-
-     $ rake spec
-
-3. Create your patch and send a pull-request[http://help.github.com/send-pull-requests/].
-
-
-== License
-
-  Copyright (c) 2012, Laurent Sansonetti <lrz@hipbyte.com>
-  All rights reserved.
-  
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met: 
-  
-  1. Redistributions of source code must retain the above copyright notice, this
-     list of conditions and the following disclaimer. 
-  2. Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution. 
-  
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.