git-duet 0.3.0 → 0.4.0

data/lib/git/duet/commit_command.rb

@@ -2,76 +2,80 @@
 require 'git/duet'
 require 'git/duet/command_methods'
 
-class Git::Duet::CommitCommand
-  include Git::Duet::CommandMethods
+module Git
+  module Duet
+    class CommitCommand
+      include Git::Duet::CommandMethods
 
-  def initialize(passthrough_argv, quiet = false)
-    @passthrough_argv = passthrough_argv
-    @quiet = quiet
-  end
+      def initialize(passthrough_argv, quiet = false)
+        @passthrough_argv = passthrough_argv
+        @quiet = quiet
+      end
 
-  def execute!
-    in_repo_root do
-      add_env_vars_to_env
-      exec_git_commit
-    end
-  end
+      def execute!
+        in_repo_root do
+          add_env_vars_to_env
+          exec_git_commit
+        end
+      end
 
-  private
+      private
 
-  def add_env_vars_to_env
-    extract_env_vars_from_git_config.each do |k, v|
-      ENV[k] = v
-    end
-  end
+      def add_env_vars_to_env
+        extract_env_vars_from_git_config.each do |k, v|
+          ENV[k] = v
+        end
+      end
 
-  def env_vars
-    @env_vars ||= Hash[env_var_pairs]
-  end
+      def env_vars
+        @env_vars ||= Hash[env_var_pairs]
+      end
 
-  def env_var_pairs
-    env_var_names.map do |env_var|
-      [env_var, env_var.downcase.gsub(/_/, '-')]
-    end
-  end
+      def env_var_pairs
+        env_var_names.map do |env_var|
+          [env_var, env_var.downcase.gsub(/_/, '-')]
+        end
+      end
 
-  def quoted_passthrough_args
-    @passthrough_argv.map do |arg|
-      "'#{arg}'"
-    end.join(' ')
-  end
+      def quoted_passthrough_args
+        @passthrough_argv.map do |arg|
+          "'#{arg}'"
+        end.join(' ')
+      end
 
-  def signoff_arg
-    soloing? ? '' : '--signoff '
-  end
+      def signoff_arg
+        soloing? ? '' : '--signoff '
+      end
 
-  SOLO_ENV_VARS = %w(
-    GIT_AUTHOR_NAME
-    GIT_AUTHOR_EMAIL
-  )
+      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
-  )
+      DUET_ENV_VARS = %w(
+        GIT_AUTHOR_NAME
+        GIT_AUTHOR_EMAIL
+        GIT_COMMITTER_NAME
+        GIT_COMMITTER_EMAIL
+      )
 
-  def env_var_names
-    return SOLO_ENV_VARS if soloing?
-    DUET_ENV_VARS
-  end
+      def env_var_names
+        return SOLO_ENV_VARS if soloing?
+        DUET_ENV_VARS
+      end
 
-  def soloing?
-    @soloing ||= begin
-      with_output_quieted do
-        exec_check(
-          "git config #{Git::Duet::Config.namespace}.git-committer-name"
-        ).chomp
+      def soloing?
+        @soloing ||=
+          begin
+            with_output_quieted do
+              exec_check(
+                "git config #{Git::Duet::Config.namespace}.git-committer-name"
+              ).chomp
+            end && false
+          rescue StandardError
+            true
+          end
       end
-      false
-    rescue StandardError
-      true
     end
   end
 end

data/lib/git/duet/duet_command.rb

@@ -3,63 +3,67 @@ require 'git/duet'
 require 'git/duet/author_mapper'
 require 'git/duet/command_methods'
 
-class Git::Duet::DuetCommand
-  include Git::Duet::CommandMethods
+module Git
+  module Duet
+    class DuetCommand
+      include Git::Duet::CommandMethods
 
-  def initialize(alpha, omega, quiet = false, global = false)
-    @alpha, @omega = alpha, omega
-    @quiet = !!quiet
-    @global = !!global
-    @author_mapper = Git::Duet::AuthorMapper.new
-  end
+      def initialize(alpha, omega, quiet = false, global = false)
+        @alpha, @omega = alpha, omega
+        @quiet = !!quiet
+        @global = !!global
+        @author_mapper = Git::Duet::AuthorMapper.new
+      end
 
-  def execute!
-    if alpha && omega
-      set_alpha_as_git_config_user
-      report_env_vars
-      write_env_vars
-    else
-      show_current_config
-    end
-  end
+      def execute!
+        if alpha && omega
+          set_alpha_as_git_config_user
+          report_env_vars
+          write_env_vars
+        else
+          show_current_config
+        end
+      end
 
-  private
+      private
 
-  attr_accessor :alpha, :omega, :author_mapper
+      attr_accessor :alpha, :omega, :author_mapper
 
-  def set_alpha_as_git_config_user
-    %w(name email).each do |setting|
-      exec_check(
-        "#{git_config} user.#{setting} '#{alpha_info[setting.to_sym]}'"
-      )
-    end
-  end
+      def set_alpha_as_git_config_user
+        %w(name email).each do |setting|
+          exec_check(
+            "#{git_config} user.#{setting} '#{alpha_info[setting.to_sym]}'"
+          )
+        end
+      end
 
-  def var_map
-    {
-      'GIT_AUTHOR_NAME' => alpha_info[:name],
-      'GIT_AUTHOR_EMAIL' => alpha_info[:email],
-      'GIT_COMMITTER_NAME' => omega_info[:name],
-      'GIT_COMMITTER_EMAIL' => omega_info[:email]
-    }
-  end
+      def var_map
+        {
+          'GIT_AUTHOR_NAME' => alpha_info[:name],
+          'GIT_AUTHOR_EMAIL' => alpha_info[:email],
+          'GIT_COMMITTER_NAME' => omega_info[:name],
+          'GIT_COMMITTER_EMAIL' => omega_info[:email]
+        }
+      end
 
-  def alpha_info
-    fetch_info(alpha, 'author')
-  end
+      def alpha_info
+        fetch_info(alpha, 'author')
+      end
 
-  def omega_info
-    fetch_info(omega, 'committer')
-  end
+      def omega_info
+        fetch_info(omega, 'committer')
+      end
 
-  def fetch_info(which, desc)
-    alpha_omega_info.fetch(which)
-  rescue KeyError, IndexError => e
-    error("git-duet: Failed to find #{desc}: #{e}")
-    raise Git::Duet::ScriptDieError, 86
-  end
+      def fetch_info(which, desc)
+        alpha_omega_info.fetch(which)
+      rescue KeyError, IndexError => e
+        error("git-duet: Failed to find #{desc}: #{e}")
+        raise Git::Duet::ScriptDieError, 86
+      end
 
-  def alpha_omega_info
-    @alpha_omega_info ||= author_mapper.map(alpha, omega)
+      def alpha_omega_info
+        @alpha_omega_info ||= author_mapper.map(alpha, omega)
+      end
+    end
   end
 end

data/lib/git/duet/install_hook_command.rb

@@ -3,35 +3,39 @@ require 'git/duet'
 require 'fileutils'
 require 'git/duet/command_methods'
 
-class Git::Duet::InstallHookCommand
-  include Git::Duet::CommandMethods
+module Git
+  module Duet
+    class InstallHookCommand
+      include Git::Duet::CommandMethods
 
-  HOOK = <<-EOF.gsub(/^ {2}/, '')
-  #!/bin/bash
-  exec git duet-pre-commit "$@"
-  EOF
+      HOOK = <<-EOF.gsub(/^ {8}/, '')
+        #!/bin/bash
+        exec git duet-pre-commit "$@"
+      EOF
 
-  def initialize(quiet = false)
-    @quiet = quiet
-  end
+      def initialize(quiet = false)
+        @quiet = quiet
+      end
 
-  def execute!
-    Dir.chdir(`git rev-parse --show-toplevel`.chomp) do
-      dest = File.join(Dir.pwd, '.git', 'hooks', 'pre-commit')
-      return error_hook_exists(dest) if File.exist?(dest)
-      File.open(dest, 'w') { |f| f.puts HOOK }
-      FileUtils.chmod(0755, dest)
-      info("git-duet-install-hook: Installed hook to #{dest}")
-    end
-    0
-  end
+      def execute!
+        Dir.chdir(`git rev-parse --show-toplevel`.chomp) do
+          dest = File.join(Dir.pwd, '.git', 'hooks', 'pre-commit')
+          return error_hook_exists(dest) if File.exist?(dest)
+          File.open(dest, 'w') { |f| f.puts HOOK }
+          FileUtils.chmod(0755, dest)
+          info("git-duet-install-hook: Installed hook to #{dest}")
+        end
+        0
+      end
 
-  private
+      private
 
-  def error_hook_exists(dest)
-    error('git-duet-install-hook: ' <<
-          "A pre-commit hook already exists at #{dest}!")
-    error('git-duet-install-hook: Move it out of the way first, mkay?')
-    1
+      def error_hook_exists(dest)
+        error('git-duet-install-hook: ' \
+              "A pre-commit hook already exists at #{dest}!")
+        error('git-duet-install-hook: Move it out of the way first, mkay?')
+        1
+      end
+    end
   end
 end

data/lib/git/duet/pre_commit_command.rb

@@ -3,44 +3,49 @@ require 'git/duet'
 require 'git/duet/command_methods'
 require 'git/duet/script_die_error'
 
-class Git::Duet::PreCommitCommand
-  include Git::Duet::CommandMethods
-
-  def initialize(quiet = false)
-    @quiet = !!quiet
-  end
-
-  def execute!
-    in_repo_root do
-      explode! if !env_cache_exists? || env_cache_stale?
+module Git
+  module Duet
+    class PreCommitCommand
+      include Git::Duet::CommandMethods
+
+      def initialize(quiet = false)
+        @quiet = !!quiet
+      end
+
+      def execute!
+        in_repo_root do
+          explode! if !env_cache_exists? || env_cache_stale?
+        end
+      end
+
+      private
+
+      def explode!
+        error('Your git duet settings are stale, human!')
+        error('Update them with `git duet` or `git solo`.')
+        fail Git::Duet::ScriptDieError, 1
+      end
+
+      def env_cache_exists?
+        with_output_quieted do
+          exec_check("git config #{Git::Duet::Config.namespace}.mtime")
+        end
+        true
+      rescue
+        false
+      end
+
+      def env_cache_stale?
+        Integer(
+          exec_check("git config #{Git::Duet::Config.namespace}.mtime")
+        ) < stale_cutoff
+      end
+
+      def stale_cutoff
+        Integer(
+          Time.now - Integer(ENV.fetch('GIT_DUET_SECONDS_AGO_STALE', '1200'))
+        )
+      end
     end
   end
-
-  private
-
-  def explode!
-    error('Your git duet settings are stale, human!')
-    error('Update them with `git duet` or `git solo`.')
-    fail Git::Duet::ScriptDieError, 1
-  end
-
-  def env_cache_exists?
-    with_output_quieted do
-      exec_check("git config #{Git::Duet::Config.namespace}.mtime")
-    end
-    true
-  rescue
-    false
-  end
-
-  def env_cache_stale?
-    Integer(exec_check("git config #{Git::Duet::Config.namespace}.mtime")) <
-      stale_cutoff
-  end
-
-  def stale_cutoff
-    Integer(
-      Time.now - Integer(ENV.fetch('GIT_DUET_SECONDS_AGO_STALE', '1200'))
-    )
-  end
 end

data/lib/git/duet/solo_command.rb

@@ -3,60 +3,64 @@ require 'git/duet'
 require 'git/duet/author_mapper'
 require 'git/duet/command_methods'
 
-class Git::Duet::SoloCommand
-  include Git::Duet::CommandMethods
-
-  def initialize(soloist, quiet = false, global = false)
-    @soloist = soloist
-    @quiet = !!quiet
-    @global = !!global
-    @author_mapper = Git::Duet::AuthorMapper.new
-  end
+module Git
+  module Duet
+    class SoloCommand
+      include Git::Duet::CommandMethods
 
-  def execute!
-    unset_committer_vars
-    if soloist
-      set_soloist_as_git_config_user
-      report_env_vars
-      write_env_vars
-    else
-      show_current_config
-    end
-  end
+      def initialize(soloist, quiet = false, global = false)
+        @soloist = soloist
+        @quiet = !!quiet
+        @global = !!global
+        @author_mapper = Git::Duet::AuthorMapper.new
+      end
 
-  private
+      def execute!
+        unset_committer_vars
+        if soloist
+          set_soloist_as_git_config_user
+          report_env_vars
+          write_env_vars
+        else
+          show_current_config
+        end
+      end
 
-  attr_accessor :soloist, :author_mapper
+      private
 
-  def set_soloist_as_git_config_user
-    exec_check("#{git_config} user.name '#{soloist_info[:name]}'")
-    exec_check("#{git_config} user.email '#{soloist_info[:email]}'")
-  end
+      attr_accessor :soloist, :author_mapper
 
-  def unset_committer_vars
-    exec_check(
-      "#{git_config} --unset-all #{Git::Duet::Config.namespace}." <<
-        'git-committer-name',
-      [0, 5]
-    )
-    exec_check(
-      "#{git_config} --unset-all #{Git::Duet::Config.namespace}." <<
-        'git-committer-email',
-      [0, 5]
-    )
-  end
+      def set_soloist_as_git_config_user
+        exec_check("#{git_config} user.name '#{soloist_info[:name]}'")
+        exec_check("#{git_config} user.email '#{soloist_info[:email]}'")
+      end
 
-  def var_map
-    {
-      'GIT_AUTHOR_NAME' => soloist_info[:name],
-      'GIT_AUTHOR_EMAIL' => soloist_info[:email]
-    }
-  end
+      def unset_committer_vars
+        exec_check(
+          "#{git_config} --unset-all #{Git::Duet::Config.namespace}." \
+          'git-committer-name',
+          [0, 5]
+        )
+        exec_check(
+          "#{git_config} --unset-all #{Git::Duet::Config.namespace}." \
+          'git-committer-email',
+          [0, 5]
+        )
+      end
 
-  def soloist_info
-    @soloist_info ||= author_mapper.map(@soloist).fetch(@soloist)
-  rescue KeyError, IndexError => e
-    error("git-solo: Failed to find author: #{e}")
-    raise Git::Duet::ScriptDieError, 86
+      def var_map
+        {
+          'GIT_AUTHOR_NAME' => soloist_info[:name],
+          'GIT_AUTHOR_EMAIL' => soloist_info[:email]
+        }
+      end
+
+      def soloist_info
+        @soloist_info ||= author_mapper.map(@soloist).fetch(@soloist)
+      rescue KeyError, IndexError => e
+        error("git-solo: Failed to find author: #{e}")
+        raise Git::Duet::ScriptDieError, 86
+      end
+    end
   end
 end