git-duet 0.1.1 → 0.1.2

data/.rbenv-version

@@ -1 +1 @@
-1.9.3-p327
+1.9.3-p392

data/.travis.yml

@@ -3,5 +3,5 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby-head
+  - jruby-19mode
   - ree

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/lib/git/duet/command_methods.rb

@@ -18,6 +18,11 @@ module Git::Duet::CommandMethods
     end
   end
 
+  def author_env_vars_set?
+    `git config --get duet.env.git-author-name && git config --get duet.env.git-author-email`
+    $? == 0
+  end
+
   def dump_env_vars
     extract_env_vars_from_git_config.each do |k,v|
       puts "#{k}='#{v}'"
@@ -38,21 +43,10 @@ module Git::Duet::CommandMethods
   end
 
   def exec_git_commit
-    exec 'git commit --signoff ' << quoted_passthrough_args
-  end
-
-  def env_vars
-    @env_vars ||= Hash[env_var_pairs]
-  end
-
-  def env_var_pairs
-    %w(
-      GIT_AUTHOR_NAME
-      GIT_AUTHOR_EMAIL
-      GIT_COMMITTER_NAME
-      GIT_COMMITTER_EMAIL
-    ).map do |env_var|
-      [env_var, env_var.downcase.gsub(/_/, '-')]
+    if author_env_vars_set?
+      exec 'git commit ' << signoff_arg << quoted_passthrough_args
+    else
+      raise Git::Duet::ScriptDieError.new(17)
     end
   end
 

data/lib/git/duet/commit_command.rb

@@ -23,10 +23,6 @@ class Git::Duet::CommitCommand
     end
   end
 
-  def exec_git_commit
-    exec 'git commit ' << signoff_arg << quoted_passthrough_args
-  end
-
   def env_vars
     @env_vars ||= Hash[env_var_pairs]
   end

data/lib/git/duet/version.rb

@@ -1,7 +1,7 @@
 unless defined?(Git::Duet::VERSION)
   module Git
     module Duet
-      VERSION = '0.1.1'
+      VERSION = '0.1.2'
     end
   end
 end

data/spec/integration/end_to_end_spec.rb

@@ -235,6 +235,26 @@ describe 'git-duet end to end', :integration => true do
         `git log -1 --format='%cn <%ce>'`.chomp.should == 'Frances Bar <f.bar@hamster.info.local>'
       end
 
+      context 'when no author has been set' do
+        before do
+          Dir.chdir(@repo_dir)
+          %w(git-author-email git-author-name).each do |config|
+            `git config --unset duet.env.#{config}`
+          end
+          make_an_edit
+        end
+
+        it 'should raise an error if committed without the -q option' do
+          `git duet-commit -q -m 'Testing commit with no author'`
+          $?.to_i.should_not == 0
+        end
+
+        it 'should fail to add a commit' do
+          expect{ `git duet-commit -q -m 'testing commit with no author'` }.
+            to_not change{ `git log -1 --format=%H`.chomp }
+        end
+      end
+
       context 'with the pre-commit hook in place' do
         before :each do
           `git commit -m 'Committing before installing the hook'`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-duet
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nyan-cat-formatter
@@ -169,4 +169,3 @@ test_files:
 - spec/lib/git/duet/solo_command_spec.rb
 - spec/spec_helper.rb
 - spec/support/author_mapper_helper.rb
-has_rdoc: