ghdeploy 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b7337590fe342d7eb0847bfc0db55f427fa21ee
-  data.tar.gz: caae3973494652dd50d238456cecbe7d1cb0eb7c
+  metadata.gz: 9fb7ea113254aeb5e3b38eb22b43060c20380c45
+  data.tar.gz: 751057cc6ac4cc0a52a1c557277ed2603b6bd3f7
 SHA512:
-  metadata.gz: c52cfbd42ea137d34b85b55bd455c39e967832b36e37fea95a40f5239b2ff99ed00ecfe841de6d03428865b6b25bbafafe2b2cd7e54dd06f461166326d40b902
-  data.tar.gz: 335e4db5a62e75f9b90290624b322fed40fd7112cd4d84d79c241cdfc59d070a67356842c8c6aaec8b7b1cb82550b11967887a043e3c5c03b477ddbe1160ee2b
+  metadata.gz: 50a5429c3bf9c990c2f0cf5f14f40ab06daad918b36130d9d94c5be322f79264876e973542ff4d338ae824b57842e9e74774221a63f57600591efa20e8a5da99
+  data.tar.gz: f3741da59ca716f4071f3778e55c9c72aca2d0105001add26533fdbf3ace4a1686de6f4addac4bb3ed5eaef84eb9ba799b6ab5ac141441ac805d1dc50d028557

data/.rubocop.yml

@@ -0,0 +1,29 @@
+require: rubocop-rspec
+
+AllCops:
+  Include:
+    - Gemfile
+    - lib/**/*
+    - spec/**/*
+  Exclude:
+    - bin/**/*
+
+Style/Documentation:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/BlockDelimiters:
+  Exclude:
+    - 'spec/**/*'
+
+Metrics/LineLength:
+  Max: 100
+
+Metrics/MethodLength:
+  Max: 12
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in ghdeploy.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ghdeploy (0.1.6)
+    ghdeploy (0.2.0)
       git (~> 1.5)
       octokit (~> 4.0)
       thor (~> 0.20)
@@ -11,6 +11,7 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    ast (2.4.0)
     diff-lcs (1.3)
     faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
@@ -18,7 +19,12 @@ GEM
     multipart-post (2.0.0)
     octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    public_suffix (3.0.2)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.1)
+    public_suffix (3.0.3)
+    rainbow (3.0.0)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -33,10 +39,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
+    rubocop (0.56.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-rspec (1.22.2)
+      rubocop (>= 0.52.1)
+    ruby-progressbar (1.9.0)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     thor (0.20.0)
+    unicode-display_width (1.3.2)
 
 PLATFORMS
   ruby
@@ -46,6 +63,8 @@ DEPENDENCIES
   ghdeploy!
   rake (~> 10.0)
   rspec (~> 3.0)
+  rubocop
+  rubocop-rspec
 
 BUNDLED WITH
    1.16.1

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "ghdeploy"
+require 'bundler/setup'
+require 'ghdeploy'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "ghdeploy"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/ghdeploy.gemspec

@@ -1,5 +1,5 @@
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ghdeploy/version'
 
@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Brandon Joyce']
   spec.email         = ['brandon@sonerdy.com']
 
-  spec.summary       = %q{Adds a deploy command to git that uses the GitHub deployments API}
-  spec.description   = %q{Run git deploy within a git repository to create a GitHub deployment.}
+  spec.summary       = 'Adds a deploy command to git that uses the GitHub deployments API'
+  spec.description   = 'Run git deploy within a git repository to create a GitHub deployment.'
   spec.homepage      = 'https://github.com/sonerdy/ghdeploy'
   spec.license       = 'MIT'
 
@@ -21,11 +21,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'thor', '~> 0.20'
   spec.add_runtime_dependency 'git', '~> 1.5'
   spec.add_runtime_dependency 'octokit', '~> 4.0'
+  spec.add_runtime_dependency 'thor', '~> 0.20'
 
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rspec'
 end

data/lib/ghdeploy.rb

@@ -1,4 +1,4 @@
-require "ghdeploy/version"
+require 'ghdeploy/version'
 
 module Ghdeploy
 end

data/lib/ghdeploy/cli.rb

@@ -4,23 +4,20 @@ require 'ghdeploy/repo_fact_finder'
 require 'octokit'
 
 module Ghdeploy
-	class CLI < Thor
-
+  class CLI < Thor
     option :description
     option :remote
 
-		desc 'deploy', 'Creates a GitHub deployment.'
-		def deploy(environment, ref)
-		  remote_name = options[:remote] || 'origin'
-
-			facts = RepoFactFinder.new(remote_name)
-      Octokit.configure { |c| c.api_endpoint = facts.host }
-			client = Octokit::Client.new(access_token: facts.token)
-			deployment = client.create_deployment(facts.repo, ref, environment: environment)
-      puts "Deployment created!" if deployment.url
-		end
+    desc 'deploy', 'Creates a GitHub deployment.'
+    def deploy(environment, ref)
+      remote_name = options[:remote] || 'origin'
+      facts = RepoFactFinder.new(remote_name)
+      Octokit.configure { |c| c.api_endpoint = facts.api_endpoint }
+      client = Octokit::Client.new(access_token: facts.token)
+      deployment = client.create_deployment(facts.repo, ref, environment: environment)
+      puts "Deployment created: #{deployment.url}" if deployment.url
+    end
 
-		default_task :deploy
-	end
+    default_task :deploy
+  end
 end
-

data/lib/ghdeploy/repo_fact_finder.rb

@@ -1,8 +1,7 @@
 require 'git'
 
-# Figures out an API host to use based on the remote for the Git repository
 class RepoFactFinder
-  URL_PATTERN = /^((http[s]?|ftp):\/)?\/?([^:\/\s]+)((\/\w+)*\/)([\w\-\.]+[^#?\s]+)(.*)?(#[\w\-]+)?/
+  URL_PATTERN = %r{^((http[s]?|ftp):/)?/?([^:/\s]+)((/\w+)*/)([\w\-\.]+[^#?\s]+)(.*)?(#[\w\-]+)?}
 
   def initialize(remote_name)
     @remote_name = remote_name
@@ -10,30 +9,34 @@ class RepoFactFinder
 
   attr_reader :remote_name
 
-  def host
-    return @host if @host
+  def api_endpoint
+    return @api_endpoint if @api_endpoint
     url = remote.url
     if url.start_with?('http')
       matches = URL_PATTERN.match(url)
-      @host = "#{matches[2]}://api.#{matches[3]}"
+      @api_endpoint = "#{matches[2]}://api.#{matches[3]}"
     else
       host = url.split('@').last.split(':').first
-      @host = "https://api.#{host}"
+      @api_endpoint = "https://api.#{host}"
     end
+    @api_endpoint = fix_enterprise_api_endpoint(@api_endpoint)
   end
 
   def repo
     return @repo if @repo
-    repo = url.split(/\/|:/).last(2).join('/')
+    repo = url.split(%r{/|:}).last(2).join('/')
     @repo = repo.gsub(/(\.git)$/, '')
   end
 
   def token
-    github_host = host.gsub(/^http[s]?:\/\/api\./, '')
-    if github_host == 'github.com'
+    github_host = api_endpoint.gsub(%r{^http[s]?://}, '')
+    if github_host == 'api.github.com'
       ENV.fetch('GHDEPLOY_TOKEN')
     else
-      key = github_host.gsub(/[\.\-]/, '_').upcase
+      key = github_host
+            .gsub(/[\.\-]/, '_')
+            .upcase
+            .gsub(%r{/API/V3/}, '')
       ENV.fetch("GHDEPLOY_#{key}_TOKEN")
     end
   end
@@ -47,4 +50,10 @@ class RepoFactFinder
   def remote
     @remote ||= Git.open('./').remotes.find { |r| r.name == remote_name }
   end
+
+  def fix_enterprise_api_endpoint(host)
+    return host if host == 'https://api.github.com'
+    enterprise_domain = host.gsub(%r{^http[s]?://api\.}, '')
+    "https://#{enterprise_domain}/api/v3/"
+  end
 end

data/lib/ghdeploy/version.rb

@@ -1,3 +1,3 @@
 module Ghdeploy
-  VERSION = "0.2.0"
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghdeploy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Brandon Joyce
@@ -11,47 +11,47 @@ cert_chain: []
 date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: octokit
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Run git deploy within a git repository to create a GitHub deployment.
 email:
 - brandon@sonerdy.com
@@ -106,6 +134,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock