github_org_reports 0.0.0 → 0.0.1

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "baza", :path => "/Users/kaspernj/Dev/Ruby/baza"
+gem "baza", ">= 0.0.10", :path => "/Users/kaspernj/Dev/Ruby/baza"
 gem "json"
 gem "github_api"
 gem "string-cases"

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: /Users/kaspernj/Dev/Ruby/baza
   specs:
-    baza (0.0.8)
+    baza (0.0.10)
       array_enumerator
       datet
       knjrbfw
+      string-cases
       wref
 
 GEM
@@ -80,7 +81,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  baza!
+  baza (>= 0.0.10)!
   bundler (>= 1.0.0)
   github_api
   jeweler (~> 1.8.4)

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/github_org_reports.gemspec

@@ -0,0 +1,84 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "github_org_reports"
+  s.version = "0.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["kaspernj"]
+  s.date = "2013-05-16"
+  s.description = "A gem to generate organization reports based on pull requests and commits."
+  s.email = "k@spernj.org"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "github_org_reports.gemspec",
+    "include/github_org_reports_dbschema.rb",
+    "include/github_org_reports_models.rb",
+    "include/github_org_reports_repo.rb",
+    "lib/github_org_reports.rb",
+    "models/commit.rb",
+    "models/commit_organization_link.rb",
+    "models/organization.rb",
+    "models/pull_request.rb",
+    "models/pull_request_organization_link.rb",
+    "models/user.rb",
+    "spec/github_org_reports_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "http://github.com/kaspernj/github_org_reports"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "A gem to generate organization reports based on pull requests and commits."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<baza>, [">= 0.0.10"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<github_api>, [">= 0"])
+      s.add_runtime_dependency(%q<string-cases>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+    else
+      s.add_dependency(%q<baza>, [">= 0.0.10"])
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<github_api>, [">= 0"])
+      s.add_dependency(%q<string-cases>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<baza>, [">= 0.0.10"])
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<github_api>, [">= 0"])
+    s.add_dependency(%q<string-cases>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+  end
+end
+

data/include/github_org_reports_dbschema.rb

@@ -4,6 +4,8 @@ class GithubOrgReports::Dbschema
       :Commit => {
         :columns => [
           {:name => :id, :type => :int, :autoincr => true, :primarykey => true},
+          {:name => :repository_name, :type => :varchar},
+          {:name => :repository_user, :type => :varchar},
           {:name => :user_id, :type => :int},
           {:name => :pull_request_id, :type => :int},
           {:name => :sha, :type => :varchar},
@@ -12,6 +14,8 @@ class GithubOrgReports::Dbschema
           {:name => :time, :type => :int}
         ],
         :indexes => [
+          :repository_name,
+          :repository_user,
           :user_id
         ]
       },
@@ -43,15 +47,23 @@ class GithubOrgReports::Dbschema
       :PullRequest => {
         :columns => [
           {:name => :id, :type => :int, :autoincr => true, :primarykey => true},
+          {:name => :repository_name, :type => :varchar},
+          {:name => :repository_user, :type => :varchar},
           {:name => :github_id, :type => :int, :renames => [:pull_request_id]},
+          {:name => :number, :type => :int},
           {:name => :user_id, :type => :int},
+          {:name => :date, :type => :datetime},
+          {:name => :title, :type => :varchar},
           {:name => :text, :type => :text},
           {:name => :html, :type => :text},
           {:name => :time, :type => :int}
         ],
         :indexes => [
+          :repository_name,
+          :repository_user,
           :github_id,
-          :user_id
+          :user_id,
+          :number
         ]
       },
       :PullRequestOrganizationLink => {

data/include/github_org_reports_repo.rb

@@ -4,4 +4,12 @@ class GithubOrgReports::Repo
   def initialize(args)
     @args = args
   end
+  
+  def name
+    return @args[:name]
+  end
+  
+  def user
+    return @args[:user]
+  end
 end

data/lib/github_org_reports.rb

@@ -11,6 +11,18 @@ class GithubOrgReports
     return GithubOrgReports.const_get(name)
   end
   
+  def self.secs_to_time(secs)
+    return "0:00" if secs <= 0
+    
+    hours = (secs / 3600).floor
+    secs -= hours * 3600
+    
+    mins = (secs / 60).floor
+    secs -= mins * 60
+    
+    return "#{hours}:#{sprintf("%02d", mins)}"
+  end
+  
   def initialize(args = {})
     @args = args
     @repos = []
@@ -34,49 +46,93 @@ class GithubOrgReports
     @repos << repo
   end
   
-  def scan_hash(str)
+  def self.scan_hash(str)
     str.to_s.scan(/!(\{(.+?)\})!/) do |match|
+      json_str = match[0]
+      
+      
+      #Fix missing quotes in 'time' and 'orgs' to make it easier to write.
+      json_str.gsub!(/time:\s*([\d+:]+)/, "\"time\": \"\\1\"")
+      
+      if orgs_match = json_str.match(/orgs:\s*\[(.+?)\]/)
+        orgs_str = orgs_match[1]
+        orgs_str.gsub!(/\s*(^|\s*,\s*)([A-z_\d]+)/, "\\1\"\\2\"")
+        json_str.gsub!(orgs_match[0], "\"orgs\": [#{orgs_str}]")
+      end
+      
+      
+      #Parse the JSON and yield it.
       begin
-        yield JSON.parse(match[1])
+        yield JSON.parse(json_str)
       rescue JSON::ParserError => e
         $stderr.puts e.inspect
-        $stderr.puts e.backtrace
+        #$stderr.puts e.backtrace
       end
     end
   end
   
   def scan
     @repos.each do |repo|
-      gh_args = {}
-      gh_args[:login] = repo.args[:login] if repo.args[:login]
-      gh_args[:password] = repo.args[:password] if repo.args[:password]
+      @cur_repo = repo
+      
+      gh_args = {
+        :user => repo.user,
+        :repo => repo.name
+      }
+      gh_args[:login] = repo.args[:login] unless repo.args[:login].to_s.strip.empty?
+      gh_args[:password] = repo.args[:password] unless repo.args[:password].to_s.strip.empty?
       
       gh = ::Github.new(gh_args)
       
-      commits = gh.repos.commits.all(repo.args[:user], repo.args[:name])
+      commits = gh.repos.commits.all(gh_args)
       commits.each do |commit_data|
         commit = init_commit_from_data(commit_data)
       end
       
-      prs = gh.pull_requests.list(repo.args[:user], repo.args[:name])
+      prs = []
+      gh.pull_requests.list(gh_args.merge(:state => "closed")).each do |pr|
+        prs << pr
+      end
+      
+      gh.pull_requests.list(gh_args.merge(:state => "open")).each do |pr|
+        prs << pr
+      end
+      
       prs.each do |pr_data|
         text = pr_data.body_text
         
+        name = pr_data.user.login
+        raise "Invalid name: '#{name}' (#{pr_data.to_hash})." if !name.is_a?(String)
         user = @ob.get_or_add(:User, {
-          :name => pr_data.user
+          :name => name
         })
         
+        
+        #puts "PullRequest: #{pr_data.to_hash}"
+        github_id = pr_data.id.to_i
+        raise "Invalid github-ID: '#{github_id}'." if github_id <= 0
+        
+        number = pr_data.number.to_i
+        raise "Invalid number: '#{number}'." if number <= 0
+        
         pr = @ob.get_or_add(:PullRequest, {
-          :github_id => pr_data.id
+          :repository_user => @cur_repo.user,
+          :repository_name => @cur_repo.name,
+          :github_id => github_id,
+          :number => number
         })
         
+        #puts "PullRequest: #{pr_data.to_hash}"
+        
         pr[:user_id] = user.id
+        pr[:title] = pr_data.title
         pr[:text] = pr_data.body_text
         pr[:html] = pr_data.body_html
+        pr[:date] = Time.parse(pr_data.created_at)
         
         pr.scan
         
-        commits = gh.pull_requests.commits(:repo => repo.args[:name], :user => repo.args[:user], :number => pr_data.number)
+        commits = gh.pull_requests.commits(gh_args.merge(:number => pr_data.number))
         commits.each do |commit_data|
           commit = init_commit_from_data(commit_data)
           commit[:pull_request_id] = pr.id
@@ -88,34 +144,31 @@ class GithubOrgReports
   def scan_for_time_and_orgs(str)
     res = {:secs => 0, :orgs => [], :orgs_time => {}}
     
-    self.scan_hash(str) do |hash|
+    GithubOrgReports.scan_hash(str) do |hash|
       #Parse time.
       if hash["time"] and match_time = hash["time"].to_s.match(/^(\d{1,2}):(\d{1,2})$/)
         secs = 0
         secs += match_time[1].to_i * 3600
         secs += match_time[2].to_i * 60
         
-        res[:secs] += secs
-        
         #Parse organizations.
         if orgs = hash["orgs"]
-          orgs = [orgs] if !orgs.is_a?(Hash)
+          orgs = [orgs] if !orgs.is_a?(Array)
           orgs.each do |org_name_short|
             org_name_short_dc = org_name_short.to_s.downcase
             next if org_name_short_dc.strip.empty?
             
-            org = self.ob.get_or_add(:Organization, {:name_short => org_name_short_dc})
+            raise "Invalid short-name: '#{org_name_short_dc}'." unless org_name_short_dc.match(/^[A-z\d+_]+$/)
             
-            link = self.ob.get_or_add(:PullRequestOrganizationLink, {
-              :organization_id => org.id,
-              :pull_request_id => self.id
-            })
+            org = self.ob.get_or_add(:Organization, {:name_short => org_name_short_dc})
             
             res[:orgs] << org unless res[:orgs].include?(org)
             
-            res[:orgs_time][org.id] = {:secs => 0} unless res[:orgs].key?(org.id)
-            res[:orgs_time][org.id][:secs] += match_time
+            res[:orgs_time][org.id] = {:secs => 0} unless res[:orgs_time].key?(org.id)
+            res[:orgs_time][org.id][:secs] += secs
           end
+        else
+          res[:secs] += secs
         end
       end
     end
@@ -126,11 +179,25 @@ class GithubOrgReports
   private
   
   def init_commit_from_data(commit_data)
+    sha = commit_data.sha
+    raise "Invalid SHA: '#{sha}' (#{commit_data.to_hash})." if sha.to_s.strip.empty?
+    
     commit = @ob.get_or_add(:Commit, {
-      :sha => commit_data.sha
+      :repository_user => @cur_repo.user,
+      :repository_name => @cur_repo.name,
+      :sha => sha
     })
-    commit[:text] = commit_data.commit
-    commit[:date] = commit_data.commit.date
+    raise "Commit didnt get added right '#{commit[:sha]}', '#{sha}'." if sha != commit[:sha]
+    
+    text = commit_data.commit.message
+    raise "Invalid text: '#{text}' (#{commit_data.to_hash})." if !text.is_a?(String)
+    commit[:text] = text
+    
+    
+    date = Time.parse(commit_data.commit.committer.date)
+    raise "Invalid date: '#{date}' (#{commit_data.commit.to_hash})" if !date
+    
+    commit[:date] = date
     
     if commit_data.author
       user = @ob.get_or_add(:User, {

data/models/commit.rb

@@ -1,6 +1,9 @@
 class GithubOrgReports::Models::Commit < Baza::Model
   has_one :User
   has_one :PullRequest
+  has_many [
+    [:CommitOrganizationLink, :commit_id]
+  ]
   
   def scan
     hash = ob.data[:github_org_reports].scan_for_time_and_orgs(self[:text])
@@ -10,9 +13,10 @@ class GithubOrgReports::Models::Commit < Baza::Model
     hash[:orgs].each do |org|
       link = self.ob.get_or_add(:CommitOrganizationLink, {
         :organization_id => org.id,
-        :pull_request_id => self.id,
-        :time => hash[:orgs_time][org.id]
+        :commit_id => self.id
       })
+      
+      link[:time] = hash[:orgs_time][org.id][:secs]
     end
     
     

data/models/organization.rb

@@ -1,3 +1,9 @@
 class GithubOrgReports::Models::Organization < Baza::Model
-  
+  def name
+    name_str = self[:name].to_s.strip
+    name_str = self[:name_short].to_s.strip if name_str.empty?
+    name_str = "[no name]" if name_str.empty?
+    
+    return name_str
+  end
 end

data/models/pull_request.rb

@@ -1,5 +1,8 @@
 class GithubOrgReports::Models::PullRequest < Baza::Model
-  has_many [[:PullRequestOrganizationLink, :pull_request_id]]
+  has_many [
+    [:PullRequestOrganizationLink, :pull_request_id],
+    [:Commit, :pull_request_id]
+  ]
   
   def scan
     hash = ob.data[:github_org_reports].scan_for_time_and_orgs(self[:text])
@@ -10,8 +13,9 @@ class GithubOrgReports::Models::PullRequest < Baza::Model
       link = self.ob.get_or_add(:PullRequestOrganizationLink, {
         :organization_id => org.id,
         :pull_request_id => self.id,
-        :time => hash[:orgs_time][:secs]
       })
+      
+      link[:time] = hash[:orgs_time][org.id][:secs]
     end
     
     
@@ -22,9 +26,46 @@ class GithubOrgReports::Models::PullRequest < Baza::Model
     return nil
   end
   
-  def total_time_for_orgs(args)
-    orgs = {}
+  def total_time_for_org(args)
+    org = args[:org]
+    raise "No ':org' was given." if !org
     
     
+    #Collect shared time.
+    secs = self[:time].to_i
+    
+    
+    #Collect time for the pull-request-organization-links.
+    self.pull_request_organization_links(:organization_id => org.id) do |prol|
+      secs += prol[:time].to_i
+    end
+    
+    
+    #Collect time from commits.
+    self.commits do |commit|
+      secs += commit[:time].to_i
+      
+      commit.commit_organization_links(:organization_id => org.id) do |col|
+        secs += col[:time].to_i
+      end
+    end
+    
+    
+    return secs
+  end
+  
+  def title(args = nil)
+    title_str = self[:title].to_s.strip
+    title_str = self[:text].to_s.lines.first.to_s.strip if title_str.empty?
+    mlength = (args && args[:maxlength]) ? args[:maxlength] : 15
+    
+    if title_str.length > mlength
+      title_str = title_str.slice(0, mlength).strip
+      title_str << "..."
+    end
+    
+    title_str = "[no title]" if title_str.empty?
+    
+    return title_str
   end
 end

data/spec/github_org_reports_spec.rb

@@ -22,4 +22,35 @@ describe "GithubOrgReports" do
       raise e
     end
   end
+  
+  it "should be able to parse special json strings" do
+    str = "!{time: 00:30, orgs: [knjit, gfish]}!\n"
+    str << "!{time: 00:15, orgs: [knjit]}!"
+    
+    db_path = "#{Dir.tmpdir}/github_org_reports.sqlite3"
+    db = Baza::Db.new(:type => :sqlite3, :path => db_path, :index_append_table_name => true)
+    
+    login_info = JSON.parse(File.read("#{File.dirname(__FILE__)}/spec_info.txt").to_s.strip)
+    
+    begin
+      gor = GithubOrgReports.new(:db => db)
+      
+      res = gor.scan_for_time_and_orgs(str)
+      
+      org_knjit = gor.ob.get_by(:Organization, :name_short => "knjit")
+      org_gfish = gor.ob.get_by(:Organization, :name_short => "gfish")
+      
+      res[:orgs_time][org_knjit.id][:secs].should eql(2700)
+      res[:orgs_time][org_gfish.id][:secs].should eql(1800)
+    rescue => e
+      puts e.inspect
+      puts e.backtrace
+      raise e
+    end
+  end
+  
+  it "should be able to convert seconds to time strings" do
+    GithubOrgReports.secs_to_time(1800).should eql("0:30")
+    GithubOrgReports.secs_to_time(2700).should eql("0:45")
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: github_org_reports
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - kaspernj
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.10
   name: baza
   type: :runtime
   prerelease: false
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -171,6 +171,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- github_org_reports.gemspec
 - include/github_org_reports_dbschema.rb
 - include/github_org_reports_models.rb
 - include/github_org_reports_repo.rb
@@ -197,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2843595140910669046
+      hash: 241850806835355267
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false