gems-cli 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3116e9b265fd3c8fa8c24823789cd119aeee6bfa
-  data.tar.gz: 1ae99d2c29f8bf3da3e5b95831c8466fb3f7d7d8
+  metadata.gz: 3867f8adb6fcf32c7dbea17cfdec4b593d065bca
+  data.tar.gz: 14f52ea29a59f9880644902d25e03f26675fbb82
 SHA512:
-  metadata.gz: 27da575cf429d42afd32e6aeaedecf5d3af2501b135fbfe8850979f7a66ead2ffe5f43eebbf802457bd831cbcc5e8bd912b2675b058ccc28367eb17db49806db
-  data.tar.gz: feed18673e310bb31b91afb0576d151c4345da24567b3b4bcbb8a737ad32b4e10dd83f8f21efa2f9f369a2807fac50ceba37d88d517c796e64dbed635beb5199
+  metadata.gz: 4d472d5e50c42663190f2ed0b9225a0ec24388a395bd41838129115af2448ef8560bb1dce2b9be10e521ddc4a732eb76b221ecbed42650a4f75739d3cabe2bda
+  data.tar.gz: 78b9870621cc6c1b3f5cc9a8eae6a960d64bcc784fc7a61a2015c13d6c9bdc4c97db90b64a8c9e44ecdaacf14d2a8806bbc597dd890e8d32e5b3b56773965978

data/bin/gems

@@ -12,54 +12,96 @@ version GemsCli::VERSION
 arguments :strict
 subcommand_option_handling :normal
 
+def display_gem data, index, prefix=''
+  puts "#{prefix}#{index}: gem '#{data['name']}', '~> #{data['version']}'"
+end
+
 desc 'Search Rubygems.org for a gem'
 arg_name 'Name of a gem'
 command [:search, :s] do |c|
   c.desc 'Number of results returned per page'
-  c.default_value 10
+  c.default_value 7
   c.flag :n
 
-  c.action do |global_options,options,args|
-    if args[0].nil? || args[0].empty?
+  c.action do |global_options, options, args|
+    query = args[0]
+
+    if query.nil? || query.empty?
       raise ArgumentError, 'Please supply a search term.'
     end
 
-    puts "Running your search for #{args[0]}...".color(:green)
+    puts "Running your search for #{query}...".color(:green)
 
-    search_results = Gems.search args[0]
+    search_results = Gems.search(query)
     limit = options[:n].to_i
     paged_results = Paginator.new(ary: search_results, per_page: limit)
 
     paged_results.first_page.each_with_index do |e, i|
-      puts "#{i}: gem '#{e['name']}', '~> #{e['version']}'"
+      display_gem e, i
     end
 
     @answer = ''
+    versions = {}
+    letters = ('a'..'c').to_a
     until @answer == 'q'
       puts "Page: #{paged_results.page}/#{paged_results.pages}\n".color(:green)
-      choices = "Select from 0..#{paged_results.per_page - 1}, (n)ext, (p)revious, or (q)uit #=> ".color(:green)
-      @answer = ask(choices, String) do |q|
-                 q.case      = :downcase
-                 q.validate  = /\A\d+|q|n|p\Z/
-               end
+      can_get_more_versions = versions.size < 1
+      choices = "Select from 0..#{paged_results.per_page - 1}, (n)ext, (p)revious, "
+      choices += "(m)ore versions, " if can_get_more_versions
+      choices += "or (q)uit #=> "
+      @answer = ask(choices.color(:green), String) do |q|
+        q.case = :downcase
+        if can_get_more_versions
+          q.validate = /\A\d+\w?|q|n|m|p\Z/
+        else
+          q.validate = /\A\d+\w?|q|n|p\Z/
+        end
+      end
 
       case @answer
-      when /\d+/
+      when /\d+\w?/
         gem_list = paged_results.current_page
-        if gem_list[@answer.to_i]
-          Clipboard.copy "gem '#{gem_list[@answer.to_i]['name']}', '~> #{gem_list[@answer.to_i]['version']}'"
-          puts "Copied #{gem_list[@answer.to_i]['name']} to your clipboard!".color(:green)
+        chosen_index, chosen_version = @answer.scan(/\d+|\D+/)
+        chosen_index = chosen_index.to_i
+        if chosen_gem=gem_list[chosen_index]
+          gem_name = chosen_gem['name']
+          gem_version = chosen_gem['version']
+          if chosen_version
+            gem_version_index = letters.index(chosen_version)
+            unless gem_version_index
+              puts 'Invalid gem and version choice'
+              next
+            end
+            selected_version = versions[gem_name][gem_version_index]
+            gem_version = selected_version['number']
+          end
+          Clipboard.copy "gem '#{gem_name}', '~> #{gem_version}'"
+          puts "Copied #{gem_name} #{gem_version} to your clipboard!".color(:green)
           break
         else
-          puts "Your choice, #{@answer}, is not in the list 0..#{gem_list.size - 1}"
+          puts "Your choice, #@answer, is not in the list 0..#{gem_list.size - 1}"
+        end
+      when 'm'
+        paged_results.current_page.each_with_index do |e, i|
+          display_gem e, i
+          gem_name = e['name']
+          versions[gem_name] = Gems.versions(gem_name).sort {|a, b|
+            b['built_at'] <=> a['built_at']
+          }.reject {|v| v['number'] == e['version'] }
+          versions[gem_name][0...letters.length].each_with_index do |v, j|
+            version_data = {'name' => gem_name, 'version' => v['number']}
+            display_gem version_data, "#{i}#{letters[j]}", '    '
+          end
         end
       when 'n'
+        versions = {}
         paged_results.next_page.each_with_index do |e, i|
-          puts "#{i}: gem '#{e['name']}', '~> #{e['version']}'"
+          display_gem e, i
         end
       when 'p'
+        versions = {}
         paged_results.previous_page.each_with_index do |e, i|
-          puts "#{i}: gem '#{e['name']}', '~> #{e['version']}'"
+          display_gem e, i
         end
       when 'q'
         puts 'Later.'
@@ -70,7 +112,7 @@ command [:search, :s] do |c|
   end
 end
 
-pre do |global,command,options,args|
+pre do |global, command, options, args|
   # Pre logic here
   # Return true to proceed; false to abort and not call the
   # chosen command
@@ -79,7 +121,7 @@ pre do |global,command,options,args|
   true
 end
 
-post do |global,command,options,args|
+post do |global, command, options, args|
   # Post logic here
   # Use skips_post before a command to skip this
   # block on that command only

data/gems-cli.gemspec

@@ -29,8 +29,8 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov', '~> 0.9.1'
   s.add_development_dependency 'rubocop', '~> 0.28.0'
 
-  s.add_runtime_dependency 'gli','2.12.2'
-  s.add_runtime_dependency 'gems','0.8.3'
+  s.add_runtime_dependency 'gli', '2.12.2'
+  s.add_runtime_dependency 'gems', '0.8.3'
   s.add_runtime_dependency 'highline', '1.6.21'
   s.add_runtime_dependency 'clipboard', '1.0.5'
   s.add_runtime_dependency 'rainbow', '2.0.0'

data/lib/gems-cli.rb

@@ -2,6 +2,5 @@ require 'gems'
 require 'highline/import'
 require 'clipboard'
 require 'rainbow/ext/string'
-require 'will_paginate/array'
 require 'gems-cli/version.rb'
 require 'gems-cli/paginator.rb'

data/lib/gems-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gems-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Chase Southard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake