guac 0.1.4 → 0.1.5

data/README.md

@@ -1,6 +1,13 @@
 # Guac
 
-Guac is a command line program to manage multiple local git repos with one command. Guac stands for `git update cli`, but it's also just a very easy to type command. Furthermore, it's shorthand for Guacamole, e.g.: "Holy Guacamole, this gem makes updating all my repos very fast and easy".
+[![Build Status](https://travis-ci.org/mattboldt/guac.svg?branch=master)](https://travis-ci.org/mattboldt/guac)
+[![Code Climate](https://codeclimate.com/github/mattboldt/guac/badges/gpa.svg)](https://codeclimate.com/github/mattboldt/guac)
+[![Gem Version](https://badge.fury.io/rb/guac.svg)](https://badge.fury.io/rb/guac)
+[![GitHub license](https://img.shields.io/github/license/mattboldt/guac.svg)](https://github.com/mattboldt/guac/blob/master/LICENSE.txt)
+
+Guac is a command line program to update multiple local git repos with one command. Guac stands for `git update cli`, but it's also just a very easy to type command. Furthermore, it's shorthand for Guacamole, e.g.: "Holy Guacamole, this gem makes updating all my repos very fast and easy".
+
+![Guac](./assets/demo.gif)
 
 Guac is written in Ruby, so you'll need to have that installed on your machine, but the functionality itself is language agnostic.
 

data/guac.gemspec

@@ -1,11 +1,11 @@
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "guac/version"
+require 'guac/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "guac"
-  spec.license       = "MIT"
+  spec.name          = 'guac'
+  spec.license       = 'MIT'
   spec.version       = Guac::VERSION
   spec.authors       = ['Matt Boldt']
   spec.email         = ['me@mattboldt.com']
@@ -18,42 +18,31 @@ Gem::Specification.new do |spec|
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "https://rubygems.org"
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+      'public gem pushes.'
   end
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "tty-color", "~> 0.4.2"
-  spec.add_dependency "tty-command", "~> 0.8.0"
-  spec.add_dependency "tty-config", "~> 0.2.0"
-  spec.add_dependency "tty-cursor", "~> 0.5.0"
-  spec.add_dependency "tty-editor", "~> 0.4.0"
-  spec.add_dependency "tty-file", "~> 0.6.0"
-  spec.add_dependency "tty-font", "~> 0.2.0"
-  spec.add_dependency "tty-markdown", "~> 0.4.0"
-  spec.add_dependency "tty-pager", "~> 0.11.0"
-  spec.add_dependency "tty-platform", "~> 0.1.0"
-  spec.add_dependency "tty-progressbar", "~> 0.15.0"
-  spec.add_dependency "tty-prompt", "~> 0.16.1"
-  spec.add_dependency "tty-screen", "~> 0.6.4"
-  spec.add_dependency "tty-spinner", "~> 0.8.0"
-  spec.add_dependency "tty-table", "~> 0.10.0"
-  spec.add_dependency "tty-tree", "~> 0.1.0"
-  spec.add_dependency "tty-which", "~> 0.3.0"
-  spec.add_dependency "pastel", "~> 0.7.2"
-  spec.add_dependency "thor", "~> 0.20.0"
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.require_paths = ['lib']
+
+  spec.post_install_message = %(
+    🥑🥑🥑 Thanks for installing 🥑🥑🥑 \n Please run `guac config`
+  )
+
+  spec.add_dependency 'colorize', '0.8.1'
+  spec.add_dependency 'thor', '0.20.0'
+
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop', '~> 0.61.1'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.30.1'
 end

data/lib/guac/cli.rb

@@ -26,7 +26,7 @@ module Guac
         invoke :help, ['config']
       else
         require_relative 'commands/config'
-        Guac::Commands::Config.new(options).execute
+        Guac::Commands::Config.new(options, self).execute
       end
     end
 
@@ -41,6 +41,8 @@ module Guac
       end
     end
 
+    map 'st' => 'status'
+
     desc 'up', 'Pull latest for all repos'
     method_option :help, aliases: '-h', type: :boolean, desc: 'Display usage information'
     method_option :branch, aliases: '-b', type: :string, desc: 'Checkout branch and pull updates'

data/lib/guac/colors.rb

@@ -6,7 +6,9 @@ class Colors
   class << self
     def paint(ary)
       color =
-        if contains?(ary, 'Updating') || contains?(ary, 'Changes not staged for commit') || contains?(ary, 'Your branch is behind')
+        if contains?(ary, 'Updating') ||
+           contains?(ary, 'Changes not staged for commit') ||
+           contains?(ary, 'Your branch is behind')
           :yellow
         elsif contains?(ary, 'Failed') || contains?(ary, 'error:')
           :red
@@ -14,7 +16,7 @@ class Colors
           :green
         end
 
-      [color, ary.map { |r| r.colorize(color) }]
+      ary.map { |r| r.colorize(color) }
     end
 
     def contains?(ary, string)

data/lib/guac/commands/config.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../command'
 require_relative '../config'
 require 'yaml'
 require 'colorize'
@@ -8,12 +7,13 @@ require 'colorize'
 
 module Guac
   module Commands
-    class Config < Guac::Command
+    class Config
 
-      def initialize(options)
+      def initialize(options, thor)
         @options = options
         @config = Guac::Config.load(raise_error: false)
         @defaults = Guac::Config.defaults
+        @thor = thor
       end
 
       def execute(_input: $stdin, output: $stdout)
@@ -35,7 +35,7 @@ module Guac
       private
 
       def prompt_repos(body, output)
-        result = prompt.ask('Git Repos (separated by spaces):'.bold.colorize(:blue), required: true)
+        result = @thor.ask('Git Repos (separated by spaces):'.bold.colorize(:blue), required: true)
 
         dirs = result.split(/ \s*/)
         body[:repos] = dirs.map do |r|
@@ -50,11 +50,11 @@ module Guac
         output.puts 'Git branch aliases:'.bold.colorize(:blue)
         output.puts 'Input format: `branch_name:branch_name_alias`'
 
-        result = prompt.yes?('Would you like to configure aliases?')
+        result = @thor.yes?('Would you like to configure aliases? (y/n)')
         return unless result
 
         body[:repos].each do |repo|
-          result = prompt.ask("Alias for `#{repo[:name].colorize(:blue)}`:")
+          result = @thor.ask("Alias for `#{repo[:name].colorize(:blue)}`:")
           next unless valid_result?(result)
 
           branch_pairs = result.split(/ \s*/)
@@ -69,14 +69,14 @@ module Guac
 
       def prompt_pull_strategy(body)
         default = "(default: `#{@defaults[:pull_strategy]}`)".colorize(:blue)
-        result = prompt.ask("Pull strategy #{default}:")
+        result = @thor.ask("Pull strategy #{default}:")
 
         body[:pull_strategy] = result if valid_result?(result)
       end
 
       def prompt_default_branch(body)
         default = "(default: `#{@defaults[:default_branch]}`)".colorize(:blue)
-        result = prompt.ask("Default branch #{default}:")
+        result = @thor.ask("Default branch #{default}:")
 
         body[:default_branch] = result if valid_result?(result)
       end

data/lib/guac/commands/status.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../command'
 require_relative '../config'
 require_relative '../repo'
 require_relative '../colors'
 
 module Guac
   module Commands
-    class Status < Guac::Command
+    class Status
       def initialize(options)
         @options = options
         @config = Guac::Config.load
@@ -15,15 +14,17 @@ module Guac
       end
 
       def execute(input: $stdin, output: $stdout)
-        @repos.each do |repo|
-          output.puts repo.name.bold.colorize(:blue)
+        threads = @repos.map do |repo|
+          Thread.new do
+            response = [repo.status]
+            response = Colors.paint(response)
+            response.unshift(repo.name.bold.colorize(:blue))
 
-          response = [repo.status]
-
-          color, response = Colors.paint(response)
-          output.puts response.join("\n")
-          break if color == :red
+            response.join("\n")
+          end
         end
+
+        puts threads.map(&:value)
       end
     end
   end

data/lib/guac/commands/up.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../command'
 require_relative '../config'
 require_relative '../repo'
 require_relative '../colors'
@@ -9,7 +8,7 @@ require_relative '../sys_command'
 
 module Guac
   module Commands
-    class Up < Guac::Command
+    class Up
       def initialize(options)
         @options = options
         @config = Guac::Config.load
@@ -18,24 +17,30 @@ module Guac
         end
       end
 
-      def execute(input: $stdin, output: $stdout)
-        @repos.each do |repo|
-          output.puts "Updating #{repo.name.bold} on branch #{repo.branch.underline}".colorize(:blue)
-          response = []
+      def execute
+        threads = @repos.map do |repo|
+          puts "Updating #{repo.name.bold} on branch #{repo.branch.underline}".colorize(:blue)
 
-          begin
-            repo.checkout
-            response << repo.pull
-          rescue Guac::SysCommandError => e
-            output.puts e.message.colorize(:red)
-            break
-          end
+          Thread.new do
+            response = []
+
+            begin
+              repo.checkout
+              response << repo.pull
+            rescue Guac::SysCommandError => e
+              response << e.message.colorize(:red)
+              break
+            end
 
-          response.compact!
-          color, response = Colors.paint(response)
-          output.puts response.join("\n")
-          break if color == :red
+            response.compact!
+            response = Colors.paint(response)
+            response.unshift(repo.name.bold.colorize(:blue))
+            response.join("\n")
+          end
         end
+
+        puts '========'
+        puts threads.map(&:value)
       end
     end
   end

data/lib/guac/version.rb

@@ -1,3 +1,3 @@
 module Guac
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,323 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: guac
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Matt Boldt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-19 00:00:00.000000000 Z
+date: 2018-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tty-color
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-- !ruby/object:Gem::Dependency
-  name: tty-command
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: tty-config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: tty-cursor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: tty-editor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: tty-file
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: tty-font
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: tty-markdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: tty-pager
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-- !ruby/object:Gem::Dependency
-  name: tty-platform
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: tty-progressbar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.15.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.15.0
-- !ruby/object:Gem::Dependency
-  name: tty-prompt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.1
-- !ruby/object:Gem::Dependency
-  name: tty-screen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.4
-- !ruby/object:Gem::Dependency
-  name: tty-spinner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: tty-table
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: tty-tree
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: tty-which
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
-  name: pastel
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
-  type: :runtime
+        version: '1.16'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
-  type: :runtime
+        version: '10.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.61.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.61.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.30.1
 description: Git your gits git
 email:
 - me@mattboldt.com
@@ -328,6 +118,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -335,6 +127,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- assets/demo.gif
 - bin/console
 - bin/reset
 - bin/setup
@@ -343,7 +136,6 @@ files:
 - lib/guac.rb
 - lib/guac/cli.rb
 - lib/guac/colors.rb
-- lib/guac/command.rb
 - lib/guac/commands/.gitkeep
 - lib/guac/commands/config.rb
 - lib/guac/commands/status.rb
@@ -362,7 +154,8 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message: "\n    \U0001F951\U0001F951\U0001F951 Thanks for installing
+  \U0001F951\U0001F951\U0001F951 \n Please run `guac config`\n  "
 rdoc_options: []
 require_paths:
 - lib