spaarti 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11cb46ba9d4286d50abc75683e01d3433d060a0a5230e15af6504ad9f9c1abf8
-  data.tar.gz: d7cf2513bbf67eb47206e6b9e5fe5e52064a86413eb06a22be4efd96c0178535
+  metadata.gz: '085c22477ef728b91f8f6a512fe8d0a684654d681a3b8e54cae9b5fff7b3b3dd'
+  data.tar.gz: 87fb4fbca2fbeda0716e2f131eb9564de2220679e9b15f470d7310f53dc43230
 SHA512:
-  metadata.gz: fce4a9832661cd46b893214e4b4d3bf9356054faa26c73913a5c5c2cd2eb90babed048171c1e96065c1e3950f7514ab50606f20176a9635230f62b75ca61d3ee
-  data.tar.gz: d47a0d30c6b405fda7b16928b5c2a99752d53742c70489742d6c86426d9447c9949bb46fb0a3c679491aca81128bbdbbf6db8e7c229c49954236a94882c43b65
+  metadata.gz: 7f492c98572363b48982cb75f15e05713a6adaeaa5fc4a9ebea53fcb23fa108719a2cdd45eac289c64b8bc0bbbf38edd095cb5688694aa0c2d2e8168546472b7
+  data.tar.gz: '09c409f6ce8b8656cd3d6ec4f15588b9c177baaee655b9504736fbec87b1afda96c4a58e51dff34c9571420889ae6e841835f78189b861b4ed73d2e3fd29e0be'

data/.github/workflows/build.yml

@@ -0,0 +1,46 @@
+name: Build
+on:
+  pull_request:
+  push:
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: write
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.1'
+        bundler-cache: true
+    - name: Build
+      run: bundle exec rake
+    - name: Release
+      if: github.ref_type == 'tag'
+      run: bundle exec rake release
+      env:
+        GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}
+    - name: Post to a Slack channel
+      if: ${{ failure() }}
+      uses: slackapi/slack-github-action@v1.23.0
+      env:
+        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+      with:
+        payload: |
+          {
+            "text": "*${{ github.repository }}*\nBuild failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+            "blocks": [
+              {
+                "type": "section",
+                "text": {
+                  "type": "mrkdwn",
+                  "text": "*${{ github.repository }}*\nBuild failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+                }
+              }
+            ]
+          }

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 3.0.0 / 2022-10-21
+
+* [FEATURE] Uses formats instead of format, to support multiple paths based on repo name
+
+# 2.0.2 / 2020-05-12
+
+* [BUGFIX] Fix Octokit error
+
+# 2.0.1 / 2020-05-12
+
+* [ENHANCEMENT] Update deps
+
 # 2.0.0 / 2019-01-12
 
 * [FEATURE] Generate new GitHub API tokens with read:org, read:user, and repo scopes. This allows the token to enumerate and fetch repos from orgs the user is a member of. **This also grants read/write access to all repos, which increases the danger of the token**

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Les Aker
+Copyright (c) 2022 Les Aker
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -2,9 +2,7 @@ spaarti
 =========
 
 [![Gem Version](https://img.shields.io/gem/v/spaarti.svg)](https://rubygems.org/gems/spaarti)
-[![Build Status](https://img.shields.io/travis/com/akerl/spaarti.svg)](https://travis-ci.com/akerl/spaarti)
-[![Coverage Status](https://img.shields.io/codecov/c/github/akerl/spaarti.svg)](https://codecov.io/github/akerl/spaarti)
-[![Code Quality](https://img.shields.io/codacy/65bacb9d92d948f6ae637ce63ade3557.svg)](https://www.codacy.com/app/akerl/spaarti)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/akerl/spaarti/Build)](https://github.com/akerl/spaarti/actions)
 [![MIT Licensed](https://img.shields.io/badge/license-MIT-green.svg)](https://tldrlegal.com/license/mit-license)
 
 Tool to maintain local clones of repos you have access to on GitHub

data/lib/spaarti/repo.rb

@@ -8,7 +8,7 @@ module Spaarti
       @data = data
       @client = client
       @options = params
-      @path = @options[:format] % @data
+      @path = resolve_path(@options[:formats], @data) % @data
     end
 
     def sync!
@@ -26,12 +26,21 @@ module Spaarti
 
     private
 
+    def resolve_path(formats, data)
+      formats.each do |format|
+        return format[:path] if format[:match].nil?
+        next unless data[:full_name].include? format[:match]
+        return format[:path]
+      end
+      raise 'No valid path format found'
+    end
+
     def log(msg)
       puts msg unless @options[:quiet]
     end
 
     def err(msg)
-      STDERR.puts msg
+      warn msg
     end
 
     def run(cmd, error_msg)

data/lib/spaarti/site.rb

@@ -12,7 +12,7 @@ module Spaarti
     auth_file: :default,
     config_file: File.expand_path('~/.spaarti.yml'),
     exclude: [],
-    format: '%<full_name>s',
+    formats: [{ path: '%<full_name>s' }],
     git_config: {},
     quiet: false,
     purge: false,
@@ -58,22 +58,22 @@ module Spaarti
     end
 
     def client
-      @client ||= Octokit::Client.new(
+      @client ||= Octokit::Client.new({
         access_token: auth.token,
         auto_paginate: true,
         default_media_type: 'application/vnd.github.moondragon+json',
         api_endpoint: @options[:api_endpoint]
-      )
+      }.compact)
     end
 
     def auth
-      @auth ||= Octoauth.new(
+      @auth ||= Octoauth.new({
         note: 'spaarti',
         scopes: %w[read:org read:user repo],
         file: @options[:auth_file],
         autosave: true,
         api_endpoint: @options[:api_endpoint]
-      )
+      }.compact)
     end
 
     def repos

data/lib/spaarti/version.rb

@@ -3,5 +3,5 @@
 ##
 # Set the version (needed for Mercenary -v)
 module Spaarti
-  VERSION = '2.0.0'.freeze
+  VERSION = '3.0.0'
 end

data/spaarti.gemspec

@@ -5,7 +5,7 @@ require 'spaarti/version'
 Gem::Specification.new do |s|
   s.name        = 'spaarti'
   s.version     = Spaarti::VERSION
-  s.date        = Time.now.strftime('%Y-%m-%d')
+  s.required_ruby_version = '>= 2.6'
 
   s.summary     = 'Helper for cloning GitHub repos'
   s.description = 'Maintain local clones of repos you have access to on GitHub'
@@ -15,20 +15,15 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
 
   s.files       = `git ls-files`.split
-  s.test_files  = `git ls-files spec/*`.split
   s.executables = ['spaarti']
 
   s.add_dependency 'cymbal', '~> 2.0.0'
   s.add_dependency 'mercenary', '~> 0.3.4'
-  s.add_dependency 'octoauth', '~> 1.5.5'
-  s.add_dependency 'octokit', '~> 4.13.0'
+  s.add_dependency 'octoauth', '~> 2.0.0'
+  s.add_dependency 'octokit', '~> 5.6.1'
 
-  s.add_development_dependency 'codecov', '~> 0.1.1'
-  s.add_development_dependency 'fuubar', '~> 2.3.0'
-  s.add_development_dependency 'goodcop', '~> 0.6.0'
-  s.add_development_dependency 'rake', '~> 12.3.0'
-  s.add_development_dependency 'rspec', '~> 3.8.0'
-  s.add_development_dependency 'rubocop', '~> 0.62.0'
-  s.add_development_dependency 'vcr', '~> 4.0.0'
-  s.add_development_dependency 'webmock', '~> 3.5.1'
+  s.add_development_dependency 'goodcop', '~> 0.9.7'
+  s.add_development_dependency 'vcr', '~> 5.0.0'
+  s.add_development_dependency 'webmock', '~> 3.7.6'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

data/spec/bin_spec.rb

@@ -1,4 +1 @@
 require 'spec_helper'
-
-describe Spaarti do
-end

data/spec/spaarti/repo_spec.rb

@@ -1,4 +1 @@
 require 'spec_helper'
-
-describe Spaarti do
-end

data/spec/spaarti/site_spec.rb

@@ -1,65 +1,2 @@
 require 'spec_helper'
 require 'fileutils'
-
-describe Spaarti do
-  describe 'Site' do
-    let(:path) { 'tmp/base' }
-    let(:config) { 'spec/examples/config.yml' }
-    let(:subject) { Spaarti::Site.new config_file: config }
-
-    before(:each) do
-      FileUtils.rm_rf path
-      FileUtils.mkdir_p path
-    end
-
-    after(:each) do
-      FileUtils.rm_rf path
-    end
-
-    describe '#sync!' do
-      it 'clones repo' do
-        expect(File.exist?("#{path}/akerl/spaarti/.git")).to be_falsey
-        VCR.use_cassette('repos') { subject.sync! }
-        expect(File.exist?("#{path}/akerl/spaarti/.git")).to be_truthy
-      end
-
-      context 'with purge enabled' do
-        it 'purges repos that are orphaned' do
-          FileUtils.mkdir_p "#{path}/akerl/orphan/.git"
-          VCR.use_cassette('repos') do
-            Spaarti::Site.new(purge: true, config_file: config).sync!
-          end
-          expect(File.exist?("#{path}/akerl/orphan")).to be_falsey
-        end
-      end
-      context 'with purge disabled' do
-        it 'does not purge repos that are orphaned' do
-          FileUtils.mkdir_p "#{path}/akerl/orphan/.git"
-          VCR.use_cassette('repos') do
-            Spaarti::Site.new(purge: false, config_file: config).sync!
-          end
-          expect(File.exist?("#{path}/akerl/orphan")).to be_truthy
-        end
-      end
-
-      it 'supports excluding repos' do
-        VCR.use_cassette('repos') do
-          Spaarti::Site.new(
-            exclude: { full_name: ['[ab]a'] }, config_file: config
-          ).sync!
-        end
-        expect(File.exist?("#{path}/akerl/spaarti")).to be_falsey
-      end
-    end
-
-    describe '#purge!' do
-      it 'purges repos that are orphaned' do
-        FileUtils.mkdir_p "#{path}/akerl/orphan/.git"
-        VCR.use_cassette('repos') do
-          Spaarti::Site.new(purge: true, config_file: config).sync!
-        end
-        expect(File.exist?("#{path}/akerl/orphan")).to be_falsey
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,20 +1,10 @@
-if ENV['CI'] == 'true'
-  require 'simplecov'
-  require 'codecov'
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
-  SimpleCov.start do
-    add_filter '/spec/'
-  end
-end
-
 require 'rspec'
 require 'spaarti'
-require 'webmock'
-
-WebMock.enable!
+require 'webmock/rspec'
 
 require 'vcr'
 VCR.configure do |c|
+  c.configure_rspec_metadata!
   c.cassette_library_dir = 'spec/fixtures/cassettes'
   c.hook_into :webmock
   c.before_record do |i|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spaarti
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2022-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cymbal
@@ -44,140 +44,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.13.0
+        version: 5.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.13.0
-- !ruby/object:Gem::Dependency
-  name: codecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 5.6.1
 - !ruby/object:Gem::Dependency
   name: goodcop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: 0.9.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.8.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.62.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: 0.9.7
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.7.6
 description: Maintain local clones of repos you have access to on GitHub
 email: me@lesaker.org
 executables:
@@ -185,12 +115,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circle-ruby"
+- ".github/workflows/build.yml"
 - ".gitignore"
-- ".prospectus"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -213,7 +141,8 @@ files:
 homepage: https://github.com/akerl/spaarti
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -222,23 +151,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Helper for cloning GitHub repos
-test_files:
-- spec/bin_spec.rb
-- spec/examples/auth.yml
-- spec/examples/config.yml
-- spec/fixtures/cassettes/repos.yml
-- spec/spaarti/repo_spec.rb
-- spec/spaarti/site_spec.rb
-- spec/spaarti_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.circle-ruby

@@ -1,4 +0,0 @@
-2.6.0
-2.5.3
-2.4.5
-2.3.8

data/.prospectus

@@ -1,11 +0,0 @@
-my_slug = 'akerl/spaarti'
-
-Prospectus.extra_dep('file', 'prospectus_travis')
-Prospectus.extra_dep('file', 'prospectus_gems')
-
-item do
-  noop
-
-  extend ProspectusGems::Gemspec.new
-  extend ProspectusTravis::Build.new(my_slug)
-end

data/.travis.yml

@@ -1,10 +0,0 @@
-dist: trusty
-install:
-- for i in $(cat .circle-ruby) ; do rvm install $i || exit 1 ; done
-- for i in $(cat .circle-ruby) ; do rvm-exec $i bundle install || exit 1 ; done
-script:
-- for i in $(cat .circle-ruby) ; do rvm-exec $i bundle exec rake || exit 1 ; done
-notifications:
-  email: false
-  slack:
-    secure: F9goVE9+dDE3FpGNgzV4419xmNk/TtrExS2vPYBZsQ1BfCz+frL4TWR+BzLp9iOKk3quMAzxw8sLVXxeUV4GjEoy00UJ7gcOcPHyFyA5ku1LlMc+PMy+85rGORc/Ks00MxkWNGXhWKNCA7Cb5QpPYqNoSzgdatk9DdA2pz+X8RCRUoaTKgWpKQvqbgAXt/ErtS6fXLzCPjSVGSg2rEC0nt0I1+vVpe8ZbQ8Q/nbroHeBIKcL6mV+YFPQ/ED69teGF1ptgAkESRhQNEZEyukDHG2SzgxxBq5ez3lTvHOqqSAlHVDH4mEil+xeh7n8antmeBbwZPSw6vwJdbFMYh9v2Pds2VWnMidAowzUrftUBAgRBFVXtjP+BQiL07Y51QaK0cpZ/OkuwrdA/PxeeUJpTXyHxNiIcdYGrgN6GSaB7Va2oSSRe0s6gjegOqdbRcR15+n9E2OPKwSSApKYsYTW85y/l0Lo9X0ANsuftDlKaS2yBV1rpdOCU5h1pgyiluidIq+gh+av7FarD9EAoMF/UBzEXpD7WPF41cCJr7MdxoolzAajYpO/ssexhRTue2953Rkii2Eg5rhTl0lZCzF3q5rGZGb00mU2gf3JvJLuy808uGV2tOd0bbCsbXFBiVxyoKkE6EQ8R1zS94FjUvdFRgQL+nMcvbdS2d30DlTHxhk=