git-projects 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34f4abc5e7f5fa48ca900a73ff2be6139f090f92
-  data.tar.gz: db54c8e627eaa582235050ced39c2ef7dfa69c8c
+  metadata.gz: b0d3460f9fc31b8d0e3f12f125d3fe7a3f6f1ea5
+  data.tar.gz: 0a20d5d089c2013fb1ec5d7c50e8fadf36fa9535
 SHA512:
-  metadata.gz: b4aa798d4c5d977b4b64844affaf33c3b624ddfb5903e05ab90cad497dec9a79f1b3eaa7771262454b3d3c4f9fe189b95b0d1a09c1c4e8559355fb85440e0bbc
-  data.tar.gz: ebe44e88e248b46f1314f6945ed5f180ef836c4d676a900bad4bb7ba85f00ee347d4ccc18e40224be2d8f82e3e54f055904dc11548b4ce57c8f5552390bd0a05
+  metadata.gz: bb218234f1e950915c16546e4cb9d5bbb8f0eb4bce0ecfa34477295347662a982e0538b1fbaf9b124c002b69b547df6b7e1cb48678d8923cf4ca1d5fc4844267
+  data.tar.gz: 8225526d267a0544ee86e0355652b71730c9a6d2d6d4e4416199c5fea9ff1e48654022e62b56304cd71aa82d8d35fa242611a59c111fcab1e8462b508ea73ae4

data/lib/git-projects/version.rb

@@ -1,3 +1,3 @@
 module GitProjects
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/lib/helpers/git_project.rb

@@ -64,11 +64,10 @@ class GitProject
   # 2. Add all other remotes unless it is origin
   def create_project_and_remotes(k, v)
     puts "root_dir isn't defined for #{k}" unless v['root_dir']
-    unless File.directory?(v['root_dir'])
-      puts "The dir #{v['root_dir']} does not exist"
-    end
-    GitProject.create_root_dir(v['root_dir'])
-    g =  GitProject.clone(v.values[0], k, v['root_dir'])
+    GitProject.dir_or_symlink_exist?(v['root_dir'])
+    root_dir = GitProject.real_root_dir(v['root_dir'])
+    GitProject.create_root_dir(root_dir)
+    g =  GitProject.clone(v.values[0], k, root_dir)
     GitProject.add_remote(g, v) if g
   end
 
@@ -76,8 +75,9 @@ class GitProject
   def fetch_all(group = nil)
     @project.all(group).each do |k, v|
       puts "Fetching changes for #{k}".green
-      GitProject.create_root_dir(v['root_dir'])
-      working_dir = "#{v['root_dir']}/#{k}"
+      root_dir = GitProject.real_root_dir(v['root_dir'])
+      GitProject.create_root_dir(root_dir)
+      working_dir = "#{root_dir}/#{k}"
       g = Git.open(working_dir) || Git.init(working_dir)
       GitProject.fetch(g)
     end

data/lib/helpers/git_project_config.rb

@@ -23,13 +23,11 @@ module GitProjectConfig
 
     # Check for the config
     def check_config
-      if ENV['GIT_PROJECTS']
-        puts "Checking repositories. If things go wrong,
+      puts "Checking repositories. If things go wrong,
               update #{ENV['GIT_PROJECTS']}".green
-      else
-        fail "Please add the path your git projects config. \n
-              export GIT_PROJECTS=/path/to/git_projects.yml"
-      end
+
+      fail "Please add the path your git projects config. \n
+              export GIT_PROJECTS=/path/to/git_projects.yml" unless ENV['GIT_PROJECTS']
     end
 
     # Create YAML file

data/lib/helpers/git_project_remote.rb

@@ -6,14 +6,29 @@ module GitProjectRemote
 
   # Check/ add new remotes
   module ClassMethods
+    # Check if symbolic link or directory exists
+    def dir_or_symlink_exist?(path)
+      symbolic_link_exists = (File.symlink?(path) && File.readlink(path))
+      unless File.directory?(path) || symbolic_link_exists
+        puts "The dir #{path} does not exist"
+      end
+    end
+
+    # Get real root_dir
+    def real_root_dir(path)
+      return File.readlink(path) if File.symlink?(path)
+      path
+    end
+
     # Clone unless dir exists
     def clone(url, name, path)
+      path = real_root_dir(path)
       r = "#{path}/#{name}"
-      if Git.open(r)
+      g = Git.open(r)
+      if g
         puts 'Already cloned '.yellow + "#{url}".blue
       else
         Git.clone(url, name, path: path) || Git.init(r)
-        g = Git.open(r)
         puts "Cloning #{url} as #{name} into #{path}".green
       end
       g

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-projects
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
-- Katherine Pe
+- Katherine G. Pe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize