cocoaseeds 0.0.12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79568e04d2e1742ad8a795176511ce2e2310deac
-  data.tar.gz: 1009f9d2ede7b1ba8b9c8e282abc766e281f1063
+  metadata.gz: 6d9cfde5f682efaad416bc63b110348fc5ab3b29
+  data.tar.gz: 0d0d7d528cf901e936c88e5632ccdcdd264fdc7f
 SHA512:
-  metadata.gz: 5d3fd12cf135d50e1aa754b825bc459bfc4e0356587cf1b2c66631e56017bf09a3bf0407fc63e0cbaf5e4221d0a37a223df234a2b0ffe4d4d94a7510e8a8c52b
-  data.tar.gz: 3206a98aae5fd9cf19003578e07ce3a34566f9a2577b10111ae122a0890afa3bc3c5da26885537c7910f320ce4477e1b5329fda52eb80fcce3aadad5509e7d96
+  metadata.gz: 95d3dde27844f52b607a3ab7dbc22823f35bce5fcc31f9d3acdc693b47efae38734f71d2a870f55d3a1d0a2db7cacecf0ccd9a7fcfecde75521a77f1d72ea894
+  data.tar.gz: 169a2941a8aef9a71e947349bd6156af40ec3cb578506e0b7bcd0c3ed375df16706b7239e420358e5c858dfee559a5e58ee8dd8c733e5337db0f1ed5a6a47c9f

data/README.md

@@ -70,6 +70,29 @@ Then all the source files will be automatically added to your Xcode project with
 ![Seeds-in-Xcode](https://cloud.githubusercontent.com/assets/931655/7502414/cbe45ecc-f476-11e4-9564-450e8887a054.png)
 
 
+Resolving Filename Conflicts
+----------------------------
+
+Since CocoaSeeds uses including source files directly than linking dynamic frameworks, it is important to make sure that all source file names are different. CocoaSeeds provides a way to do this:
+
+**Seedfile**
+
+<pre>
+<b>swift_seedname_prefix!</b>  # add this line
+
+github "thoughtbot/Argo", "v1.0.3", :files => "Argo/*/*.swift"
+github "thoughtbot/Runes", "v2.0.0", :files => "Source/*.swift"
+</pre>
+
+Then all of source files installed via CocoasSeeds will have file names with seed name as prefix.
+
+| Before (filename) | After (seedname_filename) |
+|---|---|
+| `Seeds/Alamofire/Alamofire.swift` | `Seeds/Alamofire/Alamofire_Alamofire.swift` |
+| `Seeds/Argo/Operators/Operators.swift` | `Seeds/Argo/Operators/Argo_Operators.swift` |
+| `Seeds/Runes/Operators.swift` | `Seeds/Runes/Runes_Operators.swift` |
+
+
 FAQ
 ---
 

data/lib/cocoaseeds/core.rb

@@ -70,6 +70,12 @@ module Seeds
     #
     attr_reader :file_references
 
+    # @return [Boolean] whether append seed name as a prefix to swift files
+    #
+    # @!visibility private
+    #
+    attr_accessor :swift_seedname_prefix
+
     # @param  [String] root_path
     #         The path provided will be used for detecting Xcode project and
     #         Seedfile.
@@ -107,6 +113,7 @@ module Seeds
       @targets = {}
       @source_files = {}
       @file_references = []
+      @swift_seedname_prefix = false
     end
 
     # Read Xcode project, Seedfile and lockfile. An exception will be raised if
@@ -166,6 +173,15 @@ module Seeds
     def execute_seedfile
       @current_target_name = nil
 
+      # Sets `@swift_seedname_prefix` as `true`.
+      #
+      # @!scope method
+      # @!visibility private
+      #
+      def swift_seedname_prefix!()
+        @swift_seedname_prefix = true
+      end
+
       # Sets `@current_target_name` and executes code block.
       #
       # @param [String] names The name of target.
@@ -271,12 +287,38 @@ module Seeds
         if seed.files
           self.source_files[name] = []
           seed.files.each do |file|
-            self.source_files[name] += Dir.glob(File.join(dirname, file))
+            paths = Dir.glob(File.join(dirname, file))
+            paths.each do |path|
+              path = self.path_with_prefix(seed.name, path)
+              self.source_files[name].push(path)
+            end
           end
         end
       end
     end
 
+    # Append seed name as a prefix to file name and returns the path.
+    #
+    # @!visibility private
+    #
+    def path_with_prefix(seedname, path)
+      if @swift_seedname_prefix
+        components = path.split("/")
+        prefix = seedname + "_"  # Alamofire_
+        filename = components[-1]  # Alamofire.swift
+        extension = File.extname(filename)  # .swift
+
+        # only swift files can have prefix in filename
+        if extension == '.swift' and not filename.start_with? prefix
+          filename = prefix + filename  # Alamofire_Alamofire.swift
+          newpath = components[0...-1].join('/') + '/' + filename
+          File.rename(path, newpath)  # rename real files
+          path = newpath
+        end
+      end
+      path
+    end
+
     # Adds source files to the group 'Seeds' and save its reference to
     # {#file_references} and removes disused sources files,
     #

data/lib/cocoaseeds/version.rb

@@ -1,3 +1,3 @@
 module Seeds
-  VERSION = "0.0.12"
+  VERSION = "0.1.0"
 end

metadata

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