gem-search 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf0634f75957207eecfa92cbc539e54fda22cbd3
-  data.tar.gz: afa21e69df314d524de7da7f37a712dc4002b894
+  metadata.gz: 231d6017b8ed3cc3a800f89f12a197dc8484ed1f
+  data.tar.gz: c5bef05b461fcad27de5b0c730eec8b9c49606cd
 SHA512:
-  metadata.gz: 4f09449157f6142afa641e2fd78b06cf3a54f9d87005ddb0c3fabf77145ffacac0f4dc52d87fa7af685f248ab66e761ecdbb80667246826060089be7f27046dc
-  data.tar.gz: 77c99fdbc05795f6d99a665161db680b37ee2e964c1a5ddfe2e6f833b89bb36f13202fc822f0b7b4305f860fab575ec924bf4d1051f791b5642e0fd6736d99ea
+  metadata.gz: 249916d10c938be1f880f3013f4a701e7eb52660d853d55d8cec2b280d1f0b6065628ab219b96a25c5e3777e6569365cfa9008a4cdd78d94aa93878ad3e3ddfa
+  data.tar.gz: d067723e49098a5fa604b5c12b08a4a916dd4b54451eb4cdeb7a5c19cb433df89218be795343baf318f98000a20857eb46f98b2e28f279bc55a97102d5cb2e6f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.1.7
+
+* Remove reduncancy dots [17ae8cd]  
+The request was one extra.
+
 ## v0.1.6
 
 * Update gems [17ae8cd]  

data/bin/gem-search

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 require 'gem_search'
 
-Gem::Search::CommandBuilder.new(ARGV).build.call
+GemSearch::CommandBuilder.new(ARGV).build.call

data/gem-search.gemspec

@@ -11,7 +11,7 @@ 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 |gem|
@@ -21,12 +21,12 @@ Gem::Specification.new do |gem|
   gem.summary       = 'search gems with using rubygems.org API'
   gem.description   = gem.summary
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files -z`.split("\x0")
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'gem-search'
   gem.require_paths = ['lib']
-  gem.version       = Gem::Search::VERSION
+  gem.version       = GemSearch::VERSION
 
   gem.post_install_message = install_message
 

data/lib/gem_search.rb

@@ -1,4 +1,4 @@
-module Gem::Search
+module GemSearch
   require 'mem'
   require 'slop'
 
@@ -6,7 +6,6 @@ module Gem::Search
 
   require 'gem_search/command_builder'
   require 'gem_search/commands'
-  require 'gem_search/version'
-  require 'gem_search/rendering'
   require 'gem_search/executor'
+  require 'gem_search/version'
 end

data/lib/gem_search/command_builder.rb

@@ -1,4 +1,4 @@
-module Gem::Search
+module GemSearch
   class CommandBuilder
     include Mem
 

data/lib/gem_search/commands.rb

@@ -1,4 +1,4 @@
-module Gem::Search
+module GemSearch
   module Commands
     require 'gem_search/commands/base.rb'
     require 'gem_search/commands/browse.rb'

data/lib/gem_search/commands/base.rb

@@ -1,4 +1,4 @@
-module Gem::Search
+module GemSearch
   module Commands
     class Base
       attr_reader :options

data/lib/gem_search/commands/browse.rb

@@ -1,16 +1,16 @@
-module Gem::Search
+module GemSearch
   module Commands
     class Browse < Base
       def call
         executor = Executor.new
         executor.browse(options[:browse])
-        rescue OpenURI::HTTPError
-          puts 'No such gem.'
-          abort
-        rescue => e
-          puts e.message
-          puts e.stacktrace if ENV['DEBUG']
-          abort
+      rescue OpenURI::HTTPError
+        puts 'No such gem.'
+        abort
+      rescue => e
+        puts e.message
+        puts e.stacktrace if ENV['DEBUG']
+        abort
       end
     end
   end

data/lib/gem_search/commands/help.rb

@@ -1,4 +1,4 @@
-module Gem::Search
+module GemSearch
   module Commands
     class Help < Base
       def call

data/lib/gem_search/commands/run.rb

@@ -1,4 +1,4 @@
-module Gem::Search
+module GemSearch
   module Commands
     class Run < Base
       ENABLE_SORT_OPTS = {
@@ -12,11 +12,10 @@ module Gem::Search
           puts options
           abort
         end
-
         executor = Executor.new
         gem = options.arguments[0]
         executor.search(gem, setup_opts)
-      rescue Gem::Search::LibraryNotFound => e
+      rescue GemSearch::LibraryNotFound => e
         puts e.message
         abort
       rescue => e

data/lib/gem_search/commands/version.rb

@@ -1,8 +1,8 @@
-module Gem::Search
+module GemSearch
   module Commands
     class Version < Base
       def call
-        puts "gem-search #{Gem::Search::VERSION}"
+        puts "gem-search #{GemSearch::VERSION}"
       end
     end
   end

data/lib/gem_search/executor.rb

@@ -1,30 +1,26 @@
 require 'json'
 require 'open-uri'
+require 'gem_search/rendering'
+require 'gem_search/utils/system_util'
 
-module Gem::Search
+module GemSearch
   class Executor
     include Rendering
+    include Utils::SystemUtil
     BASE_URL   = 'https://rubygems.org'
     SEARCH_API = "#{BASE_URL}/api/v1/search.json?query=%s&page=%d"
     GEM_API    = "#{BASE_URL}/api/v1/gems/%s.json"
     GEM_URL    = "#{BASE_URL}/gems/%s"
 
     MAX_REQUEST_COUNT = 20
+    MAX_GEMS_PER_PAGE = 30 # It has been determined by Github API
 
     def search(query, opts)
       return unless query
       print 'Searching '
-      gems = []
-      (1..MAX_REQUEST_COUNT).each do |n|
-        print '.'
-        url = SEARCH_API % [query, n]
-        gems_by_page = open_rubygems_api(url)
-        break if gems_by_page.size.zero?
-        gems += gems_by_page
-      end
+      gems = search_gems(query)
       puts
-
-      fail Gem::Search::LibraryNotFound, 'We did not find results.' if gems.size.zero?
+      fail GemSearch::LibraryNotFound, 'We did not find results.' if gems.size.zero?
       gems_sort!(gems, opts[:sort])
       Executor.render(gems, opts[:detail])
     end
@@ -32,7 +28,7 @@ module Gem::Search
     def browse(gem)
       return unless gem
       api_url = GEM_API % gem
-      result = open_rubygems_api(api_url)
+      result = request_ruby_gems_api(api_url)
       url = result['homepage_uri']
       if url.nil? || url.empty?
         url = GEM_URL % gem
@@ -43,31 +39,23 @@ module Gem::Search
 
     private
 
-    # https://github.com/github/hub/blob/9c589396ae38f7b9f98319065ad491149954c152/lib/hub/context.rb#L517
-    def browser_open(url)
-      cmd = osx? ? 'open' :
-        %w[xdg-open cygstart x-www-browser firefox opera mozilla netscape].find { |comm| which comm }
-      system(cmd, url)
-    end
-
-    # refer to: https://github.com/github/hub/blob/9c589396ae38f7b9f98319065ad491149954c152/lib/hub/context.rb#L527
-    def osx?
-      require 'rbconfig'
-      RbConfig::CONFIG['host_os'].to_s.include?('darwin')
+    def search_gems(query)
+      gems = []
+      (1..MAX_REQUEST_COUNT).each do |n|
+        print '.'
+        url = SEARCH_API % [query, n]
+        results = request_ruby_gems_api(url)
+        gems += results
+        break if search_ended?(results.size)
+      end
+      gems
     end
 
-    def which(cmd)
-      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-        exts.each { |ext|
-          exe = "#{path}/#{cmd}#{ext}"
-          return exe if File.executable? exe
-        }
-      end
-      return nil
+    def search_ended?(size)
+      size < MAX_GEMS_PER_PAGE || size.zero?
     end
 
-    def open_rubygems_api(url)
+    def request_ruby_gems_api(url)
       option = {}
       proxy = URI.parse(url).find_proxy
       if proxy

data/lib/gem_search/rendering.rb

@@ -1,4 +1,4 @@
-module Gem::Search
+module GemSearch
   module Rendering
     # NAME', 'DL(ver)', 'DL(all)', 'HOMEPAGE'
     DEFAULT_RULED_LINE_SIZE = [50, 8, 9, 60]
@@ -7,11 +7,11 @@ module Gem::Search
       base.extend(self)
     end
 
-    def render(gems, opt_detail)
-      @opt_detail = opt_detail
+    def render(gems, has_detail)
+      @has_detail = has_detail
       ruled_line_size(gems)
-      render_to_header
-      render_to_body(gems)
+      render_header
+      render_body(gems)
     end
 
     private
@@ -22,33 +22,31 @@ module Gem::Search
       @ruled_line_size[0] = max_name_size if max_name_size > @ruled_line_size[0]
     end
 
-    def render_to_header
+    def render_header
       f = @ruled_line_size
       fmt = "%-#{f[0]}s %#{f[1]}s %#{f[2]}s"
       titles = ['NAME', 'DL(ver)', 'DL(all)']
-      hyphens = ['-'*f[0], '-'*f[1], '-'*f[2]]
-      if @opt_detail
+      hyphens = f[0, 3].map { |field| '-' * field }
+      if @has_detail
         fmt << " %-#{f[3]}s"
         titles << 'HOMEPAGE'
-        hyphens << '-'*f[3]
+        hyphens << '-' * f[3]
       end
-
       puts fmt % titles
       puts fmt % hyphens
     end
 
-    def render_to_body(gems)
+    def render_body(gems)
       f = @ruled_line_size
-
       fmt = "%-#{f[0]}s %#{f[1]}d %#{f[2]}d"
-      fmt << " %-#{f[3]}s" if @opt_detail
+      fmt << " %-#{f[3]}s" if @has_detail
       gems.each do |gem|
         columns = [
           "#{gem['name']} (#{gem['version']})",
           gem['version_downloads'],
           gem['downloads']
         ]
-        columns << gem['homepage_uri'] if @opt_detail
+        columns << gem['homepage_uri'] if @has_detail
         puts fmt % columns
       end
     end

data/lib/gem_search/utils/system_util.rb

@@ -0,0 +1,26 @@
+module GemSearch::Utils
+  module SystemUtil
+    # https://github.com/github/hub/blob/9c589396ae38f7b9f98319065ad491149954c152/lib/hub/context.rb#L517
+    def browser_open(url)
+      cmd = osx? ? 'open' : %w[xdg-open cygstart x-www-browser firefox opera mozilla netscape].find { |comm| which comm }
+      system(cmd, url)
+    end
+
+    # refer to: https://github.com/github/hub/blob/9c589396ae38f7b9f98319065ad491149954c152/lib/hub/context.rb#L527
+    def osx?
+      require 'rbconfig'
+      RbConfig::CONFIG['host_os'].to_s.include?('darwin')
+    end
+
+    def which(cmd)
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each do |ext|
+          exe = "#{path}/#{cmd}#{ext}"
+          return exe if File.executable? exe
+        end
+      end
+      nil
+    end
+  end
+end

data/lib/gem_search/version.rb

@@ -1,3 +1,3 @@
-module Gem::Search
-  VERSION = '0.1.6'
+module GemSearch
+  VERSION = '0.1.7'
 end

data/spec/bin/gem_search_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe 'bin/gem-search' do
   context 'with -v' do
     subject { `#{BIN} -v` }
     it 'display an usage' do
-      should == "gem-search #{Gem::Search::VERSION}\n"
+      should == "gem-search #{GemSearch::VERSION}\n"
     end
   end
 end

data/spec/commands/browse_spec.rb

@@ -1,4 +1,4 @@
-include Gem::Search
+include GemSearch
 
 RSpec.describe Commands::Browse do
   describe '#call' do

data/spec/commands/run_spec.rb

@@ -1,4 +1,4 @@
-include Gem::Search
+include GemSearch
 
 RSpec.describe Commands::Run do
   describe '#call' do

data/spec/executor_spec.rb

@@ -1,4 +1,4 @@
-include Gem::Search
+include GemSearch
 
 RSpec.describe Executor do
   let(:executor) { Executor.new }
@@ -29,7 +29,7 @@ RSpec.describe Executor do
       context 'with no sort option' do
         it 'display rubygems ordering by DL(all)' do
           res = <<-'EOS'.unindent
-            |Searching ..
+            |Searching .
             |NAME                                                DL(ver)   DL(all) HOMEPAGE                                                    
             |-------------------------------------------------- -------- --------- ------------------------------------------------------------
             |factory_girl (3.6.0)                                    541   2042859 https://github.com/thoughtbot/factory_girl                  
@@ -51,7 +51,7 @@ RSpec.describe Executor do
       context 'with no sort option' do
         it 'display rubygems ordering by DL(all)' do
           res = <<-'EOS'.unindent
