git-projects 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4504bc3fe630d0ea505b28aa524773333b5be322
-  data.tar.gz: adc75f8bea5c45630d2874000b2dcd9cd3def3a1
+  metadata.gz: 1bf0e0af220a8b22f1b3543c7d929b4b4a6e0ed1
+  data.tar.gz: 11c9b54a6a523373e405cb361ea9a8ce8a14d15d
 SHA512:
-  metadata.gz: 6bf2122f31976a419836eab66db89dc5faefabe44a3293f75bb3bfabdbc94f0ca00787ccf597e1e1192dab337f232e6780c9e6a07d176ea2c451f0b6f64d6d10
-  data.tar.gz: e2e8df57c74dfd36c9d327f37d2e18f088ba9fcc036ee4b58a6aad3e65255241600aa7de44c8dd0e52663063f0277d900e9fc8116ba6ca94de14c17ab24bdc90
+  metadata.gz: 01d2cce71c5173d68e3fca746593a7f628be481f3175f6d1cc84737906692f373ef54950afd18561410d960316e227cb369d58d1ce07985b15830e9cc64b1cba
+  data.tar.gz: 72742b92441389515054902dad5edcbaf6ebf05a4676044459775fb95068787940f0667c228ed8a77ecb5ea912fec38b482c54a4af9f37fa738bf40aeedaad00

data/lib/git-projects/version.rb

@@ -1,3 +1,3 @@
 module GitProjects
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/git-projects.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'gli'
 require 'json'
+require 'colorize'
 require_relative 'helpers/project'
 require_relative 'helpers/git_project'
 
@@ -8,40 +9,40 @@ include GLI::App
 
 program_desc 'Easily manage Git projects'
 
-pre do |global_options,command,options,args|
-  if ENV['GIT_PROJECTS']
-    p "Checking repositories. If things go wrong, update #{ENV['GIT_PROJECTS']}"
-  else
-    raise "Please add the path your git projects config. \n export GIT_PROJECTS=/path/to/git_projects.yml"
-  end
-end
-
 desc 'Create a config'
-skips_pre
 command :config do |c|
   c.action do |global_options,options,args|
-    config_path = "#{args.first}/git-projects.yml"
-    GitProject.create_config(args)
+    config_path = "#{args[0]}/git-projects.yml"
+    group = args[1] || nil
+    GitProject.create_config(args[0], group)
     if File.open(config_path)
-      p "successfully created git-projects.yml"
+      puts "Successfully created git-projects.yml".green
     end
   end
 end
 
-desc 'Clone all projects'
-command :clone do |c|
+desc 'Clone or initialize all projects'
+command :init do |c|
   c.action do
-    if GitProject.new(ENV['GIT_PROJECTS']).clone_all
-      p 'successfully cloned repositories'
-    end
+    GitProject.check_config # the pre feature of GLI has a bug. investigate later.
+    GitProject.new(ENV['GIT_PROJECTS']).init
   end
 end
 
-desc 'Fetch changed from all remotes'
-command :fetch do |c|
+desc 'Add missing remotes'
+command :'add-remotes' do |c|
   c.action do
-    if GitProject.new(ENV['GIT_PROJECTS']).fetch_all
-      p 'successfully fetched changes'
+    GitProject.check_config
+    GitProject.new(ENV['GIT_PROJECTS']).add_remotes
+  end
+end
+
+desc 'Fetch changes from all remotes'
+command :fetch do |c|
+  c.action do |global_options,options,args|
+    GitProject.check_config
+    if GitProject.new(ENV['GIT_PROJECTS']).fetch_all(args[0])
+      puts "Successfully fetched changes".green
     end
   end
 end

data/lib/helpers/git_project.rb

@@ -1,6 +1,7 @@
 require_relative 'project'
 require 'git'
 require 'yaml'
+require 'colorize'
 
 class GitProject
 
@@ -11,6 +12,7 @@ class GitProject
   end
 
   class << self
+
     # Create YAML file
     def create_yaml_file(config_file, projects)
       File.open(config_file, "w") do |f|
@@ -33,18 +35,22 @@ class GitProject
     end
 
     # Create a configuration file based on a root path
-    def create_config(dir)
+    def create_config(dir, group=nil)
       dir = dir.is_a?(Array) ? dir.first : dir
       config_file = "#{dir}/git-projects.yml"
+      group ||= dir.split(File::SEPARATOR).last
+
       unless File.exists?(config_file)
         projects = []
         Dir.entries(dir)[2..-1].each do |project|
           g = Git.open("#{dir}/#{project}")
           p = {}
-          p[project]  = add_remotes_to_hash(g, p, dir)
+          p[project] = add_remotes_to_hash(g, p, dir)
+          p[project]['group'] = group
           projects << p
           create_yaml_file(config_file, projects)
         end
+        puts "You can later fetch changes through: git-projects fetch #{group}".green
       else
         raise "The config file, #{config_file} exists"
       end
@@ -57,8 +63,8 @@ class GitProject
     # Create dir unless it exists
     def create_directory(path)
       unless File.directory?(path)
-        `mkdir -p #{path}`
-        printf("Creating directory: %s\n", path)
+        `mkdir -puts #{path}`
+        puts "Creating directory: ".green+"#{path}".blue
       end
     end
 
