codestatus 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c422e70b25fb0d3623d7b93e15695d30efae525f
-  data.tar.gz: 8624d34d7925435b19f9bb9b5a6961b2fd61894b
+  metadata.gz: 296b1f49ece050248a9b6e46bfca68be9b534e97
+  data.tar.gz: 9ce227d541dc631e227564dfafb7f8bcfa64bfdd
 SHA512:
-  metadata.gz: 6cf171f0b406a442f15596b4ad0d681c5bafc7d75055d4024a2ce5a1577756ee938aaafc292f51fc5af532f8028692cdba416788ea96c25c801536bf448b6239
-  data.tar.gz: 35b775075e73d08eb83a3c3a12ae89a9d6b022ac49ca6ac9b50d5344a554a4f47eaa8aa73d3db97e6607d41b41040b478b859bd62d5b5bf0b6da06b45493c036
+  metadata.gz: 64bb41856739e0a7830e70030d424cd062b944853b1d4c93b4ffe2628c66240f8ba5df31a881669c9ca177e800777bcecc1f9d0fef0123cea9b2a6b1b47dbc75
+  data.tar.gz: 44e451ae94f63f2e5cc824e62be62370046b40f3f667a35313d3b379ac6d1c215ae64c29bf7ef91badba1f5340287d8d30eb15dca4bd7ebf7d7d7cacc524428a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    codestatus (0.1.2)
+    codestatus (0.1.3)
       gems
       octokit
       rest-client

data/lib/codestatus.rb

@@ -4,13 +4,22 @@ require "codestatus/cli"
 require "codestatus/package_resolvers/base"
 require "codestatus/package_resolvers/rubygems_resolver"
 require "codestatus/package_resolvers/npm_resolver"
+require "codestatus/package_resolvers/repository_not_found_error"
+require "codestatus/package_resolvers/package_not_found_error"
+require "codestatus/repositories/base"
 require "codestatus/repositories/github_repository"
 require "codestatus/repositories/bitbucket_repository"
 
 module Codestatus
   def self.status(repository: nil, registry: nil, package: nil)
     if !repository && registry && package
-      repository = resolver(registry).resolve(package: package)
+      begin
+        repository = resolver(registry).resolve!(package)
+      rescue PackageResolvers::PackageNotFoundError
+        abort "#{package}: Package not found"
+      rescue PackageResolvers::RepositoryNotFoundError
+        abort "#{package}: Repository not found"
+      end
     end
 
     if repository

data/lib/codestatus/package_resolvers/base.rb

@@ -4,24 +4,43 @@ module Codestatus
       GITHUB_REPOSITORY_REGEXP = %r{(https?|git)://github.com/(?<owner>[^/]*)/(?<repo>[^/]*)(\.git)?/?.*}.freeze
       BITBUCKET_REPOSITORY_REGEXP = %r{(https?|git)://bitbucket.org/(?<owner>[^/]*)/(?<repo>[^/]*)(\.git)?/?.*}.freeze
 
-      def self.resolve(package:)
-        self.new(package: package).resolve
+      def self.resolve(package)
+        self.new(package).resolve
       end
 
-      def initialize(package:)
+      def self.resolve!(package)
+        self.new(package).resolve!
+      end
+
+      def initialize(package)
         @package = package
       end
 
       attr_reader :package
 
       def resolve
-        @package = package
+        detect_repository
+      rescue PackageNotFoundError, RepositoryNotFoundError
+        # noop
+      end
 
-        github_repository || bitbucket_repository
+      def resolve!
+        detect_repository
       end
 
       private
 
+      def detect_repository
+        raise PackageNotFoundError unless found?
+        repository = github_repository || bitbucket_repository
+        raise RepositoryNotFoundError unless repository
+        repository
+      end
+
+      def found?
+        raise NotImplementedError
+      end
+
       def github_repository
         urls.map { |url|
           matched = GITHUB_REPOSITORY_REGEXP.match(url)

data/lib/codestatus/package_resolvers/npm_resolver.rb

@@ -7,6 +7,10 @@ module Codestatus
 
       private
 
+      def found?
+        package_info
+      end
+
       def urls
         [
           bugs_url,
@@ -16,19 +20,26 @@ module Codestatus
       end
 
       def bugs_url
-        package_info.dig('bugs', 'url')
+        package_info&.dig('bugs', 'url')
       end
 
       def homepage_url
-        package_info.dig('homepage')
+        package_info&.dig('homepage')
       end
 
       def repository_url
-        package_info.dig('repository', 'url')
+        package_info&.dig('repository', 'url')
       end
 
       def package_info
-        @package_info ||= JSON.parse(client.get(package_uri))
+        @package_info ||= request(package_uri)
+      end
+
+      def request(uri)
+        response = client.get(uri)
+        JSON.parse(response)
+      rescue RestClient::NotFound
+        nil
       end
 
       def client

data/lib/codestatus/package_resolvers/package_not_found_error.rb

@@ -0,0 +1,6 @@
+module Codestatus
+  module PackageResolvers
+    class PackageNotFoundError < StandardError
+    end
+  end
+end

data/lib/codestatus/package_resolvers/repository_not_found_error.rb

@@ -0,0 +1,6 @@
+module Codestatus
+  module PackageResolvers
+    class RepositoryNotFoundError < StandardError
+    end
+  end
+end

data/lib/codestatus/package_resolvers/rubygems_resolver.rb

@@ -5,6 +5,10 @@ module Codestatus
     class RubygemsResolver < Base
       private
 
+      def found?
+        gem_info
+      end
+
       def urls
         [
           source_code_uri,
@@ -14,19 +18,25 @@ module Codestatus
       end
 
       def homepage_uri
-        gem_info['homepage_uri']
+        gem_info&.dig('homepage_uri')
       end
 
       def source_code_uri
-        gem_info['source_code_uri']
+        gem_info&.dig('source_code_uri')
       end
 
       def bug_tracker_uri
-        gem_info['bug_tracker_uri']
+        gem_info&.dig('bug_tracker_uri')
       end
 
       def gem_info
-        @info ||= Gems.info(package)
+        @info ||= begin
+                    Gems.info(package)
+                  rescue JSON::ParserError
+                    # When the package is not found on rubygems,
+                    # Gems does try to parse html as json and raise JSON::ParserError :sob:
+                    nil
+                  end
       end
     end
   end

data/lib/codestatus/repositories/base.rb

@@ -0,0 +1,18 @@
+module Codestatus
+  module Repositories
+    class Base
+      def initialize(slug)
+        @slug = slug
+      end
+      attr_reader :slug
+
+      def status(ref)
+        raise NotImplementedError
+      end
+
+      def html_url
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/lib/codestatus/repositories/bitbucket_repository.rb

@@ -2,13 +2,8 @@ require 'rest-client'
 
 module Codestatus
   module Repositories
-    class BitbucketRepository
+    class BitbucketRepository < Base
       BITBUCKET_API_ENDPOINT = 'https://api.bitbucket.org/2.0/' #repositories/atlassian/aui
-      def initialize(slug)
-        # 'atlassian/aui'
-        @slug = slug
-      end
-
       # This combined status is generated by the rule of GitHub's
       #   https://developer.github.com/v3/repos/statuses/#get-the-combined-status-for-a-specific-ref
       def status(ref = main_branch)
@@ -30,7 +25,10 @@ module Codestatus
         BuildStatus.new(sha: sha, status: state)
       end
 
-      attr_reader :slug
+      # https://bitbucket.org/atlassian/aui
+      def html_url
+        repository.dig('links', 'html', 'href')
+      end
 
       private
 

data/lib/codestatus/repositories/github_repository.rb

@@ -2,20 +2,20 @@ require "octokit"
 
 module Codestatus
   module Repositories
-    class GitHubRepository
-      def initialize(slug)
-        # 'influitive/apartment'
-        @repo = slug
-      end
-
+    class GitHubRepository < Base
       # combined status on github
       # https://developer.github.com/v3/repos/statuses/#get-the-combined-status-for-a-specific-ref
       def status(ref = default_branch)
-        response = client.combined_status(@repo, ref)
+        response = client.combined_status(slug, ref)
 
         BuildStatus.new(sha: response.sha, status: response.state)
       end
 
+      # https://github.com/meganemura/codestatus
+      def html_url
+        repository['html_url']
+      end
+
       private
 
       def default_branch
@@ -23,7 +23,7 @@ module Codestatus
       end
 
       def repository
-        @repository ||= client.repository(@repo)
+        @repository ||= client.repository(slug)
       end
 
       def client

data/lib/codestatus/version.rb

@@ -1,3 +1,3 @@
 module Codestatus
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codestatus
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - meganemura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -161,7 +161,10 @@ files:
 - lib/codestatus/cli.rb
 - lib/codestatus/package_resolvers/base.rb
 - lib/codestatus/package_resolvers/npm_resolver.rb
+- lib/codestatus/package_resolvers/package_not_found_error.rb
+- lib/codestatus/package_resolvers/repository_not_found_error.rb
 - lib/codestatus/package_resolvers/rubygems_resolver.rb
+- lib/codestatus/repositories/base.rb
 - lib/codestatus/repositories/bitbucket_repository.rb
 - lib/codestatus/repositories/github_repository.rb
 - lib/codestatus/version.rb