nailed 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62065482b202db7a593d6a2cd6d53e8b562abaac
-  data.tar.gz: 156454d961ad7cd6afb1aa77579cc7672b95ae2f
+  metadata.gz: ce2404c40672c72f705429cb68a1c19e869373d9
+  data.tar.gz: 9bf34170e942c1c7eb8e94c5f693dbf1b2726697
 SHA512:
-  metadata.gz: c31d0eed612c744f457aa0cceed17dc359442be1b9ad62598a01f28480e9bb4c1a8c2c7fd2bc10cc3e2849b6f562b86dc4723c23412360056c0b6d54439645d3
-  data.tar.gz: 92d3d50f5392ab49bc3036c5818924b2209f6961112b1bb431beed82f94e9663354db2a346f9897c49e21d445d427252515d65bead0e5109206637f4ac5f4863
+  metadata.gz: ab2f21d36218a247cf1faac6a037e0ad493b4761382aea20a8ac760ba27b9253fde6b062f749d07c415142ee98de30ae0e935427cdeadfbecc054c89ec0b66a1
+  data.tar.gz: adaa596a312b6d07d8c0f18f80d16cefab2b3e0c462f19f5a1b9c554be2ef2fef15e010bdf6976ec5261fb18e6db797ffa6a73a37b38103ee40995c5e410fc50

data/README.md

@@ -19,7 +19,7 @@ Options:
       --upgrade, -u:   Upgrade database
      --bugzilla, -b:   Refresh bugzilla database records
        --github, -g:   Refresh github database records
-           --l3, -l:   Refresh l3 trend database records
+     --list, -l <s>:   List github repositories within organization
        --server, -s:   Start a dashboard webinterface
          --help, -h:   Show this message
 ```
@@ -55,10 +55,9 @@ products:
     # Array of Bugzilla products (typically different versions of one product)
     # Exact names have to be given, as they appear in Bugzilla (can not be arbitrary)
     organization: # here goes the organization name (under which your repos are hosted) as it appears in GitHub
-    # just leave it blank if your repo isn't hosted under an organizational umbrella
     repos:
     # Array of GitHub repository names, as they appear in GitHub
-    # If there are no associated repos for the product, just leave it blank
+    # query available repos with nailed -l <organization>
   # continue adding more products here
 
 ```
@@ -73,7 +72,6 @@ nailed --upgrade
 ```
 nailed --bugzilla
 nailed --github
-nailed --l3
 ```
 * restart the webserver
 

data/README.rdoc

@@ -19,7 +19,7 @@ Alternatively run it directly from the git directory
          --upgrade, -u:   Upgrade database
         --bugzilla, -b:   Refresh bugzilla database records
           --github, -g:   Refresh github database records
-              --l3, -l:   Refresh l3 trend database records
+        --list, -l <s>:   List github repositories within organization
           --server, -s:   Start a dashboard webinterface
             --help, -h:   Show this message
 
@@ -51,10 +51,9 @@ All configuration is read from +config/products.yml+
        # Array of Bugzilla products (typically different versions of one product)
        # Exact names have to be given, as they appear in Bugzilla (can not be arbitrary)
        organization: # here goes the organization name (under which your repos are hosted) as it appears in GitHub
-       # just leave it blank if your repo isn't hosted under an organizational umbrella
        repos:
        # Array of GitHub repository names, as they appear in GitHub
-       # If there are no associated repos for the product, just leave it blank
+       # query available repos with nailed -l <organization>
      # continue adding more products here
 
 == Changes in production
@@ -64,7 +63,6 @@ All configuration is read from +config/products.yml+
 * make sure to fetch new data with
    nailed --bugzilla
    nailed --github
-   nailed --l3
 * restart the webserver
 
 == Run

data/bin/app

@@ -45,7 +45,7 @@ class App < Sinatra::Base
   }
 
   before do
-    @products = Nailed::PRODUCTS["products"].map{|p,v| v["versions"]}.flatten
+    @products = Nailed::PRODUCTS["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
@@ -85,6 +85,7 @@ class App < Sinatra::Base
   # define sinatra routes
   get '/' do
     @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|
@@ -92,10 +93,16 @@ class App < Sinatra::Base
         p = Product.get(version)
         open = Bugreport.count(:product_name => p.name, :is_open => true)
         @bugtop << {label: p.name, value: open} unless open == 0
-      end
+      end unless values["versions"].nil?
     end
     @bugtop = @bugtop.to_json
 
+    @pulltop = []
+    @allpulls.each do |donut_bite|
+      @pulltop << {label: donut_bite.label, value: donut_bite.open}
+    end
+    @pulltop = @pulltop.to_json
+
     haml :index
   end
 
@@ -121,11 +128,11 @@ class App < Sinatra::Base
 
         haml :bugzilla
       end
-    end
+    end unless values["versions"].nil?
   end
 
-  @github_repos = Pullrequest.all(:order => [:created_at.desc]).map(&:repository_rname).uniq
-  @github_repos.each do |repo|
+  github_repos = Pullrequest.all(:order => [:created_at.desc]).map(&:repository_rname).uniq
+  github_repos.each do |repo|
     get "/github/#{repo}" do
       @repo = repo
       @org = Repository.get(repo).organization_oname

data/bin/nailed

@@ -12,7 +12,7 @@ opts = Trollop::options do
   opt :upgrade, "Upgrade database", :short => 'u'
   opt :bugzilla, "Refresh bugzilla database records", :short => 'b'
   opt :github, "Refresh github database records", :short => 'g'
-  opt :l3, "Refresh l3 trend database records", :short => 'l'
+  opt :list, "List github repositories within organization", :type => :string, :short => 'l'
   opt :server, "Start a dashboard webinterface", :short => 's'
 end
 
@@ -73,15 +73,19 @@ opts.each_pair do |key,val|
     if val
       bugzilla_client.get_bugs
       bugzilla_client.write_bug_trends
+      bugzilla_client.write_l3_trends
     end
   when :github
     if val
       github_client.update_pull_states
       github_client.get_open_pulls
     end
-  when :l3
+  when :list
     if val
-      bugzilla_client.write_l3_trends
+      begin
+        Nailed.list_org_repos(github_client.client, val)
+      rescue
+      end
     end
   end
 end

data/config/products.yml

@@ -1,41 +1,13 @@
 ---
 bugzilla:
-  url: https://bugzilla.novell.com
+  url: # Url of your Bugzilla instance
 products:
-  cloud:
+  example_product: # Just a a short key/name for the product (can be arbitrary)
     versions:
-    - SUSE Cloud 3
-    - SUSE Cloud 4
-    - SUSE Cloud 5
-    organization: crowbar
+    # Array of Bugzilla products (typically different versions of one product)
+    # Exact names have to be given, as they appear in Bugzilla (can not be arbitrary)
+    organization: # here goes the organization name (under which your repos are hosted) as it appears in GitHub
     repos:
-    - crowbar
-    - barclamp-crowbar
-    - barclamp-deployer
-    - barclamp-dns
-    - barclamp-ganglia
-    - barclamp-ipmi
-    - barclamp-logging
-    - barclamp-nagios
-    - barclamp-network
-    - barclamp-ntp
-    - barclamp-provisioner
-    - barclamp-redhat-install
-    - barclamp-test
-    - barclamp-ubuntu-install
-    - barclamp-glance
-    - barclamp-nova
-    - barclamp-swift
-    - barclamp-keystone
-    - barclamp-mysql
-    - barclamp-kong
-    - barclamp-nova_dashboard
-    - barclamp-openstack
-    - barclamp-hadoop
-    - barclamp-hive
-    - barclamp-pig
-    - barclamp-zookeeper
-    - barclamp-sqoop
-    - barclamp-quantum
-    - barclamp-clouderamanager
-    - barclamp-ApacheHadoop
+    # Array of GitHub repository names, as they appear in GitHub
+    # query available repos with nailed -l <organization>
+  # continue adding more products here

data/lib/nailed.rb

@@ -36,7 +36,7 @@ module Nailed
 
             db_handler = (Bugreport.get(bug.id) || Bugreport.new).update(attributes)
           end
-        end
+        end unless values["versions"].nil?
       end
     end
 
@@ -54,7 +54,7 @@ module Nailed
                        )
 
           Nailed.save_state(db_handler)
-        end
+        end unless values["versions"].nil?
       end
     end
 
@@ -81,11 +81,7 @@ module Nailed
         organization = values["organization"]
         repos = values["repos"]
         repos.each do |repo|
-          if organization.nil?
-            pulls = @client.pull_requests(repo)
-          else
-            pulls = @client.pull_requests("#{organization}/#{repo}")
-          end
+          pulls = @client.pull_requests("#{organization}/#{repo}")
           pulls.each do |pr|
             db_handler = Pullrequest.first_or_create(
                          :pr_number => pr.number,
@@ -144,27 +140,31 @@ module Nailed
 
   def Nailed.fill_db_after_migration(github_client)
     Nailed::PRODUCTS["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)
       end unless values["versions"].nil?
-      if values["organization"].nil?
-        values["repos"].each do |repo|
-          db_handler = Repository.first_or_create(:repo => repo)
-          Nailed.save_state(db_handler)
-        end unless values["repos"].nil?
-      else
-        db_handler = Organization.first_or_create(:oname => values["organization"])
+      unless organization.nil?
+        db_handler = Organization.first_or_create(:oname => organization)
         Nailed.save_state(db_handler)
-        org_repos = Nailed.get_org_repos(github_client, values["organization"])
-        org_repos.each do |org_repo|
-          db_handler = Repository.first_or_create(:rname => org_repo, :organization_oname => values["organization"])
-          Nailed.save_state(db_handler)
+        org_repos_github = Nailed.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)
+          end
         end
       end
     end
   end
 
+  def Nailed.list_org_repos(github_client, org)
+    repos = Nailed.get_org_repos(github_client, org)
+    repos.each {|r| puts "- #{r}"}
+  end
+
   def Nailed.save_state(db_handler)
     unless db_handler.save
       puts("ERROR: see logfile")

data/log/nailed.log

@@ -1,22 +1,6 @@
-I, [2014-12-26T19:12:21.897639 #20167]  INFO -- : Database migrated
-I, [2014-12-26T19:12:43.000427 #20209]  INFO -- : SUSE Cloud 5 added to the database
-E, [2014-12-27T00:32:35.768870 #2179] ERROR -- : #<DataMapper::Validations::ValidationErrors:0x007eff6bb37448 @resource=#<Organization @org=nil>, @errors={:org=>["Org must not be blank"]}>
-E, [2014-12-27T00:35:25.850846 #2214] ERROR -- : #<DataMapper::Validations::ValidationErrors:0x007f1225081f90 @resource=#<Organization @org=nil>, @errors={:org=>["Org must not be blank"]}>
-E, [2014-12-27T00:36:27.669037 #2247] ERROR -- : #<DataMapper::Validations::ValidationErrors:0x007f029cbff900 @resource=#<Organization @org=nil>, @errors={:org=>["Org must not be blank"]}>
-I, [2014-12-27T00:36:30.550094 #2247]  INFO -- : Database migrated
-I, [2014-12-27T00:38:37.370374 #2291]  INFO -- : Database migrated
-I, [2014-12-27T01:19:00.149273 #2495]  INFO -- : Database migrated
-I, [2014-12-27T01:24:19.810697 #2536]  INFO -- : Database migrated
-I, [2014-12-27T01:31:49.308007 #2922]  INFO -- : Database migrated
-I, [2014-12-27T11:02:23.637145 #2001]  INFO -- : Database migrated
-I, [2014-12-27T11:14:41.706276 #2104]  INFO -- : Database migrated
-I, [2014-12-27T11:19:14.371811 #2239]  INFO -- : Database migrated
-I, [2014-12-27T11:19:45.941606 #2284]  INFO -- : Database migrated
-I, [2014-12-27T11:20:26.744399 #2329]  INFO -- : Database migrated
-I, [2014-12-27T13:03:00.951952 #1752]  INFO -- : Database migrated
-I, [2014-12-29T15:37:45.322611 #5160]  INFO -- : Database upgraded
-I, [2014-12-29T15:40:17.109444 #5496]  INFO -- : Database upgraded
-I, [2014-12-31T10:30:48.046995 #2420]  INFO -- : Database migrated
-I, [2014-12-31T10:52:19.297754 #3508]  INFO -- : Database migrated
-I, [2014-12-31T14:28:46.717211 #5175]  INFO -- : Database migrated
-I, [2014-12-31T14:29:26.856323 #5513]  INFO -- : Database upgraded
+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.6"
+  s.version                 = "0.0.7"
   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/index.haml

@@ -1,10 +1,14 @@
 !!!
 %section.main-section
   .row
-    .large-12.columns
+    .large-6.columns
       %h1.title{:align => "center"}
         Open Bugs by Product
       #bug_top
+    .large-6.columns
+      %h1.title{:align => "center"}
+        Pullrequests by Component
+      #pull_top
     .large-12.columns
       %h1.title{:align => "center"}
         L3 Trend
@@ -17,6 +21,20 @@
   $(document).foundation();
   $(document).ready(function(){
     var colors = ['#B39DDB','#9FA8DA','#90CAF9','#81D4FA','#80DEEA','#80CBC4','#A5D6A7','#C5E1A5','#E6EE9C','#FFF59D','#FFE082','#FFCC80','#FFAB91','#BCAAA4','#EEEEEE'].reverse();
+    new Morris.Donut({
+      element: 'pull_top',
+      data: #{@pulltop},
+      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("/github/"+row.label,"_self");
+    });
     new Morris.Donut({
       element: 'bug_top',
       data: #{@bugtop},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nailed
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Maximilian Meister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Nailed CLI and WebUI