git-trend 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3de2ef516de70662c6b0e2fc26fadb1c474b3b7b
-  data.tar.gz: 23424ba56d2c4d993448d35174dba801d661140c
+  metadata.gz: 99bb0889decc7985ef6ebd3b3fee506d64c5fbaa
+  data.tar.gz: 127d52472cff601c90626748d9ff4cb148a053d5
 SHA512:
-  metadata.gz: 59767034d3a06bd1a49748a32638db9056b44e31005ee41aaacf50b98f5688a49162e6779850019539f964f594cfd0bbec80963df56889babac94bea72ef92df
-  data.tar.gz: a04ede690fcfd3610a374f1b882a336c936023b1ace92240b1479192bf71439494c82754c186d3a7a2161d09960a3be13457aee9c65a027948f84c87ce56bd99
+  metadata.gz: 396120a4a0cc592a0899edc6295190b09d31d67f67920e09f602de62aa45f210f9f04406e6fd55b9dbdca3c0e368402275cc90863d73bfe959b29f2f406c977b
+  data.tar.gz: 339990a96db3c8643d93852cabfd53046cfd16c0abb5380e9d9bde8f8d29baf2e20a825b820692bc632d3c01ef5e5727674086cff91f04cc28f25d87cc6fb92f

data/.gitignore

@@ -3,6 +3,7 @@
 .DS_Store
 .bundle
 .config
+.rubocop-*
 .yardoc
 Gemfile.lock
 InstalledFiles

data/.rubocop.yml

@@ -0,0 +1,2 @@
+inherit_from:
+  - https://raw.githubusercontent.com/rails/rails/master/.rubocop.yml

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.1.0 (Sat Nov  5 2016)
+- Adapted new github trending [49abccb]
+- Update gems [4051404]
+
 ## v1.0.2 (Fri Apr  1 2016)
 - Update gems [0d24fae]
 

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in git-trend.gemspec
 gemspec

data/README.md

@@ -27,7 +27,7 @@ Or install it yourself as:
 
     $ gem install git-trend
 
-## Usage Of a gem
+## Usage of a gem
 
 Require it if you haven't:
 
@@ -76,7 +76,7 @@ GitTrend.get(language: :ruby, since: :weekly)
 
     GitTrend.languages
 
-## Usage Of a command line tool
+## Usage of a command line tool
 
 Use the git-trend as follows:
 

data/Rakefile

@@ -1,5 +1,5 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'bundler/setup'
-require 'git_trend'
+require "bundler/setup"
+require "git_trend"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require 'git_trend'
 # require "pry"
 # Pry.start
 
-require 'irb'
+require "irb"
 IRB.start

data/exe/git-trend

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 
-require 'git_trend'
+require "git_trend"
 
 GitTrend::CLI.start

data/git-trend.gemspec

@@ -1,12 +1,12 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'git_trend/version'
+require "git_trend/version"
 
 def install_message
-  s = ''
+  s = ""
   s << "\xf0\x9f\x8d\xba  " if or_over_mac_os_lion?
-  s << 'Thanks for installing!'
+  s << "Thanks for installing!"
 end
 
 def or_over_mac_os_lion?
@@ -14,41 +14,41 @@ def or_over_mac_os_lion?
 
   macos_full_version = `/usr/bin/sw_vers -productVersion`.chomp
   macos_version = macos_full_version[/10\.\d+/]
-  macos_version >= '10.7' # 10.7 is lion
+  macos_version >= "10.7" # 10.7 is lion
 end
 
 Gem::Specification.new do |spec|
-  spec.name          = 'git-trend'
+  spec.name          = "git-trend"
   spec.version       = GitTrend::VERSION
-  spec.authors       = ['rochefort']
-  spec.email         = ['terasawan@gmail.com']
-  spec.summary       = 'CLI-Based tool that show Trending repository on github'
+  spec.authors       = ["rochefort"]
+  spec.email         = ["terasawan@gmail.com"]
+  spec.summary       = "CLI-Based tool that show Trending repository on github"
   spec.description   = spec.summary
-  spec.homepage      = 'https://github.com/rochefort/git-trend'
-  spec.license       = 'MIT'
+  spec.homepage      = "https://github.com/rochefort/git-trend"
+  spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.bindir        = 'exe'
+  spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
   spec.post_install_message = install_message
 
-  spec.add_dependency 'addressable', '~> 2.4.0'
-  spec.add_dependency 'mb_string',   '~> 0.1.6'
-  spec.add_dependency 'mechanize',   '~> 2.7.4'
-  spec.add_dependency 'thor',        '~> 0.19.1'
-  spec.add_dependency 'unicode-display_width', '~> 1.0.3'
+  spec.add_dependency "addressable", "~> 2.4.0"
+  spec.add_dependency "mb_string",   "~> 0.1.7"
+  spec.add_dependency "mechanize",   "~> 2.7.4"
+  spec.add_dependency "thor",        "~> 0.19.1"
+  spec.add_dependency "unicode-display_width", "~> 1.1.1"
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake',    '~> 11.1.2'
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake",    "~> 11.3.0"
 
-  spec.add_development_dependency 'rspec',     '~> 3.4.0'
-  spec.add_development_dependency 'simplecov', '~> 0.11.2'
-  spec.add_development_dependency 'safe_yaml', '~> 1.0.4' # for Ruby2.2.0
-  spec.add_development_dependency 'webmock',   '~> 1.24.2'
+  spec.add_development_dependency "rspec",     "~> 3.5.0"
+  spec.add_development_dependency "simplecov", "~> 0.12.0"
+  spec.add_development_dependency "safe_yaml", "~> 1.0.4" # for Ruby2.2.0
+  spec.add_development_dependency "webmock",   "~> 2.1.0"
 
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency "coveralls", "~> 0.8.15"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
 end

data/lib/git-trend.rb

@@ -1 +1 @@
-require 'git_trend'
+require "git_trend"

data/lib/git_trend.rb

@@ -1,9 +1,9 @@
-require 'mb_string'
+require "mb_string"
 
-require 'git_trend/cli'
-require 'git_trend/project'
-require 'git_trend/scraper'
-require 'git_trend/version'
+require "git_trend/cli"
+require "git_trend/project"
+require "git_trend/scraper"
+require "git_trend/version"
 
 module GitTrend
   class ScrapeException < StandardError; end

data/lib/git_trend/cli.rb

@@ -1,28 +1,28 @@
-require 'thor'
-require 'git_trend/rendering'
+require "thor"
+require "git_trend/rendering"
 
 module GitTrend
   class CLI < Thor
     include Rendering
 
-    map '-v'              => :version,
-        '--version'       => :version
+    map "-v"              => :version,
+        "--version"       => :version
 
     default_command :list
 
-    desc :version, 'show version'
+    desc :version, "show version"
     def version
       say "git-trend version: #{VERSION}", :green
     end
 
     desc :list, "\033[32m(DEFAULT COMMAND)\e[0m List Trending repository on github [-l, -s, -d]"
-    option :language,    aliases: '-l', required: false, desc: 'Specify a language'
-    option :since,       aliases: '-s', required: false, desc: 'Enable: [d, day, daily, w, week, weekly, m, month, monthly]'
-    option :description, aliases: '-d', required: false, default: true, type: :boolean, desc: "\033[32m(DEFAULT OPTION)\e[0m Dislpay descriptions"
-    option :number,      aliases: '-n', required: false, type: :numeric, desc: 'Number of lines'
-    option :help,        aliases: '-h', required: false, type: :boolean
+    option :language,    aliases: "-l", required: false, desc: "Specify a language"
+    option :since,       aliases: "-s", required: false, desc: "Enable: [d, day, daily, w, week, weekly, m, month, monthly]"
+    option :description, aliases: "-d", required: false, default: true, type: :boolean, desc: "\033[32m(DEFAULT OPTION)\e[0m Dislpay descriptions"
+    option :number,      aliases: "-n", required: false, type: :numeric, desc: "Number of lines"
+    option :help,        aliases: "-h", required: false, type: :boolean
     def list
-      help(:list) and return if options[:help]
+      help(:list) && return if options[:help]
       scraper = Scraper.new
       projects = scraper.get(options[:language], options[:since], options[:number])
       render(projects, !!options[:description])
@@ -31,7 +31,7 @@ module GitTrend
       say e.message unless e.class.to_s == e.message
     end
 
-    desc :languages, 'Show selectable languages'
+    desc :languages, "Show selectable languages"
     def languages
       scraper = Scraper.new
       languages = scraper.languages

data/lib/git_trend/project.rb

@@ -1,6 +1,14 @@
 module GitTrend
   class Project
-    attr_accessor :name, :lang, :description, :star_count
+    attr_accessor :name, :description, :lang, :star_count, :fork_count
+
+    def initialize(name: "", description: "", lang: "", star_count: 0, fork_count: 0)
+      self.name = name
+      self.description = description
+      self.lang = lang
+      self.star_count = star_count
+      self.fork_count = fork_count
+    end
 
     def to_a
       [@name, @lang, @star_count.to_s]

data/lib/git_trend/rendering.rb

@@ -25,81 +25,81 @@ module GitTrend
 
     private
 
-    def rule_columns_sizes(projects)
-      @columns_sizes = DEFAULT_COLUMNS_SIZES.dup
-      rule_max_column_size(projects, :name)
-      rule_max_column_size(projects, :lang)
-      rule_max_description_size if @enable_description
-      @columns_sizes.pop unless @enable_description
-    end
+      def rule_columns_sizes(projects)
+        @columns_sizes = DEFAULT_COLUMNS_SIZES.dup
+        rule_max_column_size(projects, :name)
+        rule_max_column_size(projects, :lang)
+        rule_max_description_size if @enable_description
+        @columns_sizes.pop unless @enable_description
+      end
 
-    def rule_max_description_size
-      terminal_width, _terminal_height = detect_terminal_size
-      description_width = terminal_width - @columns_sizes[0..-2].inject(&:+) - (@columns_sizes.size - 1)
-      if description_width >= DEFAULT_COLUMNS_SIZES.last
-        @columns_sizes[-1] = description_width
-      else
-        @enable_description = false
+      def rule_max_description_size
+        terminal_width, _terminal_height = detect_terminal_size
+        description_width = terminal_width - @columns_sizes[0..-2].inject(&:+) - (@columns_sizes.size - 1)
+        if description_width >= DEFAULT_COLUMNS_SIZES.last
+          @columns_sizes[-1] = description_width
+        else
+          @enable_description = false
+        end
       end
-    end
 
-    def rule_max_column_size(projects, attr)
-      index = HEADER_COLUMNS.index(attr.to_s)
-      max_size = max_size_of(projects, attr)
-      @columns_sizes[index] = max_size if max_size > @columns_sizes[index]
-    end
+      def rule_max_column_size(projects, attr)
+        index = HEADER_COLUMNS.index(attr.to_s)
+        max_size = max_size_of(projects, attr)
+        @columns_sizes[index] = max_size if max_size > @columns_sizes[index]
+      end
 
-    def max_size_of(projects, attr)
-      projects.max_by { |project| project.send(attr).size }.send(attr).size
-    end
+      def max_size_of(projects, attr)
+        projects.max_by { |project| project.send(attr).size }.send(attr).size
+      end
 
-    def render_header
-      header = HEADER_COLUMNS.map(&:capitalize)
-      header.pop unless @enable_description
-      f = @columns_sizes
-      fmt = "%#{f[0]}s %-#{f[1]}s %-#{f[2]}s %#{f[3]}s"
-      fmt << " %-#{f[4]}s" if @enable_description
+      def render_header
+        header = HEADER_COLUMNS.map(&:capitalize)
+        header.pop unless @enable_description
+        f = @columns_sizes
+        fmt = "%#{f[0]}s %-#{f[1]}s %-#{f[2]}s %#{f[3]}s"
+        fmt << " %-#{f[4]}s" if @enable_description
 
-      puts fmt % header
-      puts fmt % @columns_sizes.map { |column| '-' * column }
-    end
+        puts fmt % header
+        puts fmt % @columns_sizes.map { |column| "-" * column }
+      end
 
-    def render_body(projects)
-      f = @columns_sizes
-      fmt = "%#{f[0]}s %-#{f[1]}s %-#{f[2]}s %#{f[3]}s"
-      description_fmt = ''
-      projects.each_with_index do |project, i|
-        data = [i + 1, project.to_a].flatten
-        if @enable_description
-          description = project.description.mb_truncate(f.last)
-          data << description
-          mb_char_size = description.display_width - description.size
-          description_fmt = " %-#{f.last - mb_char_size}s"
+      def render_body(projects)
+        f = @columns_sizes
+        fmt = "%#{f[0]}s %-#{f[1]}s %-#{f[2]}s %#{f[3]}s"
+        description_fmt = ""
+        projects.each_with_index do |project, i|
+          data = [i + 1, project.to_a].flatten
+          if @enable_description
+            description = project.description.mb_truncate(f.last)
+            data << description
+            mb_char_size = description.display_width - description.size
+            description_fmt = " %-#{f.last - mb_char_size}s"
+          end
+          result = "#{fmt}#{description_fmt}" % data
+          puts result
         end
-        result = "#{fmt}#{description_fmt}" % data
-        puts result
       end
-    end
 
-    def render_footer
-      puts
-    end
+      def render_footer
+        puts
+      end
 
-    # https://github.com/cldwalker/hirb/blob/master/lib/hirb/util.rb#L61-71
-    def detect_terminal_size
-      if (ENV['COLUMNS'] =~ /^\d+$/) && (ENV['LINES'] =~ /^\d+$/)
-        [ENV['COLUMNS'].to_i, ENV['LINES'].to_i]
-      elsif (RUBY_PLATFORM =~ /java/ || (!STDIN.tty? && ENV['TERM'])) && command_exists?('tput')
-        [`tput cols`.to_i, `tput lines`.to_i]
-      elsif STDIN.tty? && command_exists?('stty')
-        `stty size`.scan(/\d+/).map(&:to_i).reverse
+      # https://github.com/cldwalker/hirb/blob/master/lib/hirb/util.rb#L61-71
+      def detect_terminal_size
+        if (ENV["COLUMNS"] =~ /^\d+$/) && (ENV["LINES"] =~ /^\d+$/)
+          [ENV["COLUMNS"].to_i, ENV["LINES"].to_i]
+        elsif (RUBY_PLATFORM =~ /java/ || (!STDIN.tty? && ENV["TERM"])) && command_exists?("tput")
+          [`tput cols`.to_i, `tput lines`.to_i]
+        elsif STDIN.tty? && command_exists?("stty")
+          `stty size`.scan(/\d+/).map(&:to_i).reverse
+        end
+      rescue
+        nil
       end
-    rescue
-      nil
-    end
 
-    def command_exists?(command)
-      ENV['PATH'].split(File::PATH_SEPARATOR).any? { |d| File.exist? File.join(d, command) }
-    end
+      def command_exists?(command)
+        ENV["PATH"].split(File::PATH_SEPARATOR).any? { |d| File.exist? File.join(d, command) }
+      end
   end
 end

data/lib/git_trend/scraper.rb

@@ -1,20 +1,20 @@
-require 'mechanize'
-require 'addressable/uri'
+require "mechanize"
+require "addressable/uri"
 
 module GitTrend
   class Scraper
-    BASE_HOST = 'https://github.com'
+    BASE_HOST = "https://github.com"
     BASE_URL = "#{BASE_HOST}/trending"
 
     def initialize
       @agent = Mechanize.new
       @agent.user_agent = "git-trend #{VERSION}"
-      proxy = URI.parse(ENV['http_proxy']) if ENV['http_proxy']
+      proxy = URI.parse(ENV["http_proxy"]) if ENV["http_proxy"]
       @agent.set_proxy(proxy.host, proxy.port, proxy.user, proxy.password) if proxy
     end
 
     def get(language = nil, since = nil, number = nil)
-      page = @agent.get(generate_url_for_get(language, since))
+      page = @agent.get(generate_url(language, since))
       projects = generate_project(page)
       fail ScrapeException if projects.empty?
       number ? projects[0...number] : projects
@@ -22,61 +22,44 @@ module GitTrend
 
     def languages
       page = @agent.get(BASE_URL)
-      page.search('.language-filter-list + .select-menu span.select-menu-item-text').inject([]) do |languages, content|
+      page.search(".language-filter-list + .select-menu span.select-menu-item-text").inject([]) do |languages, content|
         languages << content.text if content.text
       end
     end
 
     private
 
-    def generate_url_for_get(language, since)
-      uri = Addressable::URI.parse(BASE_URL)
-      since = convert_url_param_since(since)
-      if language || since
-        uri.query_values = { l: language, since: since }.delete_if { |_k, v| v.nil? }
-      end
-      uri.to_s
-    end
-
-    def convert_url_param_since(since)
-      return unless since
-      case since.to_sym
-      when :d, :day,   :daily   then 'daily'
-      when :w, :week,  :weekly  then 'weekly'
-      when :m, :month, :monthly then 'monthly'
-      else ''
+      def generate_url(language, since)
+        url = BASE_URL.dup
+        url << "/#{language}" if language
+        uri = Addressable::URI.parse(url)
+        since = convert_url_param_since(since)
+        if since
+          uri.query_values = { since: since }.delete_if { |_k, v| v.nil? }
+        end
+        uri.to_s
       end
-    end
 
-    # Pattern 1: lang + stars
-    #  Ruby • 24 stars today • Built by
-    # Pattern 2: only stars
-    #  85 stars today • Built by
-    # Pattern 3: only lang
-    #  ASP • Built by
-    def extract_lang_and_star_from_meta(text)
-      meta_data = text.split('•').map { |x| x.delete("\n").strip }
-      meta_data.pop # remove "Build by"
-      if meta_data.size == 2
-        [meta_data[0], meta_data[1].delete(',').to_i]
-      else
-        if meta_data[0].include?('stars')
-          ['', meta_data[0].delete(',').to_i]
-        else
-          [meta_data[0], 0]
+      def convert_url_param_since(since)
+        return unless since
+        case since.to_sym
+        when :d, :day,   :daily   then "daily"
+        when :w, :week,  :weekly  then "weekly"
+        when :m, :month, :monthly then "monthly"
+        else ""
         end
       end
-    end
 
-    def generate_project(page)
-      page.search('.repo-list-item').map do |content|
-        project = Project.new
-        meta_data = content.search('.repo-list-meta').text
-        project.lang, project.star_count = extract_lang_and_star_from_meta(meta_data)
-        project.name        = content.search('.repo-list-name a').text.split.join
-        project.description = content.search('.repo-list-description').text.delete("\n").strip
-        project
+      def generate_project(page)
+        content = page.search(".repo-list li").map do |content|
+          Project.new(
+            name: content.search("h3 a").attr("href").to_s.sub(/\A\//, ""),
+            description: content.search(".py-1").text.strip,
+            lang: content.search('span[itemprop="programmingLanguage"]').text.strip,
+            star_count: content.search('a[aria-label="Stargazers"]').text.strip.to_i,
+            fork_count: content.search('a[aria-label="Forks"]').text.strip.to_i,
+          )
+        end
       end
-    end
   end
 end