ghuls 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e229b2ce91656c21cd090555604a68391eaabdb
-  data.tar.gz: 11959e17c68899568dc01103ca2e7c3705a5eb22
+  metadata.gz: 57fd274e8ef0970e5b162dd964a03e0d300d6776
+  data.tar.gz: 67102aa993294944e1a5a1c29438f4d2f0d0d7a8
 SHA512:
-  metadata.gz: 78c393320cab0baac3dee0571e36d5fa7eeff623303815314784aa4ecaf62be1027884f6c271040f6f999f249ffd23a6f03af984d92973d7fa30bf9509eb785e
-  data.tar.gz: 22f0bb003f9c279a28a99fa6324225a5c69bae90fbb76a260ba0adc688f51b8f56bdcc65fe26d9a22690d411e908ff2bb7c61589044801fc4edfa11d0e2e057c
+  metadata.gz: e29f031fcbaf92e49ce774f96a8e3c3443c138bcf00c27a11602cdfdfe246f7ced2f79e38af11f9d244718e81dace07e6a520028ee7598ed527e2177a814aa8d
+  data.tar.gz: e889f014e5b211e7d7faf488ba9fba4b791b7d17ec600d8e4ddccb006f41577b551ee3b8496562cabb5c6a90616905c1c4243ee325c30ce1c8e55f4ced6c6a33

data/cli/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 ## Version 1
+### Version 1.1.0
+* Organizations that the -g user contributed to are now supported.
+* Better error-type-thing reporting.
+* Catches Octokit::Unauthorized errors and returns false when initializing the client.
+* Fix user_exists? error catching minor syntax bug.
+
+
 ### Version 1.0.2
 * Actually fix load path stuff again.
 

data/cli/lib/ghuls/cli.rb

@@ -1,7 +1,6 @@
 require 'octokit'
 require 'base64'
 require 'rainbow'
-require 'string-utility'
 require_relative "#{Dir.pwd}/utils/utilities"
 
 module GHULS
@@ -56,24 +55,43 @@ module GHULS
       true if @opts[:token].nil? && @opts[:pass].nil?
     end
 
+    def output(percents)
+      percents.each do |l, p|
+        color = Utilities.get_color_for_language(l.to_s, @colors)
+        puts Rainbow("#{l}: #{p}%").color(color)
+      end
+    end
+
+    def fail_after_analyze
+      puts 'Sorry, something went wrong.'
+      puts "We either could not find anyone under the name #{@opts[:get]}, " \
+           'or we could not find any data for them.'
+      puts 'Please try again with a different user. If you believe this is ' \
+           'an error, please report it to the developer.'
+      exit
+    end
+
     # Simply runs the program.
     def run
       puts @usage if failed?
       puts @help if @opts[:help]
       exit if failed?
       puts "Getting language data for #{@opts[:get]}..."
-      percents = Utilities.analyze(@opts[:get], @gh)
-      if percents
-        percents.each do |l, p|
-          color = Utilities.get_color_for_language(l.to_s, @colors)
-          color = StringUtility.random_color_six if color.nil?
-          puts Rainbow("#{l}: #{p}%").color(color)
+      user_percents = Utilities.analyze_user(@opts[:get], @gh)
+      org_percents = Utilities.analyze_orgs(@opts[:get], @gh)
+
+      if user_percents != false
+        output(user_percents)
+        if org_percents != false
+          puts 'Getting language data for their organizations...'
+          output(org_percents)
+        else
+          exit
         end
       else
-        puts "Sorry, we could not find anyone under the name #{@opts[:get]}. " \
-             'Please try again with a user that exists.'
-        exit
+        fail_after_analyze
       end
+      exit
     end
   end
 end

data/utils/utilities.rb

@@ -1,4 +1,5 @@
 require 'octokit'
+require 'string-utility'
 
 module Utilities
   # Gets the Octokit and colors for the program.
@@ -12,8 +13,12 @@ module Utilities
     user = opts[:user]
     gh = Octokit::Client.new(login: user, password: pass) if token.nil?
     gh = Octokit::Client.new(access_token: token) unless token.nil?
-    encoded = gh.contents('ozh/github-colors', path: 'colors.json')[:content]
-    colors = JSON.parse(Base64.decode64(encoded))
+    begin
+      encoded = gh.contents('ozh/github-colors', path: 'colors.json')[:content]
+      colors = JSON.parse(Base64.decode64(encoded))
+    rescue Octokit::Unauthorized
+      return false
+    end
     { git: gh, colors: colors }
   end
 
@@ -25,21 +30,54 @@ module Utilities
     full.at(full.index(single) + 1)
   end
 
+  # Gets whether or not the user exists.
+  # @param username [String] The user to check
+  # @param github [Octokit::Client] The instance of Octokit to use.
+  # @return [Boolean] True if it does, false if it doesn't.
   def self.user_exists?(username, github)
     begin
-      github.user(username).is_a?(Octokit::NotFound)
+      github.user(username)
     rescue Octokit::NotFound
       return false
     end
     true
   end
 
+  # Returns the repos in the user's organizations that they have actually
+  #   contributed to.
+  # @param username [String] See #user_exists?
+  # @param github [Octokit::Client] See #user_exists?
+  # @return [Array] All the repository full names that the user has contributed
+  #   to.
+  def self.get_org_repos(username, github)
+    orgs = github.organizations(username)
+    repos = []
+    orgs.each do |o|
+      repos += github.repositories(o[:login])
+    end
+    true_repos = []
+    repos.each do |r|
+      begin
+        is_collaborator = github.collaborator?(r[:full_name], username)
+      rescue Octokit::Forbidden
+        next
+      end
+      if is_collaborator
+        next if r[:fork]
+        true_repos.push(r[:full_name])
+      else
+        next
+      end
+    end
+    true_repos
+  end
+
   # Gets the langauges and their bytes for the :user.
   # @param username [String] The username to get info for.
   # @param github [OctoKit::Client] The instance of Octokit::Client.
   # @return [Hash] The languages and their bytes, as formatted as
   #   { :Ruby => 129890, :CoffeeScript => 5970 }
-  def self.get_langs(username, github)
+  def self.get_user_langs(username, github)
     repos = github.repositories(username)
     langs = {}
     repos.each do |r|
@@ -57,6 +95,23 @@ module Utilities
     langs
   end
 
+  def self.get_org_langs(username, github)
+    org_repos = get_org_repos(username, github)
+    langs = {}
+    org_repos.each do |r|
+      repo_langs = github.languages(r)
+      repo_langs.each do |l, b|
+        if langs[l].nil?
+          langs[l] = b
+        else
+          existing = langs[l]
+          langs[l] = existing + b
+        end
+      end
+    end
+    langs
+  end
+
   # Gets the percentage for the given numbers.
   # @param part [Fixnum] The partial value.
   # @param whole [Fixnum] The whole value.
@@ -71,20 +126,39 @@ module Utilities
   # @return [String] The 6 digit hexidecimal color.
   # @return [Nil] If there is no defined color for the language.
   def self.get_color_for_language(lang, colors)
-    return colors[lang]['color'] unless colors[lang]['color'].nil?
+    if colors[lang]['color'].nil?
+      return StringUtility.random_color_six
+    else
+      return colors[lang]['color']
+    end
   end
 
-  def self.analyze(username, github)
+  def self.get_language_percentages(langs)
+    total = 0
+    langs.each { |_, b| total += b }
+    lang_percents = {}
+    langs.each do |l, b|
+      percent = Utilities.calculate_percent(b, total.to_f)
+      lang_percents[l] = percent.round(2)
+    end
+    lang_percents
+  end
+
+  def self.analyze_orgs(username, github)
     if user_exists?(username, github)
-      languages = get_langs(username, github)
-      total = 0
-      languages.each { |_, b| total += b }
-      language_percentages = {}
-      languages.each do |l, b|
-        percent = Utilities.calculate_percent(b, total.to_f)
-        language_percentages[l] = percent.round(2)
-      end
-      language_percentages
+      langs = get_org_langs(username, github)
+      return false if langs.empty?
+      get_language_percentages(langs)
+    else
+      false
+    end
+  end
+
+  def self.analyze_user(username, github)
+    if user_exists?(username, github)
+      langs = get_user_langs(username, github)
+      return false if langs.empty?
+      get_language_percentages(langs)
     else
       false
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghuls
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Eli Foster