git-commit-notifier 0.10.4 → 0.10.5

data/.gitignore

@@ -15,7 +15,8 @@ tmtags
 
 ## PROJECT::GENERAL
 coverage
-rdoc
+doc
+.yardoc
 pkg
 .bundle
 Gemfile.lock

data/.travis.yml

@@ -6,4 +6,5 @@ rvm:
   - 1.8.7
   - ree
   - 1.9.2
+  - 1.9.3
 

data/.yardopts

@@ -0,0 +1,5 @@
+--markup markdown
+--markup-provider redcarpet
+--charset utf-8
+--readme README.md
+

data/Gemfile

@@ -4,4 +4,5 @@ gemspec
 
 gem "rcov", :group => :test, :platforms => :mri_18
 gem "erubis", "~> 2.7"
+gem "ripper", :group => :development, :platforms => :mri_18
 

data/Rakefile

@@ -26,14 +26,15 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exists?('VERSION') ? IO.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "git-commit-notifier #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+begin
+  require 'yard'
+
+  YARD::Rake::YardocTask.new do |yard|
+    version = File.exists?('VERSION') ? IO.read('VERSION') : ""
+    yard.options << "--title='git-commit-notifier #{version}'"
+  end
+rescue LoadError
+  $stderr.puts "Please install YARD with: gem install yard"
 end
 
 begin

data/VERSION

@@ -1 +1 @@
-0.10.4
+0.10.5

data/git-commit-notifier.gemspec

@@ -36,5 +36,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<rspec-expectations>, [">= 0"])
   s.add_development_dependency(%q<rr>, ["~> 1.0"])
   s.add_development_dependency(%q<faker>, ["~> 0.9.5"])
+  s.add_development_dependency(%q<yard>, ["~> 0.7.3"])
+  s.add_development_dependency(%q<redcarpet>, ["~> 1.17.2"])
 end
 

data/lib/git_commit_notifier/diff_to_html.rb

@@ -436,6 +436,7 @@ module GitCommitNotifier
       if merge_commit?(commit_info)
         changed_file_list = []
         merge_revisions = commit_info[:merge].split
+        merge_revisions.map!{|rev| rev.chomp("...")}
         merge_first_parent = merge_revisions.slice!(0)
         merge_revisions.each do |merge_other_parent|
           changed_file_list += Git.changed_files(merge_first_parent, merge_other_parent)

data/lib/git_commit_notifier/git.rb

@@ -22,7 +22,7 @@ class GitCommitNotifier::Git
 
     def changed_files(rev1, rev2)
       output = ""
-      lines = from_shell("git log #{rev1}..#{rev2} --name-status --oneline")
+      lines = from_shell("git log #{rev1}..#{rev2} --name-status --pretty=oneline")
       lines = lines.lines if lines.respond_to?(:lines)
       lines = lines.select {|line| line =~ /^\w{1}\s+\w+/} # grep out only filenames
       lines.uniq

data/spec/lib/git_commit_notifier/git_spec.rb

@@ -97,7 +97,7 @@ describe GitCommitNotifier::Git do
       files = ["M       README.rdoc\n",
                "D       git_commit_notifier/Rakefile\n",
                "M       post-receive\n"]
-      mock(GitCommitNotifier::Git).from_shell("git log #{SAMPLE_REV}..#{SAMPLE_REV_2} --name-status --oneline" ) { IO.read(FIXTURES_PATH + 'git_log_name_status') }
+      mock(GitCommitNotifier::Git).from_shell("git log #{SAMPLE_REV}..#{SAMPLE_REV_2} --name-status --pretty=oneline" ) { IO.read(FIXTURES_PATH + 'git_log_name_status') }
       GitCommitNotifier::Git.changed_files(SAMPLE_REV, SAMPLE_REV_2).should == files
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-commit-notifier
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &70146987224500 !ruby/object:Gem::Requirement
+  requirement: &70277632158420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +22,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70146987224500
+  version_requirements: *70277632158420
 - !ruby/object:Gem::Dependency
   name: nntp
-  requirement: &70146987224020 !ruby/object:Gem::Requirement
+  requirement: &70277632157800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +33,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70146987224020
+  version_requirements: *70277632157800
 - !ruby/object:Gem::Dependency
   name: premailer
-  requirement: &70146987223500 !ruby/object:Gem::Requirement
+  requirement: &70277632157260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -51,10 +50,10 @@ dependencies:
         version: 1.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70146987223500
+  version_requirements: *70277632157260
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70146987222540 !ruby/object:Gem::Requirement
+  requirement: &70277632156160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -62,10 +61,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70146987222540
+  version_requirements: *70277632156160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70146987222040 !ruby/object:Gem::Requirement
+  requirement: &70277632155540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +75,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70146987222040
+  version_requirements: *70277632155540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70146987221280 !ruby/object:Gem::Requirement
+  requirement: &70277632154480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +89,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *70146987221280
+  version_requirements: *70277632154480
 - !ruby/object:Gem::Dependency
   name: code-cleaner
-  requirement: &70146987183560 !ruby/object:Gem::Requirement
+  requirement: &70277632153000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146987183560
+  version_requirements: *70277632153000
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70146987182960 !ruby/object:Gem::Requirement
+  requirement: &70277632152400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146987182960
+  version_requirements: *70277632152400
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &70146987182380 !ruby/object:Gem::Requirement
+  requirement: &70277632151660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146987182380
+  version_requirements: *70277632151660
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70146987181780 !ruby/object:Gem::Requirement
+  requirement: &70277632150500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +133,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70146987181780
+  version_requirements: *70277632150500
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70146987181200 !ruby/object:Gem::Requirement
+  requirement: &70277632243320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -145,7 +144,29 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70146987181200
+  version_requirements: *70277632243320
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70277632241680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+  type: :development
+  prerelease: false
+  version_requirements: *70277632241680
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: &70277632240700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.17.2
+  type: :development
+  prerelease: false
+  version_requirements: *70277632240700
 description: This git commit notifier sends html mails with nice diffs for every changed
   file.
 email: bodo@bitboxer.de
@@ -159,6 +180,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- .yardopts
 - Gemfile
 - LICENSE
 - README.md
@@ -201,7 +223,6 @@ files:
 - spec/spec_helper.rb
 - template/email.html.erb
 - template/styles.css
-has_rdoc: true
 homepage: http://github.com/bitboxer/git-commit-notifier
 licenses: []
 post_install_message: 
@@ -216,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2487211850689935719
+      hash: -486808045600569914
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -225,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Sends git commit messages with diffs
@@ -251,3 +272,4 @@ test_files:
 - spec/lib/git_commit_notifier/logger_spec.rb
 - spec/lib/git_commit_notifier/result_processor_spec.rb
 - spec/spec_helper.rb
+has_rdoc: