git-projects 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 145601748d4cda601bc403ea515b76512ab3230f
-  data.tar.gz: 14f0a8efee0d133ff9e286a3358c47dbe7cb3a1a
+  metadata.gz: b3242cc416b633af159ae2c9382e272fa0fcf3e0
+  data.tar.gz: c03664dc2621b8ec9bbb539df5738e1f4ffe9dd1
 SHA512:
-  metadata.gz: 138dd6c41ae38666eae2efd1ddd3e746183d6dc42961243e3d1b4eda5c1bb7069d7abf7bf6f2733e3b71bd8693455f143d954dec573bcb84e64212709e1d2f8c
-  data.tar.gz: af62eb78ea5f794107b87cdfada3718a373bdc621b451c33b838ab25fbdbf8668bea6879d6aa55054b549ffddb039e537a07a9057a0dc4c32e4686e15c5d0a1d
+  metadata.gz: ee5de45113f5eb7fd93514561a8bbd7b9cc8c164fae9d3b538b7fbd593fdc03923e6ca966714842f9462845b8d36c42e04a3aa272c3556e8e08ea50c4a65f97e
+  data.tar.gz: a44f32a3964a5ea591cd30a9f5ef588c2848fceddd3af063b1b110cb143f5db035f4cc932a0c7a37d3b1111eefbc3f9a5c2821d0cf7272f61986a9daeebe4135

data/lib/git-projects/version.rb

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

data/lib/helpers/git_project.rb

@@ -1,3 +1,5 @@
+require_relative 'git_project_config'
+require_relative 'git_project_remote'
 require_relative 'project'
 require 'git'
 require 'yaml'
@@ -7,139 +9,13 @@ require 'colorize'
 class GitProject
   attr_reader :project
 
+  include GitProjectConfig
+  include GitProjectRemote
+
   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(/---/, '')
-      end
-    end
-
-    # Create a hash for remotes
-    def add_remotes_to_hash(g, dir)
-      remotes_h = {}
-      r = {}
-      remotes_h.tap do |remotes|
-        g.remotes.each do |remote|
-          r[remote.name] = remote.url
-        end
-        r['all'] = true
-        r['root_dir'] = dir
-        remotes.merge!(r)
-      end
-    end
-
-    # Create a configuration file based on a root path
-    def create_config(dir, group = nil)
-      dir = dir.is_a?(Array) ? dir.first : dir
-      config_file = File.join(dir, 'git-projects.yml')
-      group ||= dir.split(File::SEPARATOR).last if dir
-
-      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 create_root_path(path)
-      @project.create_root_path(path)
-    end
-
-    # Create dir unless it exists
-    def create_directory(path)
-      `mkdir -p #{path}` unless File.directory?(path)
-      puts 'Creating directory: '.green + "#{path}".blue
-    end
-
-    # Create root_dir
-    def create_root_dir(path)
-      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
-        fail "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)
-        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
-    end
-
-    # Add remote
-    def add_remote(g, v)
-      unless g.remotes.map(&:name).include?('all')
-        g.add_remote('all', v['origin'])
-      end
-      v.each do |name, remote|
-        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)
-      g.remotes.each do |r|
-        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|
       begin
@@ -153,6 +29,13 @@ class GitProject
     end
   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 projects
     @project.all
   end
@@ -177,8 +60,18 @@ class GitProject
     end
   end
 
-  # Fetch all updates
-  # Group is optional
+  # 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)
+    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.add_remote(g, v) if g
+  end
+
   # By default, fetch from all
   def fetch_all(group = nil)
     @project.all(group).each do |k, v|

data/lib/helpers/git_project_config.rb

@@ -0,0 +1,85 @@
+# Create YML config
+module GitProjectConfig
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  # Create YML config
+  module ClassMethods
+    def create_root_path(path)
+      @project.create_root_path(path)
+    end
+
+    # Create dir unless it exists
+    def create_directory(path)
+      `mkdir -p #{path}` unless File.directory?(path)
+      puts 'Creating directory: '.green + "#{path}".blue
+    end
+
+    # Create root_dir
+    def create_root_dir(path)
+      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
+        fail "Please add the path your git projects config. \n
+              export GIT_PROJECTS=/path/to/git_projects.yml"
+      end
+    end
+
+    # 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(/---/, '')
+      end
+    end
+
+    # Create a hash for remotes
+    def add_remotes_to_hash(g, dir)
+      remotes_h = {}
+      r = {}
+      remotes_h.tap do |remotes|
+        g.remotes.each do |remote|
+          r[remote.name] = remote.url
+        end
+        r['all'] = true
+        r['root_dir'] = dir
+        remotes.merge!(r)
+      end
+    end
+
+    # Create has for the project
+    def project_info_hash(dir, project, group)
+      g = Git.open(File.join(dir, project))
+      p = {}
+      p.tap do |pr|
+        pr[project] = add_remotes_to_hash(g, dir)
+        pr[project]['group'] = group
+      end
+    end
+
+    def create_project_info_hash(projects, dir, group, config_file)
+      Dir.entries(dir)[2..-1].each do |project|
+        projects << project_info_hash(dir, project, group)
+        create_yaml_file(config_file, projects)
+      end
+    end
+
+    # Create a configuration file based on a root path
+    def create_config(dir, group = nil)
+      dir = dir.is_a?(Array) ? dir.first : dir
+      config_file = File.join(dir, 'git-projects.yml')
+      group ||= dir.split(File::SEPARATOR).last if dir
+      fail "The config file, #{config_file} exists" if File.exist?(config_file)
+      projects = []
+      create_project_info_hash(projects, dir, group, config_file)
+      puts "You can later fetch changes through:
+            \ngit-projects fetch #{group}".green
+    end
+  end
+end

data/lib/helpers/git_project_remote.rb

@@ -0,0 +1,50 @@
+# Mostly methods for checking/ adding new remotes
+module GitProjectRemote
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  # Check/ add new remotes
+  module ClassMethods
+    # Clone unless dir exists
+    def clone(url, name, path)
+      r = "#{path}/#{name}"
+      if Git.open(r)
+        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
+    end
+
+    def fetch(g)
+      g.remotes.each do |r|
+        next if %w(root_dir all group).include?(r.name)
+        r.fetch
+        puts "Fetching updates from #{r.name}: #{r.url}".green
+      end
+    end
+
+    def remote_exists?(g, name)
+      g.remotes.map(&:name).include?(name)
+    end
+
+    def add_new_remote(g, name, remote)
+      g.add_remote(name, remote)
+      `git remote set-url --add all #{remote}`
+      puts "Added remote #{name}".green
+    end
+
+    # Add remote
+    def add_remote(g, v)
+      g.add_remote('origin', v['origin']) unless remote_exists?(g, 'origin')
+      v.each do |name, remote|
+        next if  %w(root_dir all group).include?(name) ||
+          g.remotes.map(&:name).include?(name)
+        add_new_remote(g, name, remote)
+      end
+    end
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: git-projects
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Katherine Pe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -25,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.7
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +105,8 @@ files:
 - lib/git-projects.rb
 - lib/git-projects/version.rb
 - lib/helpers/git_project.rb
+- lib/helpers/git_project_config.rb
+- lib/helpers/git_project_remote.rb
 - lib/helpers/project.rb
 homepage: https://github.com/katgironpe/git-projects
 licenses: