cocoaseeds 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d9fd573a0fb96497fe521d33f9dd057c01857a8
-  data.tar.gz: bfad6abeaabb6b2145d8f7d55328016e9e69adad
+  metadata.gz: cb1ce5d4cf02f05991f1115ea60a9c41465c1689
+  data.tar.gz: f1987ccb684d7e1e46c39f3c8647cf4ea51be0aa
 SHA512:
-  metadata.gz: 595b220ac03001e852bf1d29cd04a1559984433f6a6036b62b3bb7f9d252e527de7337e45dbd09aeefce4a4f1085aaeabc93dc59f573b03688f96dcf35abc516
-  data.tar.gz: eb8a3f2e982a4b947d4748961384bbce18f1d54abc6068ceded326a0696a849488424a8589c357bf823d7684326682809ad93a2dfe796e8726b1d08e45c7710d
+  metadata.gz: 6ec636215395f95bb79487983bb722eee49112eaa8573d84999ea80d764c86eddb1afd02ee64fcf51200e3f31f35d68e045f83071f7adb1e8752b757cdaab6a4
+  data.tar.gz: b6135203d4f2535d496d376868f327287686209d9d05debee598c03f90877c516ba5f0adfb544c280660a61c84e8375094ab66a339d3a6a8019b9cb1fd4831d6

data/README.md

@@ -33,7 +33,7 @@ How to Use CocoaSeeds
 
 ### 1. Write a Seedfile
 
-A *Seedfile* is a ruby script that manifests the dependencies of your project. You can manage third party libraries by simply specifying them in the Seedfile. Currently, CocoaSeeds supports only GitHub repositories. However, we are planning to support other version control systems.
+A *Seedfile* is a ruby script that manifests the dependencies of your project. You can manage third party libraries by simply specifying them in the Seedfile. Currently, CocoaSeeds supports only GitHub and BitBucket repositories. However, we are planning to support other version control systems.
 
 Let's make an empty file named **Seedfile** in the directory where your Xcode project file is located. Here is a sample Seedfile:
 
@@ -43,7 +43,7 @@ Let's make an empty file named **Seedfile** in the directory where your Xcode pr
 github "Alamofire/Alamofire", "1.2.1", :files => "Source/*.{swift,h}"
 github "devxoul/JLToast", "1.2.5", :files => "JLToast/*.{swift,h}"
 github "devxoul/SwipeBack", "1.0.4"
-github "Masonry/SnapKit", "0.10.0", :files => "Source/*.{swift,h}"
+github "SnapKit/SnapKit", :commit => "62e7645", :files => "Source/*.{swift,h}"
 
 target :MyAppTest do
   github "Quick/Quick", "v0.3.1", :files => "Quick/**.{swift,h}"
@@ -58,14 +58,14 @@ Each line in a Seedfile consists of three parts: source, tag, and files. Let's l
 ```ruby
 github "devxoul/JLToast", "1.2.5", :files => "JLToast/*.{swift,h}"
 ~~~~~~~~~~~~~~~~~~~~~~~~  ~~~~~~~  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-       (Source)            (Tag)              (Files)
+       (Source)          (Version)             (Files)
 ```
 
-| Parts  | Example                           | Required | Default               |
-|--------|-----------------------------------|:--------:|:---------------------:|
-| Source | `github "devxoul/SwipeBack"`      | Required | -                     |
-| Tag    | `1.0.4`                           | Required | -                     |
-| Files  | `:files => "JLToast/*.{swift,h}"` | Optional | `*/**.{h,m,mm,swift}` |
+| Parts   | Example                           | Required | Default               |
+|---------|-----------------------------------|:--------:|:---------------------:|
+| Source  | `github "devxoul/SwipeBack"`      | Required | -                     |
+| Version | Tag: `"1.0.4"`<br>Branch: `"swift-2.0"`<br>Commit: `:commit => "SHA1"` | Required | -                     |
+| Files   | `:files => "JLToast/*.{swift,h}"` | Optional | `*/**.{h,m,mm,swift}` |
 
 > **Tip:** You can pass an array to `:files` for multiple file patterns:
 >

data/lib/cocoaseeds/core.rb

@@ -161,6 +161,10 @@ module Seeds
           seed = Seeds::Seed.new
           seed.name = lock.split(' (')[0]
           seed.version = lock.split('(')[1].split(')')[0]
+          if seed.version.start_with? '$'
+            seed.commit = seed.version[1..-1]
+            seed.version = nil
+          end
           self.locks[seed.name] = seed
         end
       end
@@ -224,8 +228,17 @@ module Seeds
           seed = Seeds::Seed::GitHub.new
           seed.url = "https://github.com/#{repo}"
           seed.name = repo.split('/')[1]
-          seed.version = tag
-          seed.files = options[:files] || '**/*.{h,m,mm,swift}'
+          if tag.is_a?(String)
+            if options[:commit]
+              raise Seeds::Exception.new\
+                "#{repo}: Version and commit are both specified."
+            end
+            seed.version = tag
+            seed.files = options[:files] || '**/*.{h,m,mm,swift}'
+          elsif tag.is_a?(Hash)
+            seed.commit = tag[:commit][0..6]
+            seed.files = tag[:files] || '**/*.{h,m,mm,swift}'
+          end
           if seed.files.kind_of?(String)
             seed.files = [seed.files]
           end
@@ -256,8 +269,17 @@ module Seeds
           seed = Seeds::Seed::BitBucket.new
           seed.url = "https://bitbucket.org/#{repo}"
           seed.name = repo.split('/')[1]
-          seed.version = tag
-          seed.files = options[:files] || '**/*.{h,m,mm,swift}'
+          if tag.is_a?(String)
+            if options[:commit]
+              raise Seeds::Exception.new\
+                "#{repo}: Version and commit are both specified."
+            end
+            seed.version = tag
+            seed.files = options[:files] || '**/*.{h,m,mm,swift}'
+          elsif tag.is_a?(Hash)
+            seed.commit = tag[:commit][0..6]
+            seed.files = tag[:files] || '**/*.{h,m,mm,swift}'
+          end
           if seed.files.kind_of?(String)
             seed.files = [seed.files]
           end
@@ -289,53 +311,107 @@ module Seeds
     #
     def install_seeds
       self.seeds.sort.each do |name, seed|
-        dirname = File.join(self.root_path, "Seeds", name)
+        dirname = File.join(self.root_path, "Seeds", seed.name)
+        self.install_seed(seed, dirname)
+
+        next if not seed.files
+
+        # add seed files to `source_files`
+        self.source_files[name] = []
+        seed.files.each do |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
 
-        if lock = self.locks[name]
-          old_version = lock.version
+
+    # Installs new seed or updates existing seed in {#dirname}.
+    #
+    # @!visibility private
+    #
+    def install_seed(seed, dirname)
+      # if remote url has changed, remove directory and clone again
+      remote_url = `
+        cd #{dirname} 2>&1 &&
+        git remote show origin -n | grep Fetch | awk '{ print $3 }' 2>&1
+      `.strip
+      if remote_url != seed.url
+        FileUtils.rm_rf(dirname)
+      end
+
+      # clone and return if not exists
+      if not File.exist?(dirname)
+        say "Installing #{seed.name} (#{seed.version or seed.commit})".green
+
+        command = "git clone #{seed.url}"
+        command += " -b #{seed.version}" if seed.version
+        command += " #{dirname} 2>&1"
+        output = `#{command}`
+
+        not_found = output.include?("not found")
+        if not_found and output.include?("repository")
+          raise Seeds::Exception.new\
+            "#{seed.name}: Couldn't find the repository."
+        elsif not_found and output.include?("upstream")
+          raise Seeds::Exception.new\
+            "#{seed.name}: Couldn't find the tag `#{seed.version}`."
         end
 
-        if File.exist?(dirname)
-          tag = `cd #{dirname} && git describe --tags --abbrev=0 2>&1`
-          tag.strip!
-          if tag == seed.version and (not old_version or tag == old_version)
-            say "Using #{name} (#{seed.version})"
-            `cd #{dirname} 2>&1 &&\
-             git reset HEAD --hard 2>&1 &&\
-             git checkout . 2>&1 &&\
-             git clean -fd 2>&1`
-          else
-            say "Installing #{name} #{seed.version} (was #{old_version})".green
-            `cd #{dirname} 2>&1 &&\
-             git reset HEAD --hard 2>&1 &&\
-             git checkout . 2>&1 &&\
-             git clean -fd 2>&1 &&\
-             git fetch origin #{seed.version} --tags 2>&1 &&\
-             git checkout #{seed.version} 2>&1`
-          end
-        else
-          say "Installing #{name} (#{seed.version})".green
-          output = `git clone #{seed.url} -b #{seed.version} #{dirname} 2>&1`
-          if output.include?("not found")
-            if output.include?("repository")
-              say "[!] #{name}: Couldn't find the repository.".red
-            elsif output.include?("upstream")
-              say "[!] #{name}: Couldn't find the tag `#{seed.version}`.".red
-            end
+        if seed.commit and not seed.version # checkout to commit
+          output = `cd #{dirname} 2>&1 && git checkout #{seed.commit} 2>&1`
+          if output.include?("did not match any")
+            raise Seeds::Exception.new\
+              "#{seed.name}: Couldn't find the commit `#{seed.commit}`."
           end
         end
 
-        if seed.files
-          self.source_files[name] = []
-          seed.files.each do |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
+        return
+      end
+
+      # discard local changes
+      `cd #{dirname} 2>&1 &&\
+       git reset HEAD --hard 2>&1 &&\
+       git checkout . 2>&1 &&\
+       git clean -fd 2>&1`
+
+      if lock = self.locks[seed.name]
+        lock_version = lock.version
+        lock_commit = lock.commit
+      end
+
+      if seed.version == lock_version and seed.commit == lock_commit
+        say "Using #{seed.name} (#{lock_version or lock_commit})"
+        return
+      end
+
+      if seed.version
+        say "Installing #{seed.name} #{seed.version}"\
+            " (was #{lock_version or lock_commit})".green
+        output = `cd #{dirname} 2>&1 &&\
+                 git fetch origin #{seed.version} --tags 2>&1 &&\
+                 git checkout #{seed.version} 2>&1`
+        if output.include?("Couldn't find")
+          raise Seeds::Exception.new\
+            "#{seed.name}: Couldn't find the tag or branch `#{seed.version}`."
+        end
+
+      elsif seed.commit
+        say "Installing #{seed.name} #{seed.commit}"\
+            " (was #{lock_version or lock_commit})".green
+        output = `cd #{dirname} 2>&1 &&
+                  git checkout master 2>&1 &&
+                  git pull 2>&1 &&
+                  git checkout #{seed.commit} 2>&1`
+        if output.include?("did not match any")
+          raise Seeds::Exception.new\
+            "#{seed.name}: Couldn't find the commit `#{seed.commit}`.".red
         end
       end
+
     end
 
     # Append seed name as a prefix to file name and returns the path.
@@ -463,7 +539,7 @@ module Seeds
     def build_lockfile
       tree = { "SEEDS" => [] }
       self.seeds.each do |name, seed|
-        tree["SEEDS"] << "#{name} (#{seed.version})"
+        tree["SEEDS"] << "#{name} (#{seed.version or '$' + seed.commit})"
       end
       File.write(self.lockfile_path, YAML.dump(tree))
     end

data/lib/cocoaseeds/seed.rb

@@ -9,6 +9,10 @@ module Seeds
     #
     attr_accessor :version
 
+    # @return [String] the commit hash of the seed
+    #
+    attr_accessor :commit
+
     # @return [String] the url of the seed
     #
     attr_accessor :url

data/lib/cocoaseeds/version.rb

@@ -1,3 +1,3 @@
 module Seeds
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoaseeds
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Suyeol Jeon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj