Skip to content

Commit

Permalink
chore: clean up and upgrade dev dependencies (#497)
Browse files Browse the repository at this point in the history
  • Loading branch information
childish-sambino authored Mar 2, 2020
1 parent 4ec3a9b commit 7bfa9aa
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 77 deletions.
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Layout/LineLength:
Metrics/BlockLength:
Exclude:
- 'spec/**/*'
- twilio-ruby.gemspec

Layout/HeredocIndentation:
Enabled: false
Expand Down
9 changes: 0 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,2 @@
source 'https://rubygems.org'

gemspec

group :test do
gem 'equivalent-xml', '~> 0.6'
gem 'fakeweb', '~> 1.3'
gem 'rack', '~> 1.3'
gem 'rake', '~> 10.1'
gem 'rspec', '~> 3.0'
end
19 changes: 5 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,33 +1,24 @@
.PHONY: githooks test lint-changed lint docs
.PHONY: githooks install test lint docs docker-build docker-push

CHANGED_RUBY_FILES = $(shell git status --porcelain | grep ".rb" | awk -F ' ' '{print $2}' | tr '\n' ' ')
githooks:
ln -sf ../../githooks/pre-commit .git/hooks/pre-commit

install: githooks
bundle install; bundle exec rake install

test-install:
bundle install

test: lint
bundle exec rake spec

docs:
yard doc --output-dir ./doc

lint:
rubocop --cache true --parallel

githooks:
cp githooks/pre-commit .git/hooks/pre-commit
chmod +x .git/hooks/pre-commit
docs:
yard doc --output-dir ./doc

authors:
echo "Authors\n=======\n\nA huge thanks to all of our contributors:\n\n" > AUTHORS.md
git log --raw | grep "^Author: " | cut -d ' ' -f2- | cut -d '<' -f1 | sed 's/^/- /' | sort | uniq >> AUTHORS.md

gem:
bundle exec rake build | sed -e 's/.*pkg/pkg/g' | sed -e "s/\.$$//g" | xargs gem push

API_DEFINITIONS_SHA=$(shell git log --oneline | grep Regenerated | head -n1 | cut -d ' ' -f 5)
docker-build:
docker build -t twilio/twilio-ruby .
Expand Down
54 changes: 0 additions & 54 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,57 +8,3 @@ RSpec::Core::RakeTask.new(:spec)

task default: :spec
task test: :spec

task :authors do
`make authors`
end

task :deploy, [:version] => [:spec, :authors] do |t, args|
current_version = Twilio::VERSION

if args.version.nil?
version = Twilio::VERSION
version_parts = version.split('.')
increment = version_parts.pop
increment_prefix = increment.split(/\d/)[0]

increment = increment[increment_prefix.length..-1] if increment_prefix

increment = increment.to_i + 1
increment = "#{increment_prefix}#{increment}" if increment_prefix

version = [*version_parts, increment].join('.')
else
version = args.version
end

puts("Deploying #{version}")

# Update version.rb
version_file = <<SRC
module Twilio
VERSION = '#{version}'
end
SRC
File.write('lib/twilio-ruby/version.rb', version_file)

# Update README.md
current_readme = File.read('README.md')
new_readme = current_readme.gsub(Regexp.new(current_version.gsub('.', '\.')), version)
File.write('README.md', new_readme)

# Make a git commit
`git commit -am "Bumping to version #{version}"`

# Do the gem deployment
`make gem`

# Push the branch back up
`git push`

# Tag the branch
`git tag #{version}`

# Push the tags
`git push --tags`
end
Empty file modified githooks/pre-commit
100644 → 100755
Empty file.
5 changes: 5 additions & 0 deletions twilio-ruby.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ Gem::Specification.new do |spec|
spec.add_dependency('rubysl') if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'

spec.add_development_dependency 'bundler', '>= 1.5', '< 3.0'
spec.add_development_dependency 'equivalent-xml', '~> 0.6'
spec.add_development_dependency 'fakeweb', '~> 1.3'
spec.add_development_dependency 'rack', '~> 2.0'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rspec', '~> 3.0'
spec.add_development_dependency 'rubocop', '~> 0.80.0'
spec.add_development_dependency 'yard', '~> 0.9.9'
end

0 comments on commit 7bfa9aa

Please sign in to comment.