escobar 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1734c4c77497ac41042dada569e23e2f694921c7
-  data.tar.gz: d08a56a8e2fe64867e066e77cbf44c9c19bf5743
+  metadata.gz: 4504457f5bf33b345fdb8250cff7d246a07c1102
+  data.tar.gz: 8780426f0b46903792a101954476e1781c9128f9
 SHA512:
-  metadata.gz: 82a1cebae49c1fc0c6a2d12837cbb89cf0315b8d36a5932091a097072b969acf0cf18dc967862ffd6957b8b4cded1d5520b96c51d6cb5c204418328f50f3931c
-  data.tar.gz: 323a9bc6acde6d4efb535002dcc0af090173c7b2856a0ef95d5e6db98df65325adaa7aa9e665ca2827ce5ec3f8ecb34e3875672cb53f50fda4f6e613dc7bceaa
+  metadata.gz: afd9fbe836337dcdd8eaee118bb8e246a500ca1b65bd3a92acafd85b4a217383ec3426b9b744ea67bf9aaf70ec9b4cedb9b6c91c8be1987fc1883fdb67e432d8
+  data.tar.gz: 953d97c4041b6669c3caa9fb485e2c93a83b7db63a37f0e6daef3bf0a72e2278874072fd3d704b06e15759e50ffadae59c79472d84b9ee012c212b8a1df1e2e2

data/.rubocop.yml

@@ -74,6 +74,9 @@ MethodLength:
   Max: 25
   Severity: error
 
+FrozenStringLiteralComment:
+  Enabled: false # Adding comment to all files...
+
 Alias:
   Enabled: false # We have no guidance on alias vs alias_method
 
@@ -87,6 +90,7 @@ Metrics/AbcSize:
   Max: 16
 
 AllCops:
+  TargetRubyVersion: 2.3
   # Include gemspec and Rakefile
   Include:
     - '**/*.gemspec'
@@ -103,7 +107,9 @@ AllCops:
     - 'script/**/*'
     - 'config/**/*'
     - 'vendor/**/*'
-  # By default, the rails cops are not run. Override in project or home
-  # directory .rubocop.yml files, or by giving the -R/--rails option.
+# By default, the rails cops are not run. Override in project or home
+# directory .rubocop.yml files, or by giving the -R/--rails option.
 Rails:
-  Enabled: false
+  Enabled: true
+Rails/Delegate:
+  Enabled: false # delegate isn't available outside of rails?

data/README.md

@@ -18,8 +18,6 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/atmos/escobar. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/escobar/github/client.rb

@@ -26,28 +26,25 @@ module Escobar
         response && response.headers && response.headers["Location"]
       end
 
+      def not_found
+        raise RepoNotFound, "Unable to access #{name_with_owner}"
+      end
+
       def required_contexts
         path = "/repos/#{name_with_owner}/branches/#{default_branch}"
         response = http_method(:get, path)
-        if response.status == 200
-          repo = JSON.parse(response.body)
-          if repo["protection"] && repo["protection"]["enabled"]
-            return repo["protection"]["required_status_checks"]["contexts"]
-          else
-            []
-          end
-        else
-          raise RepoNotFound, "Unable to access #{name_with_owner}"
-        end
+
+        not_found unless response.status == 200
+
+        repo = JSON.parse(response.body)
+        return [] unless repo["protection"] && repo["protection"]["enabled"]
+        repo["protection"]["required_status_checks"]["contexts"]
       end
 
       def default_branch
         response = http_method(:get, "/repos/#{name_with_owner}")
-        if response.status == 200
-          JSON.parse(response.body)["default_branch"]
-        else
-          raise RepoNotFound, "Unable to access #{name_with_owner}"
-        end
+        not_found unless response.status == 200
+        JSON.parse(response.body)["default_branch"]
       end
 
       def create_deployment(options)

data/lib/escobar/heroku/app.rb

@@ -19,6 +19,11 @@ module Escobar
       def dashboard_url
         "https://dashboard.heroku.com/apps/#{name}"
       end
+
+      # Accepts either google authenticator or yubikey second_factor formatting
+      def preauth(second_factor)
+        !client.heroku.put("/apps/#{id}/pre-authorizations", second_factor).any?
+      end
     end
   end
 end

data/lib/escobar/heroku/client.rb

@@ -61,6 +61,23 @@ module Escobar
         response && response.body
       end
 
+      def put(path, second_factor = nil)
+        response = client.put do |request|
+          request.url path
+          request.headers["Accept"] = heroku_accept_header(3)
+          request.headers["Accept-Encoding"] = ""
+          request.headers["Content-Type"]    = "application/json"
+          request.headers["Authorization"]   = "Bearer #{token}"
+          if second_factor
+            request.headers["Heroku-Two-Factor-Code"] = second_factor
+          end
+        end
+
+        JSON.parse(response.body)
+      rescue StandardError
+        response && response.body
+      end
+
       private
 
       def heroku_accept_header(version)

data/lib/escobar/heroku/pipeline.rb

@@ -97,7 +97,7 @@ module Escobar
         when "two_factor"
           description = "A second factor is required. Use your configured authenticator app or yubikey."
           create_github_deployment_status(github_deployment["url"], nil, "failure", description)
-          return({ error: build["message"] })
+          { error: build["message"] }
         when Escobar::Heroku::BuildRequestSuccess
           target_url = "https://dashboard.heroku.com/apps/#{app.name}/activity/builds/#{build['id']}"
 
@@ -112,7 +112,7 @@ module Escobar
             deployment_url: github_deployment["url"]
           }
         else
-          return({ error: "Unable to create heroku build for #{name}" })
+          { error: "Unable to create heroku build for #{name}" }
         end
       end
 

data/lib/escobar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escobar
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Corey Donohoe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-10 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday