bake-modernize 0.1.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a43c383bb9baa39b723d9e32328b95221dc92d9dd71addf4aa535e4f07bd8059
-  data.tar.gz: 15488c3b2641443ab69909e139faa43d8cba0c6b4f71653d0cf6775faf8f1c1d
+  metadata.gz: 904b0280bd4e281dc69bbf777b3705803211314ca3f0bf35b28a2790f6674e87
+  data.tar.gz: aa494bb27e8337d9542da21d018311e45aa8e9052f6dbc686bcc3c6cacfdb19b
 SHA512:
-  metadata.gz: 3588ead1b3bbf41dd6f2760e6cc5e1be7758afabab578ca26b73802a73b115b05699a8e9d1ca68ef3cca58bc3b8ab67f83222764260d28a7dc3a7f074697c08d
-  data.tar.gz: 7dd515852d76b609a5c47171b7071b7073046b24982c3ecad478bfd07d78170877a6fd638707eabac444e171fa2d6c1765767d8cda8512d1f7fbf68e9cab845c
+  metadata.gz: 65ff2a4ede12154d09745c87aa3838f03b62e4fe3d5d59b55976229045b183395a97dcd9937b3b008cd60d0e89ca71f2609eafd1958688fe8d7473f311f2e8f9
+  data.tar.gz: 1aa50ca6b9ca112a3e5b7450ec912dc377900c1027bee30647539d73c3daca95c5c0ad1925ebedddf618b2d36e6f4242cb7a48793fa60244ec02b1a6fcd0804a

data/bake/modernize.rb

@@ -1,4 +1,4 @@
 
 def modernize
-	call('modernize:actions', 'modernize:gemfile', 'modernize:gemspec')
+	call('modernize:actions', 'modernize:editorconfig', 'modernize:gemfile', 'modernize:gemspec')
 end

data/bake/modernize/actions.rb

@@ -1,5 +1,7 @@
 
 require 'bake/modernize'
+require 'rugged'
+require 'markly'
 
 def actions
 	update(root: Dir.pwd)
@@ -14,4 +16,58 @@ def update(root:)
 	
 	template_root = Bake::Modernize.template_path_for('actions')
 	Bake::Modernize.copy_template(template_root, root)
+	
+	readme_path = File.expand_path("README.md", root)
+	repository_url = self.repository_url(root)
+	self.update_badges(readme_path, repository_url)
+end
+
+private
+
+def repository_url(root)
+	repository = Rugged::Repository.discover(root)
+	git_url = repository.remotes['origin'].url
+	
+	if match = git_url.match(/@(?<url>.*?):(?<path>.*?)(\.git)?\z/)
+		return "https://#{match[:url]}/#{match[:path]}"
+	end
+end
+
+def badge_for(repository_url = self.repository_url)
+	"[![Development Status](#{repository_url}/workflows/Development/badge.svg)](#{repository_url}/actions?workflow=Development)"
+end
+
+def badge?(node)
+	return false unless node.type == :link
+	return node.all?{|child| child.type == :image}
+end
+
+def badges?(node)
+	node.any?{|child| badge?(child)}
+end
+
+def update_badges(readme_path, repository_url)
+	root = Markly.parse(File.read(readme_path))
+	
+	node = root.first_child
+	
+	# Skip heading:
+	node = node.next if node.type == :header
+	
+	replacement = Markly.parse(badge_for(repository_url))
+	
+	# We are looking for the first paragraph which contains only links, which contain one image.
+	while node
+		if badges?(node)
+			node = node.replace(replacement.first_child)
+			break
+		elsif node.type == :header
+			node.insert_before(replacement.first_child)
+			break
+		end
+		
+		node = node.next
+	end
+	
+	File.write(readme_path, root.to_markdown(width: 0))
 end

data/bake/modernize/editorconfig.rb

@@ -0,0 +1,17 @@
+
+require 'bake/modernize'
+
+def editorconfig
+	update(root: Dir.pwd)
+end
+
+def update(root:)
+	editorconfig_path = File.expand_path(".editorconfig", root)
+	
+	if File.exist?(editorconfig_path)
+		FileUtils.rm_rf(editorconfig_path)
+	end
+	
+	template_root = Bake::Modernize.template_path_for('editorconfig')
+	Bake::Modernize.copy_template(template_root, root)
+end

data/bake/modernize/gemspec.rb

@@ -70,8 +70,10 @@ def update(path: self.default_gemspec_path, output: $stdout)
 	end
 	
 	if required_ruby_version = spec.required_ruby_version
-		output.puts
-		output.puts "\tspec.required_ruby_version = #{required_ruby_version.to_s.inspect}"
+		unless required_ruby_version.none?
+			output.puts "\t"
+			output.puts "\tspec.required_ruby_version = #{required_ruby_version.to_s.inspect}"
+		end
 	end
 	
 	if spec.dependencies.any?
@@ -107,7 +109,7 @@ def directory_glob_for(spec, paths = spec.files)
 		end
 	end
 	
-	return "Dir['{#{directories.keys.join(',')}}/**/*', base: __dir__]"
+	return "Dir.glob('{#{directories.keys.join(',')}}/**/*', File::FNM_DOTMATCH, base: __dir__)"
 end
 
 def format_dependency(dependency)
@@ -155,7 +157,7 @@ end
 GITHUB_PROJECT = /github.com\/(?<account>.*?)\/(?<project>.*?)\/?/
 
 def detect_funding_uri(spec)
-	if match = spec.homepage.match(GITHUB_PROJECT)
+	if match = spec.homepage&.match(GITHUB_PROJECT)
 		account = match[:account]
 		
 		funding_uri = "https://github.com/sponsors/#{account}/"

data/lib/bake/modernize/version.rb

@@ -20,6 +20,6 @@
 
 module Bake
 	module Modernize
-		VERSION = "0.1.4"
+		VERSION = "0.4.1"
 	end
 end

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

@@ -0,0 +1,46 @@
+name: Development
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ${{matrix.os}}-latest
+    continue-on-error: ${{matrix.experimental}}
+    
+    strategy:
+      matrix:
+        os:
+          - ubuntu
+          - macos
+        
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+        
+        experimental: [false]
+        env: [""]
+        
+        include:
+          - os: ubuntu
+            ruby: truffleruby
+            experimental: true
+          - os: ubuntu
+            ruby: jruby
+            experimental: true
+          - os: ubuntu
+            ruby: head
+            experimental: true
+    
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+    
+    - name: Install dependencies
+      run: ${{matrix.env}} bundle install
+    
+    - name: Run tests
+      timeout-minutes: 5
+      run: ${{matrix.env}} bundle exec rspec

data/template/editorconfig/.editorconfig

@@ -0,0 +1,5 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-modernize
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.4.1
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -53,7 +53,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: bake-bundler
+  name: markly
+  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: rugged
+  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
     requirements:
     - - ">="
@@ -66,33 +94,36 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - bake/modernize.rb
 - bake/modernize/actions.rb
+- bake/modernize/editorconfig.rb
 - bake/modernize/gemfile.rb
 - bake/modernize/gemspec.rb
 - lib/bake/modernize.rb
 - lib/bake/modernize/version.rb
+- template/actions/.github/workflows/development.yml
+- template/editorconfig/.editorconfig
 - template/readme/README.md
 homepage: https://github.com/ioquatix/bake-modernize
 licenses:
 - MIT
 metadata:
   funding_uri: https://github.com/sponsors/ioquatix/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -100,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Automatically modernize parts of your project/gem.
 test_files: []