@@ -67,38 +73,48 @@ class GitProject
       GitProject.create_directory(path) unless File.directory?(path)
     end
 
+    # Check for the config
+    def check_config
+      if ENV['GIT_PROJECTS']
+        puts "Checking repositories. If things go wrong, update #{ENV['GIT_PROJECTS']}".green
+      else
+        raise "Please add the path your git projects config. \n export GIT_PROJECTS=/path/to/git_projects.yml"
+      end
+    end
+
     # Clone unless dir exists
     def clone(url, name, path)
       r = "#{path}/#{name}"
       if Git.open(r)
-        p "Already cloned #{url}"
+        puts "Already cloned ".yellow+ "#{url}".blue
       else
         Git.clone(url, name, path: path) || Git.init(r)
         g = Git.open(r)
-        p "Cloning #{url} as #{name} into #{path}"
+        puts "Cloning #{url} as #{name} into #{path}".green
       end
       g
     end
 
     # Add remote
     def add_remote(g, v)
-      g.add_remote('all', v['origin'])
+      g.add_remote('all', v['origin']) unless g.remotes.map(&:name).include?('all')
       v.each do |name, remote|
-        unless ['root_dir', 'origin', 'all'].include?(name)
-          g.add_remote(name, remote) unless g.remotes.map(&:name).include?(name)
-
-          # add to all remote
-          # useful when you want to do git push all --all
-          `git remote set-url --add all #{remote}`
+        unless ['root_dir', 'all', 'group'].include?(name) || g.remotes.map(&:name).include?(name)
+          if g.add_remote(name, remote)
+            # add to all remote
+            # useful when you want to do git push all --all
+            `git remote set-url --add all #{remote}`
+            puts "Added remote #{name}".green
+          end
         end
       end
     end
 
     def fetch(g, url)
       g.remotes.each do |r|
-        unless r.name=='all'
+        unless ['root_dir', 'all', 'group'].include?(name)
           r.fetch
-          p "Fetching updates from #{r.name} : #{r.url}"
+          puts "Fetching updates from #{r.name}: #{r.url}".green
         end
       end
     end
@@ -106,11 +122,11 @@ class GitProject
 
   # 1. Clone all repositories based on the origin key
   # 2. Add all other remotes unless it is origin
-  def clone_all
+  def init
     @project.all.each do |k,v|
       begin
-        p "root_dir isn't defined for #{k}" unless v['root_dir']
-        p "The dir #{v['root_dir']} does not exist" unless File.directory?(v['root_dir'])
+        puts "root_dir isn't defined for #{k}" unless v['root_dir']
+        puts "The dir #{v['root_dir']} does not exist" unless File.directory?(v['root_dir'])
         GitProject.create_root_dir(v['root_dir'])
         g =  GitProject.clone(v.values[0], k, v['root_dir'])
         GitProject.add_remote(g,v) if g
@@ -120,22 +136,48 @@ class GitProject
           GitProject.add_remote(g,v)
           GitProject.fetch(g, v)
         end
-        p "Please check paths and permissions for #{k}. Error: #{e}"
-        p "Failed to clone #{v.values[0]}. Initialized & fetch update from remotes instead."
+        puts "Please check paths and permissions for #{k}. Error: #{e}".red
+        puts "Failed to clone #{v.values[0]}. Initialized & fetch update from remotes instead.".yellow
       end
     end
   end
 
-  # Fetch all updates for remotes for all projects
-  def fetch_all
-    p "Found #{@project.all.size} projects"
+  def projects
+    @project.all
+  end
+
+  # Add a new remote
+  def new_remote(project, name, url)
+    @project.new_remote(project, name, url)
+  end
+
+  # Change group
+  def new_group(project, name)
+    @project.new_group(project, name)
+  end
+
+  # Add missing remotes
+  def add_remotes
+    puts "Found #{@project.all.size} projects".green
     @project.all.each do |k,v|
-      p "Fetching changes for #{k}"
+      working_dir = "#{v['root_dir']}/#{k}"
+      g = Git.open(working_dir) || Git.init(working_dir)
+      GitProject.add_remote(g,v)
+      puts "Checking new remotes for #{k}".green
+    end
+  end
+
+  # Fetch all updates
+  # Group is optional
+  # By default, fetch from all
+  def fetch_all(group=nil)
+    puts "Found #{@project.all.size} projects".green
+    @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}"
       g = Git.open(working_dir) || Git.init(working_dir)
       GitProject.fetch(g, v)
-      GitProject.add_remote(g,v)
     end
     return true
   end

data/lib/helpers/project.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'colorize'
 
 class Project
 
@@ -8,8 +9,8 @@ class Project
     @projects = YAML.load_file(config)
   end
 
-  def all
-    @projects
+  def all(group=nil)
+    group ? @projects.select { |k, v| v['group'].include?(group) } : @projects
   end
 
   def first
@@ -23,4 +24,16 @@ class Project
       end
     end
   end
+
+  def new_remote(remote, name, url)
+    @projects.tap do |project|
+      project[remote][name] = url
+    end
+  end
+
+  def new_group(remote, name)
+    @projects.tap do |project|
+      project[remote]['group'] = name
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-projects
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Katherine Pe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -25,13 +25,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.6
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement