git_manager 0.0.9 → 0.1.0

data/config/email.yml

@@ -1,7 +1,16 @@
 # example:
-# email_config:
+# authentication:
 #   from: you@yourdomain.com
 #   password: your_password_here
 # users:
 #   "User 1 Full Name as found in git blame":"associated_email1@domain.com@"
 #   "User 2 Full Name as found in git blame":"associated_email2@domain.com@"
+authentication:
+  from: you@your_gmail_hosted_domain.com
+  password: your_password_here
+
+users:
+  'First Name': 'me@my_gmail_hosted_domain.com'
+  'First Name': 'me@my_gmail_hosted_domain.com'
+  'First Name': 'me@my_gmail_hosted_domain.com'
+  'First Name': 'me@my_gmail_hosted_domain.com'

data/lib/blames.rb

@@ -0,0 +1,43 @@
+module Git::Blames
+  include Git::Emails
+
+  def blame(options = nil)
+    if !options[:spam]
+      self.tasks_by_collaborator.each_pair do |recipient, message|
+        send_gmail( 
+          :recipients => [recipient],
+          :subject => "Please collaborate to fix consolidated list of specs: ",
+          :message => message
+        )
+      end
+    else
+      self.tasks.each_pair do |key, attributes|
+        if options.nil? || !options[:email]
+          stdout key, attributes
+        else
+          send_gmail :recipients => attributes[:contributors],
+            :subject => "Please collaborate to fix spec: " +
+              "#{attributes[:spec_file]} : " +
+              "#{attributes[:line_number]}",
+            :message => "Spec Details:\n  " +
+              "Details\n  #{attributes[:details].join('\n')}\n" +
+              "Collaborators:\n  #{attributes[:contributors].join(', ')}\n"
+        end
+      end
+    end
+  end
+
+  def stdout key, attributes
+    puts "\nPending Spec Information:"
+    puts "  Description: #{key}"
+    puts "  Contributors: #{attributes[:contributors].join(', ')}"
+    puts "  File: #{attributes[:spec_file]}"
+    puts "  Line: #{attributes[:line_number]}\n"
+  end
+
+  # class Pending
+  # end
+
+  # class Blame
+  # end
+end

data/lib/blames/pending.rb

@@ -0,0 +1,148 @@
+class Git::Blames::Pending 
+  attr_accessor :tasks, :rspec_results
+
+  include Git::Blames
+
+  def initialize options = nil
+    if options.nil? || options[:root].nil? && !options[:rspec] && !options[:log]
+      @root = "#{File.dirname(__FILE__)}/logs"
+    elsif options[:log]
+      find_pending_specs_by_logfile_name( options[:log] )
+    elsif options[:rspec]
+      find_pending_specs_by_rspec_results( rspec_results )
+    else
+      @root = options[:root]
+      find_pending_specs_by_logfile_name( "#{@root}/#{find_last_logfile_name}" )
+    end
+    find_contributors
+  end
+
+  def rspec_results
+    results =  `rspec spec`
+    results
+  end
+
+  def find_contributors
+    # @tasks = Git::Blames::Pending.new.tasks
+    @tasks.each_pair do |key, attributes|
+      contributors = []
+      `git blame "#{attributes[:spec_file]}"`.each do |blame|
+        contributor = blame.split(")")[0].split("(")[1]
+        contributor = contributor.split(/\s+\d/)[0]
+        contributors.push( contributor )
+      end
+      @tasks[key][:contributors] = contributors.uniq
+      @tasks[key][:contributors].reject!{ |contributor| contributor == 'Not Committed Yet'}
+    end
+    @tasks
+  end
+
+  def found_pending_marker line
+    line.match( /^[\s\t]*Pending:/ )
+  end
+
+  def found_new_spec_marker line, status
+    ( status == 'start' || status == 'updating spec data' ) && !line.match( /^[\s\t]*#/ )
+  end
+
+  def found_spec_details_marker line, status
+    ( status == 'found new pending spec' || status == 'updating spec data' ) && line.match( /^[\s\t]*\#/ )
+  end
+
+  def find_last_logfile_name
+    begin
+      files = Dir.new @root
+    rescue => e 
+      begin
+      Dir.mkdir @root
+      files = Dir.new @root
+      rescue
+        puts e
+      end
+    end
+    file_name = files.to_a.select { |log| log.match /\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}/ }.sort.last
+    "#{file_name}/log"
+  end
+
+  def find_pending_specs_by_rspec_results spec_output
+    status = ''
+    @tasks = {}
+    task = {}
+
+    spec_output.each do |line|
+      if found_pending_marker line
+        status = 'start'
+        
+      elsif found_new_spec_marker line, status
+        status = 'found new pending spec'  
+        task = {}
+        task[:name] = line.chomp
+        task[:details] = []
+
+      elsif found_spec_details_marker line, status
+        status = 'updating spec data'
+        if line.match /(spec.*)[:](\d+)/
+          task[:spec_file] = $1
+          task[:line_number] = $2
+        else
+          task[:details].push line.chomp
+        end
+        @tasks[task[:name]] = task
+      end
+    end
+  end
+
+  def find_pending_specs_by_logfile_name logfile_name
+    logfile = File.new( logfile_name )
+    status = ''
+    @tasks = {}
+    task = {}
+
+    logfile.readlines.each do |line|
+
+      if found_pending_marker line
+        status = 'start'
+        
+      elsif found_new_spec_marker line, status
+        status = 'found new pending spec'  
+        task = {}
+        task[:name] = line.chomp
+        task[:details] = []
+
+      elsif found_spec_details_marker line, status
+        status = 'updating spec data'
+        if line.match /(spec.*)[:](\d+)/
+          task[:spec_file] = $1
+          task[:line_number] = $2
+        else
+          task[:details].push line.chomp
+        end
+        @tasks[task[:name]] = task
+      end
+    end
+  end
+
+  def tasks_by_collaborator
+    load_configuration
+    consolidated_emails = {}
+    @email_mappings.each_key do |contributor|
+      consolidated_emails[contributor] = []
+      @tasks.each do |object|
+        key = object[0]
+        values = object[1]
+        if values[:contributors].include?( contributor )
+          message = "\n" +
+            "  Spec:          #{values[:spec_file]}:#{values[:line_number]}\n" +
+            "    Collaborators: #{values[:contributors].join(',')}\n" +
+            "    Title:         #{values[:name]}\n" +
+            "    Details:       #{values[:details].join('\n')}"
+          consolidated_emails[contributor].push( message )
+        end
+      end
+      consolidated_emails[contributor] = consolidated_emails[contributor].join(
+        "\n\n"
+      )
+    end
+    consolidated_emails
+  end
+end

data/lib/emails.rb

@@ -0,0 +1,25 @@
+module Git::Emails
+  def load_configuration
+    config = YAML::load_file( './config/email.yml' )
+    @email_from = config['authentication']['from']
+    @email_password = config['authentication']['password']
+    @email_mappings = config['users']
+  end
+
+  def send_gmail options
+    load_configuration
+    recipients = options[:recipients]
+    msg = "Subject: #{options[:subject]}\n\n#{options[:message]}"
+    smtp = Net::SMTP.new 'smtp.gmail.com', 587
+    smtp.enable_starttls
+    puts "Sending e-mail to #{recipients.join(',')}"
+    smtp.start( '', @email_from, @email_password, :login ) do
+      smtp.send_message( msg, @email_from, recipients.map{ |recipient| 
+          # @email_mappings["#{recipient.gsub(' ', '_') }" ] 
+          @email_mappings[ recipient ] 
+      })
+    end
+  end
+end
+
+

data/lib/git.rb

@@ -0,0 +1,2 @@
+module Git
+end

data/lib/git_manager.rb

@@ -13,213 +13,11 @@
 require 'rubygems'
 require 'net/smtp'
 require 'yaml'
-
-module Git
-  module Emails
-    def load_configuration
-      config = YAML::load_file('./config/email.yml')
-      @email_from = config['authentication']['from']
-      @email_password = config['authentication']['password']
-      @email_mappings = config['users']
-      puts "email_mappings = #{@email_mappings.inspect}"
-    end
-  
-    def send_gmail options
-      load_configuration
-      recipients = options[:recipients]
-      puts "recipients = #{recipients.inspect}"
-      msg = "Subject: #{options[:subject]}\n\n#{options[:message]}"
-      smtp = Net::SMTP.new 'smtp.gmail.com', 587
-      smtp.enable_starttls
-      smtp.start( '', @email_from, @email_password, :login ) do
-        smtp.send_message( msg, @email_from, recipients.map{ |recipient| @email_mappings["#{recipient.gsub(' ', '_') }" ] } )
-      end
-    end
-  end
-
-  module Managed
-    class Branch
-    end
-  end
-
-  module Blames
-    include Git::Emails
-    def blame(options = nil)
-      self.tasks.each_pair do |key, attributes|
-        if options.nil? || !options[:email]
-          stdout key, attributes
-        else
-          send_gmail :recipients => attributes[:contributors],
-            :subject => "Please collaborate to fix spec: " +
-              "#{attributes[:spec_file]} : " +
-              "#{attributes[:line_number]}",
-            :message => "Spec Details:\n  " +
-              "Details\n  #{attributes[:details].join('\n')}\n" +
-              "Collaborators:\n  #{attributes[:contributors].join(', ')}\n"
-        end
-      end
-    end
-    def stdout key, attributes
-      puts "\nPending Spec Information:"
-      puts "  Description: #{key}"
-      puts "  Contributors: #{attributes[:contributors].join(', ')}"
-      puts "  File: #{attributes[:spec_file]}"
-      puts "  Line: #{attributes[:line_number]}\n"
-    end
-    class Pending
-    end
-    class Blame
-    end
-  end
-end
-
-class Git::Managed::Branch
-  attr_accessor :branches, :current_branch, :branches_to_delete
-  def initialize
-    @branches = `git branch`.split /\n/
-    partition_branches
-  end
-  def partition_branches
-    @current_branch = @branches.select {|branch| branch.match /^\*/}.first
-    @branches_to_delete = @branches.select {|branch| branch != @current_branch }
-    @current_branch.chomp!
-    @current_branch.gsub! /\s|\*/, ''
-  end
-
-  def delete_branches
-    return false if @branches_to_delete.length == 0
-    @branches_to_delete.each do |branch|
-      delete_branch( branch.gsub /\s/, '' )
-    end
-  end
-
-  def delete_branch branch
-    `git branch -D #{branch}`
-  end
-
-end
-
-class Git::Blames::Pending 
-  attr_accessor :tasks, :rspec_results
-
-  include Git::Blames
-
-  def initialize options = nil
-    if options.nil? || options[:root].nil? && !options[:rspec] && !options[:log]
-      @root = "#{File.dirname(__FILE__)}/logs"
-    elsif options[:log]
-      find_pending_specs_by_logfile_name( options[:log] )
-    elsif options[:rspec]
-      find_pending_specs_by_rspec_results( rspec_results )
-    else
-      @root = options[:root]
-      find_pending_specs_by_logfile_name( "#{@root}/#{find_last_logfile_name}" )
-    end
-    find_contributors
-  end
-
-  def rspec_results
-    results =  `rspec spec`
-    results
-  end
-
-  def find_contributors
-    # @tasks = Git::Blames::Pending.new.tasks
-    @tasks.each_pair do |key, attributes|
-      contributors = []
-      `git blame "#{attributes[:spec_file]}"`.each do |blame|
-        contributor = blame.split(")")[0].split("(")[1]
-        contributor = contributor.split(/\s+\d/)[0]
-        contributors.push( contributor )
-      end
-      @tasks[key][:contributors] = contributors.uniq
-      @tasks[key][:contributors].reject!{ |contributor| contributor == 'Not Committed Yet'}
-    end
-    @tasks
-  end
-
-  def found_pending_marker line
-    line.match( /^[\s\t]*Pending:/ )
-  end
-
-  def found_new_spec_marker line, status
-    ( status == 'start' || status == 'updating spec data' ) && !line.match( /^[\s\t]*#/ )
-  end
-
-  def found_spec_details_marker line, status
-    ( status == 'found new pending spec' || status == 'updating spec data' ) && line.match( /^[\s\t]*\#/ )
-  end
-
-  def find_last_logfile_name
-    begin
-      files = Dir.new @root
-    rescue => e 
-      begin
-      Dir.mkdir @root
-      files = Dir.new @root
-      rescue
-        puts e
-      end
-    end
-    file_name = files.to_a.select { |log| log.match /\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}/ }.sort.last
-    "#{file_name}/log"
-  end
-
-  def find_pending_specs_by_rspec_results spec_output
-    status = ''
-    @tasks = {}
-    task = {}
-
-    spec_output.each do |line|
-      if found_pending_marker line
-        status = 'start'
-        
-      elsif found_new_spec_marker line, status
-        status = 'found new pending spec'  
-        task = {}
-        task[:name] = line.chomp
-        task[:details] = []
-
-      elsif found_spec_details_marker line, status
-        status = 'updating spec data'
-        if line.match /(spec.*)[:](\d+)/
-          task[:spec_file] = $1
-          task[:line_number] = $2
-        else
-          task[:details].push line.chomp
-        end
-        @tasks[task[:name]] = task
-      end
-    end
-  end
-
-  def find_pending_specs_by_logfile_name logfile_name
-    logfile = File.new( logfile_name )
-    status = ''
-    @tasks = {}
-    task = {}
-
-    logfile.readlines.each do |line|
-
-      if found_pending_marker line
-        status = 'start'
-        
-      elsif found_new_spec_marker line, status
-        status = 'found new pending spec'  
-        task = {}
-        task[:name] = line.chomp
-        task[:details] = []
-
-      elsif found_spec_details_marker line, status
-        status = 'updating spec data'
-        if line.match /(spec.*)[:](\d+)/
-          task[:spec_file] = $1
-          task[:line_number] = $2
-        else
-          task[:details].push line.chomp
-        end
-        @tasks[task[:name]] = task
-      end
-    end
-  end
-end
+require "#{ File.dirname(  __FILE__ ) }/git"
+require "#{ File.dirname(  __FILE__ ) }/managed"
+require "#{ File.dirname(  __FILE__ ) }/managed/branch"
+require "#{ File.dirname(  __FILE__ ) }/emails"
+require "#{ File.dirname(  __FILE__ ) }/blames"
+require "#{ File.dirname(  __FILE__ ) }/blames/pending"
+
+Git::Blames::Pending.new( :root => './lib/logs/' ).blame( :email => true )

data/lib/managed.rb

@@ -0,0 +1,4 @@
+module Git::Managed
+  class Branch
+  end
+end

data/lib/managed/branch.rb

@@ -0,0 +1,27 @@
+class Git::Managed::Branch
+  attr_accessor :branches, :current_branch, :branches_to_delete
+
+  def initialize
+    @branches = `git branch`.split /\n/
+    partition_branches
+  end
+
+  def partition_branches
+    @current_branch = @branches.select {|branch| branch.match /^\*/}.first
+    @branches_to_delete = @branches.select {|branch| branch != @current_branch }
+    @current_branch.chomp!
+    @current_branch.gsub! /\s|\*/, ''
+  end
+
+  def delete_branches
+    return false if @branches_to_delete.length == 0
+    @branches_to_delete.each do |branch|
+      delete_branch( branch.gsub /\s/, '' )
+    end
+  end
+
+  def delete_branch branch
+    `git branch -D #{branch}`
+  end
+
+end

data/spec/git_manager_spec.rb

@@ -80,5 +80,36 @@ describe Git do
       @git_blames_pending.tasks[@test_01][:details].should == @expected_tasks[@test_01][:details]
       @git_blames_pending.tasks[@test_02][:details].should == @expected_tasks[@test_02][:details]
     end 
+
+    it "consolidates blames into structure for e-mailing each developer once" do
+
+      expected_text =  "\n" +
+        "  Spec:          spec/git_manager_spec.rb:11\n" +
+        "    Collaborators: John Jimenez\n" +
+        "    Title:           Fake test 2 spec/git_manager_spec.rb\n" +
+        "    Details:           # Test 123\n\n\n" +
+        "  Spec:          spec/git_manager_spec.rb:13\n" +
+        "    Collaborators: John Jimenez\n" +
+        "    Title:           Fake test 1 spec/git_manager_spec.rb\n" +
+        "    Details:           # Test 123"
+
+      @git_blames_pending.tasks_by_collaborator.should == {
+        "John Jimenez" => expected_text
+      }
+        # { "  Fake test 2 spec/git_manager_spec.rb"=>{
+        #   :spec_file=>"spec/git_manager_spec.rb", 
+        #   :details=>["    # Test 123"], 
+        #   :contributors=>["John Jimenez"], 
+        #   :name=>"  Fake test 2 spec/git_manager_spec.rb", 
+        #   :line_number=>"11"
+        # }, 
+        # "  Fake test 1 spec/git_manager_spec.rb"=>{
+        #   :spec_file=>"spec/git_manager_spec.rb", 
+        #   :details=>["    # Test 123"], 
+        #   :contributors=>["John Jimenez"], 
+        #   :name=>"  Fake test 1 spec/git_manager_spec.rb", 
+        #   :line_number=>"13"
+        # }
+    end
   end 
 end 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git_manager
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - kikuchiyo
@@ -15,14 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-22 00:00:00 Z
+date: 2012-10-31 00:00:00 Z
 dependencies: []
 
-description: |-
-  delete old git branches and blame pending specs
-  for e-mailing: requires config/email.yml file in root directory
-  for using build logs make sure you pass path to Git::Blames::Pending.new through :root parameter.  Bug fix to contributors - was not being reset per spec
-email: kikuchiyo6@gmail.com
+description: A QA Automation Enineer's Assistant, utilizing Jenkins and Git.
+email: jimenez.john0@gmail.com
 executables: []
 
 extensions: []
@@ -30,9 +27,15 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/git_manager.rb
 - lib/logs/2012-08-21_00-00-02/log
+- lib/blames/pending.rb
+- lib/managed/branch.rb
+- lib/git_manager.rb
 - config/email.yml
+- lib/managed.rb
+- lib/blames.rb
+- lib/emails.rb
+- lib/git.rb
 - spec/git_manager_spec.rb
 homepage: http://rubygems.org/gems/git_manager
 licenses: []
@@ -63,9 +66,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: gem to manage git
+summary: qa automation engineer assistant
 test_files: 
 - spec/git_manager_spec.rb
+has_rdoc: