bake-modernize 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a7da2f3243b5c36b0eb365a98e350868b8834db66f71b549cfc14a06103691c
-  data.tar.gz: 976f7c5d8fc9198b479f80d210efce7c78664bca1a1dab6c4825c660229c0ffb
+  metadata.gz: 75c75ec487952e6ce97c8ffbbf8c4de7d3d656eaf7a9e49e656b71a96b5405b7
+  data.tar.gz: 67d94eb1b42c359de608198b8eee416922ed7759a18b26858a98e88136fea044
 SHA512:
-  metadata.gz: 23b5d5a149758808e2c5802c8bb5ac9dd63afaf769b1a5257324243f2c56f96b46e0bbd34ccb86a47b87071855e4f1d9bee12fb7e33d98de04551c95cde819d7
-  data.tar.gz: fdae79916724bc2d7f4ff8df55f6ebd7689dca2fbb0a3c94a8597a6302b1bfd9cd24f6a9a6910b9cbc4039287b62f4e05129ae8f5eded297cd4fadd70d30accd
+  metadata.gz: a49d876f77bb583e292957111984f7d981ad4c7a7e2e0383db211d633e3de57d705903ba756383b0948bdbacd5784f9ce34eaa8efdc07787466a807df698cb7c
+  data.tar.gz: 3988ea8f27d4aafdd8d3780c7098f372702fd114d3c4d95c3fc722dbf7940a7b2e9050d191df169fceb9ebd91434d7ee87b960816056d8ddd084dc1c023127f9

data/bake/modernize/gemspec.rb

@@ -109,17 +109,28 @@ private
 def directory_glob_for(spec, paths = spec.files)
 	directories = {}
 	root = File.dirname(spec.loaded_from)
+	dotfiles = false
 	
 	paths.each do |path|
 		directory, _ = path.split(File::SEPARATOR, 2)
+		basename = File.basename(path)
 		
 		full_path = File.expand_path(directory, root)
+		
 		if File.directory?(full_path)
 			directories[directory] = true
 		end
+		
+		if basename.start_with?('.')
+			dotfiles = true
+		end
 	end
 	
-	return "Dir.glob('{#{directories.keys.join(',')}}/**/*', File::FNM_DOTMATCH, base: __dir__)"
+	if dotfiles
+		return "Dir.glob('{#{directories.keys.join(',')}}/**/*', File::FNM_DOTMATCH, base: __dir__)"
+	else
+		return "Dir['{#{directories.keys.join(',')}}/**/*', base: __dir__]"
+	end
 end
 
 def format_dependency(dependency)
@@ -207,5 +218,5 @@ def sorted_authors(spec)
 	Process.wait(pid)
 	input.close
 	
-	return authors.keys
+	return authors.sort_by{|k,v| [-v, k]}.map(&:first)
 end

data/lib/bake/modernize/version.rb

@@ -20,6 +20,6 @@
 
 module Bake
 	module Modernize
-		VERSION = "0.8.0"
+		VERSION = "0.9.1"
 	end
 end

data/template/actions/.github/workflows/coverage.yml

@@ -0,0 +1,57 @@
+name: Coverage
+
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+env:
+  CONSOLE_OUTPUT: Text
+  COVERAGE: PartialSummary
+
+jobs:
+  test:
+    name: ${{matrix.ruby}} on ${{matrix.os}}
+    runs-on: ${{matrix.os}}-latest
+    
+    strategy:
+      matrix:
+        os:
+          - ubuntu
+          - macos
+        
+        ruby:
+          - "3.1"
+    
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+        bundler-cache: true
+    
+    - name: Run tests
+      timeout-minutes: 5
+      run: bundle exec rspec
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: coverage-${{matrix.os}}-${{matrix.ruby}}
+        path: .covered.db
+  
+  validate:
+    needs: test
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "3.1"
+        bundler-cache: true
+    
+    - uses: actions/download-artifact@v3
+    
+    - name: Validate coverage
+      timeout-minutes: 5
+      run: bundle exec bake covered:validate --paths */.covered.db \;

data/template/actions/.github/workflows/development.yml

@@ -2,6 +2,12 @@ name: Development
 
 on: [push, pull_request]
 
+permissions:
+  contents: read
+
+env:
+  CONSOLE_OUTPUT: Text
+
 jobs:
   test:
     name: ${{matrix.ruby}} on ${{matrix.os}}
@@ -15,12 +21,11 @@ jobs:
           - macos
         
         ruby:
-          - "2.6"
           - "2.7"
           - "3.0"
+          - "3.1"
         
         experimental: [false]
-        env: [""]
         
         include:
           - os: ubuntu
@@ -34,7 +39,7 @@ jobs:
             experimental: true
     
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}
@@ -42,4 +47,4 @@ jobs:
     
     - name: Run tests
       timeout-minutes: 5
-      run: ${{matrix.env}} bundle exec rspec
+      run: bundle exec rspec

data/template/actions/.github/workflows/documentation.yml

@@ -1,32 +1,41 @@
 name: Documentation
 
+permissions:
+  contents: write
+
 on:
   push:
     branches:
       - main
 
+permissions:
+  contents: write
+
+env:
+  CONSOLE_OUTPUT: Text
+  BUNDLE_WITH: maintenance
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
     
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+
     - uses: ruby/setup-ruby@v1
-      env:
-        BUNDLE_WITH: maintenance
       with:
-        ruby-version: 3.0
+        ruby-version: "3.1"
         bundler-cache: true
     
     - name: Installing packages
       run: sudo apt-get install wget
     
+    - name: Prepare GitHub Pages
+      run: bundle exec bake github:pages:prepare --directory docs
+    
     - name: Generate documentation
       timeout-minutes: 5
-      run: bundle exec bake utopia:project:static
+      run: bundle exec bake utopia:project:static --force no
     
-    - name: Deploy documentation
-      uses: JamesIves/github-pages-deploy-action@4.0.0
-      with:
-        branch: docs
-        folder: docs
+    - name: Deploy GitHub Pages
+      run: bundle exec bake github:pages:commit --directory docs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake-modernize
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
   HiLJ8VOFx6w=
   -----END CERTIFICATE-----
-date: 2022-02-18 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -138,6 +138,7 @@ files:
 - bake/modernize/signing.rb
 - lib/bake/modernize.rb
 - lib/bake/modernize/version.rb
+- template/actions/.github/workflows/coverage.yml
 - template/actions/.github/workflows/development.yml
 - template/actions/.github/workflows/documentation.yml
 - template/editorconfig/.editorconfig
@@ -162,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Automatically modernize parts of your project/gem.