reponaut 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 985b9da1a543fc796c3ce12f0905e43cf20abb43
-  data.tar.gz: 7655ae1f153449137992b2a03f8be9fdcb9cbc77
+  metadata.gz: ca3c8d9d91d3d659a13788b5173fc39b670e4124
+  data.tar.gz: 7b423f8199715b9d3fe97e33e86e5aaaa82bb7be
 SHA512:
-  metadata.gz: 9bc1b74370e8d307a6e297745b3ccc7c983edf91823144c38a5b34a1fe0cd2783fe4ec40843570ba822e6b08c3fe172d27e268294751581f4ab65aea01d54424
-  data.tar.gz: 1edef2e6384a54b7c907ec4e6d0c62e6b9bda58690baf7a5a237c0a042bbe98c38ad690018e56486f8f0f2207c14954f5a6dd5d8f4479748129e6dc73625f2f8
+  metadata.gz: 99ee34463141ccde3352c27b06ab141473af74061cb4a0a2789b0b3b836ffae3db4ca998a8a80352a19ddfa75581a3b3b32ba4e56d97dffb43c0a88eff0feba5
+  data.tar.gz: 724c5e848bf24285f45083e5e57255f49f6a77c5063ec418c5deb491c80244278d94da93a88ddfdd76474dd15a59a63168a9307829071aa9807bec107a7b12c1

data/features/list.feature

@@ -62,6 +62,64 @@ Feature: List repos for a given language
       zanegort
       """
 
+  Scenario: Show languages for all repositories
+    Given the GitHub service returns repository data for the user "mdippery"
+    When I run `reponaut ls -l mdippery`
+    Then it should pass with:
+      """
+      3ddv [Java]
+      blackout [Objective-C]
+      bucknellbug [Objective-C]
+      chameleon [Clojure]
+      collections [Objective-C]
+      dnsimple-python -> tbunnyman/dnsimple-python [Python]
+      dotfiles [Perl]
+      glitz [Python]
+      homebrew-self [Ruby]
+      karmanaut [Clojure]
+      libtar [C]
+      nginx.vim -> vim-scripts/nginx.vim [VimL]
+      rack-pesticide [Ruby]
+      rainyday [Objective-C]
+      reponaut [Python]
+      Smyck-Color-Scheme -> hukl/Smyck-Color-Scheme [VimL]
+      snodes [Java]
+      squash [Objective-C]
+      stackim [JavaScript]
+      staticgenerator -> mrj0/staticgenerator [Python]
+      usaidwat [Ruby]
+      vimfiles [VimL]
+      whitman [Clojure]
+      zanegort [Erlang]
+      """
+
+  Scenario: Show languages for all repositories without forks
+    Given the GitHub service returns repository data for the user "mdippery"
+    When I run `reponaut ls -lf mdippery`
+    Then it should pass with:
+      """
+      3ddv [Java]
+      blackout [Objective-C]
+      bucknellbug [Objective-C]
+      chameleon [Clojure]
+      collections [Objective-C]
+      dotfiles [Perl]
+      glitz [Python]
+      homebrew-self [Ruby]
+      karmanaut [Clojure]
+      libtar [C]
+      rack-pesticide [Ruby]
+      rainyday [Objective-C]
+      reponaut [Python]
+      snodes [Java]
+      squash [Objective-C]
+      stackim [JavaScript]
+      usaidwat [Ruby]
+      vimfiles [VimL]
+      whitman [Clojure]
+      zanegort [Erlang]
+      """
+
   Scenario: Describe all repositories
     Given the GitHub service returns repository data for the user "mdippery"
     When I run `reponaut ls -d mdippery`
@@ -234,11 +292,20 @@ Feature: List repos for a given language
       vimfiles
       """
 
+  Scenario: List repositories for a given user with no results
+    Given the GitHub service returns repository data for the user "emptyuser"
+    When I run `reponaut ls emptyuser`
+    Then the exit status should not be 0
+    And the output should contain exactly:
+      """
+      emptyuser has no repositories
+      """
+
   Scenario: List repositories in a given language with no results
     Given the GitHub service returns repository data for the user "mdippery"
     When I run `reponaut ls mdippery C++`
     Then the exit status should not be 0
-    And the output should contain:
+    And the output should contain exactly:
       """
       mdippery has no repositories written in C++
       """
@@ -251,3 +318,12 @@ Feature: List repos for a given language
       """
       GitHub rate limit exceeded. Try your request again later.
       """
+
+  Scenario: List both descriptions and languages for a given user
+    Given the GitHub service returns repository data for the user "mdippery"
+    When I run `reponaut ls -ld mdippery`
+    Then the exit status should not be 0
+    And the output should contain exactly:
+      """
+      Only one of -l and -d may be specified
+      """

data/lib/reponaut/commands/list.rb

@@ -8,6 +8,7 @@ module Reponaut
           c.description "List a user's repos"
           c.option 'ignore_forks', '-f', 'Ignore forks'
           c.option 'show_description', '-d', 'Show repo description'
+          c.option 'show_language', '-l', 'Show repo language'
 
           c.action do |args, options|
             process(options, args)
@@ -20,9 +21,15 @@ module Reponaut
 
         language = args[1]
 
+        quit 6, 'Only one of -l and -d may be specified' if options['show_description'] && options['show_language']
+
         filtered_repos = repos
         filtered_repos = filtered_repos.select { |r| r.language.downcase == language.downcase } if language
-        quit 4, "#{username} has no repositories written in #{language}" if filtered_repos.empty?
+        if filtered_repos.empty?
+          msg = "#{username} has no repositories"
+          msg += " written in #{language}" if language
+          quit 4, msg
+        end
 
         formatter = formatter_class(options).new
         filtered_repos.sort.each do |r|
@@ -33,7 +40,13 @@ module Reponaut
       private
 
       def formatter_class(options)
-        options['show_description'] ? LongPresenter : SimplePresenter
+        if options['show_description']
+          LongPresenter
+        elsif options['show_language']
+          LanguagePresenter
+        else
+          SimplePresenter
+        end
       end
     end
   end

data/lib/reponaut/github.rb

@@ -17,7 +17,7 @@ module Reponaut
       end
 
       def repos
-        JSON.parse(repo_data).map { |e| Repository.new(self, e) }
+        repo_data.map { |e| Repository.new(self, e) }
       end
 
       def to_s
@@ -35,10 +35,31 @@ module Reponaut
       private
 
         def real_repo_data
-          resp = get("/users/#{username}/repos")
+          resp = request_repo_data("/users/#{username}/repos")
+          body = JSON.parse(resp.body)
+          parse_linked_data(resp, body)
+        end
+
+        def request_repo_data(url)
+          resp = get(url)
           raise NoSuchUserError, username if resp.code == 404
           raise RateLimitExceededError if resp.code == 403
-          resp.body
+          resp
+        end
+
+        def parse_linked_data(resp, acc)
+          return acc unless resp.headers.include?('link')
+          links = resp.headers['link'].split(/,/).map { |l| l.strip }
+          next_url = links.find { |l| l =~ link_url_re }
+          return acc unless next_url
+          next_url = next_url.match(link_url_re).captures.first
+          resp = request_repo_data(next_url)
+          acc += JSON.parse(resp.body)
+          parse_linked_data(resp, acc)
+        end
+
+        def link_url_re
+          /^<(.+)>; rel="next"$/
         end
 
         def mock_repo_data
@@ -47,7 +68,7 @@ module Reponaut
           raw_data = IO.read(path)
           data = YAML.load(raw_data)
           raise NoSuchUserError, username if data['http_interactions'][0]['response']['status']['code'] == 404
-          data['http_interactions'][0]['response']['body']['string']
+          JSON.parse(data['http_interactions'][0]['response']['body']['string'])
         end
 
         define_method(:repo_data, instance_method(ENV.cucumber? ? :mock_repo_data : :real_repo_data))

data/lib/reponaut/presenter.rb

@@ -10,6 +10,13 @@ module Reponaut
 
     class SimplePresenter < Presenter; end
 
+    class LanguagePresenter < Presenter
+      def format(repo)
+        line = super
+        line += " [#{repo.language}]"
+      end
+    end
+
     class LongPresenter < Presenter
       attr_reader :count
 

data/lib/reponaut/version.rb

@@ -1,3 +1,3 @@
 module Reponaut
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/spec/reponaut/presenter_spec.rb

@@ -4,12 +4,14 @@ module Reponaut
   module Application
     describe 'Presenters' do
       let (:repo) { double('repo', :name => '3ddv',
-                                  :description => 'NEES 3D Data Viewer from the Center for Earthquake Engineering Simulation at RPI',
-                                  :fork? => false) }
+                                   :description => 'NEES 3D Data Viewer from the Center for Earthquake Engineering Simulation at RPI',
+                                   :fork? => false,
+                                   :language => 'Java') }
       let (:fork) { double('repo', :name => 'mercenary',
-                                  :description => 'An easier way to build your command-line scripts in Ruby.',
-                                  :fork? => true,
-                                  :upstream => 'jekyll/mercenary') }
+                                   :description => 'An easier way to build your command-line scripts in Ruby.',
+                                   :fork? => true,
+                                   :upstream => 'jekyll/mercenary',
+                                   :language => 'Ruby') }
 
       describe SimplePresenter do
         let (:formatter) { SimplePresenter.new }
@@ -23,6 +25,18 @@ module Reponaut
         end
       end
 
+      describe LanguagePresenter do
+        let (:formatter) { LanguagePresenter.new }
+
+        it "prints the repo's name and language" do
+          expect(formatter.format(repo)).to eq('3ddv [Java]')
+        end
+
+        it "prints the repo's name and language and the name of the upstream repo if the repo is a fork" do
+          expect(formatter.format(fork)).to eq('mercenary -> jekyll/mercenary [Ruby]')
+        end
+      end
+
       describe LongPresenter do
         let (:formatter) { LongPresenter.new }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reponaut
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Michael Dippery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -183,9 +183,9 @@ homepage: https://github.com/mdippery/reponaut
 licenses:
 - MIT
 metadata:
-  build_date: 2016-08-28 17:52:49 PDT
-  commit: v2.0.0
-  commit_hash: df5fa0aefe17ed3033928aad6e6ea2b0450416b1
+  build_date: 2017-03-05 18:44:49 PST
+  commit: v2.1.0
+  commit_hash: 3c46cd939ddbc9ae8d3fd06ce6d3c86b153533f6
 post_install_message: 
 rdoc_options: []
 require_paths: