git-trend 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 046379964fb65d48c57f0cd14578fb998a9f17db
-  data.tar.gz: 552e82b1b68d889e45412f8b66cb919a9d3362ec
+  metadata.gz: a9c3b0583d0d6b10a7d9599f831de86d5c2bf45e
+  data.tar.gz: c969011d88502cb5776ce8269642e1ee87de2615
 SHA512:
-  metadata.gz: 3c9fb8cd20db488cbc80d3f8c7193a760aec1f5a307b1050749e4d0d9a9714af57e989d89647081d126fdc99d0637d5eacd34a672ec014dab8eeb7bc8dd37d46
-  data.tar.gz: f3b1e78b68e6de637992220ed92f425f3caadc4098e211332387635e24631c2f5d40ea0fefb891728f7c0937e6dc21260c9b9af15728ced021fd0545acb95784
+  metadata.gz: 5f7f47ea2d4c6f1b8587ded201212c0e0feb41d7b7fcc185c275320ecbbbed5cca46a12eb762c5e9b92f1511da402f97b27b022800e16c7bbd4f2116690abb21
+  data.tar.gz: 7550677c7a327d551e557afa4cec41ecaf0c4d5a86a4ad9bd19c6ac0067ac8a85ba46c16ef808556bf218aeee5dbe0bb9b9c9e45b117f26c93f4807ec932d534

data/README.md

@@ -7,21 +7,11 @@
 
 # git-trend
 
-git-trend is a command line utitlity to show [Trending repositories on GitHub](https://github.com/trending).  
+git-trend is a command line utility to show [Trending repositories on GitHub](https://github.com/trending).  
 
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-    gem 'git-trend'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
     $ gem install git-trend
 
 ## Usage
@@ -63,6 +53,7 @@ No. Name                                     Lang          Star Description
  23 google/cadvisor                          Go              48 Analyzes resource usage and performance characteristics of running containers.
  24 vladikoff/chromeos-apk                   JavaScript      46 Run Android APKs in Chrome OS OR Chrome in OS X, Linux and Windows.
  25 nhanaswigs/htmljs                        JavaScript      47 HTML render engine and data binding (MVVM)
+
 ```
 
 ### daily trending without description
@@ -100,6 +91,7 @@ No. Name                                     Lang          Star
  23 google/cadvisor                          Go              48
  24 vladikoff/chromeos-apk                   JavaScript      46
  25 nhanaswigs/htmljs                        JavaScript      47
+
 ```
 
 ### daily trending by language
@@ -137,6 +129,7 @@ No. Name                                     Lang         Star Description
  23 fluent/fluentd                           Ruby            6 Fluentd data collector
  24 caskroom/homebrew-cask                   Ruby            5 A CLI workflow for the administration of Mac applications distributed as binaries
  25 cantino/huginn                           Ruby            5 Build agents that monitor and act on your behalf.  Your agents are standing by!
+
 ```
 
 ### weekly/monthly trending
@@ -180,9 +173,10 @@ No. Name                                     Lang           Star Description
  23 mechio/takana                            CoffeeScript    341 Takana lets you see your SCSS and CSS style changes live, in the browser, as you type them
  24 davidtheclark/scalable-css-reading-list                  331 Collected dispatches from The Quest for Scalable CSS
  25 addyosmani/timing.js                     JavaScript      335 Navigation Timing API measurement helpers
+
 ```
 
-### number of trendings
+### number of trending
 
     git trend -n <number>
 

data/git-trend.gemspec

@@ -14,7 +14,7 @@ def or_over_mac_os_lion?
 
   macos_full_version = `/usr/bin/sw_vers -productVersion`.chomp
   macos_version = macos_full_version[/10\.\d+/]
-  return macos_version >= '10.7'  # 10.7 is lion
+  macos_version >= '10.7' # 10.7 is lion
 end
 
 Gem::Specification.new do |spec|
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.version       = GitTrend::VERSION
   spec.authors       = ['rochefort']
   spec.email         = ['terasawan@gmail.com']
-  spec.summary       = 'cli based; show Trending repository on github'
+  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'
@@ -34,18 +34,19 @@ Gem::Specification.new do |spec|
 
   spec.post_install_message = install_message
 
-  spec.add_dependency 'thor',        '~> 0.19.1'
+  spec.add_dependency 'addressable', '~> 2.3.8'
   spec.add_dependency 'mechanize',   '~> 2.7.3'
-  spec.add_dependency 'addressable', '~> 2.3.6'
+  spec.add_dependency 'thor',        '~> 0.19.1'
+  spec.add_dependency 'unicode-display_width', '~> 0.2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
 
-  spec.add_development_dependency 'rspec',     '~> 3.2.0'
+  spec.add_development_dependency 'rspec',     '~> 3.4.0'
   spec.add_development_dependency 'rspec-its', '~> 1.2.0'
-  spec.add_development_dependency 'simplecov', '~> 0.9.0'
+  spec.add_development_dependency 'simplecov', '~> 0.10.0'
   spec.add_development_dependency 'safe_yaml', '~> 1.0.4' # for Ruby2.2.0
-  spec.add_development_dependency 'webmock',   '~> 1.20.4'
+  spec.add_development_dependency 'webmock',   '~> 1.22.3'
 
   spec.add_development_dependency 'coveralls'
 end

data/lib/git_trend/cli.rb

@@ -21,7 +21,7 @@ module GitTrend
     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) and return if options[:help]
       scraper = Scraper.new
       projects = scraper.get(options[:language], options[:since], options[:number])
       render(projects, !!options[:description])

data/lib/git_trend/ext/string.rb

@@ -1,8 +1,6 @@
-class String
-  def mb_width
-    each_char.inject(0) { |sum, c| sum += c.ascii_only? ? 1 : 2 }
-  end
+require 'unicode/display_width'
 
+class String
   def mb_slice(width)
     return '' if empty?
 
@@ -10,7 +8,7 @@ class String
     extraction_size = 0
     extraction = ''
     each_char do |c|
-      char_size = c.ascii_only? ? 1 : 2
+      char_size = c.display_width
       if extraction_size + char_size > max_size
         extraction << '...'
         break
@@ -20,9 +18,4 @@ class String
     end
     extraction
   end
-
-  def mb_ljust(width, padding = ' ')
-    padding_size = [0, width - mb_width].max
-    self + padding * padding_size
-  end
 end

data/lib/git_trend/rendering.rb

@@ -3,18 +3,15 @@ module GitTrend
     def self.included(base)
       base.extend(self)
     end
+    HEADER_COLUMNS = %w(no. name lang star description)
+    DEFAULT_COLUMNS_SIZES = [3, 40, 10, 6, 20]
 
-    # header columns:
-    # 'No.', 'Name', 'Lang', 'Star', 'Fork', ['Description']
-    DEFAULT_RULED_LINE_SIZE = [3, 40, 10, 6]
-    DESCRIPTION_MIN_SIZE = 20
-
-    def render(projects, describable = false)
-      @describable = describable
-      ruled_line_size(projects)
-      render_to_header
-      render_to_body(projects)
-      render_to_footer
+    def render(projects, enable_description = false)
+      @enable_description = enable_description
+      rule_columns_sizes(projects)
+      render_header
+      render_body(projects)
+      render_footer
     end
 
     def render_languages(languages)
@@ -28,65 +25,61 @@ module GitTrend
 
     private
 
-    def max_size_of(projects, attr)
-      projects.max_by { |project| project.send(attr).size }.send(attr).size
+    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 ruled_line_size(projects)
-      @ruled_line_size = DEFAULT_RULED_LINE_SIZE.dup
-      max_name_size = max_size_of(projects, :name)
-      if max_name_size > @ruled_line_size[1]
-        @ruled_line_size[1] = max_name_size
+    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
 
-      max_lang_size = max_size_of(projects, :lang)
-      if max_lang_size > @ruled_line_size[2]
-        @ruled_line_size[2] = max_lang_size
-      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
 
-      # setting description size
-      if @describable
-        terminal_width, _terminal_height = detect_terminal_size
-        description_width = terminal_width - @ruled_line_size.inject(&:+) - @ruled_line_size.size
-        if description_width >= DESCRIPTION_MIN_SIZE
-          @ruled_line_size << description_width
-        else
-          @describable = false
-        end
-      end
+    def max_size_of(projects, attr)
+      projects.max_by { |project| project.send(attr).size }.send(attr).size
     end
 
-    def render_to_header
-      f = @ruled_line_size
-      if @describable
-        fmt = "%#{f[0]}s %-#{f[1]}s %-#{f[2]}s %#{f[3]}s %-#{f[4]}s"
-      else
-        fmt = "%#{f[0]}s %-#{f[1]}s %-#{f[2]}s %#{f[3]}s"
-      end
-      header = ['No.', 'Name', 'Lang', 'Star']
-      header << 'Description' if @describable
+    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 % @ruled_line_size.map { |field| '-'*field }
+      puts fmt % @columns_sizes.map { |column| '-' * column }
     end
 
-    def render_to_body(projects)
-      f = @ruled_line_size
+    def render_body(projects)
+      f = @columns_sizes
       fmt = "%#{f[0]}s %-#{f[1]}s %-#{f[2]}s %#{f[3]}s"
+      fmt << " %-#{f[4]}s" if @enable_description
       projects.each_with_index do |project, i|
-        result = fmt % [i + 1, project.to_a].flatten
-        result << ' ' + project.description.mb_slice(f.last).mb_ljust(f.last) if @describable
+        data = [i + 1, project.to_a].flatten
+        data << project.description.mb_slice(f.last) if @enable_description
+        result = fmt % data
         puts result
       end
     end
 
-    def render_to_footer
+    def render_footer
       puts
     end
 
-    def command_exists?(command)
-      ENV['PATH'].split(File::PATH_SEPARATOR).any? { |d| File.exist? File.join(d, command) }
-    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+$/)
@@ -101,5 +94,9 @@ module GitTrend
     rescue
       nil
     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

@@ -15,17 +15,8 @@ module GitTrend
     end
 
     def get(language = nil, since = nil, number = nil)
-      projects = []
       page = @agent.get(generate_url_for_get(language, since))
-
-      page.search('.repo-list-item').each 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.gsub("\n", '').strip
-        projects << project
-      end
+      projects = generate_project(page)
       fail ScrapeException if projects.empty?
       number ? projects[0...number] : projects
     end
@@ -36,7 +27,7 @@ module GitTrend
       page.search('div.select-menu-item a').each do |content|
         href = content.attributes['href'].value
         # objective-c++ =>
-        language = href.match(/github.com\/trending\?l=(.+)/).to_a[1]
+        language = href.match(%r{github.com/trending\?l=(.+)}).to_a[1]
         languages << CGI.unescape(language) if language
       end
       languages
@@ -53,15 +44,26 @@ module GitTrend
     end
 
     def extract_lang_and_star_from_meta(text)
-      meta_data = text.split('•').map { |x| x.gsub("\n", '').strip }
+      meta_data = text.split('•').map { |x| x.delete("\n").strip }
       if meta_data.size == 3
         lang = meta_data[0]
-        star_count = meta_data[1].gsub(',', '').to_i
+        star_count = meta_data[1].delete(',').to_i
         [lang, star_count]
       else
-        star_count = meta_data[0].gsub(',', '').to_i
+        star_count = meta_data[0].delete(',').to_i
         ['', star_count]
       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
+      end
+    end
   end
 end

data/lib/git_trend/version.rb

@@ -1,3 +1,3 @@
 module GitTrend
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: git-trend
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - rochefort
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 2.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 2.3.8
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.7.3
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.6
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.6
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.4
+        version: 1.22.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.4
+        version: 1.22.3
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +178,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: cli based; show Trending repository on github
+description: CLI-Based tool that show Trending repository on github
 email:
 - terasawan@gmail.com
 executables:
@@ -221,10 +235,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: cli based; show Trending repository on github
+summary: CLI-Based tool that show Trending repository on github
 test_files:
 - spec/fixtures/trending
 - spec/fixtures/trending?l=objective-c%2B%2B