cocoapods 0.3.4 → 0.3.5

data/lib/cocoapods.rb

@@ -1,5 +1,5 @@
 module Pod
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 
   class Informative < StandardError
   end

data/lib/cocoapods/command/install.rb

@@ -2,15 +2,18 @@ module Pod
   class Command
     class Install < Command
       def self.banner
-%{Installing dependencies of a pod spec:
+%{Installing dependencies of a project:
 
-    $ pod install [NAME] [PROJECT]
+    $ pod install [PROJECT]
 
-      Downloads all dependencies of the specified podspec file `NAME',
-      creates an Xcode Pods library project in `./Pods', and sets up `PROJECT' 
-      to use the specified pods (if `PROJECT' is given). In case `NAME' is
-      omitted it defaults to either `Podfile' or `*.podspec' in the current
-      working directory.
+      Downloads all dependencies defined in `Podfile' and creates an Xcode
+      Pods library project in `./Pods'.
+
+      In case `PROJECT' is given, it configures it to use the specified Pods
+      and generates a workspace with the Pods project and `PROJECT'. (It is
+      important that once you have run this you open the workspace instead of
+      `PROJECT'.) You usually specify `PROJECT' only the first time that you
+      run `pod install'.
 }
       end
 
@@ -21,27 +24,18 @@ module Pod
 
       def initialize(argv)
         config.clean = !argv.option('--no-clean')
-        projpath = argv.shift_argument
-        projpath =~ /\.xcodeproj\/?$/ ? @projpath = projpath : podspec = projpath
-        @podspec = Pathname.new(podspec) if podspec
-        @projpath ||= argv.shift_argument
+        @projpath = argv.shift_argument
         super unless argv.empty?
       end
 
       def run
-        spec = nil
-        if @podspec
-          if @podspec.exist?
-            spec = Specification.from_file(@podspec)
-          else
-            raise Informative, "The specified podspec `#{@podspec}' doesn't exist."
-          end
-        else
-          unless spec = config.rootspec
-            raise Informative, "No `Podfile' or `.podspec' file found in the current working directory."
-          end
+        unless podfile = config.rootspec
+          raise Informative, "No `Podfile' found in the current working directory."
+        end
+        if @projpath && !File.exist?(@projpath)
+          raise Informative, "The specified project `#{@projpath}' does not exist."
         end
-        installer = Installer.new(spec)
+        installer = Installer.new(podfile)
         installer.install!
         installer.configure_project(@projpath) if @projpath
       end

data/lib/cocoapods/command/setup.rb

@@ -11,8 +11,7 @@ module Pod
 
           https://github.com/CocoaPods/Specs
 
-      If the clone already exists, it will ensure that it points to the correct
-      remote.}
+      If the clone already exists, it will ensure that it is up-to-date.}
       end
 
       def initialize(argv)
@@ -28,15 +27,23 @@ module Pod
       end
 
       def update_master_repo_remote_command
-        @command ||= Repo.new(ARGV.new(['set-url', 'master', master_repo_url]))
+        Repo.new(ARGV.new(['set-url', 'master', master_repo_url]))
+      end
+
+      def update_master_repo_command
+        Repo.new(ARGV.new(['update', 'master']))
       end
 
       def run
         if (config.repos_dir + 'master').exist?
           update_master_repo_remote_command.run
+          update_master_repo_command.run
         else
           add_master_repo_command.run
         end
+        hook = config.repos_dir + 'master/.git/hooks/pre-commit'
+        hook.open('w') { |f| f << "#!/bin/sh\nrake lint" }
+        `chmod +x '#{hook}'`
       end
     end
   end

data/lib/cocoapods/command/spec.rb

@@ -31,24 +31,87 @@ module Pod
         author = `git config --get user.name`.strip
         email = `git config --get user.email`.strip
         spec = <<-SPEC.gsub(/^          /, '')
+          #
+          # Be sure to run `pod lint #{@name}.podspec' to ensure this is a
+          # valid spec.
+          #
+          # Remove all comments before submitting the spec.
+          #
           Pod::Spec.new do |s|
             s.name     = '#{@name}'
             s.version  = '1.0.0'
             s.license  = 'MIT'
             s.summary  = 'A short description of #{@name}.'
-            s.homepage = 'http://example.com/#{@name}'
+            s.homepage = 'http://EXAMPLE/#{@name}'
             s.author   = { '#{author}' => '#{email}' }
-            s.source   = { :git => 'http://example.com/#{@name}.git', :tag => '1.0.0' }
+
+            # Specify the location from where the source should be retreived.
+            #
+            s.source   = { :git => 'http://EXAMPLE/#{@name}.git', :tag => '1.0.0' }
+            # s.source   = { :svn => 'http://EXAMPLE/#{@name}/tags/1.0.0' }
+            # s.source   = { :hg  => 'http://EXAMPLE/#{@name}', :revision => '1.0.0' }
 
             s.description = 'An optional longer description of #{@name}.'
 
-            # A list of file patterns. If the pattern is a directory then the path will
-            # automatically have '*.{h,m,mm,c,cpp}' appended.
+            # If this Pod runs only on iOS or OS X, then specify that with one of
+            # these, or none if it runs on both platforms.
+            #
+            # s.platform = :ios
+            # s.platform = :osx
+
+            # A list of file patterns which select the source files that should be
+            # added to the Pods project. If the pattern is a directory then the
+            # path will automatically have '*.{h,m,mm,c,cpp}' appended.
+            #
+            # Alternatively, you can use the FileList class for even more control
+            # over the selected files.
+            # (See http://rake.rubyforge.org/classes/Rake/FileList.html.)
+            #
             s.source_files = 'Classes', 'Classes/**/*.{h,m}'
 
-            s.framework = 'SomeRequiredFramework'
+            # A list of resources included with the Pod. These are copied into the
+            # target bundle with a build phase script.
+            #
+            # Also allows the use of the FileList class like `source_files does.
+            #
+            # s.resource = "icon.png"
+            # s.resources = "Resources/*.png"
+
+            # A list of paths to remove after installing the Pod without the
+            # `--no-clean' option. These can be examples, docs, and any other type
+            # of files that are not needed to build the Pod.
+            #
+            # *NOTE*: Never remove license and README files.
+            #
+            # Also allows the use of the FileList class like `source_files does.
+            #
+            # s.clean_path = "examples"
+            # s.clean_paths = "examples", "doc"
+
+            # Specify a list of frameworks that the application needs to link
+            # against for this Pod to work.
+            #
+            # s.framework = 'SomeFramework'
+            # s.frameworks = 'SomeFramework', 'AnotherFramework'
+
+            # Specify a list of libraries that the application needs to link
+            # against for this Pod to work.
+            #
+            # s.library = 'iconv'
+            # s.libraries = 'iconv', 'xml2'
+
+            # If this Pod uses ARC, specify it like so.
+            #
+            # s.requires_arc = true
+
+            # If you need to specify any other build settings, add them to the
+            # xcconfig hash.
+            #
+            # s.xcconfig = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' }
 
-            s.dependency 'SomeLibraryThat#{@name}DependsOn', '>= 1.0.0'
+            # Finally, specify any Pods that this Pod depends on.
+            #
+            # s.dependency 'JSONKit', '~> 1.4'
           end
         SPEC
         (Pathname.pwd + "#{@name}.podspec").open('w') { |f| f << spec }

data/lib/cocoapods/downloader.rb

@@ -1,9 +1,19 @@
 module Pod
   class Downloader
+    autoload :Git,        'cocoapods/downloader/git'
+    autoload :Mercurial,  'cocoapods/downloader/mercurial'
+    autoload :Subversion, 'cocoapods/downloader/subversion'
+
+    extend Executable
+
     def self.for_source(pod_root, source)
       options = source.dup
       if url = options.delete(:git)
         Git.new(pod_root, url, options)
+      elsif url = options.delete(:hg)
+        Mercurial.new(pod_root, url, options)
+      elsif url = options.delete(:svn)
+        Subversion.new(pod_root, url, options)
       else
         raise "Unsupported download strategy `#{source.inspect}'."
       end
@@ -15,49 +25,10 @@ module Pod
       @pod_root, @url, @options = pod_root, url, options
     end
 
-    class Git < Downloader
-      extend Executable
-      executable :git
-
-      def download
-        @pod_root.dirname.mkpath
-        if @options[:tag]
-          download_tag
-        elsif @options[:commit]
-          download_commit
-        else
-          download_head
-        end
-      end
-
-      def download_head
-        git "clone '#{@url}' '#{@pod_root}'"
-      end
-
-      def download_tag
-        @pod_root.mkpath
-        Dir.chdir(@pod_root) do
-          git "init"
-          git "remote add origin '#{@url}'"
-          git "fetch origin tags/#{@options[:tag]}"
-          git "reset --hard FETCH_HEAD"
-          git "checkout -b activated-pod-commit"
-        end
-      end
-
-      def download_commit
-        git "clone '#{@url}' '#{@pod_root}'"
-        Dir.chdir(@pod_root) do
-          git "checkout -b activated-pod-commit #{@options[:commit]}"
-        end
-      end
-
-      def clean(clean_paths = [])
-        (@pod_root + '.git').rmtree
-        clean_paths.each do |path|
-          path.rmtree
-        end if clean_paths
-      end
+    def clean(clean_paths = [])
+      clean_paths.each do |path|
+        path.rmtree
+      end if clean_paths
     end
   end
 end

data/lib/cocoapods/downloader/git.rb

@@ -0,0 +1,46 @@
+module Pod
+  class Downloader
+    class Git < Downloader
+      executable :git
+
+      def download
+        @pod_root.dirname.mkpath
+        if @options[:tag]
+          download_tag
+        elsif @options[:commit]
+          download_commit
+        else
+          download_head
+        end
+      end
+
+      def download_head
+        git "clone '#{@url}' '#{@pod_root}'"
+      end
+
+      def download_tag
+        @pod_root.mkpath
+        Dir.chdir(@pod_root) do
+          git "init"
+          git "remote add origin '#{@url}'"
+          git "fetch origin tags/#{@options[:tag]}"
+          git "reset --hard FETCH_HEAD"
+          git "checkout -b activated-pod-commit"
+        end
+      end
+
+      def download_commit
+        git "clone '#{@url}' '#{@pod_root}'"
+        Dir.chdir(@pod_root) do
+          git "checkout -b activated-pod-commit #{@options[:commit]}"
+        end
+      end
+
+      def clean(clean_paths = [])
+        super
+        (@pod_root + '.git').rmtree
+      end
+    end
+  end
+end
+

data/lib/cocoapods/downloader/mercurial.rb

@@ -0,0 +1,30 @@
+module Pod
+  class Downloader
+    class Mercurial < Downloader
+      executable :hg
+
+      def download
+        @pod_root.dirname.mkpath
+        if @options[:revision]
+          download_revision
+        else
+          download_head
+        end
+      end
+
+      def download_head
+        hg "clone '#{@url}' '#{@pod_root}'"
+      end
+
+      def download_revision
+        hg "clone '#{@url}' --rev '#{@options[:revision]}' '#{@pod_root}'"
+      end
+
+      def clean(clean_paths = [])
+        super
+        (@pod_root + '.hg').rmtree
+      end
+    end
+  end
+end
+

data/lib/cocoapods/downloader/subversion.rb

@@ -0,0 +1,29 @@
+module Pod
+  class Downloader
+    class Subversion < Downloader
+      executable :svn
+
+      def download
+        @pod_root.dirname.mkpath
+        if @options[:revision]
+          download_revision
+        else
+          download_head
+        end
+      end
+
+      def download_head
+        svn "checkout '#{@url}' '#{@pod_root}'"
+      end
+
+      def download_revision
+        svn "checkout '#{@url}' -r '#{@options[:revision]}' '#{@pod_root}'"
+      end
+
+      def clean(clean_paths = [])
+        super
+        @pod_root.glob('**/.svn').each(&:rmtree)
+      end
+    end
+  end
+end

data/lib/cocoapods/executable.rb

@@ -1,12 +1,16 @@
 module Pod
   module Executable
     def executable(name)
+      bin = `which #{name}`.strip
       define_method(name) do |command|
+        if bin.empty?
+          raise Informative, "Unable to locate the executable `#{name}'"
+        end
         if Config.instance.verbose?
-          puts "#{name} #{command}"
-          `#{name} #{command} 1>&2`
+          puts "#{bin} #{command}"
+          `#{bin} #{command} 1>&2`
         else
-          `#{name} #{command} 2> /dev/null`
+          `#{bin} #{command} 2> /dev/null`
         end
       end
       private name

data/lib/cocoapods/installer.rb

@@ -18,7 +18,7 @@ module Pod
       include Config::Mixin
       include Shared
 
-      attr_reader :target
+      attr_reader :podfile, :project, :definition, :target
 
       def initialize(podfile, project, definition)
         @podfile, @project, @definition = podfile, project, definition
@@ -163,8 +163,8 @@ module Pod
 
     def target_installers
       @target_installers ||= @podfile.target_definitions.values.map do |definition|
-        TargetInstaller.new(@podfile, project, definition)
-      end
+        TargetInstaller.new(@podfile, project, definition) unless definition.empty?
+      end.compact
     end
 
     def install!

data/lib/cocoapods/podfile.rb

@@ -8,7 +8,13 @@ module Pod
       end
 
       def lib_name
-        name == :default ? "Pods" : "Pods-#{name}"
+        if name == :default
+          "Pods"
+        elsif @parent
+          "#{@parent.lib_name}-#{name}"
+        else
+          "Pods-#{name}"
+        end
       end
 
       # Returns *all* dependencies of this target, not only the target specific
@@ -16,6 +22,10 @@ module Pod
       def dependencies
         @target_dependencies + (@parent ? @parent.dependencies : [])
       end
+
+      def empty?
+        target_dependencies.empty?
+      end
     end
 
     def self.from_file(path)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Eloy Duran
@@ -53,6 +53,9 @@ files:
 - lib/cocoapods/command.rb
 - lib/cocoapods/config.rb
 - lib/cocoapods/dependency.rb
+- lib/cocoapods/downloader/git.rb
+- lib/cocoapods/downloader/mercurial.rb
+- lib/cocoapods/downloader/subversion.rb
 - lib/cocoapods/downloader.rb
 - lib/cocoapods/executable.rb
 - lib/cocoapods/file_list.rb