sleet 0.4.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54355bc21cd53356e769f7bc10c5ac14ae2c0c332203e1194ee4588c40ebe475
-  data.tar.gz: b4d029da2f74a94712edcd0cde780f8e4029c844be8461a544d589c40072a6d9
+  metadata.gz: 4fac7493ce36c1bd93ce7b8adb7026bb7717472df669a91cc86b2c38aedd16aa
+  data.tar.gz: '0180aa81852054f6ae694198bf668dec598df6d5304f526977158ecafc50ddc7'
 SHA512:
-  metadata.gz: 7d9c5d7d4d8ac342de5a1abc280ed46da05cb72680f4973c9351eb277f87f89756a82bac6ff6c2fdfcd070f54ea39fc8b819f49946e13ea0f7592db8c2451fb9
-  data.tar.gz: '0190c0ffb1e5cc760fbe024920a1b892fc05185ab61a9633580829739c0308f217394a68509df8dd846474a5593ba51fd68d8e60b7c9879fb6f41c2873be891e'
+  metadata.gz: 96219d22089a50d8a9899291c86f3e756611f1981f37837d751ffee58f395efdd50694104a6465db64637110e5de326069fc6cc6270457d8db820f609f14c81f
+  data.tar.gz: 022bdbfbe371c6768109ca30132806adaef7519d6d87577a7ff7b5111d5c74b23f432cd93aea66317eaacfe37a940e282eb8174a61be8e8ade33cd9a46763a7e

data/.sleet.yml

@@ -1 +1,4 @@
 output_file: 'spec/.rspec_example_statuses'
+username: coreyja
+workflows:
+  test: spec/.rspec_example_statuses

data/CHANGELOG.md

@@ -1,6 +1,67 @@
-# Change Log
+# Changelog
+
+## [v0.5.3](https://github.com/coreyja/sleet/tree/v0.5.3) (2020-08-09)
+
+[Full Changelog](https://github.com/coreyja/sleet/compare/v0.5.2...v0.5.3)
+
+**Merged pull requests:**
+
+- bug: Add support for redirects. [\#80](https://github.com/coreyja/sleet/pull/80) ([temochka](https://github.com/temochka))
+
+## [v0.5.2](https://github.com/coreyja/sleet/tree/v0.5.2) (2020-06-14)
+
+[Full Changelog](https://github.com/coreyja/sleet/compare/v0.5.1...v0.5.2)
+
+**Merged pull requests:**
+
+- bug: Fix bug in error message when no upstream exists [\#79](https://github.com/coreyja/sleet/pull/79) ([coreyja](https://github.com/coreyja))
+
+## [v0.5.1](https://github.com/coreyja/sleet/tree/v0.5.1) (2020-06-14)
+
+- This was an accidental release that contains no changes from `0.5.0`
+
+[Full Changelog](https://github.com/coreyja/sleet/compare/v0.5.0...v0.5.1)
+
+## [v0.5.0](https://github.com/coreyja/sleet/tree/v0.5.0) (2020-06-14)
+
+[Full Changelog](https://github.com/coreyja/sleet/compare/v0.4.3...v0.5.0)
+
+**Closed issues:**
+
+- Add Support for Forked Repos in Github [\#41](https://github.com/coreyja/sleet/issues/41)
+
+**Merged pull requests:**
+
+- Support PR builds from forked repos!!! ✨ [\#77](https://github.com/coreyja/sleet/pull/77) ([smudge](https://github.com/smudge))
+- Update rugged requirement from \>= 0.26, \< 0.100 to \>= 0.26, \< 1.1 [\#76](https://github.com/coreyja/sleet/pull/76) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update rugged requirement from \>= 0.26, \< 0.29 to \>= 0.26, \< 0.100 [\#75](https://github.com/coreyja/sleet/pull/75) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update thor requirement from ~\> 0.20.0 to \>= 0.20, \< 1.1 [\#70](https://github.com/coreyja/sleet/pull/70) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+
+## [v0.4.3](https://github.com/coreyja/sleet/tree/v0.4.3) (2020-03-07)
+
+[Full Changelog](https://github.com/coreyja/sleet/compare/v0.4.2...v0.4.3)
+
+**Closed issues:**
+
+- s/Artifcats/Artifacts/ [\#44](https://github.com/coreyja/sleet/issues/44)
+
+**Merged pull requests:**
+
+- fix: Replace "artifi🐱s" with "artifacts". [\#74](https://github.com/coreyja/sleet/pull/74) ([temochka](https://github.com/temochka))
+- feat: Look at 100 recent builds instead of just 30. [\#73](https://github.com/coreyja/sleet/pull/73) ([temochka](https://github.com/temochka))
+- Update webmock requirement from ~\> 3.7.0 to ~\> 3.8.0 [\#72](https://github.com/coreyja/sleet/pull/72) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update faraday requirement from \>= 0.13.1, \< 0.16.0 to \>= 0.13.1, \< 1.1.0 [\#71](https://github.com/coreyja/sleet/pull/71) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update gem-release requirement from = 2.1.0 to = 2.1.1 [\#69](https://github.com/coreyja/sleet/pull/69) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update gem-release requirement from = 2.0.4 to = 2.1.0 [\#68](https://github.com/coreyja/sleet/pull/68) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update gem-release requirement from = 2.0.3 to = 2.0.4 [\#67](https://github.com/coreyja/sleet/pull/67) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update rake requirement from ~\> 12.3 to ~\> 13.0 [\#64](https://github.com/coreyja/sleet/pull/64) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update webmock requirement from ~\> 3.6.0 to ~\> 3.7.0 [\#63](https://github.com/coreyja/sleet/pull/63) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update gem-release requirement from = 2.0.2 to = 2.0.3 [\#62](https://github.com/coreyja/sleet/pull/62) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update gem-release requirement from = 2.0.1 to = 2.0.2 [\#61](https://github.com/coreyja/sleet/pull/61) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update webmock requirement from ~\> 3.5.1 to ~\> 3.6.0 [\#60](https://github.com/coreyja/sleet/pull/60) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+
+## [v0.4.2](https://github.com/coreyja/sleet/tree/v0.4.2) (2019-05-27)
 
-## [v0.4.2](https://github.com/coreyja/sleet/tree/v0.4.2) (2019-05-26)
 [Full Changelog](https://github.com/coreyja/sleet/compare/v0.4.1...v0.4.2)
 
 **Closed issues:**
@@ -22,6 +83,7 @@
 - Update webmock requirement from ~\> 3.4.0 to ~\> 3.5.1 [\#47](https://github.com/coreyja/sleet/pull/47) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 
 ## [v0.4.1](https://github.com/coreyja/sleet/tree/v0.4.1) (2018-11-24)
+
 [Full Changelog](https://github.com/coreyja/sleet/compare/v0.4.0...v0.4.1)
 
 **Merged pull requests:**
@@ -36,6 +98,7 @@
 - Update rugged requirement to \>= 0.26, \< 0.28 [\#24](https://github.com/coreyja/sleet/pull/24) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 
 ## [v0.4.0](https://github.com/coreyja/sleet/tree/v0.4.0) (2018-03-08)
+
 [Full Changelog](https://github.com/coreyja/sleet/compare/v0.3.10...v0.4.0)
 
 **Closed issues:**
@@ -47,6 +110,7 @@
 - Get Token From Config File [\#21](https://github.com/coreyja/sleet/pull/21) ([coreyja](https://github.com/coreyja))
 
 ## [v0.3.10](https://github.com/coreyja/sleet/tree/v0.3.10) (2018-03-08)
+
 [Full Changelog](https://github.com/coreyja/sleet/compare/v0.3.9...v0.3.10)
 
 **Merged pull requests:**
@@ -55,6 +119,7 @@
 - Update rubocop requirement to ~\> 0.53.0 [\#19](https://github.com/coreyja/sleet/pull/19) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 
 ## [v0.3.9](https://github.com/coreyja/sleet/tree/v0.3.9) (2018-03-04)
+
 [Full Changelog](https://github.com/coreyja/sleet/compare/v0.3.8...v0.3.9)
 
 **Closed issues:**
@@ -66,15 +131,14 @@
 - Refactor [\#18](https://github.com/coreyja/sleet/pull/18) ([coreyja](https://github.com/coreyja))
 - Update rake requirement to ~\> 12.3 [\#17](https://github.com/coreyja/sleet/pull/17) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Update faraday requirement to \>= 0.13.1, \< 0.15.0 [\#16](https://github.com/coreyja/sleet/pull/16) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- More Specs [\#15](https://github.com/coreyja/sleet/pull/15) ([coreyja](https://github.com/coreyja))
 
 ## [v0.3.8](https://github.com/coreyja/sleet/tree/v0.3.8) (2018-02-25)
-[Full Changelog](https://github.com/coreyja/sleet/compare/v0.3.7...v0.3.8)
-
-**Merged pull requests:**
 
-- More Specs [\#15](https://github.com/coreyja/sleet/pull/15) ([coreyja](https://github.com/coreyja))
+[Full Changelog](https://github.com/coreyja/sleet/compare/v0.3.7...v0.3.8)
 
 ## [v0.3.7](https://github.com/coreyja/sleet/tree/v0.3.7) (2018-01-19)
+
 [Full Changelog](https://github.com/coreyja/sleet/compare/v0.3.6...v0.3.7)
 
 **Merged pull requests:**
@@ -82,6 +146,7 @@
 - Fix token auth and finally add a spec for it so I don't break it again [\#14](https://github.com/coreyja/sleet/pull/14) ([coreyja](https://github.com/coreyja))
 
 ## [v0.3.6](https://github.com/coreyja/sleet/tree/v0.3.6) (2018-01-18)
+
 [Full Changelog](https://github.com/coreyja/sleet/compare/v0.3.5...v0.3.6)
 
 **Merged pull requests:**
@@ -89,9 +154,11 @@
 - Fix Auth By Going Back to Query Params [\#13](https://github.com/coreyja/sleet/pull/13) ([coreyja](https://github.com/coreyja))
 
 ## [v0.3.5](https://github.com/coreyja/sleet/tree/v0.3.5) (2018-01-17)
+
 [Full Changelog](https://github.com/coreyja/sleet/compare/v0.3.4...v0.3.5)
 
 ## [v0.3.4](https://github.com/coreyja/sleet/tree/v0.3.4) (2018-01-17)
+
 [Full Changelog](https://github.com/coreyja/sleet/compare/v0.3.3...v0.3.4)
 
 **Merged pull requests:**
@@ -100,6 +167,7 @@
 - Fix Auth [\#11](https://github.com/coreyja/sleet/pull/11) ([coreyja](https://github.com/coreyja))
 
 ## [v0.3.3](https://github.com/coreyja/sleet/tree/v0.3.3) (2018-01-16)
+
 [Full Changelog](https://github.com/coreyja/sleet/compare/v0.3.2...v0.3.3)
 
 **Merged pull requests:**
@@ -107,6 +175,7 @@
 - Add `version` cmd [\#10](https://github.com/coreyja/sleet/pull/10) ([coreyja](https://github.com/coreyja))
 
 ## [v0.3.2](https://github.com/coreyja/sleet/tree/v0.3.2) (2018-01-16)
+
 [Full Changelog](https://github.com/coreyja/sleet/compare/v0.3.1...v0.3.2)
 
 **Merged pull requests:**
@@ -114,6 +183,7 @@
 - Update Readme and Add Descriptions to Help Menus [\#8](https://github.com/coreyja/sleet/pull/8) ([coreyja](https://github.com/coreyja))
 
 ## [v0.3.1](https://github.com/coreyja/sleet/tree/v0.3.1) (2018-01-15)
+
 [Full Changelog](https://github.com/coreyja/sleet/compare/v0.3.0...v0.3.1)
 
 **Merged pull requests:**
@@ -121,6 +191,7 @@
 - Add Dependency Versions [\#5](https://github.com/coreyja/sleet/pull/5) ([coreyja](https://github.com/coreyja))
 
 ## [v0.3.0](https://github.com/coreyja/sleet/tree/v0.3.0) (2018-01-15)
+
 [Full Changelog](https://github.com/coreyja/sleet/compare/v0.2.0...v0.3.0)
 
 **Closed issues:**
@@ -133,10 +204,13 @@
 - Error Messages [\#3](https://github.com/coreyja/sleet/pull/3) ([coreyja](https://github.com/coreyja))
 
 ## [v0.2.0](https://github.com/coreyja/sleet/tree/v0.2.0) (2018-01-14)
+
+[Full Changelog](https://github.com/coreyja/sleet/compare/aa005fdae00ae843909f3a2d1753db3727a27c2c...v0.2.0)
+
 **Merged pull requests:**
 
 - Gemify [\#2](https://github.com/coreyja/sleet/pull/2) ([coreyja](https://github.com/coreyja))
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/docs/README.md

@@ -9,7 +9,7 @@
 
 RSpec has a [feature](https://relishapp.com/rspec/rspec-core/v/3-7/docs/command-line/only-failures) that I find very useful which is the `--only-failures` option. This will re-run only that examples that failed the previous run.
 
-CircleCI has support for [uploading artifcats](https://circleci.com/docs/2.0/artifacts/) with your builds, which allows us to store the persistance file that powers the RSpec only failures option.
+CircleCI has support for [uploading artifacts](https://circleci.com/docs/2.0/artifacts/) with your builds, which allows us to store the persistance file that powers the RSpec only failures option.
 However! CircleCI also supports and encourages parallelizing your build, which means even if you upload your rspec persistance file, you actually have a number of them each containing a subset of your test suite.
 This is where `Sleet` comes in!
 
@@ -95,31 +95,31 @@ To view your current configuration use the `sleet config` command which will giv
 
 These are the options that are currently supported
 
-#### `source_dir`
+#### `--source_dir`
 
-Alias: s
+Alias: `s`
 
 This is the directory of the source git repo. If a `source_dir` is NOT given we look up from the current directory for the nearest git repo.
 
-#### `input_file`
+#### `--input_file`
 
-Alias: i
+Alias: `i`
 
 This is the name of the Rspec Circle Persistance File in CircleCI. The default is `.rspec_example_statuses`
 
 This will match if the full path on CircleCI ends in the given name.
 
-#### `output_file`
+#### `--output_file`
 
-Alias: o
+Alias: `o`
 
 This is the name for the output file, on your local system. It is relative to the `source_dir`.
 
 Will be IGNORED if `workflows` is provided.
 
-#### `workflows`
+#### `--workflows`
 
-Alias: w
+Alias: `w`
 
 If you are using workflows in CircleCI, then this is for you! You need to tell `Sleet` which build(s) to look in, and where each output should be saved.
 The input is a hash, where the key is the build name and the value is the `output_file` for that build. Sleet supports saving the artifacts to multiple builds, meaning it can support a mono-repo setup.
@@ -128,12 +128,11 @@ Build-Test-Deploy Demo:
 
 For this example you have three jobs in your CircleCI Workflow, `build`, `test` and `deploy`, but only 1 (the `test` build) generate an Rspec persistance file
 
-This command will pick the `test` build and save it's artificats to the `.rspec_example_statuses` file
+This command will pick the `test` build and save its artifacts to the `.rspec_example_statuses` file
 
 ```
 sleet fetch --workflows test:.rspec_example_statuses
 ```
-
 MonoRepo Demo:
 
 If you have a mono-repo that contains 3 sub-dirs. `foo`, `bar` and `baz`. And each one has an accompanying build. We can process all these sub-dirs at once with the following workflow command.
@@ -141,3 +140,21 @@ If you have a mono-repo that contains 3 sub-dirs. `foo`, `bar` and `baz`. And ea
 ```
 sleet fetch --workflows foo-test:foo/.rpsec_example_statuses bar-test:bar/.rspec_example_statuses baz-specs:baz/spec/examples.txt
 ```
+
+#### `--username`
+
+Alias: `u`
+
+This is the GitHub username that is referenced by the CircleCI build. By default, Sleet will base this on your upstream git remote.
+
+#### `--project`
+
+Alias: `p`
+
+This is the GitHub project that is referenced by the CircleCI build. By default, Sleet will base this on your upstream git remote.
+
+#### `--branch`
+
+Alias: `b`
+
+This is the remote branch that is referenced by the CircleCI build. Sleet will attempt to guess this by default, but if you are pushing to a forked repo, you may need to specify a different branch name (e.g. "pull/1234").

data/lib/sleet.rb

@@ -2,6 +2,7 @@
 
 require 'colorize'
 require 'faraday'
+require 'faraday_middleware'
 require 'forwardable'
 require 'json'
 require 'rspec'
@@ -25,6 +26,7 @@ require 'sleet/config'
 require 'sleet/error'
 require 'sleet/fetch_command'
 require 'sleet/job_fetcher'
+require 'sleet/local_repo'
 require 'sleet/repo'
 require 'sleet/rspec_file_merger'
 require 'sleet/version'

data/lib/sleet/branch.rb

@@ -6,14 +6,14 @@ module Sleet
       @circle_ci_token = circle_ci_token
       @github_user = github_user
       @github_repo = github_repo
-      @branch = branch
+      @branch = CGI.escape(branch)
     end
 
     def builds
       @builds ||= JSON.parse(Sleet::CircleCi.get(url, circle_ci_token).body)
     end
 
-    def builds_with_artificats
+    def builds_with_artifacts
       builds.select { |b| b['has_artifacts'] }
     end
 
@@ -22,7 +22,8 @@ module Sleet
     attr_reader :github_user, :github_repo, :branch, :circle_ci_token
 
     def url
-      "https://circleci.com/api/v1.1/project/github/#{github_user}/#{github_repo}/tree/#{branch}?filter=completed"
+      "https://circleci.com/api/v1.1/project/github/#{github_user}/#{github_repo}/tree/#{branch}" \
+        '?filter=completed&limit=100'
     end
   end
 end

data/lib/sleet/build_selector.rb

@@ -29,14 +29,14 @@ module Sleet
     end
 
     def chosen_build_json
-      branch.builds_with_artificats.find do |b|
+      branch.builds_with_artifacts.find do |b|
         b.fetch('workflows', nil)&.fetch('job_name', nil) == job_name
       end
     end
 
     def must_find_a_build_with_artifacts!
       !chosen_build_json.nil? ||
-        raise(Error, "No builds with artifcats found#{" for job name [#{job_name}]" if job_name}")
+        raise(Error, "No builds with artifacts found#{" for job name [#{job_name}]" if job_name}")
     end
 
     def chosen_build_must_have_input_file!

data/lib/sleet/circle_ci.rb

@@ -5,7 +5,14 @@ require 'singleton'
 module Sleet
   class CircleCi
     def self.get(url, token)
-      Faraday.get(url, 'circle-token' => token)
+      connection.get(url, 'circle-token' => token)
+    end
+
+    def self.connection
+      Faraday.new do |b|
+        b.use FaradayMiddleware::FollowRedirects
+        b.adapter :net_http
+      end
     end
   end
 end

data/lib/sleet/cli.rb

@@ -4,6 +4,10 @@ module Sleet
   class Cli < Thor
     default_task :fetch
 
+    def self.exit_on_failure?
+      true
+    end
+
     desc 'fetch', 'Fetch and Aggregate RSpec Persistance Files from CircleCI'
     long_desc <<~LONGDESC
       `sleet fetch` will find build(s) in CircleCI for the current branch, and
@@ -20,6 +24,15 @@ module Sleet
     option :output_file, type: :string, aliases: [:o], desc: <<~DESC
       This is the name for the output file, on your local system. It is relative to the source_dir. Will be IGNORED if workflows is provided.
     DESC
+    option :username, type: :string, aliases: [:u], desc: <<~DESC
+      This is the GitHub username that is referenced by the CircleCI build. By default, Sleet will base this on your upstream git remote.
+    DESC
+    option :project, type: :string, aliases: [:p], desc: <<~DESC
+      This is the GitHub project that is referenced by the CircleCI build. By default, Sleet will base this on your upstream git remote.
+    DESC
+    option :branch, type: :string, aliases: [:b], desc: <<~DESC
+      This is the remote branch that is referenced by the CircleCI build. Sleet will attempt to guess this by default, but if you are pushing to a forked repo, you may need to specify a different branch name (e.g. "pull/1234").
+    DESC
     option :workflows, type: :hash, aliases: [:w], desc: <<~DESC
       To use Sleet with CircleCI Workflows you need to tell Sleet which build(s) to look in, and where each output should be saved. The input is a hash, where the key is the build name and the value is the output_file for that build. Sleet supports saving the artifacts to multiple builds, meaning it can support a mono-repo setup.
     DESC

data/lib/sleet/config.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sleet
-  class Config
+  class Config # rubocop:disable Metrics/ClassLength
     OPTION_FILENAME = '.sleet.yml'
     HIDDEN_UNLESS_IN_CLI_OPTIONS = %w[show_sensitive print_config].freeze
     ConfigOption = Struct.new(:value, :source)
@@ -23,6 +23,18 @@ module Sleet
       options_hash[:output_file]
     end
 
+    def username
+      options_hash[:username]
+    end
+
+    def project
+      options_hash[:project]
+    end
+
+    def branch
+      options_hash[:branch]
+    end
+
     def workflows
       options_hash[:workflows]
     end

data/lib/sleet/fetch_command.rb

@@ -7,7 +7,6 @@ module Sleet
     end
 
     def do!
-      repo.validate!
       error_messages = []
       fetchers.map do |fetcher|
         begin

data/lib/sleet/job_fetcher.rb

@@ -41,10 +41,6 @@ module Sleet
       ).files
     end
 
-    def branch
-      repo.branch
-    end
-
     def build
       build_selector.build
     end

data/lib/sleet/local_repo.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Sleet
+  class LocalRepo
+    REMOTE_BRANCH_REGEX = %r{^([^\/.]+)\/(.+)}.freeze
+    CURRENT_BRANCH_REGEX = %r{^refs\/heads\/}.freeze
+    GITHUB_MATCH_REGEX = %r{github.com[:\/](.+)\/(.+)\.git}.freeze
+
+    def initialize(source_dir:)
+      @source_dir = source_dir
+    end
+
+    def username
+      validate!
+
+      github_match[1]
+    end
+
+    def project
+      validate!
+
+      github_match[2]
+    end
+
+    def branch_name
+      validate!
+
+      current_branch.upstream.name.match(REMOTE_BRANCH_REGEX)[2]
+    end
+
+    private
+
+    attr_reader :source_dir
+
+    def current_branch_name
+      @current_branch_name ||= repo.head.name.sub(CURRENT_BRANCH_REGEX, '')
+    end
+
+    def current_branch
+      @current_branch ||= repo.branches[current_branch_name]
+    end
+
+    def github_match
+      @github_match ||= GITHUB_MATCH_REGEX.match(current_branch.remote.url)
+    end
+
+    def repo
+      @repo ||= Rugged::Repository.new(source_dir)
+    end
+
+    def validate!
+      return if @validated
+
+      must_be_on_branch!
+      must_have_an_upstream_branch!
+      upstream_remote_must_be_github!
+      @validated = true
+    end
+
+    def must_be_on_branch!
+      !current_branch.nil? ||
+        raise(Error, 'Not on a branch')
+    end
+
+    def must_have_an_upstream_branch!
+      !current_branch.remote.nil? ||
+        raise(Error, "No upstream branch set for the current branch of #{current_branch_name}")
+    end
+
+    def upstream_remote_must_be_github!
+      !github_match.nil? ||
+        raise(Error, 'Upstream remote is not GitHub')
+    end
+  end
+end

data/lib/sleet/repo.rb

@@ -2,87 +2,44 @@
 
 module Sleet
   class Repo
-    REMOTE_BRANCH_REGEX = %r{^([^\/.]+)\/(.+)}.freeze
-    CURRENT_BRANCH_REGEX = %r{^refs\/heads\/}.freeze
-    GITHUB_MATCH_REGEX = %r{github.com[:\/](.+)\/(.+)\.git}.freeze
-
     def self.from_config(config)
+      local_repo = Sleet::LocalRepo.new(source_dir: config.source_dir)
+
       new(
-        repo: Rugged::Repository.new(config.source_dir),
-        circle_ci_token: config.circle_ci_token
+        circle_ci_token: config.circle_ci_token,
+        username: config.username || local_repo.username,
+        project: config.project || local_repo.project,
+        branch_name: config.branch || local_repo.branch_name
       )
     end
 
-    def initialize(repo:, circle_ci_token:)
-      @repo = repo
+    def initialize(circle_ci_token:, username:, project:, branch_name:)
       @circle_ci_token = circle_ci_token
+      @github_user = username
+      @github_repo = project
+      @branch_name = branch_name
     end
 
-    def validate!
-      must_be_on_branch!
-      must_have_an_upstream_branch!
-      upstream_remote_must_be_github!
-    end
-
-    def branch
-      @branch ||= Sleet::Branch.new(
+    def build_for(build_num)
+      Sleet::Build.new(
         circle_ci_token: circle_ci_token,
         github_user: github_user,
         github_repo: github_repo,
-        branch: remote_branch
+        build_num: build_num
       )
     end
 
-    def build_for(build_num)
-      Sleet::Build.new(
+    def branch
+      @branch ||= Sleet::Branch.new(
         circle_ci_token: circle_ci_token,
         github_user: github_user,
         github_repo: github_repo,
-        build_num: build_num
+        branch: branch_name
       )
     end
 
     private
 
-    attr_reader :repo, :circle_ci_token
-
-    def remote_branch
-      current_branch.upstream.name.match(REMOTE_BRANCH_REGEX)[2]
-    end
-
-    def github_user
-      github_match[1]
-    end
-
-    def github_repo
-      github_match[2]
-    end
-
-    def current_branch_name
-      repo.head.name.sub(CURRENT_BRANCH_REGEX, '')
-    end
-
-    def current_branch
-      repo.branches[current_branch_name]
-    end
-
-    def github_match
-      @github_match ||= GITHUB_MATCH_REGEX.match(current_branch.remote.url)
-    end
-
-    def must_be_on_branch!
-      !current_branch.nil? ||
-        raise(Error, 'Not on a branch')
-    end
-
-    def must_have_an_upstream_branch!
-      !current_branch.remote.nil? ||
-        raise(Error, "No upstream branch set for the current branch of #{repo.current_branch_name}")
-    end
-
-    def upstream_remote_must_be_github!
-      !github_match.nil? ||
-        raise(Error, 'Upstream remote is not GitHub')
-    end
+    attr_reader :circle_ci_token, :github_user, :github_repo, :branch_name
   end
 end

data/lib/sleet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sleet
-  VERSION = '0.4.2'
+  VERSION = '0.5.3'
 end

data/sleet.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'CircleCI RSpec Status Persistance File Aggregator'
   spec.description   = <<~DOC
     Sleet provides an easy way to grab the most recent Rspec persistance files from CircleCI.
-    It also aggregates the artificats from CircleCI, since you will have 1 per build container.
+    It also aggregates the artifacts from CircleCI, since you will have 1 per build container.
   DOC
   spec.homepage      = 'https://github.com/coreyja/sleet'
   spec.license       = 'MIT'
@@ -26,16 +26,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'colorize', '~> 0.8.1'
-  spec.add_dependency 'faraday', '>= 0.13.1', '< 0.16.0'
+  spec.add_dependency 'faraday', '>= 0.13.1', '< 1.1.0'
+  spec.add_dependency 'faraday_middleware'
   spec.add_dependency 'rspec', '~> 3.0'
-  spec.add_dependency 'rugged', '>= 0.26', '< 0.29'
+  spec.add_dependency 'rugged', '>= 0.26', '< 1.1'
   spec.add_dependency 'terminal-table', '~> 1.8'
-  spec.add_dependency 'thor', '~> 0.20.0'
+  spec.add_dependency 'thor', '>= 0.20', '< 1.1'
 
-  spec.add_development_dependency 'gem-release', '= 2.0.1'
+  spec.add_development_dependency 'gem-release', '= 2.1.1'
   spec.add_development_dependency 'github_changelog_generator', '~> 1.14'
   spec.add_development_dependency 'pry', '~> 0.10'
-  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop-coreyja', '0.4.0'
-  spec.add_development_dependency 'webmock', '~> 3.5.1'
+  spec.add_development_dependency 'webmock', '~> 3.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sleet
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Corey Alexander
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -33,7 +33,7 @@ dependencies:
         version: 0.13.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,21 @@ dependencies:
         version: 0.13.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +81,7 @@ dependencies:
         version: '0.26'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +91,7 @@ dependencies:
         version: '0.26'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -96,30 +110,36 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.20'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.20'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
@@ -154,14 +174,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-coreyja
   requirement: !ruby/object:Gem::Requirement
@@ -182,17 +202,17 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.8.0
 description: |
   Sleet provides an easy way to grab the most recent Rspec persistance files from CircleCI.
-  It also aggregates the artificats from CircleCI, since you will have 1 per build container.
+  It also aggregates the artifacts from CircleCI, since you will have 1 per build container.
 email:
 - coreyja@gmail.com
 executables:
@@ -231,6 +251,7 @@ files:
 - lib/sleet/error.rb
 - lib/sleet/fetch_command.rb
 - lib/sleet/job_fetcher.rb
+- lib/sleet/local_repo.rb
 - lib/sleet/repo.rb
 - lib/sleet/rspec_file_merger.rb
 - lib/sleet/version.rb