ghuls-lib 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 854c231a6588d4e5c56be67a62dd3cce4e033daf
-  data.tar.gz: 47dc5e611a68cc4a64ca332194929986ffafecc9
+  metadata.gz: b4e2040544766256c602ec373c8009ab23cc84d2
+  data.tar.gz: 889301d654b0f5bc7d24f237c7c887a821e578f5
 SHA512:
-  metadata.gz: 387fd02a78926e93f1e4a1c2796d727d3f8ef971b044a1d3e6de6ae5cb88e25e05750ce6f989fa9c3035fffd882fd5ad79d8a360f07c3a2ddf92b93eccd5de8a
-  data.tar.gz: ce8a91b7760ffc57fef2a40e81a79bb9c7a2036a40247fad3670d47a0a66d1db266348deda00da1390126e0cc98f21b51c5bf48b2a2dc0e96bd5bd2db7031fc0
+  metadata.gz: 83007bb0b206a49e418a21b714813e4778c8bff5f3b265a1c4a2624c83b6ea7f880d5e3f38a17d8bf2c6172303c1d009dcb4429d7ec69e4b1a6dddf83aa0f1fa
+  data.tar.gz: dc6ea9e9b2d07a7f5beccd73868ca99c85324257da745d5b27445d961833559e52ee91d030f67f7f5c305265cc08f816886b94a85e674c11fe8d20210544aa6e

data/lib/ghuls/lib.rb

@@ -1,6 +1,7 @@
 require 'octokit'
 require 'string-utility'
 require 'open-uri'
+require 'faraday-http-cache'
 
 module GHULS
   module Lib
@@ -15,13 +16,18 @@ module GHULS
       user = opts[:user]
       gh = Octokit::Client.new(login: user, password: pass) if token.nil?
       gh = Octokit::Client.new(access_token: token) unless token.nil?
+      stack = Faraday::RackBuilder.new do |builder|
+        builder.use Faraday::HttpCache, shared_cache: false
+        builder.use Octokit::Response::RaiseError
+        builder.adapter :net_http_persistent
+      end
+      gh.middleware = stack
       begin
         encode = gh.contents('ozh/github-colors', path: 'colors.json')[:content]
-        colors = JSON.parse(Base64.decode64(encode))
+        { git: gh, colors: JSON.parse(Base64.decode64(encode)) }
       rescue Octokit::Unauthorized
         return false
       end
-      { git: gh, colors: colors }
     end
 
     # Gets the next value in an array.
@@ -29,7 +35,7 @@ module GHULS
     # @param full [Array] The main array to parse.
     # @return [Any] The next value in the array.
     def self.get_next(single, full)
-      full.at(full.index(single) + 1)
+      full[full.index(single) + 1]
     end
 
     # Gets the user and checks if it exists in the process.
@@ -38,15 +44,13 @@ module GHULS
     # @return [Hash] Their username and avatar URL.
     # @return [Boolean] False if it does not exist.
     def self.get_user_and_check(user, github)
-      begin
-        user_full = github.user(user)
-      rescue Octokit::NotFound
-        return false
-      end
+      user_full = github.user(user)
       {
         username: user_full[:login],
         avatar: user_full[:avatar_url]
       }
+    rescue Octokit::NotFound
+      return false
     end
 
     # Returns the repos in the user's organizations that they have actually
@@ -92,14 +96,10 @@ module GHULS
     # @param github [Octkit::Client] See #get_user_and_check
     # @return [Hash] The forks, stars, and watcher count.
     def self.get_forks_stars_watchers(repository, github)
-      stargazers = github.stargazers(repository).length
-      forks = github.forks(repository).length
-      watchers = github.subscribers(repository).length
-
       {
-        forks: forks,
-        stars: stargazers,
-        watchers: watchers
+        forks: github.forks(repository).length,
+        stars: github.stargazers(repository).length,
+        watchers: github.subscribers(repository).length
       }
     end
 
@@ -108,12 +108,9 @@ module GHULS
     # @param github [Octokit::Client] See #get_user_and_check
     # @return [Hash] The number of following and followed users.
     def self.get_followers_following(username, github)
-      following = github.following(username)
-      followers = github.followers(username)
-
       {
-        following: following.length,
-        followers: followers.length
+        following: github.following(username).length,
+        followers: github.followers(username).length
       }
     end
 
@@ -191,8 +188,7 @@ module GHULS
           if langs[l].nil?
             langs[l] = b
           else
-            existing = langs[l]
-            langs[l] = existing + b
+            langs[l] += b
           end
         end
       end
@@ -213,10 +209,12 @@ module GHULS
     # @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)
-      if colors[lang].nil? || colors[lang]['color'].nil?
+      color_lang = colors[lang]
+      color = color_lang['color']
+      if colors_lang.nil? || color.nil?
         return StringUtility.random_color_six
       else
-        return colors[lang]['color']
+        return color
       end
     end
 
@@ -269,15 +267,16 @@ module GHULS
       mirrors = []
       privates = []
       repos.each do |r|
-        forks.push(r[:full_name]) if r[:fork]
+        repo_name = r[:full_name]
+        forks.push(repo_name) if r[:fork]
 
         if r[:private]
-          privates.push(r[:full_name])
+          privates.push(repo_name)
         else
-          publics.push(r[:full_name])
+          publics.push(repo_name)
         end
 
-        mirrors.push(r[:full_name]) unless r[:mirror_url].nil?
+        mirrors.push(repo_name) unless r[:mirror_url].nil?
       end
 
       {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ghuls-lib
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Eli Foster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -30,14 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The library used for and by the GHULS applications.
 email: elifosterwy@gmail.com
 executables: []