nailed 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce2404c40672c72f705429cb68a1c19e869373d9
-  data.tar.gz: 9bf34170e942c1c7eb8e94c5f693dbf1b2726697
+  metadata.gz: 2c61db81e9588903795209716ac504caa4fa7df0
+  data.tar.gz: 0125349b98cc888829ec79dc9cf02a1eadcf5efa
 SHA512:
-  metadata.gz: ab2f21d36218a247cf1faac6a037e0ad493b4761382aea20a8ac760ba27b9253fde6b062f749d07c415142ee98de30ae0e935427cdeadfbecc054c89ec0b66a1
-  data.tar.gz: adaa596a312b6d07d8c0f18f80d16cefab2b3e0c462f19f5a1b9c554be2ef2fef15e010bdf6976ec5261fb18e6db797ffa6a73a37b38103ee40995c5e410fc50
+  metadata.gz: aa3b37beae82df9904e92b6d41dc81aafe0b14d8931162d0ac222fb820ac4a0c11c486af9eae24967002f0ef374223491eb0900c491ebb01f9a66208f7853d18
+  data.tar.gz: 3313f9300db5e555f6dac533695086e9622137099335d5bf3acd22a1d9dbbb51e0d9dfaa0c183bb35a0ebdfe320f69e0ea01c54fe27d0070206fd3f568e9fdfc

data/README.md

@@ -5,10 +5,16 @@
 `Be aware` that the bugzilla layout (metadata) is still SUSE specific, which may not be useful for everybody.
 e.g. it relies on bugs being tagged as L3. The plan is to make it optional in the future.
 
-## Installation
+## Installation using gem
 `gem install 'nailed'`
 
-Alternatively run it directly from the git directory
+## Installation using git
+You can use nailed directly from a git checkout as well. Make sure to fetch the dependencies and call `nailed` from the `bin` directory.
+### SUSE
+```
+zypper in libxml2-devel sqlite3-devel gcc make ruby-devel
+bundle install
+```
 
 ## Usage
 
@@ -43,10 +49,12 @@ nailed --migrate
 
 ## Configuration
 
-All configuration is read from `config/products.yml`
+All configuration is read from `config/config.yml`
 
 ``` yaml
 ---
+title: # Give me a name, or (default) call me Dashboard
+port: # Specify a port where you can reach the webinterface, or (default) 4567
 bugzilla:
   url: # Url of your Bugzilla instance
 products:

data/README.rdoc

@@ -6,10 +6,14 @@
 +Be+ +aware+ that the bugzilla layout (metadata) is still SUSE specific, which may not be useful for everybody.
 e.g. it relies on bugs being tagged as L3. The plan is to make it optional in the future.
 
-== Installation
+== Installation using gem
    gem install 'nailed'
 
-Alternatively run it directly from the git directory
+== Installation using git
+You can use nailed directly from a git checkout as well. Make sure to fetch the dependencies and call `nailed` from the `bin` directory.
+=== SUSE
+   zypper in libxml2-devel sqlite3-devel gcc make ruby-devel
+   bundle install
 
 == Usage
 
@@ -34,7 +38,7 @@ Alternatively run it directly from the git directory
      login MaximilianMeister
      password <your OAuth Token>
 
-* configure your +products.yml+
+* configure your +config.yml+
 * to setup the database run
    nailed --migrate
 
@@ -43,6 +47,8 @@ Alternatively run it directly from the git directory
 All configuration is read from +config/products.yml+
 
    ---
+   title: # Give me a name, or (default) call me Dashboard
+   port: # Specify a port where you can reach the webinterface, or (default) 4567
    bugzilla:
      url: # Url of your Bugzilla instance
    products:

data/bin/app

@@ -14,6 +14,7 @@ class App < Sinatra::Base
   set :public_folder, File.join(ROOT_PATH, "public")
   set :views, File.join(ROOT_PATH, "views")
   set :bind, '0.0.0.0'
+  set :port, Nailed.get_config["port"] || 4567
 
   register Sinatra::AssetPack
 
@@ -45,12 +46,16 @@ class App < Sinatra::Base
   }
 
   before do
-    @products = Nailed::PRODUCTS["products"].map{|p,v| v["versions"]}.flatten.compact
+    @title = Nailed.get_config["title"] || "Dashboard"
+    @products = Nailed.get_config["products"].map{|p,v| v["versions"]}.flatten.compact
     @product_query = @products.join('&product=')
-    @github_repos = Pullrequest.all(:order => [:created_at.desc]).map(&:repository_rname).uniq
   end
 
   helpers do
+    def get_github_repos
+      Pullrequest.all(:order => [:created_at.desc]).map(&:repository_rname).uniq
+    end
+
     def get_trends(action, item)
       case action
       when :bug
@@ -63,18 +68,12 @@ class App < Sinatra::Base
       trend_clone = trend.clone
       begin
         interval = (trend.length/20.0).round
-        last_iter_open = trend.first.open
         trend.each do |bt|
           if trend.index(bt) % interval != 0
             if bt != trend.last
-              if bt.open == last_iter_open
-                trend_clone.delete(bt)
-              end
+              trend_clone.delete(bt)
             end
-          else
-            next
           end
-          last_iter_open = bt.open
         end
       rescue ZeroDivisionError
       end
@@ -84,11 +83,12 @@ class App < Sinatra::Base
 
   # define sinatra routes
   get '/' do
+    @github_repos = get_github_repos
     @l3trend = get_trends(:l3, nil)
     @allpulls = repository(:default).adapter.select("SELECT COUNT(repository_rname) AS open, repository_rname AS label FROM pullrequests GROUP BY repository_rname")
 
     @bugtop = []
-    Nailed::PRODUCTS["products"].each do |product,values|
+    Nailed.get_config["products"].each do |product,values|
       values["versions"].each do |version|
         p = Product.get(version)
         open = Bugreport.count(:product_name => p.name, :is_open => true)
@@ -106,16 +106,17 @@ class App < Sinatra::Base
     haml :index
   end
 
-  Nailed::PRODUCTS["products"].each do |product,values|
+  Nailed.get_config["products"].each do |product,values|
     values["versions"].each do |version|
       get "/#{version.gsub(/ /,'_')}/bugzilla" do
+        @github_repos = get_github_repos
         @product = version
 
         @bugtrend = get_trends(:bug, version)
-        @allbugs = Bugreport.all(:product_name => version).to_json
         @allopenbugs = (Bugreport.all(:product_name => version, :is_open => true) -
                         Bugreport.all(:product_name => version, :whiteboard.like => "%openL3%", :is_open => true)).sort! {|a,b| Time.parse(b.last_change_time.to_s).to_i <=> Time.parse(a.last_change_time.to_s).to_i}
         @allopenl3bugs = (Bugreport.all(:product_name => version, :is_open => true, :whiteboard.like => "%openL3%")).sort! {|a,b| Time.parse(b.last_change_time.to_s).to_i <=> Time.parse(a.last_change_time.to_s).to_i}
+
         @bugprio = []
         {"P1 - Urgent" => "p1",
          "P2 - High" => "p2",
@@ -126,6 +127,15 @@ class App < Sinatra::Base
         end
         @bugprio = @bugprio.to_json
 
+        @top5_components = []
+        components = repository(:default).adapter.select("SELECT component AS label, COUNT(component) AS value FROM bugreports WHERE product_name = '#{version}' AND is_open = 't' GROUP BY component ORDER BY COUNT(component) DESC LIMIT 5")
+        components.each do |bar|
+          @top5_components << {label: bar.label, value: bar.value}
+        end
+        @component_labels = @top5_components.map{|a| a.values[0]}
+        @component_values = @top5_components.map{|a| a.values[1]}
+        @top5_components = @top5_components.to_json
+
         haml :bugzilla
       end
     end unless values["versions"].nil?
@@ -134,9 +144,10 @@ class App < Sinatra::Base
   github_repos = Pullrequest.all(:order => [:created_at.desc]).map(&:repository_rname).uniq
   github_repos.each do |repo|
     get "/github/#{repo}" do
+      @github_repos = get_github_repos
       @repo = repo
-      @org = Repository.get(repo).organization_oname
-      @github_url_all_pulls = "https://github.com/#{@org}/#{@repo}/pulls"
+      org = Repository.get(repo).organization_oname
+      @github_url_all_pulls = "https://github.com/#{org}/#{repo}/pulls"
 
       @allpulls = Pullrequest.all(:repository_rname => repo).sort! {|a,b| b.pr_number <=> a.pr_number}
       @pulltrend = get_trends(:pull, repo)

data/bin/nailed

@@ -19,7 +19,7 @@ end
 abort("try nailed -h") if opts.all?{|k,v| v.is_a?(FalseClass)}
 
 if opts[:server_given]
-  if Nailed::PRODUCTS["products"].nil?
+  if Nailed.get_config["products"].nil?
     abort("Add some data, there is nothing to be shown")
   else
     begin

data/config/{products.yml → config.yml}

@@ -1,4 +1,6 @@
 ---
+title: # Give me a name, or (default) call me Dashboard
+port: # Specify a port where you can reach the webinterface, or (default) 4567
 bugzilla:
   url: # Url of your Bugzilla instance
 products:

data/lib/nailed.rb

@@ -6,42 +6,44 @@ require  File.join(File.expand_path("..", File.dirname(__FILE__)),"db","database
 
 module Nailed
   LOGGER = Logger.new(File.join(File.expand_path("..", File.dirname(__FILE__)),"log","nailed.log"))
-  CONFIG_FILE =  File.join(File.expand_path("..", File.dirname(__FILE__)),"config","products.yml")
-  PRODUCTS = YAML.load_file(CONFIG_FILE)
 
   class Bugzilla
     def initialize
-      Bicho.client = Bicho::Client.new(Nailed::PRODUCTS["bugzilla"]["url"])
+      Bicho.client = Bicho::Client.new(Nailed.get_config["bugzilla"]["url"])
     end
 
     def get_bugs
-      Nailed::PRODUCTS["products"].each do |product,values|
+      Nailed.get_config["products"].each do |product,values|
         values["versions"].each do |version|
-          Bicho::Bug.where(:product => version).each do |bug|
-            attributes = {
-              :bug_id => bug.id,
-              :summary => bug.summary,
-              :status => bug.status,
-              :is_open => bug.is_open,
-              :product_name => bug.product,
-              :component => bug.component,
-              :severity => bug.severity,
-              :priority => bug.priority,
-              :whiteboard => bug.whiteboard,
-              :assigned_to => bug.assigned_to,
-              :creation_time => "#{bug.creation_time.to_date}T#{bug.creation_time.hour}:#{bug.creation_time.min}:#{bug.creation_time.sec}+00:00",
-              :last_change_time => "#{bug.last_change_time.to_date}T#{bug.last_change_time.hour}:#{bug.last_change_time.min}:#{bug.last_change_time.sec}+00:00",
-              :url => bug.url.gsub(/novell.com\//,'suse.com/show_bug.cgi?id=')
-            }
-
-            db_handler = (Bugreport.get(bug.id) || Bugreport.new).update(attributes)
+          begin
+            Bicho::Bug.where(:product => version).each do |bug|
+              attributes = {
+                :bug_id => bug.id,
+                :summary => bug.summary,
+                :status => bug.status,
+                :is_open => bug.is_open,
+                :product_name => bug.product,
+                :component => bug.component,
+                :severity => bug.severity,
+                :priority => bug.priority,
+                :whiteboard => bug.whiteboard,
+                :assigned_to => bug.assigned_to,
+                :creation_time => "#{bug.creation_time.to_date}T#{bug.creation_time.hour}:#{bug.creation_time.min}:#{bug.creation_time.sec}+00:00",
+                :last_change_time => "#{bug.last_change_time.to_date}T#{bug.last_change_time.hour}:#{bug.last_change_time.min}:#{bug.last_change_time.sec}+00:00",
+                :url => bug.url.gsub(/novell.com\//,'suse.com/show_bug.cgi?id=')
+              }
+
+              db_handler = (Bugreport.get(bug.id) || Bugreport.new).update(attributes)
+            end
+          rescue
+            Nailed.log("error","Could not fetch Bugs for #{version}.")
           end
         end unless values["versions"].nil?
       end
     end
 
     def write_bug_trends
-      Nailed::PRODUCTS["products"].each do |product,values|
+      Nailed.get_config["products"].each do |product,values|
         values["versions"].each do |version|
           open = Bugreport.count(:is_open => true, :product_name => version)
           fixed = Bugreport.count(:status => "VERIFIED", :product_name => version) + \
@@ -59,7 +61,12 @@ module Nailed
     end
 
     def write_l3_trends
-      open = Bugreport.count(:whiteboard.like => "%openL3%", :is_open => true)
+      open = 0
+      Nailed.get_config["products"].each do |product,values|
+        values["versions"].each do |version|
+          open += Bugreport.count(:product_name => version, :whiteboard.like => "%openL3%", :is_open => true)
+        end unless values["versions"].nil?
+      end
       db_handler = L3Trend.first_or_create(
                    :time => Time.new.strftime("%Y-%m-%d %H:%M:%S"),
                    :open => open
@@ -73,11 +80,12 @@ module Nailed
     attr_reader :client
 
     def initialize
+      Octokit.auto_paginate = true
       @client = Octokit::Client.new(:netrc => true)
     end
 
     def get_open_pulls
-      Nailed::PRODUCTS["products"].each do |product,values|
+      Nailed.get_config["products"].each do |product,values|
         organization = values["organization"]
         repos = values["repos"]
         repos.each do |repo|
@@ -124,48 +132,54 @@ module Nailed
     end
   end
 
+  extend self
   # Generic methods
-  def Nailed.log(level,msg)
+  def log(level,msg)
     if level == "error"
-      Nailed::LOGGER.error(msg)
+      LOGGER.error(msg)
     else
-      Nailed::LOGGER.info(msg)
+      LOGGER.info(msg)
     end
   end
 
-  def Nailed.get_org_repos(github_client, org)
+  def get_config
+    conf = File.join(File.expand_path("..", File.dirname(__FILE__)),"config","config.yml")
+    YAML.load_file(conf)
+  end
+
+  def get_org_repos(github_client, org)
     all_repos = github_client.org_repos(org)
     all_repos.map(&:name)
   end
 
-  def Nailed.fill_db_after_migration(github_client)
-    Nailed::PRODUCTS["products"].each do |product,values|
+  def fill_db_after_migration(github_client)
+    get_config["products"].each do |product,values|
       organization = values["organization"]
       values["versions"].each do |version|
         db_handler = Product.first_or_create(:name => version)
-        Nailed.save_state(db_handler)
+        save_state(db_handler)
       end unless values["versions"].nil?
       unless organization.nil?
         db_handler = Organization.first_or_create(:oname => organization)
-        Nailed.save_state(db_handler)
-        org_repos_github = Nailed.get_org_repos(github_client, organization)
+        save_state(db_handler)
+        org_repos_github = get_org_repos(github_client, organization)
         org_repos_yml = values["repos"]
         org_repos_yml.each do |org_repo|
           if org_repos_github.include?(org_repo)
             db_handler = Repository.first_or_create(:rname => org_repo, :organization_oname => organization)
-            Nailed.save_state(db_handler)
+            save_state(db_handler)
           end
         end
       end
     end
   end
 
-  def Nailed.list_org_repos(github_client, org)
-    repos = Nailed.get_org_repos(github_client, org)
+  def list_org_repos(github_client, org)
+    repos = get_org_repos(github_client, org)
     repos.each {|r| puts "- #{r}"}
   end
 
-  def Nailed.save_state(db_handler)
+  def save_state(db_handler)
     unless db_handler.save
       puts("ERROR: see logfile")
       log("error", db_handler.errors.inspect)

data/log/nailed.log

@@ -1,6 +0,0 @@
-I, [2015-01-12T21:09:16.448245 #5708]  INFO -- : Database migrated
-I, [2015-01-12T21:11:16.939299 #7487]  INFO -- : Database upgraded
-I, [2015-01-12T21:14:16.471252 #9406]  INFO -- : Database upgraded
-I, [2015-01-12T21:27:06.617120 #11844]  INFO -- : Database migrated
-I, [2015-01-12T21:31:58.597441 #13739]  INFO -- : Database migrated
-I, [2015-01-12T21:42:10.532078 #16032]  INFO -- : Database migrated

data/nailed.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                    = "nailed"
-  s.version                 = "0.0.7"
+  s.version                 = "0.0.8"
   s.date                    = Time.now.strftime("%Y-%m-%d")
   s.summary                 = "Nailed CLI and WebUI"
   s.description             = "Collect and visualize Product related data from Bugzilla and Github"

data/views/bugzilla.haml

@@ -11,9 +11,12 @@
     %hr
     %br
   .row
-    .large-12.columns
+    .large-6.columns
       %h5 Bug Priorities
       #bug_prio
+    .large-6.columns
+      %h5 Top 5 Components
+      #top_components
   .row
     %hr
     %br
@@ -46,6 +49,7 @@
       data: #{@bugtrend},
       xkey: 'time',
       ykeys: ['open', 'fixed'],
+      yLabelFormat: function(y){return y != Math.round(y)?'':y;},
       labels: ['Open', 'Fixed'],
       resize: true,
       fillOpacity: 0.5,
@@ -90,6 +94,20 @@
       else
         window.open("https://bugzilla.suse.com/buglist.cgi?order=Importance&priority="+row.bugprio+"&product=#{@product}&query_format=advanced&resolution=---");
     });
+    new Morris.Donut({
+      element: 'top_components',
+      data: #{@top5_components},
+      colors: colors,
+      resize: true,
+      formatter: function(y, data){
+        return y;
+      }
+    }).on('click', function(i, row){
+      if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent))
+        jQuery.noop();
+      else
+        window.open("https://bugzilla.suse.com/buglist.cgi?order=Importance&component="+row.label+"&product=#{@product}&query_format=advanced&resolution=---");
+    });
     $("[last_change_time]").each(function (index, value){
       var one_week = 604800;
       var two_weeks = 1209600;

data/views/github.haml

@@ -28,6 +28,7 @@
       data: #{@pulltrend},
       xkey: 'time',
       ykeys: ['open'],
+      yLabelFormat: function(y){return y != Math.round(y)?'':y;},
       labels: ['Open'],
       resize: true,
       hideHover: true,
@@ -51,13 +52,13 @@
       var then = $(this).attr("creation_time");
       var diff = now - then;
       if (diff < one_week) {
-        $(value).css("color","#212121").attr('title', 'last change < one week');
+        $(value).css("color","#212121").attr('title', 'opened < one week ago');
       } else if (diff < two_weeks) {
-        $(value).css("color","#E57373").attr('title', 'last change < two weeks');
+        $(value).css("color","#E57373").attr('title', 'opened < two weeks ago');
       } else if (diff < one_month) {
-        $(value).css("color","#C62828").attr('title', 'last change < one month');
+        $(value).css("color","#C62828").attr('title', 'opened < one month ago');
       } else {
-        $(value).css("color","#D50000").attr('title', 'last change > one month');
+        $(value).css("color","#D50000").attr('title', 'opened > one month ago');
       }
     });
   });

data/views/index.haml

@@ -7,7 +7,7 @@
       #bug_top
     .large-6.columns
       %h1.title{:align => "center"}
-        Pullrequests by Component
+        Open Pullrequests by Repo
       #pull_top
     .large-12.columns
       %h1.title{:align => "center"}
@@ -20,7 +20,7 @@
 :javascript
   $(document).foundation();
   $(document).ready(function(){
-    var colors = ['#B39DDB','#9FA8DA','#90CAF9','#81D4FA','#80DEEA','#80CBC4','#A5D6A7','#C5E1A5','#E6EE9C','#FFF59D','#FFE082','#FFCC80','#FFAB91','#BCAAA4','#EEEEEE'].reverse();
+    var colors = ['#FFCDD2','#E1BEE7','#D1C4E9','#C5CAE9','#BBDEFB','#B3E5FC','#B2EBF2','#B2DFDB','#C8E6C9','#DCEDC8','#F0F4C3','#FFF9C4','#FFECB3','#FFE0B2','#FFCCBC','#D7CCC8','#F5F5F5','#CFD8DC','#EF9A9A','#CE93D8','#B39DDB','#9FA8DA','#90CAF9','#81D4FA','#80DEEA','#80CBC4','#A5D6A7','#C5E1A5','#E6EE9C','#FFF59D','#FFE082','#FFCC80','#FFAB91','#BCAAA4'].reverse();//sort(function() { return 0.5 - Math.random() });
     new Morris.Donut({
       element: 'pull_top',
       data: #{@pulltop},
@@ -51,6 +51,7 @@
       data: #{@l3trend},
       xkey: 'time',
       ykeys: ['open'],
+      yLabelFormat: function(y){return y != Math.round(y)?'':y;},
       labels: ['Open'],
       resize: true,
       hideHover: true,

data/views/layout.haml

@@ -5,7 +5,7 @@
     != css :morris, :media => 'screen'
     %meta{:charset => "utf-8"}
     %meta{:name => "viewport", :content => "width=device-width, initial-scale=1.0"}
-    %title Dashboard
+    %title #{@title}
     %link{:href => "/images/favicon.ico", :rel => "shortcut icon"}
   %body
     .off-canvas-wrap{:data => {'offcanvas' => true}}
@@ -17,7 +17,7 @@
               %span
           %section.middle.tab-bar-section
             %h1.title
-              %a{:href => '/',:style => "color:white"} Dashboard
+              %a{:href => '/',:style => "color:white"} #{@title}
     
         %aside.left-off-canvas-menu
           %ul.off-canvas-list

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nailed
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Maximilian Meister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -149,7 +149,7 @@ files:
 - README.rdoc
 - bin/app
 - bin/nailed
-- config/products.yml
+- config/config.yml
 - config/products.yml.example
 - db/database.rb
 - lib/nailed.rb
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Nailed CLI and WebUI