r-git 1.0.2 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d592d0c13788f1e5ff4d480b64f43999ca745780
-  data.tar.gz: 1c7fd8337e4a1fcd5e7dd9b5810b85bf61e2f75b
+  metadata.gz: 9b9b8b71821185add335a94f2b6cb8b36a54b769
+  data.tar.gz: 0fedb11778194aebeb7ea22d62aad4e04975f848
 SHA512:
-  metadata.gz: 2ae58d99104c230e97b8899fd87e479b18a7cddb0af55eeada000b24e84004267ea671a97b929ec3a78f5031e56c6dd087a808d476dfebd656dca02ad1f0c048
-  data.tar.gz: 68ad0f950a3644e208fc4d55d8497a26c152da42cfa958f7777dc0ebf790c606dc0c30aeda379951f194528798de58c9002d21f104210c4dfe3f3ee081189c11
+  metadata.gz: a39436aa0aa0c0d786ddc8955c53e884cc489360b79d5248dac56195382c9a520fde0bde227f6ccd0008736decf0fede53a15eb290ad85184fb7e30a5fd9ab3e
+  data.tar.gz: 620463392c4514f91755e129271aa92cadfc5b4a0c540077f12fe377521b143c5187f1c6d6c21f338da51a94ec8bb82c3350ec60b724328a72932a1274665532

data/.codeclimate.yml

@@ -0,0 +1,25 @@
+---
+engines:
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+      - javascript
+      - python
+      - php
+  fixme:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+  - "**.inc"
+  - "**.js"
+  - "**.jsx"
+  - "**.module"
+  - "**.php"
+  - "**.py"
+  - "**.rb"
+exclude_paths:
+- spec/

data/.rubocop.yml

@@ -1,8 +1,17 @@
+CaseIndentation:
+  IndentWhenRelativeTo: case
+  IndentOneStep: true
 Documentation:
   Enabled: false
+Metrics/AbcSize:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - lib/rgit/cli.rb
 Metrics/LineLength:
   Max: 120
 Metrics/MethodLength:
   Max: 40
-Metrics/AbcSize:
-  Enabled: false
+Metrics/PerceivedComplexity:
+  Exclude:
+    - lib/rgit/cli.rb

data/.travis.yml

@@ -2,3 +2,6 @@ language: ruby
 rvm:
   - 2.2.1
 before_install: gem install bundler -v 1.11.2
+addons:
+  code_climate:
+    repo_token: "2ab359df06f020c1cba2747bcf9fb9a6fbec7788f039e4c521fc15e2dbf22d55"

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+## Change Log
+
+### 1.1
+* Added travis configuration
+* Added code climate configuration
+* Increased test coverage and code quality
+* Moved to sub-commands
+### 1.0.2
+* Initial Version

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 TODO: Write your name
+Copyright (c) 2016 James Ridgway
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,5 +1,9 @@
 # r-git
 
+[![Build Status](https://travis-ci.org/jamesridgway/r-git.svg?branch=master)](https://travis-ci.org/jamesridgway/r-git)
+[![Code Climate](https://codeclimate.com/github/jamesridgway/r-git/badges/gpa.svg)](https://codeclimate.com/github/jamesridgway/r-git)
+[![Test Coverage](https://codeclimate.com/github/jamesridgway/r-git/badges/coverage.svg)](https://codeclimate.com/github/jamesridgway/r-git/coverage)
+
 r-git is an executable gem that assists with managing multiple git repositories. The current functionality allows you to perform the following actions on multiple repositories at once:
 * Pull
 * Checkout
@@ -20,27 +24,27 @@ Imagine the scenario where you have several git projects under some parent:
 
 r-git has the concepts of 'roots' in our scenario `personal-projects` and `work-projects` are our roots. I register these by running the following from within each folder:
 
-    $ rgit --add-root
+    $ rgit add-root
 
 Running any of the following commands will result in that command being executed across all projects within the root:
 
-* `rgit -s`
+* `rgit status`
 
   Status of all repositories
 
-* `rgit -p`
+* `rgit pull`
 
   Execute git pull on all repositories
 
-* `rgit -f`
+* `rgit fetch`
 
   Execute git fetch on all repositories
 
-* `rgit -c development`
+* `rgit checkout development`
 
   Execute `git checkout development` on all repositories
 
-For example: executing `rgit -f` from within any folder in `personal-projects` will run git fetch on all repositories in that folder/root.
+For example: executing `rgit fetch` from within any folder in `personal-projects` will run git fetch on all repositories in that folder/root.
 
 It's that simple!
 
@@ -52,16 +56,22 @@ Install it yourself as:
 ## Usage
 r-git is an executable gem with the following CLI options.
 
-    Usage: rgit [options]
-            --add-root [PATH]            Add a root directory (defaults to pwd).
-            --remove-root [PATH]         Remove a root directory (defaults to pwd).
-            --show-roots                 Show roots.
-        -p, --pull                       Git pull
-        -f, --fetch                      Git fetch
-        -c, --checkout BRANCH            Git checkout
-        -s, --status                     Git status
-        -h, --help                       Show this message
-            --version                    Show version
+    USAGE:
+        rgit [global options] COMMAND [command options]
+    
+    GLOBAL OPTIONS:
+        -v                         Run verbosely
+    
+    COMMANDS:
+        add-root [PATH]            Add a root directory (defaults to pwd).
+        remove-root [PATH]         Remove a root directory (defaults to pwd).
+        show-roots                 Show roots.
+        pull                       Git pull
+        fetch                      Git fetch
+        checkout BRANCH            Git checkout
+        status                     Git status
+        -h, --help                 Show this message
+        version                    Show version
 
 See the main description for examples of how to use r-git
 

data/lib/rgit/cli.rb

@@ -1,37 +1,49 @@
+require 'trollop'
+
 module Rgit
   class Cli
     include Rgit
+
+    SUB_COMMANDS = %w(add-root remove-root show-roots checkout pull fetch status version).freeze
+
     def self.parse(args, rgit = Rgit.new(Configuration.exist? ? Configuration.load : Configuration.create))
-      OptionParser.new do |opts|
-        opts.banner = 'Usage: rgit [options]'
-        opts.on('--add-root [PATH]', 'Add a root directory (defaults to pwd).') do |root_path|
-          rgit.add_root(root_path.nil? ? Dir.pwd : root_path)
-        end
-        opts.on('--remove-root [PATH]', 'Remove a root directory (defaults to pwd).') do |root_path|
-          rgit.remove_root(root_path.nil? ? Dir.pwd : root_path)
-        end
-        opts.on('--show-roots', 'Show roots.') do |root_path|
+      global_opts = Trollop.options(args) do
+        banner 'rgit is a utility for managing multiple git repositories'
+        opt :verbose, 'Run verbosely', short: '-v'
+        stop_on SUB_COMMANDS
+      end
+
+      rgit.verbose = global_opts[:verbose]
+
+      cmd = args.shift
+      case cmd
+        when 'add-root'
+          path = args.size == 1 ? args[0] : Dir.pwd
+          rgit.add_root(path)
+        when 'remove-root'
+          path = args.size == 1 ? args[0] : Dir.pwd
+          rgit.remove_root(path)
+        when 'checkout'
+          branch = args[0] if args.size == 1
+          unless branch
+            puts 'ERROR: checkout subcommand expects a branch name'.red
+            return
+          end
+          rgit.checkout branch
+        when 'show-root'
           rgit.print_roots
-        end
-        opts.on('-p', '--pull', 'Git pull') do
+        when 'pull'
           rgit.pull
-        end
-        opts.on('-f', '--fetch', 'Git fetch') do
+        when 'fetch'
           rgit.fetch
-        end
-        opts.on('-c', '--checkout BRANCH', 'Git checkout') do |branch|
-          rgit.checkout branch
-        end
-        opts.on('-s', '--status', 'Git status') do
+        when 'status'
           rgit.status
-        end
-        opts.on_tail('-h', '--help', 'Show this message') do
-          puts opts
-        end
-        opts.on_tail('--version', 'Show version') do
-          puts VERSION
-        end
-      end.parse!(args)
+        when 'version'
+          puts "rgit #{VERSION}"
+        else
+          puts "ERROR: unknown subcommand #{cmd}".red
+          return
+      end
     end
   end
 end

data/lib/rgit/configuration.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 
 module Rgit
   class Configuration
-    attr_reader :filename
+    attr_reader :filename, :roots
 
     def self.exist?(filename = File.join(Dir.home, '.rgit.yml'))
       File.exist?(filename)
@@ -20,10 +20,6 @@ module Rgit
       Configuration.new(filename)
     end
 
-    def roots
-      @roots
-    end
-
     def add_root(path)
       raise '"/" path unsupported!' if path == '/'
       @roots << path unless @roots.include? path
@@ -34,9 +30,7 @@ module Rgit
     end
 
     def save
-      config = {
-          'roots' => @roots
-      }
+      config = { 'roots' => @roots }
       File.open(@filename, 'w') do |f|
         f.write config.to_yaml
       end
@@ -56,11 +50,10 @@ module Rgit
       @filename = filename
       @roots = []
 
-      return if File.size(filename) == 0
+      return if File.size(filename).zero?
 
       yaml = YAML.load_file(filename)
       @roots = yaml['roots']
     end
-
   end
 end

data/lib/rgit/rgit.rb

@@ -6,9 +6,11 @@ require 'git'
 require 'colorize'
 module Rgit
   class Rgit
+    attr_accessor :verbose
 
     def initialize(config)
       @config = config
+      @verbose = false
     end
 
     def add_root(path)
@@ -27,20 +29,20 @@ module Rgit
 
     def pull(path = Dir.pwd)
       recursive_cmd(path) do |git|
-        git.remotes.each do | remote|
+        git.remotes.each do |remote|
           puts " Pulling remote: #{remote.name}".colorize(:light_cyan)
           results = git.pull(remote.name, git.current_branch)
-          puts results.split("\n").map {|l| "   #{l}"}.join("\n")
+          puts results.split("\n").map { |l| "   #{l}" }.join("\n") if @verbose
         end
       end
     end
 
     def fetch(path = Dir.pwd)
       recursive_cmd(path) do |git|
-        git.remotes.each do | remote|
+        git.remotes.each do |remote|
           puts " Fetching remote: #{remote.name}".colorize(:light_cyan)
           results = git.fetch(remote.name, all: true)
-          puts results.split("\n").map {|l| "   #{l}"}.join("\n")
+          puts results.split("\n").map { |l| "   #{l}" }.join("\n") if @verbose
         end
       end
     end
@@ -56,11 +58,11 @@ module Rgit
       recursive_cmd(path) do |git|
         unless git.status.untracked.empty?
           puts " Untracked changes (#{git.current_branch}):".colorize(:light_red)
-          git.status.untracked.keys.each {|filename| puts "   - #{filename}" }
+          git.status.untracked.keys.each { |filename| puts "   - #{filename}" }
         end
         unless git.status.changed.empty?
           puts " Uncommitted changes (#{git.current_branch}):".colorize(:light_magenta)
-          git.status.changed.keys.each {|filename| puts "   - #{filename}" }
+          git.status.changed.keys.each { |filename| puts "   - #{filename}" }
         end
         if git.status.untracked.empty? && git.status.changed.empty?
           puts " On branch: #{git.current_branch}".colorize(:green)
@@ -81,7 +83,7 @@ module Rgit
 
     private
 
-    def recursive_cmd(path, &block)
+    def recursive_cmd(path)
       parent_path = @config.find_root(path)
       repositories(parent_path).each do |git|
         repo_name = git.dir.path.gsub("#{path}/", '')
@@ -89,15 +91,17 @@ module Rgit
         begin
           yield git
         rescue Git::GitExecuteError => e
-          puts "   Failed:".colorize(:red)
-          puts e.message.split("\n").map {|l| "    #{l}"}.join("\n").colorize(:red)
+          puts '   Failed:'.colorize(:red)
+          puts e.message.split("\n").map { |l| "    #{l}" }.join("\n").colorize(:red)
         end
       end
     end
 
     def repositories(path)
       git_repos = []
-      dirs = Dir.entries(path).select{ |entry| File.directory?(File.join(path, entry)) && !(entry == '.' || entry == '..') }.sort
+      dirs = Dir.entries(path).select do |entry|
+        File.directory?(File.join(path, entry)) && !(entry == '.' || entry == '..')
+      end.sort
       dirs.each do |dir|
         dir_path = File.join(path, dir)
         if File.exist?(File.join(dir_path, '.git', 'config'))

data/lib/rgit/version.rb

@@ -1,3 +1,3 @@
 module Rgit
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.1'.freeze
 end

data/r-git.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.37'
   spec.add_development_dependency 'simplecov', '~> 0.11'
+  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.0'
+  spec.add_dependency 'trollop', '~> 2.1.2'
   spec.add_dependency 'git', '~> 1.2.9'
   spec.add_dependency 'colorize', '~> 0.7.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r-git
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: '1.1'
 platform: ruby
 authors:
 - James Ridgway
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -119,10 +147,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -155,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Executable gem for managing multiple git repositories in a top level directory.