git-duet 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50d7af1c799d72430af337f3ebce7f5594628022
-  data.tar.gz: 8efc2502e7dbcf5048c208dc38dffef004b10ae8
+  metadata.gz: f5a7119cb29f7c28cbb125f4f33013cbb8cff6dc
+  data.tar.gz: 6b6a786fa89f95717f22295979b1921dde224f2c
 SHA512:
-  metadata.gz: e36a169a110dbef6344c8f4c58dce163c4e83c432be772136a07095f84ba2ba80037da6bf2f8ba016c9211e92d23341ccae7209c502dc808aa3fd6063e0a1862
-  data.tar.gz: c579fc838fe6616f768cf28a25e29a6d7e6c9a56ef050dc56f20d014305e4af3f289062718b0b7d8d3247337d5bf7bc73574cf8a70105d25b6ea372add205c85
+  metadata.gz: 2b48834810702670b620f63783b30a6ff53c0e6e4bdf33be742046f95b9bf221b9e179665533a31b784454f5129c24835b20628c8b808f1aa29b334be1969aed
+  data.tar.gz: dc1a039596092cffa2810c63c7aa1636c386f19aab13813bdf8c2183daadcea134012e38c95a8b5cde4a8d3b17b19c2285edbc760f0c52ca1553fccf392a9688

data/.rubocop.yml

@@ -1,4 +1,5 @@
 ---
+inherit_from: .rubocop_todo.yml
 AllCops:
   Include:
     - git-duet.gemspec

data/.rubocop_todo.yml

@@ -0,0 +1,15 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-05-23 12:02:33 -0700 using RuboCop version 0.31.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+Metrics/AbcSize:
+  Max: 17
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 109

data/.travis.yml

@@ -1,8 +1,10 @@
 ---
 language: ruby
+sudo: false
 env:
   global:
   - COVERAGE=1
+  - PATH="$HOME/bin:$PATH"
 matrix:
   allow_failures:
   - rvm: jruby-19mode
@@ -12,8 +14,9 @@ rvm:
 - 2.1.3
 - jruby-19mode
 before_script:
-- "git clone https://github.com/sstephenson/bats.git"
-- "cd bats && sudo ./install.sh /usr/local"
+- mkdir -p $HOME/bin
+- git clone https://github.com/sstephenson/bats.git
+- cd bats && ./install.sh $HOME
 script:
 - bundle exec rake
 - bundle exec bats test

data/README.md

@@ -93,6 +93,21 @@ git solo -g jd
 git duet --global jd fb
 ```
 
+If you do this habitually, you can set the `GIT_DUET_GLOBAL` environment
+variable to `true` to always operate on the global git config:
+
+``` bash
+export GIT_DUET_GLOBAL=true
+git solo jd
+```
+
+``` bash
+GIT_DUET_GLOBAL=true git duet jd fb
+```
+
+You can also set it to `false` to always operate on the local config, even if
+the global flag is used.
+
 ### Email Configuration
 
 By default, email addresses are constructed from the first initial and
@@ -134,7 +149,7 @@ key, and `username` which is the part following `;` in the author value.
 pairs:
   jd: Jane Doe
   fb: Frances Bar
-email_template: '<%= "#{author.gsub(/ /, "-").downcase}@hamster.local" =%>'
+email_template: '<%= "#{author.gsub(/ /, "-").downcase}@hamster.local" %>'
 ```
 
 After invoking:
@@ -286,6 +301,11 @@ github](https://github.com/meatballhat/git-duet/issues/new).
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git dci -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+3. Implement!
+4. Run the tests
+    1. RSpec `bundle exec rake spec`
+    2. Rubocop `bundle exec rake rubocop`
+    3. [Bats](https://github.com/sstephenson/bats) `bundle exec rake install && bundle exec bats test` (if you have added new files, `git add` them before installing)
+5. Commit your changes (`git dci -am 'Added some feature'`)
+6. Push to the branch (`git push origin my-new-feature`)
+7. Create new Pull Request

data/git-duet.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |gem|
   gem.license = 'MIT'
 
   gem.files = `git ls-files -z`.split("\x00")
-  gem.executables = gem.files.grep(/^bin\//)
-                             .map { |f| File.basename(f) }
-                             .reject { |n| n =~ /rubymine-git-wrapper/ }
-  gem.test_files = gem.files.grep(/^spec\//)
+  gem.executables = gem.files.grep(%r{^bin/})
+    .map { |f| File.basename(f) }
+    .reject { |n| n =~ /rubymine-git-wrapper/ }
+  gem.test_files = gem.files.grep(%r{^spec/})
   gem.name = 'git-duet'
   gem.require_paths = %w(lib)
   gem.version = Git::Duet::VERSION

data/lib/git/duet/author_mapper.rb

@@ -10,10 +10,10 @@ module Git
 
       def initialize(authors_file = nil, email_lookup = nil)
         @authors_file = authors_file ||
-          ENV['GIT_DUET_AUTHORS_FILE'] ||
-          File.join(ENV['HOME'], '.git-authors')
+                        ENV['GIT_DUET_AUTHORS_FILE'] ||
+                        File.join(ENV['HOME'], '.git-authors')
         @email_lookup = email_lookup ||
-          ENV['GIT_DUET_EMAIL_LOOKUP_COMMAND']
+                        ENV['GIT_DUET_EMAIL_LOOKUP_COMMAND']
       end
 
       def map(*initials_list)

data/lib/git/duet/cli.rb

@@ -1,6 +1,7 @@
 # vim:fileencoding=utf-8
 require 'optparse'
 require 'git/duet'
+require 'git/duet/cli_options'
 require 'git/duet/script_die_error'
 
 module Git
@@ -8,9 +9,7 @@ module Git
     class Cli
       class << self
         def run(prog, argv)
-          method_name = File.basename(prog)
-          .sub(/^git-duet-/, '').sub(/^git-/, '').tr('-', '_')
-          send(method_name, parse_options(method_name, argv.clone))
+          invoke(File.basename(prog), argv.clone, ENV)
           0
         rescue NoMethodError
           raise ScriptError, 'How did you get here???'
@@ -20,67 +19,26 @@ module Git
 
         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)
+        def invoke(prog_name, args, environment)
+          method_name = prog_name
+                        .sub(/^git-duet-/, '')
+                        .sub(/^git-/, '')
+                        .tr('-', '_')
+          options = CliOptions.parse_options(method_name, args)
+          if environment['GIT_DUET_GLOBAL']
+            options[:global] = parse_boolean(environment['GIT_DUET_GLOBAL'])
           end
+          send(method_name, options)
         end
 
-        def with_common_opts(argv, banner)
-          options = {}
-          leftover_argv = OptionParser.new do |opts|
-            opts.banner = banner.gsub(/__PROG__/, opts.program_name)
-            opts.on('-q', 'Silence output') do |_|
-              options[:quiet] = true
-            end
-            yield opts, options if block_given?
-          end.parse!(argv)
-          [leftover_argv, options]
-        end
-
-        def parse_solo_options(argv)
-          parse_options_with_positional_args(
-            argv, '<soloist-initials>') do |leftover_argv, options|
-              options[:soloist] = leftover_argv.first
-            end
-        end
-
-        def parse_duet_options(argv)
-          parse_options_with_positional_args(
-            argv,
-            '<alpha-initials> <omega-initials>'
-          ) do |leftover_argv, options|
-            options[:alpha], options[:omega] = leftover_argv[0..1]
+        def parse_boolean(s)
+          case s
+          when 'true' then true
+          when 'false' then false
+          else fail ArgumentError, "must be 'true' or 'false': #{s}"
           end
         end
 
-        def parse_options_with_positional_args(argv, usage)
-          leftover_argv, options = with_common_opts(
-            argv, 'Usage: __PROG__ [options] ' << usage
-          ) do |opts, options_hash|
-            opts.on('-g', '--global', 'Change global git config') do |_|
-              options_hash[:global] = true
-            end
-          end
-          yield leftover_argv, options
-          options
-        end
-
-        def parse_generic_options(argv)
-          with_common_opts(argv, 'Usage: __PROG__').last
-        end
-
-        def parse_commit_options(argv)
-          opts_argv = []
-          opts_argv << '-q' if argv.delete('-q')
-          options = with_common_opts(opts_argv, 'Usage: __PROG__').last
-          options[:passthrough_args] = argv
-          options
-        end
-
         def solo(options)
           require 'git/duet/solo_command'
           Git::Duet::SoloCommand.new(

data/lib/git/duet/cli_options.rb

@@ -0,0 +1,70 @@
+module Git
+  module Duet
+    class CliOptions
+      class << self
+        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
+
+        private
+
+        def with_common_opts(argv, banner)
+          options = {}
+          leftover_argv = OptionParser.new do |opts|
+            opts.banner = banner.gsub(/__PROG__/, opts.program_name)
+            opts.on('-q', 'Silence output') do |_|
+              options[:quiet] = true
+            end
+            yield opts, options if block_given?
+          end.parse!(argv)
+          [leftover_argv, options]
+        end
+
+        def parse_solo_options(argv)
+          parse_options_with_positional_args(
+            argv, '<soloist-initials>') do |leftover_argv, options|
+            options[:soloist] = leftover_argv.first
+          end
+        end
+
+        def parse_duet_options(argv)
+          parse_options_with_positional_args(
+            argv,
+            '<alpha-initials> <omega-initials>'
+          ) do |leftover_argv, options|
+            options[:alpha], options[:omega] = leftover_argv[0..1]
+          end
+        end
+
+        def parse_options_with_positional_args(argv, usage)
+          leftover_argv, options = with_common_opts(
+            argv, 'Usage: __PROG__ [options] ' << usage
+          ) do |opts, options_hash|
+            opts.on('-g', '--global', 'Change global git config') do |_|
+              options_hash[:global] = true
+            end
+          end
+          yield leftover_argv, options
+          options
+        end
+
+        def parse_generic_options(argv)
+          with_common_opts(argv, 'Usage: __PROG__').last
+        end
+
+        def parse_commit_options(argv)
+          opts_argv = []
+          opts_argv << '-q' if argv.delete('-q')
+          options = with_common_opts(opts_argv, 'Usage: __PROG__').last
+          options[:passthrough_args] = argv
+          options
+        end
+      end
+    end
+  end
+end

data/lib/git/duet/duet_command.rb

@@ -9,7 +9,8 @@ module Git
       include Git::Duet::CommandMethods
 
       def initialize(alpha, omega, quiet = false, global = false)
-        @alpha, @omega = alpha, omega
+        @alpha = alpha
+        @omega = omega
         @quiet = !!quiet
         @global = !!global
         @author_mapper = Git::Duet::AuthorMapper.new

data/lib/git/duet/version.rb

@@ -3,7 +3,7 @@
 unless defined?(Git::Duet::VERSION)
   module Git
     module Duet
-      VERSION = '0.5.0'
+      VERSION = '0.5.1'
     end
   end
 end

data/spec/lib/git/duet/author_mapper_spec.rb

@@ -26,7 +26,7 @@ describe Git::Duet::AuthorMapper do
 
   it 'uses an authors file given at initialization' do
     instance = described_class
-      .new('/blarggie/blarggie/new/friend/.git-authors')
+               .new('/blarggie/blarggie/new/friend/.git-authors')
     expect(instance.authors_file)
       .to eq('/blarggie/blarggie/new/friend/.git-authors')
   end

data/spec/lib/git/duet/cli_spec.rb

@@ -44,4 +44,48 @@ describe Git::Duet::Cli do
     )
     cli.run('git-duet-pre-commit', %w(-q))
   end
+
+  it 'defaults to loud and local when running `solo`' do
+    allow(Git::Duet::SoloCommand)
+      .to receive(:new).with('jd', be_falsey, be_falsey)
+      .and_return(double('solo').as_null_object)
+    cli.run('git-solo', %w(jd))
+  end
+
+  it 'parses options for quietness and globality when running `solo`' do
+    allow(Git::Duet::SoloCommand)
+      .to receive(:new).with('jd', be_truthy, be_truthy)
+      .and_return(double('solo').as_null_object)
+    cli.run('git-solo', %w(jd -q -g))
+  end
+
+  it 'defaults to loud and local when running `duet`' do
+    allow(Git::Duet::DuetCommand)
+      .to receive(:new).with('jd', 'fb', be_falsey, be_falsey)
+      .and_return(double('duet').as_null_object)
+    cli.run('git-duet', %w(jd fb))
+  end
+
+  it 'parses options for quietness and globality when running `duet`' do
+    allow(Git::Duet::DuetCommand)
+      .to receive(:new).with('jd', 'fb', be_truthy, be_truthy)
+      .and_return(double('duet').as_null_object)
+    cli.run('git-duet', %w(jd fb -q -g))
+  end
+
+  it 'respects the environment about global issues when running `solo`' do
+    stub_const('ENV', 'GIT_DUET_GLOBAL' => 'true')
+    allow(Git::Duet::SoloCommand)
+      .to receive(:new).with('cp', anything, be_truthy)
+      .and_return(double('solo').as_null_object)
+    cli.run('git-solo', %w(cp))
+  end
+
+  it 'respects the environment about global issues when running `duet`' do
+    stub_const('ENV', 'GIT_DUET_GLOBAL' => 'true')
+    allow(Git::Duet::DuetCommand)
+      .to receive(:new).with('cp', 'g', anything, be_truthy)
+      .and_return(double('duet').as_null_object)
+    cli.run('git-duet', %w(cp g))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-duet
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Dan Buch
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -116,6 +116,7 @@ files:
 - ".jrubyrc"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-version"
 - ".simplecov"
 - ".travis.yml"
@@ -135,6 +136,7 @@ files:
 - lib/git/duet.rb
 - lib/git/duet/author_mapper.rb
 - lib/git/duet/cli.rb
+- lib/git/duet/cli_options.rb
 - lib/git/duet/command_methods.rb
 - lib/git/duet/commit_command.rb
 - lib/git/duet/config.rb