git-duet 0.1.3 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 46323bd5392d627ae8bed46e4cd89f2bf8803885
+  data.tar.gz: b78bc212d1b95a47e28c8337b19cd5b3ebb38072
+SHA512:
+  metadata.gz: 28d686c6d459b9104b5c9279e98cc49b6119461bf6b19cf88b41c71b053465fc8c2bb8e66cc856571fc909206a6e4ea7946d2b0f090ae29c38ce50761635d5ba
+  data.tar.gz: ec5038f060832c4f7ed5ad35243ba9ef43498a07eff2722ac2d65e2846c10460d2c5fe879e1750dc1e913d624ebfdb3ce43732345534a3f86b5ce22b1003f03c

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --require spec_helper
+--require English

data/.rubocop.yml

@@ -0,0 +1,3 @@
+---
+Documentation:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p247

data/.simplecov

@@ -1,3 +1,4 @@
+# vim:fileencoding=utf-8
 if ENV['COVERAGE']
   SimpleCov.start do
     add_filter '/spec/'

data/.travis.yml

@@ -1,3 +1,4 @@
+---
 language: ruby
 env:
   global:
@@ -6,12 +7,9 @@ matrix:
   allow_failures:
   - rvm: jruby-19mode
 rvm:
-  - '1.9'
-  - '2.0'
-  - jruby-19mode
-  - ree
-script:
-- bundle exec rake spec --trace
+- 1.9.3
+- 2.0.0
+- jruby-19mode
 notifications:
   email:
     recipients:

data/Gemfile

@@ -1,3 +1,4 @@
+# vim:fileencoding=utf-8
 source 'https://rubygems.org'
 
 gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 ModCloth, Inc.
+Copyright (c) 2013 ModCloth, Inc.
 
 MIT License
 

data/README.md

@@ -217,6 +217,7 @@ If you'd like to regularly remind yourself to set the solo or duet
 initials, use `git duet-pre-commit` in your pre-commit hook:
 
 *(in $REPO_ROOT/.git/hooks/pre-commit)*
+
 ~~~~~ bash
 #!/bin/bash
 exec git duet-pre-commit

data/Rakefile

@@ -1,10 +1,16 @@
 #!/usr/bin/env rake
+# vim:fileencoding=utf-8
 require "bundler/gem_tasks"
 
 require 'rspec/core/rake_task'
 
+desc 'Run rubocop'
+task :rubocop do
+  sh('rubocop --format simple') { |r, _| r || abort }
+end
+
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = '--format documentation'
 end
 
-task :default => :spec
+task :default => [:rubocop, :spec]

data/bin/git-duet

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
+# vim:fileencoding=utf-8
 require 'git-duet'
-exit Git::Duet::Cli.run($0, ARGV)
+exit Git::Duet::Cli.run($PROGRAM_NAME, ARGV)

data/bin/git-duet-commit

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
+# vim:fileencoding=utf-8
 require 'git-duet'
-exit Git::Duet::Cli.run($0, ARGV)
+exit Git::Duet::Cli.run($PROGRAM_NAME, ARGV)

data/bin/git-duet-install-hook

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
+# vim:fileencoding=utf-8
 require 'git-duet'
-exit Git::Duet::Cli.run($0, ARGV)
+exit Git::Duet::Cli.run($PROGRAM_NAME, ARGV)

data/bin/git-duet-pre-commit

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
+# vim:fileencoding=utf-8
 require 'git-duet'
-exit Git::Duet::Cli.run($0, ARGV)
+exit Git::Duet::Cli.run($PROGRAM_NAME, ARGV)

data/bin/git-solo

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
+# vim:fileencoding=utf-8
 require 'git-duet'
-exit Git::Duet::Cli.run($0, ARGV)
+exit Git::Duet::Cli.run($PROGRAM_NAME, ARGV)

data/git-duet.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.summary = "Pair harmoniously!  Decide who's driving.  " <<
                 "Commit along the way.  Don't make a mess of " <<
                 "the repository history."
-  gem.homepage = ''
+  gem.homepage = 'https://github.com/modcloth/git-duet'
   gem.license = 'MIT'
 
   gem.files = `git ls-files`.split($\)
@@ -27,14 +27,12 @@ Gem::Specification.new do |gem|
   gem.name = 'git-duet'
   gem.require_paths = %w(lib)
   gem.version = Git::Duet::VERSION
-  gem.required_ruby_version = '>= 1.8.7'
+  gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_development_dependency 'nyan-cat-formatter'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rubocop'
 
-  unless RUBY_PLATFORM == 'java'
-    gem.add_development_dependency 'pry'
-    gem.add_development_dependency 'simplecov'
-  end
+  gem.add_development_dependency 'pry' unless RUBY_PLATFORM == 'java'
+  gem.add_development_dependency 'simplecov' unless RUBY_PLATFORM == 'java'
 end

data/lib/git-duet.rb

@@ -1 +1,2 @@
+# vim:fileencoding=utf-8
 require 'git/duet'

data/lib/git/duet.rb

@@ -1,8 +1,8 @@
+# vim:fileencoding=utf-8
 module Git
   module Duet
+    autoload :VERSION, 'git/duet/version'
+    autoload :Cli, 'git/duet/cli'
+    autoload :Config, 'git/duet/config'
   end
 end
-
-require 'git/duet/version'
-require 'git/duet/cli'
-require 'git/duet/key_error'

data/lib/git/duet/author_mapper.rb

@@ -1,3 +1,4 @@
+# vim:fileencoding=utf-8
 require 'yaml'
 require 'erb'
 require 'git/duet'
@@ -22,27 +23,30 @@ class Git::Duet::AuthorMapper
   end
 
   private
+
   def author_info(initials)
     author, username = author_map.fetch(initials).split(/;/).map(&:strip)
     {
-      :name => author,
-      :email => lookup_author_email(initials, author, username)
+      name: author,
+      email: lookup_author_email(initials, author, username)
     }
   end
 
   def lookup_author_email(initials, author, username)
-    if @email_lookup
-      author_email = `#{@email_lookup} '#{initials}' '#{author}' '#{username}'`.strip
-      return author_email if !author_email.empty?
-    end
-
+    author_email = email_from_lookup(initials, author, username)
+    return author_email unless author_email.empty?
     return email_addresses[initials] if email_addresses[initials]
     return email_from_template(initials, author, username) if email_template
     return "#{username}@#{email_domain}" if username
 
     author_name_parts = author.split
-    return "#{author_name_parts.first[0,1].downcase}." <<
-           "#{author_name_parts.last.downcase}@#{email_domain}"
+    "#{author_name_parts.first[0, 1].downcase}." <<
+      "#{author_name_parts.last.downcase}@#{email_domain}"
+  end
+
+  def email_from_lookup(initials, author, username)
+    return '' unless @email_lookup
+    `#{@email_lookup} '#{initials}' '#{author}' '#{username}'`.strip
   end
 
   def email_from_template(initials, author, username)
@@ -69,7 +73,7 @@ class Git::Duet::AuthorMapper
   end
 
   def cfg
-    @cfg ||= YAML.load(IO.read(@authors_file))
+    @cfg ||= YAML.load(IO.read(authors_file))
   rescue StandardError => e
     $stderr.puts("git-duet: Missing or corrupt authors file: #{e.message}")
     raise Git::Duet::ScriptDieError.new(3)

data/lib/git/duet/cli.rb

@@ -1,3 +1,4 @@
+# vim:fileencoding=utf-8
 require 'optparse'
 require 'git/duet'
 require 'git/duet/script_die_error'
@@ -5,30 +6,27 @@ require 'git/duet/script_die_error'
 class Git::Duet::Cli
   class << self
     def run(prog, argv)
-      case prog
-      when /solo$/
-        solo(parse_solo_options(argv.clone))
-        return 0
-      when /duet$/
-        duet(parse_duet_options(argv.clone))
-        return 0
-      when /pre-commit$/
-        pre_commit(parse_generic_options(argv.clone))
-        return 0
-      when /install-hook$/
-        install_hook(parse_generic_options(argv.clone))
-        return 0
-      when /commit$/
-        commit(parse_commit_options(argv.clone))
-        return 0
-      else
-        raise ScriptError.new('How did you get here???')
-      end
+      method_name = File.basename(prog)
+        .sub(/^git-duet-/, '').sub(/^git-/, '').tr('-', '_')
+      send(method_name, parse_options(method_name, argv.clone))
+      0
+    rescue NoMethodError
+      raise ScriptError.new('How did you get here???')
     rescue Git::Duet::ScriptDieError => e
-      return e.exit_code
+      e.exit_code
     end
 
     private
+
+    def parse_options(method_name, argv)
+      case method_name
+      when 'pre_commit', 'install_hook'
+        parse_generic_options(argv)
+      else
+        send("parse_#{method_name}_options", argv)
+      end
+    end
+
     def with_common_opts(argv, banner)
       options = {}
       leftover_argv = OptionParser.new do |opts|
@@ -36,17 +34,15 @@ class Git::Duet::Cli
         opts.on('-q', 'Silence output') do |q|
           options[:quiet] = true
         end
-        if block_given?
-          yield opts, options
-        end
+        yield opts, options if block_given?
       end.parse!(argv)
-      return leftover_argv, options
+      [leftover_argv, options]
     end
 
     def parse_solo_options(argv)
       leftover_argv, options = with_common_opts(
         argv, 'Usage: __PROG__ [options] <soloist-initials>'
-      ) do |opts,options_hash|
+      ) do |opts, options_hash|
         opts.on('-g', '--global', 'Change global git config') do |g|
           options_hash[:global] = true
         end
@@ -58,7 +54,7 @@ class Git::Duet::Cli
     def parse_duet_options(argv)
       leftover_argv, options = with_common_opts(
         argv, 'Usage: __PROG__ [options] <alpha-initials> <omega-initials>'
-      ) do |opts,options_hash|
+      ) do |opts, options_hash|
         opts.on('-g', '--global', 'Change global git config') do |g|
           options_hash[:global] = true
         end

data/lib/git/duet/command_methods.rb

@@ -1,40 +1,68 @@
+# vim:fileencoding=utf-8
+require 'English'
 require 'git/duet'
 require 'git/duet/script_die_error'
 
 module Git::Duet::CommandMethods
+
   private
+
   def report_env_vars
-    var_map.each do |key,value|
+    var_map.each do |key, value|
       info("#{key}='#{value}'")
     end
   end
 
   def write_env_vars
     in_repo_root do
-      var_map.each do |key,value|
-        exec_check("git config #{@global ? '--global ' : ''}duet.env.#{key.downcase.gsub(/_/, '-')} '#{value}'")
+      var_map.each do |key, value|
+        exec_check(
+          "#{git_config} #{Git::Duet::Config.namespace}." <<
+            "#{key.downcase.gsub(/_/, '-')} '#{value}'"
+        )
       end
-      exec_check("git config #{@global ? '--global ' : ''}duet.env.mtime #{Time.now.to_i}")
+      exec_check("#{git_config} #{Git::Duet::Config
+                                  .namespace}.mtime #{Time.now.to_i}")
     end
   end
 
+  def git_config
+    "git config#{@global ? ' --global' : ''}"
+  end
+
   def author_env_vars_set?
-    `git config --get duet.env.git-author-name && git config --get duet.env.git-author-email`
-    $? == 0
+    %x(#{get_author_name} && #{get_author_email})
+    $CHILD_STATUS == 0
+  end
+
+  def get_author_name
+    "git config --get #{Git::Duet::Config.namespace}.git-author-name"
+  end
+
+  def get_author_email
+    "git config --get #{Git::Duet::Config.namespace}.git-author-email"
+  end
+
+  def get_current_config
+    "git config --get-regexp #{Git::Duet::Config.namespace}"
+  end
+
+  def show_current_config
+    info(exec_check(get_current_config))
   end
 
   def dump_env_vars
-    extract_env_vars_from_git_config.each do |k,v|
+    extract_env_vars_from_git_config.each do |k, v|
       puts "#{k}='#{v}'"
     end
   end
 
   def extract_env_vars_from_git_config
     dest = {}
-    env_vars.each do |env_var,config_key|
+    env_vars.each do |env_var, config_key|
       begin
-        value = exec_check("git config duet.env.#{config_key}").chomp
-        dest[env_var] = value if !value.empty?
+        value = check_env_var_config_key(config_key)
+        dest[env_var] = value unless value.empty?
       rescue StandardError => e
         error("#{e.message}")
       end
@@ -42,6 +70,10 @@ module Git::Duet::CommandMethods
     dest
   end
 
+  def check_env_var_config_key(config_key)
+    exec_check("git config #{Git::Duet::Config.namespace}.#{config_key}").chomp
+  end
+
   def exec_git_commit
     if author_env_vars_set?
       exec 'git commit ' << signoff_arg << quoted_passthrough_args
@@ -58,8 +90,8 @@ module Git::Duet::CommandMethods
 
   def exec_check(command, okay_statuses = [0].freeze)
     output = `#{command}`
-    if !okay_statuses.include?($?.exitstatus)
-      error("Command #{command.inspect} exited with #{$?.to_i}")
+    unless okay_statuses.include?($CHILD_STATUS.exitstatus)
+      error("Command #{command.inspect} exited with #{$CHILD_STATUS.to_i}")
       raise Git::Duet::ScriptDieError.new(1)
     end
     output

data/lib/git/duet/commit_command.rb

@@ -1,3 +1,4 @@
+# vim:fileencoding=utf-8
 require 'git/duet'
 require 'git/duet/command_methods'
 
@@ -17,8 +18,9 @@ class Git::Duet::CommitCommand
   end
 
   private
+
   def add_env_vars_to_env
-    extract_env_vars_from_git_config.each do |k,v|
+    extract_env_vars_from_git_config.each do |k, v|
       ENV[k] = v
     end
   end
@@ -43,26 +45,29 @@ class Git::Duet::CommitCommand
     soloing? ? '' : '--signoff '
   end
 
+  SOLO_ENV_VARS = %w(
+    GIT_AUTHOR_NAME
+    GIT_AUTHOR_EMAIL
+  )
+
+  DUET_ENV_VARS = %w(
+    GIT_AUTHOR_NAME
+    GIT_AUTHOR_EMAIL
+    GIT_COMMITTER_NAME
+    GIT_COMMITTER_EMAIL
+  )
+
   def env_var_names
-    if soloing?
-      %w(
-        GIT_AUTHOR_NAME
-        GIT_AUTHOR_EMAIL
-      )
-    else
-      %w(
-        GIT_AUTHOR_NAME
-        GIT_AUTHOR_EMAIL
-        GIT_COMMITTER_NAME
-        GIT_COMMITTER_EMAIL
-      )
-    end
+    return SOLO_ENV_VARS if soloing?
+    DUET_ENV_VARS
   end
 
   def soloing?
     @soloing ||= begin
       with_output_quieted do
-        exec_check('git config duet.env.git-committer-name').chomp
+        exec_check(
+          "git config #{Git::Duet::Config.namespace}.git-committer-name"
+        ).chomp
       end
       false
     rescue StandardError