-            |Searching ..
+            |Searching .
             |NAME                                                DL(ver)   DL(all)
             |-------------------------------------------------- -------- ---------
             |factory_girl (3.6.0)                                    541   2042859
@@ -65,7 +65,7 @@ RSpec.describe Executor do
       context 'with sort option: [a]download' do
         it 'display rubygems ordering by DL(all)' do
           res = <<-'EOS'.unindent
-            |Searching ..
+            |Searching .
             |NAME                                                DL(ver)   DL(all)
             |-------------------------------------------------- -------- ---------
             |factory_girl (3.6.0)                                    541   2042859
@@ -79,7 +79,7 @@ RSpec.describe Executor do
       context 'with sort option: [v]version_downloads' do
         it 'display rubygems ordering by DL(ver)' do
           res = <<-'EOS'.unindent
-            |Searching ..
+            |Searching .
             |NAME                                                DL(ver)   DL(all)
             |-------------------------------------------------- -------- ---------
             |factory_girl_rails (3.5.0)                            39724   1238780
@@ -93,7 +93,7 @@ RSpec.describe Executor do
       context 'with sort option: [n]ame' do
         it 'display rubygems ordering by name' do
           res = <<-'EOS'.unindent
-            |Searching ..
+            |Searching .
             |NAME                                                DL(ver)   DL(all)
             |-------------------------------------------------- -------- ---------
             |factory_girl (3.6.0)                                    541   2042859
@@ -115,7 +115,7 @@ RSpec.describe Executor do
       let(:query) { 'cucumber-' }
       it 'display rubygems ordering by name' do
         res = <<-'EOS'.unindent
-          |Searching ....
+          |Searching ...
           |NAME                                                DL(ver)   DL(all)
           |-------------------------------------------------- -------- ---------
           |autotest-cucumber-notification (0.0.6)                 1027      3607
@@ -195,7 +195,7 @@ RSpec.describe Executor do
         let(:query) { 'size_is_42_2345678901234567890123456789012' }
         it 'is 50 characters' do
           res = <<-'EOS'.unindent
-            |Searching ..
+            |Searching .
             |NAME                                                DL(ver)   DL(all)
             |-------------------------------------------------- -------- ---------
             |size_is_42_2345678901234567890123456789012 (0.0.1)      100      1000
@@ -212,7 +212,7 @@ RSpec.describe Executor do
         let(:query) { 'size_is_43_23456789012345678901234567890123' }
         it 'is 51 characters' do
           res = <<-'EOS'.unindent
-            |Searching ..
+            |Searching .
             |NAME                                                 DL(ver)   DL(all)
             |--------------------------------------------------- -------- ---------
             |size_is_43_23456789012345678901234567890123 (0.0.2)      200      2000

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem-search
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - rochefort
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -122,6 +122,7 @@ files:
 - lib/gem_search/commands/version.rb
 - lib/gem_search/executor.rb
 - lib/gem_search/rendering.rb
+- lib/gem_search/utils/system_util.rb
 - lib/gem_search/version.rb
 - sideci_build.txt
 - spec/bin/gem_search_spec.rb