git-copilot 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71d6d6d5ec79dcc60ede3ddc73ab7fe42ce741fbdaaf7155f3b3e163cf0864ff
-  data.tar.gz: 308eb67d9e45b0c26910b7ab2887492e1038be93b5b13c8d0ae4517d96bd5013
+  metadata.gz: 28bd030a9e78802dfbfb4d18795f56807308aa62045f840b69aec6b617e4251b
+  data.tar.gz: 0f907a3b725d66e8024c2cf695f367dbe0ca09a84159de38d6788d37b9f0ba29
 SHA512:
-  metadata.gz: 4f3c9b37c43a79269298a42e70dd03c838b2d229e5c0b08f58465a17301dfb6900c6c4e14c984d23cc74481c78ba66f3027909f4b02744a2e996933f61bb3a9a
-  data.tar.gz: 1a7ef02ffdab51702956fcbb8c132bbd4e72d1c19d925fe8e551191a0eab5b743e88d02d287b03d31f54d28342424d4486aaaeb35b52669eb3effde57a14aa20
+  metadata.gz: 2388eaad908b14599501a84c3d2278e5505af83801b9590ef239dd05703bfb7af928dcf837988c8ee5c09c819359a367066af52eeba0428dabdf843aab8d7ed1
+  data.tar.gz: d86b7c929a14c2a42befdda7905bf9aad340a9579b453425c0800fb9ed98205a6cd910a867c3208c84569bca9d05a86cd076cca28a6bc774d12c40b49ee14a15

data/.rubocop.yml

@@ -5,6 +5,9 @@ AllCops:
 Metrics/LineLength:
   Max: 120
 
+Metrics/MethodLength:
+  Max: 20
+
 Style/ClassAndModuleChildren:
   EnforcedStyle: compact
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-copilot (0.1.0)
+    git-copilot (0.2.0)
       thor (~> 0.20)
 
 GEM

data/README.md

@@ -113,10 +113,17 @@ users:
   george:
     name: George Geoffries
     email: george.geoffries@example.com
+current_pairs:
+- george
 ```
 
 ## Development
 
+1. Clone this repo
+1. Run `bin/setup` to install dependencies
+1. Run `bundle exec rake` to run all tests
+1. You can run `bin/console` to open an IRB console with Git Co-pilot already loaded
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/atmattpatt/git-copilot.

data/lib/git/copilot/cli.rb

@@ -17,13 +17,20 @@ module Git::Copilot
       say "Writing configuration file to #{config_file_path}"
       File.write(config_file_path, empty_configuration)
 
+      if yes?("Set up a global git alias? (This will allow you to run `git copilot`)")
+        system("git config --global alias.copilot '\!git-copilot'")
+      end
+
       solo
     end
 
     desc "solo", "Prepare a commit message template for solo work"
     def solo
+      clear_pairs
+      commit_config
       write_template
       set_git_commit_template
+      status
     end
 
     desc "pair USERNAME...", "Prepare a commit message template for pairing"
@@ -35,8 +42,29 @@ module Git::Copilot
         end
       end.compact
 
-      write_template(authors: authors)
+      if authors.empty?
+        return say_status "ERROR", "No users to pair with. " \
+          "Did you mean to run git-copilot solo?", :red
+      end
+
+      self.current_pairs = authors
+      commit_config
+      write_template
       set_git_commit_template
+
+      status
+    end
+
+    desc "status", "Show the current pairs, if any"
+    def status
+      if current_pairs.empty?
+        say "Now working solo", :green
+      else
+        say "Now working with #{pluralize_pairs(current_pairs.length)}:"
+        current_pairs.each do |author|
+          say format("%{name} <%{email}>", name: author.name, email: author.email), :green
+        end
+      end
     end
 
     desc "user SUBCOMMAND", "Manage users that Git Co-pilot knows about"
@@ -44,8 +72,8 @@ module Git::Copilot
 
     private
 
-    def write_template(authors: [])
-      File.write(commit_message_template_path, template(authors: authors))
+    def write_template
+      File.write(commit_message_template_path, template(authors: current_pairs))
     end
 
     def set_git_commit_template
@@ -66,5 +94,9 @@ module Git::Copilot
         "users" => {},
       )
     end
+
+    def pluralize_pairs(number)
+      number == 1 ? "1 pair" : "#{number} pairs"
+    end
   end
 end

data/lib/git/copilot/configuration.rb

@@ -39,6 +39,7 @@ module Git::Copilot::Configuration
       "users" => users.each_with_object({}) do |(username, user), memo|
         memo[username.to_s] = user.to_h
       end,
+      "current_pairs" => current_pairs.map(&:username),
     }
   end
 
@@ -52,6 +53,20 @@ module Git::Copilot::Configuration
     end
   end
 
+  def current_pairs
+    @current_pairs ||= configuration.fetch("current_pairs", []).map do |username|
+      users.fetch(username)
+    end
+  end
+
+  def clear_pairs
+    self.current_pairs = []
+  end
+
+  def current_pairs=(usernames)
+    @current_pairs = usernames.to_a.flatten
+  end
+
   def add_user(username, name, email)
     user = User.new(username, name, email)
     users.store(user.username, user)

data/lib/git/copilot/version.rb

@@ -3,7 +3,7 @@
 # rubocop:disable Style/ClassAndModuleChildren
 module Git
   module Copilot
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end
 # rubocop:enable Style/ClassAndModuleChildren

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-copilot
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Matthew Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor