Skip to content

Commit

Permalink
Remove ruby2.2 builds from Travis and circle (#91)
Browse files Browse the repository at this point in the history
* Remove ruby2.2 builds from Travis and circle

* Rubocop fixes. Set TargetRubyVersion to 2.4
  • Loading branch information
dkaplan1 authored and jaymzh committed Sep 8, 2018
1 parent b9d4f45 commit 2251aa9
Show file tree
Hide file tree
Showing 28 changed files with 54 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .rubocop.yml
@@ -1,5 +1,5 @@
AllCops:
TargetRubyVersion: 2.1
TargetRubyVersion: 2.4
Exclude:
# template files named `rb` instead of `erb` are a sin against ruby-nature.
- '**/templates/**/*.rb'#
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -3,7 +3,6 @@ language: ruby
before_install: gem update --system

rvm:
- 2.2.2
- 2.3.4
- 2.4.0

Expand Down
2 changes: 2 additions & 0 deletions Gemfile
@@ -1,3 +1,5 @@
# frozen_string_literal: true

source 'https://rubygems.org'

gemspec
2 changes: 2 additions & 0 deletions between_meals.gemspec
@@ -1,3 +1,5 @@
# frozen_string_literal: true

Gem::Specification.new do |s|
s.name = 'between_meals'
s.version = '0.0.8'
Expand Down
5 changes: 0 additions & 5 deletions circle.yml
Expand Up @@ -10,10 +10,6 @@ defaults: &defaults

version: 2
jobs:
ruby_2_2:
<<: *defaults
docker:
- image: circleci/ruby:2.2
ruby_2_3:
<<: *defaults
docker:
Expand All @@ -26,6 +22,5 @@ workflows:
version: 2
test:
jobs:
- ruby_2_2
- ruby_2_3
- ruby_2_4
10 changes: 4 additions & 6 deletions lib/between_meals/changes/change.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down Expand Up @@ -37,15 +39,11 @@ def logger=(log)
end

def self.info(msg)
if @@logger
@@logger.info(msg)
end
@@logger&.info(msg)
end

def self.debug(msg)
if @@logger
@@logger.debug(msg)
end
@@logger&.debug(msg)
end

def info(msg)
Expand Down
2 changes: 2 additions & 0 deletions lib/between_meals/changes/cookbook.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions lib/between_meals/changes/databag.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions lib/between_meals/changes/role.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions lib/between_meals/changeset.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions lib/between_meals/cmd.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions lib/between_meals/knife.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions lib/between_meals/repo.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions lib/between_meals/repo/git.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions lib/between_meals/repo/git/cmd.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions lib/between_meals/repo/hg.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions lib/between_meals/repo/hg/cmd.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions lib/between_meals/repo/svn.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions lib/between_meals/repo/svn/cmd.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
4 changes: 3 additions & 1 deletion lib/between_meals/util.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down Expand Up @@ -52,7 +54,7 @@ def exec(command, logger = nil)
private

def info(msg)
@@logger.info(msg) if @@logger
@@logger&.info(msg)
end

def execute(command)
Expand Down
2 changes: 2 additions & 0 deletions spec/cookbook_spec.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions spec/databag_spec.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions spec/git_spec.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions spec/hg_spec.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions spec/repo_spec.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions spec/role_spec.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down
2 changes: 2 additions & 0 deletions spec/spec_helper.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# Copyright 2013-present Facebook
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 2 additions & 0 deletions spec/svn_spec.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2

# Copyright 2013-present Facebook
Expand Down

0 comments on commit 2251aa9

Please sign in to comment.