gem-search 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8356a8e7af2ec374120d282eedaa11b3c7c2bd7b
-  data.tar.gz: dcbe5e724bbf8fef828d07adab9e25a6c456a179
+  metadata.gz: 007f61dd3c35fc00a951fd431c22ddc81b6a5d97
+  data.tar.gz: c6251305ba1722f85da3c9ef7174755bbc39e765
 SHA512:
-  metadata.gz: 96f1228d384a6ce4f7de35762ae2f132084d2e219b22d8f3ee590556d56e3c590e07ca7c8609239ff4f50f55af59472832ca2a2952d494c1a146ee10b8a66261
-  data.tar.gz: d2f2a18ea20e935a6dee3e969819f0b249c58f1907f967f5d32269ca90c91bc345e8bebf5223fa651fad1e92faa332af52140e1e98b18c34ce92c1ddef1fdd80
+  metadata.gz: 5fccfe3e6be4a304b2cef71d4c878522047d27e658a9a55c0efe04764392c1baa57467ff78c656e5d2deccc426e84408a11b21a612cfabc2fa38521b28df461e
+  data.tar.gz: 0c6546b3481356f6458571b7e014262bdd7fc5555ac3ae6050c610745ed8b06a47796cf5cd97df07d3fb1bf0b9e6d5e2671b0cf368697f1fd4ab9204e0e35eb7

data/CHANGELOG.md

@@ -1,6 +1,11 @@
+## v0.1.5
+
+* Update slop for v4.0.0 and refactor. [94db668]
+
+
 ## v0.1.4
 
-* Fix cannnot open gem url when gem has no homepage url. [b476b28]
+* Fix cannot open gem url when gem has no homepage url. [b476b28]
 
 ## v0.1.3
 

data/README.md

@@ -118,7 +118,11 @@ node-webkit-bootstrap (1.0.0)                           226       226 https://gi
 ### Browse
 It open rubygem's homepage in the system's default web browser.
 
-	gem-search browse 'gem_name'
+  gem-search -b `keyword'
+  
+  or
+  
+  gem-search --browse `keyword'
 
 
 

data/bin/gem-search

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

data/gem-search.gemspec

@@ -30,8 +30,9 @@ Gem::Specification.new do |gem|
 
   gem.post_install_message = install_message
 
-  gem.add_dependency 'slop', '~>3.6.0'
-  gem.add_dependency 'json', '~>1.8.1'
+  gem.add_dependency 'slop', '~>4.0.0'
+  gem.add_dependency 'json', '~>1.8.2'
+  gem.add_dependency 'mem',  '~>0.1.5'
 
   # gem.add_development_dependency 'pry',     '~>0.9.12.6'
   gem.add_development_dependency 'webmock', '~>1.18.0'

data/lib/gem_search.rb

@@ -1,9 +1,12 @@
-module Gem
-  module Search
-    class LibraryNotFound    < StandardError; end
-    autoload :Command,   'gem_search/command'
-    autoload :Executor,  'gem_search/executor'
-    autoload :Rendering, 'gem_search/rendering'
-    autoload :VERSION,   'gem_search/version'
-  end
+module Gem::Search
+  require 'mem'
+  require 'slop'
+
+  class LibraryNotFound < StandardError; end
+
+  require 'gem_search/command_builder'
+  require 'gem_search/commands'
+  require 'gem_search/version'
+  require 'gem_search/rendering'
+  require 'gem_search/executor'
 end

data/lib/gem_search/command_builder.rb

@@ -0,0 +1,52 @@
+module Gem::Search
+  class CommandBuilder
+    include Mem
+
+    attr_reader :arguments
+
+    def initialize(arguments = ARGV)
+      @arguments = arguments
+    end
+
+    def build
+      command_class.new(options)
+    end
+
+    private
+
+    def command_class
+      case
+      when options[:help] then    Commands::Help
+      when options[:version] then Commands::Version
+      when options[:browse] then  Commands::Browse
+      else Commands::Run
+      end
+    end
+
+    def options
+      Slop.parse(arguments, suppress_errors: true) do |opts|
+        opts.banner = "Usage: gem-search gem_name [options]\n"
+        sort_msg = detail_message([
+          'Sort by the field.',
+          'default [a]ll',
+          '[a]ll  :DL(all)  e.g.: gem-search webkit -s a',
+          '[v]er  :DL(ver)  e.g.: gem-search webkit -s v',
+          '[n]ame :         e.g.: gem-search webkit -s n',
+        ])
+        opts.string('-s', '--sort', sort_msg)
+        opts.string('-b', '--browse', "Open rubygem's homepage in the system's default web browser.")
+        opts.on('-d', '--detail', "Display rubygems's homepage url.")
+        opts.on('-v', '--version', 'Display the version.')
+        opts.on('-h', '--help', 'Display this help message.')
+      end
+    end
+    memoize :options
+
+    def detail_message(msgs)
+      indent = ' ' * 21
+      main = msgs[0]
+      detail = msgs[1..-1].map { |msg| "#{indent}#{msg}" }.join("\n")
+      "#{main}\n#{detail}"
+    end
+  end
+end

data/lib/gem_search/commands.rb

@@ -0,0 +1,9 @@
+module Gem::Search
+  module Commands
+    require 'gem_search/commands/base.rb'
+    require 'gem_search/commands/browse.rb'
+    require 'gem_search/commands/help.rb'
+    require 'gem_search/commands/run.rb'
+    require 'gem_search/commands/version.rb'
+  end
+end

data/lib/gem_search/commands/base.rb

@@ -0,0 +1,11 @@
+module Gem::Search
+  module Commands
+    class Base
+      attr_reader :options
+
+      def initialize(options)
+        @options = options
+      end
+    end
+  end
+end

data/lib/gem_search/commands/browse.rb

@@ -0,0 +1,17 @@
+module Gem::Search
+  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
+      end
+    end
+  end
+end

data/lib/gem_search/commands/help.rb

@@ -0,0 +1,9 @@
+module Gem::Search
+  module Commands
+    class Help < Base
+      def call
+        puts @options
+      end
+    end
+  end
+end

data/lib/gem_search/commands/run.rb

@@ -0,0 +1,43 @@
+module Gem::Search
+  module Commands
+    class Run < Base
+      ENABLE_SORT_OPTS = {
+        'v' => 'version_downloads',
+        'a' => 'downloads',
+        'n' => 'name',
+      }
+
+      def call
+        unless valid?(options.arguments)
+          puts options
+          abort
+        end
+
+        executor = Executor.new
+        gem = options.arguments[0]
+        executor.search(gem, setup_opts)
+      rescue Gem::Search::LibraryNotFound => e
+        puts e.message
+        abort
+      rescue => e
+        puts "An unexpected #{e.class} has occurred."
+        puts e.message
+        puts e.backtrace if ENV['DEBUG']
+        abort
+      end
+
+      private
+
+      def setup_opts
+        {
+          sort: ENABLE_SORT_OPTS[options['sort']] || 'downloads',
+          detail: options.detail?
+        }
+      end
+
+      def valid?(arguments)
+        arguments.size > 0 && arguments.none? { |arg| arg.match(/\A-/) }
+      end
+    end
+  end
+end

data/lib/gem_search/commands/version.rb

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

data/lib/gem_search/executor.rb

@@ -3,7 +3,7 @@ require 'open-uri'
 
 module Gem::Search
   class Executor
-    include Gem::Search::Rendering
+    include Rendering
     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"
@@ -37,6 +37,7 @@ module Gem::Search
       if url.nil? || url.empty?
         url = GEM_URL % gem
       end
+      puts "Opening #{url}"
       browser_open(url)
     end
 

data/lib/gem_search/version.rb

@@ -1,3 +1,3 @@
 module Gem::Search
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/spec/bin/gem_search_spec.rb

@@ -1,23 +1,19 @@
 require 'spec_helper'
 
 BIN = 'bin/gem-search'
+
 USAGE = <<-EOS
 Usage: gem-search gem_name [options]
 
-    -s, --sort         Sort by the item.
-                        default [a]ll
-                        [a]ll  :DL(all)  eg. gem-search webkit -s a
-                        [v]er  :DL(ver)  eg. gem-search webkit -s v
-                        [n]ame :         eg. gem-search webkit -s n
-    -d, --detail       Display homepage url of gem
-    -v, --version      Display the version.
-    -h, --help         Display this help message.
-
-Available commands:
-
-  browse   Open rubygem's homepage in the system's default web browser
-
-See `<command> --help` for more information on a specific command.
+    -s, --sort     Sort by the field.
+                     default [a]ll
+                     [a]ll  :DL(all)  e.g.: gem-search webkit -s a
+                     [v]er  :DL(ver)  e.g.: gem-search webkit -s v
+                     [n]ame :         e.g.: gem-search webkit -s n
+    -b, --browse   Open rubygem's homepage in the system's default web browser.
+    -d, --detail   Display rubygems's homepage url.
+    -v, --version  Display the version.
+    -h, --help     Display this help message.
 EOS
 
 RSpec.shared_examples 'display an usage' do
@@ -48,5 +44,4 @@ RSpec.describe 'bin/gem-search' do
       should == "gem-search #{Gem::Search::VERSION}\n"
     end
   end
-
 end

data/spec/commands/browse_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+include Gem::Search
+
+RSpec.describe Commands::Browse do
+  describe '#call' do
+    before do
+      @executor = Executor.new
+      allow(Executor).to receive(:new).and_return(@executor)
+      @options = { browse: query }
+    end
+
+    let(:query) { 'factory_girl' }
+
+    context 'with browse option' do
+      it 'called Executor#browse with browse option' do
+        expect(@executor).to receive(:browse).with(query).once
+        Commands::Browse.new(@options).call
+      end
+    end
+  end
+end

data/spec/{command_spec.rb → commands/run_spec.rb}

@@ -2,35 +2,34 @@ require 'spec_helper'
 
 include Gem::Search
 
-RSpec.describe Command do
-  describe '#run' do
+RSpec.describe Commands::Run do
+  describe '#call' do
     before do
       @executor = Executor.new
       allow(Executor).to receive(:new).and_return(@executor)
-      allow(ARGV).to receive(:[]).with(0).and_return(query)
+      @options = {}
+      allow(@options).to receive(:arguments).and_return([query])
+      allow(@options).to receive(:detail?).and_return(false)
       stub_request_search(query, 1, dummy_search_result)
       stub_request_search_no_result_with_page(query, 2)
     end
+
     let(:query) { 'factory_girl' }
 
-    context 'with no sort option' do
-      before do
-        allow(Command::OPTS).to receive(:[]).and_return(nil)
-      end
-      it 'called with no sort option' do
+    context 'without sort option' do
+      it 'called Executor#search without sort option' do
         expect(@executor).to receive(:search).with(query, default_opts).once
-        Command.new.run
+        Commands::Run.new(@options).call
       end
     end
 
     context 'with sort option' do
       before do
-        allow(Command::OPTS).to receive(:[]).and_return(nil)
-        allow(Command::OPTS).to receive(:[]).with('sort').and_return('a')
+        allow(@options).to receive(:sort).and_return('a')
       end
-      it 'called with sort option' do
+      it 'called Executor#search with sort option' do
         expect(@executor).to receive(:search).with(query, default_opts(sort: 'downloads')).once
-        Command.new.run
+        Commands::Run.new(@options).call
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem-search
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - rochefort
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.8.2
+- !ruby/object:Gem::Dependency
+  name: mem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -112,12 +126,19 @@ files:
 - bin/gem-search
 - gem-search.gemspec
 - lib/gem_search.rb
-- lib/gem_search/command.rb
+- lib/gem_search/command_builder.rb
+- lib/gem_search/commands.rb
+- lib/gem_search/commands/base.rb
+- lib/gem_search/commands/browse.rb
+- lib/gem_search/commands/help.rb
+- lib/gem_search/commands/run.rb
+- lib/gem_search/commands/version.rb
 - lib/gem_search/executor.rb
 - lib/gem_search/rendering.rb
 - lib/gem_search/version.rb
 - spec/bin/gem_search_spec.rb
-- spec/command_spec.rb
+- spec/commands/browse_spec.rb
+- spec/commands/run_spec.rb
 - spec/executor_spec.rb
 - spec/http_stubs/gems/git-trend.json
 - spec/http_stubs/gems/git-trend_no_homepage.json
@@ -128,7 +149,7 @@ files:
 homepage: https://github.com/rochefort/gem-search
 licenses: []
 metadata: {}
-post_install_message: "\U0001F37A  Thanks for installing!"
+post_install_message: Thanks for installing!
 rdoc_options: []
 require_paths:
 - lib
@@ -144,13 +165,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: search gems with using rubygems.org API
 test_files:
 - spec/bin/gem_search_spec.rb
-- spec/command_spec.rb
+- spec/commands/browse_spec.rb
+- spec/commands/run_spec.rb
 - spec/executor_spec.rb
 - spec/http_stubs/gems/git-trend.json
 - spec/http_stubs/gems/git-trend_no_homepage.json

data/lib/gem_search/command.rb

@@ -1,91 +0,0 @@
-require 'slop'
-
-class Slop
-  def opt_description(msgs)
-    ind = ' ' * 22
-    msgs.inject { |rtn, msg| rtn << "\n#{ind}#{msg}" }
-  end
-end
-
-module Gem::Search
-  class Command
-    ENABLE_SORT_OPT = {
-      'v' => 'version_downloads',
-      'a' => 'downloads',
-      'n' => 'name',
-    }
-
-    OPTS = Slop.parse(help: true) do
-      banner "Usage: gem-search gem_name [options]\n"
-      on :s, :sort, opt_description([
-        'Sort by the item.',
-        '  default [a]ll',
-        '  [a]ll  :DL(all)  eg. gem-search webkit -s a',
-        '  [v]er  :DL(ver)  eg. gem-search webkit -s v',
-        '  [n]ame :         eg. gem-search webkit -s n',
-      ]), argument: :optional
-      on :d, :detail, 'Display homepage url of gem'
-      on :v, :version, 'Display the version.'
-
-      command 'browse' do
-        description "Open rubygem's homepage in the system's default web browser"
-        run do |_opts, args|
-          gem = args.first
-          executor = Executor.new
-          begin
-            executor.browse(gem)
-          rescue OpenURI::HTTPError
-            puts 'No such gem.'
-            abort
-          rescue => e
-            puts e.message
-            puts e.stacktrace
-            abort
-          end
-          exit
-        end
-      end
-    end
-
-    def run
-      version if OPTS['v']
-      validate
-
-      gs = Executor.new
-      gs.search(ARGV[0], setup_opts)
-    rescue LibraryNotFound => e
-      puts e.message
-      abort
-    rescue => e
-      puts "An unexpected #{e.class} has occurred."
-      puts e.message
-      abort
-    end
-
-    def setup_opts
-      {
-        sort: ENABLE_SORT_OPT[OPTS['sort']] || 'downloads',
-        detail: OPTS.detail?
-      }
-    end
-
-    private
-
-    def version
-      puts "gem-search #{Gem::Search::VERSION}"
-      exit
-    end
-
-    def validate
-      if (ARGV.size == 0)
-        puts OPTS
-        abort
-      end
-
-      if ARGV.any? { |arg| arg.match(/\A-/) }
-        puts OPTS
-        exit
-      end
-    end
-  end
-end