sleet 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e5378bcb98986a685c8f0711fb18b23da95a880bc1e72ba291033168f76f839
-  data.tar.gz: 5306953ddf25adc7367d367f1b2c3e1a4b132efeded68af5bf8847a7b9868f3f
+  metadata.gz: 80cad44120cf0a7c36a746f8bf76bd4164b349b2f7da0263dce63fc945ce2f20
+  data.tar.gz: 3e1f4ace18363872b5d630d70950166088bd29a469ad7428feef18db378fd33a
 SHA512:
-  metadata.gz: a9fde7dd6815ed0dfd348a80c90e2754666abc3531544eb2c34e54f50ee8c1c161683b3f4b5987258d8aa49e70fc5eb0391af9a445097fec2197ca2ae539ac44
-  data.tar.gz: e365aa4011e0ca73c9867a847766fa72bbc1d8303dbef91a66f271cb90433ed3d691b9c4b31a6263afdbc27e7c78c3d388d65bd9ed27f4d157ed44a2885e9b2c
+  metadata.gz: dc9d1b16768e0faab3667a46ce3b43afc9c53e4568110cba635ff7b71a4d260c2feaafaeca6d2a3e6dc88de6df2fa83e46ae6fa56d7c9d15928d5c43bda25cb5
+  data.tar.gz: '0194667dc3eaf4902e2f32d2c1c073596b31e85c03550e2cece9926e26482ca41c7fdd7edb20e08c0b390c01ea751d7663707a9bfe29963a4d9cd1d13e346174'

data/.rubocop_todo.yml

@@ -1,12 +1,41 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-01-15 00:27:38 -0500 using RuboCop version 0.52.1.
+# on 2018-01-16 22:17:20 -0500 using RuboCop version 0.52.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAdjacentOneLineDefs, NumberOfEmptyLines.
+Layout/EmptyLineBetweenDefs:
+  Exclude:
+    - 'lib/sleet/fetcher.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLines:
+  Exclude:
+    - 'lib/sleet/fetcher.rb'
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 107
+
+# Offense count: 1
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 128
+
+# Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 15
+
+# Offense count: 1
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 7

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log
 
-## [v0.3.3](https://github.com/coreyja/sleet/tree/v0.3.3) (2018-01-15)
+## [v0.3.4](https://github.com/coreyja/sleet/tree/v0.3.4) (2018-01-16)
+[Full Changelog](https://github.com/coreyja/sleet/compare/v0.3.3...v0.3.4)
+
+**Merged pull requests:**
+
+- Only Fetch Branch Once [\#12](https://github.com/coreyja/sleet/pull/12) ([coreyja](https://github.com/coreyja))
+- 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:**

data/README.md

@@ -1,4 +1,8 @@
-# Sleet
+# Sleet ☁️ ❄️
+
+[![Gem Version](https://badge.fury.io/rb/sleet.svg)](https://badge.fury.io/rb/sleet)
+[![Maintainability](https://api.codeclimate.com/v1/badges/7f346b368d72b53ef630/maintainability)](https://codeclimate.com/github/coreyja/sleet/maintainability)
+[![CircleCI](https://circleci.com/gh/coreyja/sleet.svg?style=svg)](https://circleci.com/gh/coreyja/sleet)
 
 ## Background and Problem
 

data/lib/sleet/circle_ci.rb

@@ -10,12 +10,18 @@ module Sleet
       @_token ||= File.read("#{Dir.home}/.circleci.token").strip
     end
 
-    def get(url)
-      Faraday.get(url, circleci_token: token)
+    def get(*args, &block)
+      connection.get(*args, &block)
     end
 
     def self.get(url)
       instance.get(url)
     end
+
+    private
+
+    def connection
+      @_connection ||= Faraday.new.tap { |c| c.basic_auth(token, '') }
+    end
   end
 end

data/lib/sleet/circle_ci_branch.rb

@@ -9,7 +9,7 @@ module Sleet
     end
 
     def builds
-      @_builds ||= JSON.parse(Sleet::CircleCi.get(url).body)
+      @_builds ||= JSON.parse(Sleet::CircleCi.get(url, filter: :completed).body)
     end
 
     def builds_with_artificats

data/lib/sleet/circle_ci_build.rb

@@ -19,7 +19,7 @@ module Sleet
     attr_reader :github_user, :github_repo
 
     def url
-      "https://circleci.com/api/v1.1/project/github/#{github_user}/#{github_repo}/#{build_num}/artifacts?filter=completed" # rubocop:disable Metrics/LineLength
+      "https://circleci.com/api/v1.1/project/github/#{github_user}/#{github_repo}/#{build_num}/artifacts" # rubocop:disable Metrics/LineLength
     end
   end
 end

data/lib/sleet/cli.rb

@@ -24,11 +24,17 @@ module Sleet
       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
     def fetch
+      must_be_on_branch!
+      must_have_an_upstream_branch!
+      upstream_remote_must_be_github!
       if options[:workflows]
         workflow_fetch
       else
         single_fetch
       end
+    rescue Sleet::Error => e
+      error(e.message)
+      exit 1
     end
 
     desc 'version', 'Display the version'
@@ -67,10 +73,40 @@ module Sleet
       exit 1 if failed
     end
 
+    def circle_ci_branch
+      @_circle_ci_branch ||= Sleet::CircleCiBranch.new(
+        github_user: repo.github_user,
+        github_repo: repo.github_repo,
+        branch: repo.remote_branch
+      )
+    end
+
+    def must_be_on_branch!
+      repo.on_branch? ||
+        error('Not on a branch')
+    end
+
+    def must_have_an_upstream_branch!
+      repo.remote? ||
+        error("No upstream branch set for the current branch of #{repo.current_branch_name}")
+    end
+
+    def upstream_remote_must_be_github!
+      repo.github? ||
+        error('Upstream remote is not GitHub')
+    end
+
+    def repo
+      @_repo ||= Sleet::Repo.from_dir(options.fetch(:source_dir, default_dir))
+    end
+
     def base_fetcher_params
       {
         source_dir: options.fetch(:source_dir, default_dir),
-        input_filename: options.fetch(:input_file, '.rspec_example_statuses')
+        circle_ci_branch: circle_ci_branch,
+        input_filename: options.fetch(:input_file, '.rspec_example_statuses'),
+        github_user: repo.github_user,
+        github_repo: repo.github_repo
       }
     end
 

data/lib/sleet/fetcher.rb

@@ -4,11 +4,14 @@ module Sleet
   class Fetcher
     class Error < ::Sleet::Error; end
 
-    def initialize(source_dir:, input_filename:, output_filename:, job_name: nil)
+    def initialize(source_dir:, circle_ci_branch:, input_filename:, output_filename:, github_user:, github_repo:, job_name: nil) # rubocop:disable Metrics/LineLength
       @source_dir = source_dir
+      @circle_ci_branch = circle_ci_branch
       @input_filename = input_filename
       @output_filename = output_filename
       @job_name = job_name
+      @github_user = github_user
+      @github_repo = github_repo
     end
 
     def do!
@@ -17,9 +20,6 @@ module Sleet
     end
 
     def validate!
-      must_be_on_branch!
-      must_have_an_upstream_branch!
-      upstream_remote_must_be_github!
       must_find_a_build_with_artifacts!
       chosen_build_must_have_input_file!
       true
@@ -34,7 +34,7 @@ module Sleet
 
     private
 
-    attr_reader :source_dir, :input_filename, :output_filename, :job_name
+    attr_reader :input_filename, :output_filename, :job_name, :circle_ci_branch, :github_user, :github_repo, :source_dir
 
     def error(msg)
       raise Error, msg
@@ -53,16 +53,12 @@ module Sleet
 
     def circle_ci_build
       @_circle_ci_build ||= Sleet::CircleCiBuild.new(
-        github_user: repo.github_user,
-        github_repo: repo.github_repo,
+        github_user: github_user,
+        github_repo: github_repo,
         build_num: chosen_build_json['build_num']
       )
     end
 
-    def repo
-      @_repo ||= Sleet::Repo.from_dir(source_dir)
-    end
-
     def chosen_build_json
       if job_name
         circle_ci_branch.builds_with_artificats.find { |b| b.fetch('workflows', {})&.fetch('job_name', {}) == job_name }
@@ -71,28 +67,6 @@ module Sleet
       end
     end
 
-    def circle_ci_branch
-      @_circle_ci_branch ||= Sleet::CircleCiBranch.new(
-        github_user: repo.github_user,
-        github_repo: repo.github_repo,
-        branch: repo.remote_branch
-      )
-    end
-
-    def must_be_on_branch!
-      repo.on_branch? ||
-        error('Not on a branch')
-    end
-
-    def must_have_an_upstream_branch!
-      repo.remote? ||
-        error("No upstream branch set for the current branch of #{repo.current_branch_name}")
-    end
-
-    def upstream_remote_must_be_github!
-      repo.github? ||
-        error('Upstream remote is not GitHub')
-    end
 
     def must_find_a_build_with_artifacts!
       !chosen_build_json.nil? ||

data/lib/sleet/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sleet
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Corey Alexander
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize