git-projects 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba0871ee122c54f64d4cc3f1aca28789f60a0755
-  data.tar.gz: a193c614e24c3d3f423d8d6e96b424ae86ba4064
+  metadata.gz: 145601748d4cda601bc403ea515b76512ab3230f
+  data.tar.gz: 14f0a8efee0d133ff9e286a3358c47dbe7cb3a1a
 SHA512:
-  metadata.gz: 1967e90f959781598fb858055354ae4dcd789e214c7d2fa70e940647d3a9655d28cd897cee8906d5b763bb9482d42e633f6cf008a96f19bcfce2211933967976
-  data.tar.gz: 8bf97b0476ce481833b9d8710cb58e83279d3b05800803ffbb08e59220811e8b1e066609d40f89f0174db09bd082219c9a1a20bd2bbe860cbdb1b61f37eb07d0
+  metadata.gz: 138dd6c41ae38666eae2efd1ddd3e746183d6dc42961243e3d1b4eda5c1bb7069d7abf7bf6f2733e3b71bd8693455f143d954dec573bcb84e64212709e1d2f8c
+  data.tar.gz: af62eb78ea5f794107b87cdfada3718a373bdc621b451c33b838ab25fbdbf8668bea6879d6aa55054b549ffddb039e537a07a9057a0dc4c32e4686e15c5d0a1d

data/lib/git-projects/version.rb

@@ -1,3 +1,3 @@
 module GitProjects
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/git-projects.rb

@@ -11,20 +11,18 @@ program_desc 'Easily manage Git projects'
 
 desc 'Create a config'
 command :config do |c|
-  c.action do |global_options,options,args|
+  c.action do |global_options, options, args|
     config_path = "#{args[0]}/git-projects.yml"
     group = args[1] || nil
     GitProject.create_config(args[0], group)
-    if File.open(config_path)
-      puts "Successfully created git-projects.yml".green
-    end
+    puts 'Created git-projects.yml'.green if File.open(config_path)
   end
 end
 
 desc 'Clone or initialize all projects'
 command :init do |c|
   c.action do
-    GitProject.check_config # the pre feature of GLI has a bug. investigate later.
+    GitProject.check_config
     GitProject.new(ENV['GIT_PROJECTS']).init
   end
 end
@@ -39,10 +37,10 @@ end
 
 desc 'Fetch changes from all remotes'
 command :fetch do |c|
-  c.action do |global_options,options,args|
+  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
+      puts 'Successfully fetched changes'.green
     end
   end
 end

data/lib/helpers/git_project.rb

@@ -3,25 +3,24 @@ require 'git'
 require 'yaml'
 require 'colorize'
 
+# GitProject contains helpers for Git commands
 class GitProject
-
-  attr :project
+  attr_reader :project
 
   def initialize(config)
     @project = Project.new(config)
   end
 
   class << self
-
     # Create YAML file
     def create_yaml_file(config_file, projects)
-      File.open(config_file, "w") do |f|
-        f.write projects.to_yaml.gsub(/- /,'').gsub(/    /,'  ').gsub(/---/,'')
+      File.open(config_file, 'w') do |f|
+        f.write projects.to_yaml.gsub(/- /, '').gsub(/    /, '  ').gsub(/---/, '')
       end
     end
 
     # Create a hash for remotes
-    def add_remotes_to_hash(g, p, dir)
+    def add_remotes_to_hash(g, dir)
       remotes_h = {}
       r = {}
       remotes_h.tap do |remotes|
@@ -35,37 +34,34 @@ class GitProject
     end
 
     # Create a configuration file based on a root path
-    def create_config(dir, group=nil)
+    def create_config(dir, group = nil)
       dir = dir.is_a?(Array) ? dir.first : dir
-      config_file = File.join(dir, "git-projects.yml")
+      config_file = File.join(dir, 'git-projects.yml')
       group ||= dir.split(File::SEPARATOR).last if dir
 
-      unless File.exists?(config_file)
-        projects = []
-        Dir.entries(dir)[2..-1].each do |project|
-          g = Git.open(File.join(dir, project))
-          p = {}
-          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"
+      fail "The config file, #{config_file} exists" if File.exist?(config_file)
+
+      projects = []
+      Dir.entries(dir)[2..-1].each do |project|
+        g = Git.open(File.join(dir, project))
+        p = {}
+        p[project] = add_remotes_to_hash(g, dir)
+        p[project]['group'] = group
+        projects << p
+        create_yaml_file(config_file, projects)
       end
+      puts "You can later fetch changes through:
+            \ngit-projects fetch #{group}".green
     end
 
-    def set_root_path(path)
-      @project.set_root_path(path)
+    def create_root_path(path)
+      @project.create_root_path(path)
     end
 
     # Create dir unless it exists
     def create_directory(path)
-      unless File.directory?(path)
-        `mkdir -puts #{path}`
-        puts "Creating directory: ".green+"#{path}".blue
-      end
+      `mkdir -p #{path}` unless File.directory?(path)
+      puts 'Creating directory: '.green + "#{path}".blue
     end
 
     # Create root_dir
@@ -76,9 +72,11 @@ class GitProject
     # Check for the config
     def check_config
       if ENV['GIT_PROJECTS']
-        puts "Checking repositories. If things go wrong, update #{ENV['GIT_PROJECTS']}".green
+        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"
+        fail "Please add the path your git projects config. \n
+              export GIT_PROJECTS=/path/to/git_projects.yml"
       end
     end
 
@@ -86,7 +84,7 @@ class GitProject
     def clone(url, name, path)
       r = "#{path}/#{name}"
       if Git.open(r)
-        puts "Already cloned ".yellow+ "#{url}".blue
+        puts 'Already cloned '.yellow + "#{url}".blue
       else
         Git.clone(url, name, path: path) || Git.init(r)
         g = Git.open(r)
@@ -97,47 +95,60 @@ class GitProject
 
     # Add remote
     def add_remote(g, v)
-      g.add_remote('all', v['origin']) unless g.remotes.map(&:name).include?('all')
+      unless g.remotes.map(&:name).include?('all')
+        g.add_remote('all', v['origin'])
+      end
       v.each do |name, 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
+        next if  %w(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
 
-    def fetch(g, url)
+    def fetch(g)
       g.remotes.each do |r|
-        unless ['root_dir', 'all', 'group'].include?(name)
-          r.fetch
-          puts "Fetching updates from #{r.name}: #{r.url}".green
-        end
+        next if %w(root_dir all group).include?(r.name)
+        r.fetch
+        puts "Fetching updates from #{r.name}: #{r.url}".green
       end
     end
   end
 
   # 1. Clone all repositories based on the origin key
   # 2. Add all other remotes unless it is origin
+  def create_project_and_remotes(k, v)
+    unless v['root_dir']
+      puts "root_dir isn't defined for #{k}"
+    end
+    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.add_remote(g, v) if g
+  end
+
+  def initialize_and_add_remotes(k, v)
+    g = Git.init("#{v['root_dir']}/#{k}")
+    return nil unless g
+    GitProject.add_remote(g, v)
+    GitProject.fetch(g)
+  end
+
   def init
-    @project.all.each do |k,v|
+    @project.all.each do |k, v|
       begin
-        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
+        create_project_and_remotes(k, v)
       rescue => e
-        g = Git.init("#{v['root_dir']}/#{k}")
-        if g
-          GitProject.add_remote(g,v)
-          GitProject.fetch(g, v)
-        end
+        initialize_and_add_remotes(k, v)
         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
+        puts "Failed to clone #{v.values[0]}. Initialized &
+              fetched updates from remotes instead.".yellow
       end
     end
   end
@@ -158,10 +169,10 @@ class GitProject
 
   # Add missing remotes
   def add_remotes
-    @project.all.each do |k,v|
+    @project.all.each do |k, v|
       working_dir = "#{v['root_dir']}/#{k}"
       g = Git.open(working_dir) || Git.init(working_dir)
-      GitProject.add_remote(g,v)
+      GitProject.add_remote(g, v)
       puts "Checking new remotes for #{k}".green
     end
   end
@@ -169,15 +180,13 @@ class GitProject
   # Fetch all updates
   # Group is optional
   # By default, fetch from all
-  def fetch_all(group=nil)
-    @project.all(group).each do |k,v|
+  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}"
       g = Git.open(working_dir) || Git.init(working_dir)
-      GitProject.fetch(g, v)
+      GitProject.fetch(g)
     end
-    return true
   end
-
 end

data/lib/helpers/project.rb

@@ -1,25 +1,25 @@
 require 'yaml'
 require 'colorize'
 
+# Project represents a Git project
 class Project
-
-  attr :projects
+  attr_reader :projects
 
   def initialize(config)
     @projects = YAML.load_file(config)
   end
 
-  def all(group=nil)
-    group ? @projects.select { |k, v| v['group'].include?(group) } : @projects
+  def all(group = nil)
+    group ? @projects.select { |_k, v| v['group'].include?(group) } : @projects
   end
 
   def first
     all.first
   end
 
-  def set_root_path(path)
+  def create_root_path(path)
     @projects.tap do |project|
-      project.each do |k,v|
+      project.each do |_k, v|
         v['root_dir'] = path
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-projects
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Katherine Pe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easily manage Git projects