groundskeeper-bitcore 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa9db5c1fbd2ad3662d2bd6b124054088a1ea063fc4269f9aead572a54c13ac
-  data.tar.gz: 2a547f643b13a57ee1cdc5ca4034fb45a4dadd959021b4ea28abcc50c7d601d4
+  metadata.gz: 809d12859add61d5a82c2e9f55d773b9ed88e42aa7440a4e8b95bc42758b32cc
+  data.tar.gz: ca191ff7c1db6a185ead9b4c1e643627437d150286f9f0f71c013c31752e8a32
 SHA512:
-  metadata.gz: 20dfdd3fb15cfdf7f42a150b662111f7bd30aabbb7ceda8205ddbba4b45adaa77f2f96ba103bc0b80bdd0303b8cfaf454e2baa65211481340b4d0ede444272e3
-  data.tar.gz: e5ff1669be37cf936cfc74eed4520dc6c61191dc1755a6432cb5f30958aa5157c947b791096a907f803e08a62a91da3c6411305bf094e391601d3e36003692c1
+  metadata.gz: fca0e0631f1a3db3f0117acd1b274a01c68ed2a36cdf9f63bc472133b9d09c65e79d077fb14c64b2ca95291aa097ca4f2ac1279ac4e63883263a98ea70fbb84e
+  data.tar.gz: 2911246a9f12b19160946351a03c4ed28882c6b79546200e5f16cdbd67ef7287e8fa865ae673d6b74efef48717398e821966e1837a6ba7bea83e629c50a18d74

data/.travis.yml

@@ -2,4 +2,6 @@ sudo: false
 language: ruby
 rvm:
   - 2.3.4
-before_install: gem install bundler -v 1.15.1
+before_install:
+  - curl -sL https://sentry.io/get-cli/ | bash
+  - gem install bundler -v 1.15.1

data/README.md

@@ -23,14 +23,6 @@ export JIRA_PASSWORD="my-password"
 export JIRA_SITE="https://cbit123.atlassian.net"
 ```
 
-You also need to add a GitHub API Token with `repo` scope to your `bash_profile`.
-You can create one [here](https://github.com/settings/tokens) if you don't have
-one already.
-
-```bash
-export GITHUB_API_TOKEN="my-github-api-token"
-```
-
 For integration with Sentry, find or create your auth token
 [from here](https://sentry.io/settings/account/api/auth-tokens/) with the scopes `event:admin, event:read, member:read, org:read, project:read, project:releases, team:read`:
 

data/groundskeeper.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.executables   = "ground"
   spec.require_paths = %w[lib config]
 
-  spec.add_dependency "jira-ruby", "~> 1.3"
+  spec.add_dependency "jira-ruby", "~> 1.6"
   spec.add_dependency "mina", "~> 1.2"
   spec.add_dependency "mina-whenever", "~> 1.0.1"
   spec.add_dependency "thor", "~> 0.19"

data/lib/groundskeeper.rb

@@ -6,7 +6,6 @@ require "groundskeeper/commands"
 require "groundskeeper/document"
 require "groundskeeper/executable"
 require "groundskeeper/git"
-require "groundskeeper/git_hub"
 require "groundskeeper/jira"
 require "groundskeeper/project"
 require "groundskeeper/rails_version"

data/lib/groundskeeper/commands.rb

@@ -25,10 +25,6 @@ module Groundskeeper
       project = Project.build(repository.name)
       deploy_url = "https://#{project.full_dns(stage)}"
       website = Website.new(deploy_url)
-      git_hub = GitHub.build(
-        username: project.source_control_username,
-        repository_name: repository.name
-      )
       sentry = Sentry.build(
         project_name: project.sentry_project,
         version_prefix: repository.name
@@ -38,7 +34,6 @@ module Groundskeeper
         changelog: Changelog.build,
         console: console,
         git: Git.build,
-        git_hub: git_hub,
         jira: Jira.build(project.jira_prefix),
         project: project,
         repository: repository,
@@ -59,7 +54,6 @@ module Groundskeeper
       changelog: nil,
       console:,
       git: nil,
-      git_hub: nil,
       jira: nil,
       project: nil,
       repository: nil,
@@ -71,7 +65,6 @@ module Groundskeeper
       @changelog = changelog
       @console = console
       @git = git
-      @git_hub = git_hub
       @jira = jira
       @project = project
       @repository = repository
@@ -107,12 +100,10 @@ module Groundskeeper
     # rubocop:enable Metrics/AbcSize
 
     # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
-    # rubocop:disable Metrics/PerceivedComplexity
     def release(options = {})
       is_initial_release = !version_file.exists?
 
       return missing_jira_credentials unless jira.credentials?
-      return missing_github_credentials unless git_hub.credentials?
       return unless check_groundskeeper_version
       return unrecognized_version unless version_file.rails?
 
@@ -129,10 +120,9 @@ module Groundskeeper
       ask_create_jira_version
       ask_push_with_tags
       ask_add_version_to_jira_issues unless is_initial_release
-      open_pull_request_page
     end
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
-    # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/MethodLength
 
     # :nocov:
     def predeploy(options = {})
@@ -171,7 +161,7 @@ module Groundskeeper
     private
 
     # collaborators
-    attr_reader :changelog, :console, :git, :git_hub, :jira, :project,
+    attr_reader :changelog, :console, :git, :jira, :project,
                 :repository, :rubygems, :sentry, :version_file, :website
     # state
     attr_reader :current_step, :did_checkout_branch, :did_push_to_remote,
@@ -344,19 +334,6 @@ module Groundskeeper
       )
     end
 
-    def missing_github_credentials
-      console.say(
-        "Please configure your GitHub environment variables.",
-        :red
-      )
-    end
-
-    def open_pull_request_page
-      return unless did_checkout_branch && did_push_to_remote
-
-      git_hub.open_pull_request_page(new_branch_name)
-    end
-
     def new_branch_name
       "v#{next_version}"
     end

data/lib/groundskeeper/executable.rb

@@ -16,6 +16,10 @@ module Groundskeeper
     end
 
     def initialize(command)
+      if `which #{command}`.empty?
+        raise "#{command} not found, is it installed on your PATH?"
+      end
+
       @command = command
     end
 

data/lib/groundskeeper/git.rb

@@ -9,6 +9,7 @@ module Groundskeeper
     FETCH_WITH_TAGS = "fetch --tags"
     VERSION = "--version"
     TAGS_ASC = "tag -l --sort=v:refname"
+    TAGS_DESC = "tag -l --sort=-v:refname"
     LATEST_TAG_COMMIT = "#{COMMAND} rev-list --tags --max-count=1"
     LATEST_TAG_NAME =
       format("describe --tags $(%<commit>s)", commit: LATEST_TAG_COMMIT)
@@ -23,6 +24,7 @@ module Groundskeeper
     PUSH_HEAD_WITH_TAGS = "push origin head --tags"
     PULL = "-C #{Dir.home}/%s pull"
     REMOTE_URL = "-C #{Dir.home}/%s config --get remote.origin.url"
+    ORIGIN_URL = "config --get remote.origin.url"
 
     attr_reader :git
 
@@ -52,6 +54,11 @@ module Groundskeeper
       git.execute(TAGS_ASC)
     end
 
+    def fetch_and_list_tags
+      git.execute(FETCH_WITH_TAGS)
+      git.execute(TAGS_DESC).split("\n")
+    end
+
     def latest_tag_name_across_branches
       git.execute(LATEST_TAG_NAME).chop
     end
@@ -97,5 +104,9 @@ module Groundskeeper
     def remote_url(name)
       git.execute(format(REMOTE_URL, name))
     end
+
+    def origin_url
+      git.execute(ORIGIN_URL).strip
+    end
   end
 end

data/lib/groundskeeper/project.rb

@@ -6,13 +6,12 @@ require "json"
 module Groundskeeper
   # Accesses project details stored in the home directory.
   class Project
-    attr_reader :details, :servers, :repo_name
+    attr_reader :details, :servers, :repo_name, :git
 
     DETAILS_PATH = "~/.project_details/projects.yml"
     SERVERS_PATH = "~/.project_details/servers.yml"
     JIRA_PREFIX_KEY = "jira_prefix"
     PROJECT_NAME_KEY = "name"
-    SOURCE_CONTROL_USERNAME_KEY = "scm_username"
     FULL_DNS_KEY = "full_dns"
     RVM_RUBY_VERSION_KEY = "ruby_version"
     DB_ENV_VARIABLES_KEY = "db_env_variables"
@@ -27,7 +26,8 @@ module Groundskeeper
       new(
         projects_yaml: Document.new(DETAILS_PATH).read,
         servers_yaml: Document.new(SERVERS_PATH).read,
-        repository_name: repository_name
+        repository_name: repository_name,
+        git: Git.build
       )
     end
 
@@ -39,11 +39,12 @@ module Groundskeeper
     end
     # :nocov:
 
-    def initialize(projects_yaml:, servers_yaml:, repository_name:)
+    def initialize(projects_yaml:, servers_yaml:, repository_name:, git: nil)
       projects = YAML.safe_load(projects_yaml) || {}
       @details = projects[repository_name] || {}
       @servers = YAML.safe_load(servers_yaml) || {}
       @repo_name = repository_name
+      @git = git
     end
 
     def project_name
@@ -54,10 +55,6 @@ module Groundskeeper
       details[JIRA_PREFIX_KEY] || ""
     end
 
-    def source_control_username
-      details[SOURCE_CONTROL_USERNAME_KEY] || ""
-    end
-
     def full_dns(stage)
       details.dig(FULL_DNS_KEY, stage.to_s) || ""
     end
@@ -116,7 +113,7 @@ module Groundskeeper
 
     # :nocov:
     def repo_url
-      "git@github.com:#{source_control_username}/#{repo_name}.git"
+      git.origin_url
     end
     # :nocov:
 
@@ -128,16 +125,7 @@ module Groundskeeper
 
     # :nocov:
     def tags
-      api_url = "https://api.github.com/repos/" \
-                "#{source_control_username}/#{repo_name}/tags"
-      authorization_header = "Authorization: token #{ENV['GITHUB_API_TOKEN']}"
-      response = JSON.parse(`curl -s -H "#{authorization_header}" #{api_url}`)
-      unless response.is_a?(Array)
-        message = response["message"]
-        puts "Failed to obtain response: #{message}"
-        return []
-      end
-      response.map { |h| h["name"] }
+      git.fetch_and_list_tags
     end
     # :nocov:
   end

data/lib/groundskeeper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Groundskeeper
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groundskeeper-bitcore
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - BIT Core
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - certs/ericcf.pem
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jira-ruby
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: mina
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +175,6 @@ files:
 - lib/groundskeeper/document.rb
 - lib/groundskeeper/executable.rb
 - lib/groundskeeper/git.rb
-- lib/groundskeeper/git_hub.rb
 - lib/groundskeeper/jira.rb
 - lib/groundskeeper/project.rb
 - lib/groundskeeper/rails_version.rb
@@ -207,7 +206,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A gem for managing releases and deployments.

data/lib/groundskeeper/git_hub.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module Groundskeeper
-  # Wraps an interface to GitHub.
-  class GitHub
-    attr_reader :opener, :username, :repository_name
-
-    GITHUB_API_TOKEN = "GITHUB_API_TOKEN"
-    COMMAND = "open"
-    URL_BASE = "https://github.com/"
-
-    def self.build(username:, repository_name:)
-      new(
-        opener: Executable.new(COMMAND),
-        username: username,
-        repository_name: repository_name
-      )
-    end
-
-    def initialize(opener:, username:, repository_name:)
-      @opener = opener
-      @username = username
-      @repository_name = repository_name
-    end
-
-    def open_pull_request_page(branch_name)
-      url = "#{URL_BASE}#{username}/#{repository_name}/compare/" \
-            "#{branch_name}?expand=1"
-
-      opener.execute(url)
-    end
-
-    def credentials?
-      ENV[GITHUB_API_TOKEN].present?
-    end
-  end
-end