cocoaseeds 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41e6d9a834427b838d21d2ca857c0c6933f5da4d
-  data.tar.gz: 15ac0913f812185465faf744a516690e0bce6e92
+  metadata.gz: 6974ed3a3a029f088504399048c7e0eaf371f37f
+  data.tar.gz: 247acd2b39bba6a82b1c73cba5ec0ab0069747f9
 SHA512:
-  metadata.gz: 23833083862e852475995ff3f78ba9b8bfbc18b24dad36abfb62342c15941f9c80078cbd88bc844255cbc3acfbfa2a9fc75e126b6c9a79cab95b975646778aa1
-  data.tar.gz: 8967fd0a76b2b02cf253e89df1324759b660652a398a7a8a35e3d88d0877b22ffb03e57d32ab8dd44bf1221e6faa4d8fce664574f82d70cda4229c66c5efc4a3
+  metadata.gz: a5a9f67a3537c0ead3ac292eada8254937681a8d4618c4778edb3e5b82aee4664e54cae61245531222dbe8f9d96259743c89e97dbfe9e1c6c617de243dccc940
+  data.tar.gz: dcff45bc12c2c6154aebc6e6e1dbefc2f6368788562649ad3f9b5b0e3836ea345bbdaff1df4ded9f00e95653895a3e9ecb812e76dbf4e3a2c844b91589d27b59

data/README.md

@@ -113,23 +113,36 @@ Then, all the source files will be automatically downloaded and added to a group
 
 ### 3. Enjoy
 
-Build your project and enjoy!
+Build your project and enjoy coding!
 
 
-Beta Features
--------------
+Tips and Tricks
+---------------
 
-There are some beta features that seem to work but are not fully tested in the real world. Please keep that in mind if you want to use those features. (Don't worry too much. I'm using them for my company's projects.)
+#### Using branches
 
+You can specify a branch name instead of the tag. What you need to do is just replacing the tag with the branch name.
 
-#### Branch support
+```ruby
+github 'devxoul/SwiftyImage', 'swift-2.0', :files => 'SwiftyImage/SwiftyImage.swift'
+```
+
+
+#### Excluding files
 
-Previously, you could specify a library only with a tag. However, depending on your situation, such as using an experimental branch like `swift-2.0`, you can specify them with a branch name instead of the tag. What you need to do is just replacing the tag with the branch name.
+Use `exclude_files` to exclude files from `files` pattern.
 
 ```ruby
-github 'devxoul/SwiftyImage', 'swift-2.0', :files => 'SwiftyImage/SwiftyImage.swift'
+github 'devxoul/Carte', '0.2.2', :files => 'Carte/*', :exclude_files => "Carte/Carte.h"
 ```
 
+#### Using resources
+
+If the resource files are sprecified in `files`, they will be added to *Copy Bundle Resource* build phase instead of *Compile Source* build phase.
+
+```ruby
+github 'author/Repository', 'x.y.z', :files => ['Source/*', 'Images/*']
+```
 
 #### Resolving filename conflicts
 
@@ -157,7 +170,7 @@ FAQ
 ---
 
 * Are you using this in real-world projects? (Does Apple allow apps to use CocoaSeeds?)
-    * Of course I am. I'm developing a social media service that has about 1.6 million users. The app is on AppStore without any complaints from Apple.
+    * Of course I am. I'm developing a social media service that has about 2 million users. The app is on AppStore without any complaints from Apple.
 
 * Can I ignore **Seeds** folder in VCS *(version control system)*?
     * Yes, you can ignore the **Seeds** folder (by adding it to `.gitignore` if you use Git).

data/lib/cocoaseeds/core.rb

@@ -249,8 +249,9 @@ module Seeds
             seed.files = options[:files] || '**/*.{h,m,mm,swift}'
             seed.exclude_files = options[:exclude_files] || []
           elsif tag.is_a?(Hash)
-            seed.commit = tag[:commit][0..6]
-            seed.files = tag[:files] || '**/*.{h,m,mm,swift}'
+            options.merge!(tag)
+            seed.commit = options[:commit][0..6]
+            seed.files = options[:files] || '**/*.{h,m,mm,swift}'
             seed.exclude_files = options[:exclude_files] || []
           end
           if seed.files.kind_of?(String)
@@ -294,14 +295,15 @@ module Seeds
             end
             seed.version = tag
             seed.files = options[:files] || '**/*.{h,m,mm,swift}'
+            seed.exclude_files = options[:exclude_files] || []
           elsif tag.is_a?(Hash)
-            seed.commit = tag[:commit][0..6]
-            seed.files = tag[:files] || '**/*.{h,m,mm,swift}'
+            options.merge!(tag)
+            seed.commit = options[:commit][0..6]
+            seed.files = options[:files] || '**/*.{h,m,mm,swift}'
             seed.exclude_files = options[:exclude_files] || []
           end
           if seed.files.kind_of?(String)
             seed.files = [seed.files]
-            seed.exclude_files = options[:exclude_files] || []
           end
           if seed.exclude_files.kind_of?(String)
             seed.exclude_files = [seed.exclude_files]
@@ -528,6 +530,8 @@ module Seeds
       self.project.targets.each do |target|
         begin
           phase = target.sources_build_phase
+          # support resources phase
+          resource_phase = target.resources_build_phase
           next unless phase
         rescue NoMethodError
           next
@@ -544,6 +548,17 @@ module Seeds
           end
         end
 
+        resource_phase.files_references.each do |file|
+          begin
+            file.real_path
+          rescue 
+            resource_phase.files.each do |build_file|
+              resource_phase.files.delete(build_file) if build_file.file_ref == file
+            end
+          end
+        end
+
+
         removings = [] # name of seeds going to be removed from the target
         addings = [] # name of seeds going to be added to the target
 
@@ -562,18 +577,39 @@ module Seeds
             phase.files.each do |build_file|
               phase.files.delete(build_file) if build_file.file_ref == file
             end
+            resource_phase.files.each do |build_file|
+              resource_phase.files.delete(build_file) if build_file.file_ref == file
+            end
           end
 
           addings.each do |seed_names|
             next if file.name.end_with? ".h"
             next if not seed_names.include?(file.parent.name)
             uuid = Xcodeproj::uuid_with_name "#{target.name}:#{file.name}"
-            phase.add_file_reference_with_uuid(file, uuid, true)
+            # Treat a file as resource file unless confirm it can be compiled.
+            if self.valid_source_file?(file)
+              phase.add_file_reference_with_uuid(file, uuid, true)
+            else
+              resource_phase.add_file_reference_with_uuid(file, uuid, true)
+            end
+
           end
         end
       end
     end
 
+    # Determines whether there's a source file.
+    #
+    # @!visibility private
+    #
+    def valid_source_file? filename
+      suffixs = [".h", ".c", ".m", ".mm", ".swift", ".cpp"]
+      suffixs.each do |suffix|
+        return true if filename.name.end_with? suffix
+      end
+      return false
+    end
+
     # Writes Seedfile.lock file.
     #
     # @!visibility private

data/lib/cocoaseeds/version.rb

@@ -1,3 +1,3 @@
 module Seeds
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/lib/cocoaseeds/xcodehelper.rb

@@ -114,7 +114,7 @@ module Xcodeproj::Project::Object
     end
   end
 
-  class PBXSourcesBuildPhase
+  class AbstractBuildPhase
 
     # Adds the file reference with given UUID.
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoaseeds
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Suyeol Jeon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj