Upgrade bundler to version 2.0.1

.rubocop.yml

@@ -1,16 +1,17 @@
+inherit_from: .rubocop_todo.yml
+
 require: rubocop-rspec
 
 AllCops:
   DisplayCopNames: true
 
+Layout/SpaceBeforeFirstArg:
+  Enabled: false
+
 ## Style
 
 Style/Documentation:
   Enabled: false
-Style/SingleSpaceBeforeFirstArg:
-  Enabled: false
-Style/AccessorMethodName:
-  Enabled: false
 Style/SymbolArray:
   Enabled: false
 Style/SignalException:
@@ -30,32 +31,37 @@ Style/CollectionMethods:
 Style/TrivialAccessors:
   ExactNameMatch: true
 
-Style/PredicateName:
-  NamePrefix:
-    - is_
-    - have_
-  NamePrefixBlacklist:
-    - is_
-    - have_
-
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 ## Metrics
 
 Metrics/LineLength:
-  Max: 100
+  Max: 120
   Exclude:
     - 'spec/**/*'
 
 Metrics/MethodLength:
-  Max: 15
   Exclude:
     - 'spec/**/*'
 
 Metrics/CyclomaticComplexity:
   Max: 10
 
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+
+Naming/AccessorMethodName:
+  Enabled: false
+Naming/PredicateName:
+  NamePrefix:
+    - is_
+    - have_
+  NamePrefixBlacklist:
+    - is_
+    - have_
+
 ## RSpec
 
 RSpec/DescribeClass:
@@ -68,3 +74,11 @@ RSpec/FilePath:
   Enabled: false
 RSpec/InstanceVariable:
   Enabled: false
+RSpec/ExampleLength:
+  Enabled: false
+RSpec/ContextWording:
+  Enabled: false
+RSpec/MultipleExpectations:
+  Enabled: false
+RSpec/ExpectActual:
+  Enabled: false

.rubocop_todo.yml

@@ -0,0 +1,21 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2019-03-26 23:45:23 -0700 using RuboCop version 0.66.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+Metrics/AbcSize:
+  Max: 31
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 110
+
+# Offense count: 2
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 24

.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.0.0-p648
+  - 2.3.7
 
 before_install:
   - gem update bundler

exe/mac_setup

@@ -13,7 +13,7 @@ when "install"
   # config_path = (ARGV - options)[0] || File.expand_path(DEFAULT_CONFIG_PATH)
 
   # if File.exist?(config_path)
-    MacSetup.install # (config_path, options)
+  MacSetup.install # (config_path, options)
   # else
   #   puts "You must specify a path to config file or create one at #{DEFAULT_CONFIG_PATH}"
   # end

lib/mac_setup.rb

@@ -29,14 +29,14 @@ module MacSetup
     HomebrewRunner,
     ScriptInstaller,
     DefaultsInstaller
-  ]
+  ].freeze
 
   DEFAULT_PLUGINS = [
     Plugins::MacAppStore,
     Plugins::Keybase,
     Plugins::Dotfiles,
     Plugins::Asdf
-  ]
+  ].freeze
 
   class << self
     def bootstrap(dotfiles_repo)
@@ -48,7 +48,7 @@ def bootstrap(dotfiles_repo)
       plugins(config).each { |plugin| plugin.bootstrap(config) }
     end
 
-    def install # (config_path, _options)
+    def install
       config = Configuration.new(DEFAULT_CONFIG_PATH)
 
       Shell.raw("brew update")

lib/mac_setup/brewfile_installer.rb

@@ -3,7 +3,7 @@
 
 module MacSetup
   class BrewfileInstaller
-    BUNDLE_TAP = "homebrew/bundle"
+    BUNDLE_TAP = "homebrew/bundle".freeze
 
     attr_reader :config, :status
 

lib/mac_setup/command_line_tools_installer.rb

@@ -2,7 +2,7 @@
 
 module MacSetup
   class CommandLineToolsInstaller
-    BIN_PATH = "/Library/Developer/CommandLineTools/usr/bin/clang"
+    BIN_PATH = "/Library/Developer/CommandLineTools/usr/bin/clang".freeze
 
     def self.run
       if File.exist?(BIN_PATH)

lib/mac_setup/configuration.rb

@@ -6,7 +6,7 @@ class Configuration
     InvalidConfigError = Class.new(StandardError)
     DEFAULT_KEYS = [
       :repo, :plugins, :git_repos, :symlinks, :taps, :brews, :fonts, :casks, :quicklook, :mas, :extra_dotfiles
-    ]
+    ].freeze
 
     def initialize(config_path)
       @config_path = config_path
@@ -99,11 +99,9 @@ def mas
 
     def add_brews(item, existing_brews = brews)
       existing_brews.merge!(brew_value(item)) do |key, oldval, newval|
-        if oldval == newval
-          oldval
-        else
-          raise InvalidConfigError, "#{key} is defined twice!: #{oldval}, #{newval}"
-        end
+        raise InvalidConfigError, "#{key} is defined twice!: #{oldval}, #{newval}" unless oldval == newval
+
+        oldval
       end
     end
 

lib/mac_setup/homebrew_installer.rb

@@ -2,7 +2,7 @@
 
 module MacSetup
   class HomebrewInstaller
-    BREW_INSTALL_URL = "https://raw.githubusercontent.com/Homebrew/install/master/install"
+    BREW_INSTALL_URL = "https://raw.githubusercontent.com/Homebrew/install/master/install".freeze
 
     def self.run
       if Shell.command_present?("brew")

lib/mac_setup/homebrew_runner.rb

@@ -6,7 +6,7 @@ def self.run(config, _status)
       MacSetup.log("Installing Homebrew brews and casks") do
         Tempfile.create("Brewfile") do |brewfile|
           write_brewfile(config, brewfile)
-          File.chmod(0644, brewfile)
+          File.chmod(0o644, brewfile)
           brewfile.rewind
 
           Shell.raw("brew bundle install --file=#{brewfile.path}")

lib/mac_setup/plugin.rb

@@ -1,20 +1,15 @@
 module MacSetup
   class Plugin
     class << self
-      def add_requirements(_config)
-      end
+      def add_requirements(_config); end
 
-      def run(_config, _status)
-      end
+      def run(_config, _status); end
 
-      def load(_plugin_name)
-      end
+      def load(_plugin_name); end
 
-      def get_status(_status)
-      end
+      def get_status(_status); end
 
-      def bootstrap(config)
-      end
+      def bootstrap(config); end
     end
   end
 end

lib/mac_setup/script_installer.rb

@@ -2,7 +2,7 @@
 
 module MacSetup
   class ScriptInstaller
-    SCRIPTS_PATH = "mac_setup/scripts"
+    SCRIPTS_PATH = "mac_setup/scripts".freeze
 
     def self.run(_config, _status)
       Pathname.new(MacSetup.dotfiles_path).join(SCRIPTS_PATH).each_child do |script|

lib/mac_setup/secrets.rb

@@ -1,9 +1,9 @@
 module MacSetup
   class Secrets
-    CRYPTO_LIB = "openssl"
-    CIPHER = "aes-256-cbc"
-    PLAINTEXT_EXT = "priv"
-    CIPHERTEXT_EXT = "crypt"
+    CRYPTO_LIB = "openssl".freeze
+    CIPHER = "aes-256-cbc".freeze
+    PLAINTEXT_EXT = "priv".freeze
+    CIPHERTEXT_EXT = "crypt".freeze
 
     attr_reader :files, :password
 
@@ -122,15 +122,15 @@ def do_encrypt(file, target_path)
     end
 
     def encrypt_command(file, target_path)
-      %W(openssl enc -aes-256-cbc -k testme -in #{file} -out #{target_path})
+      %W[openssl enc -aes-256-cbc -k testme -in #{file} -out #{target_path}]
     end
 
     def decrypt_command(file, target_path)
-      %W(openssl enc -aes-256-cbc -k testme -d -in #{file} -out #{target_path})
+      %W[openssl enc -aes-256-cbc -k testme -d -in #{file} -out #{target_path}]
     end
 
     def base_command(password)
-      %W(#{CRYPTO_LIB} enc -#{CIPHER} -k #{password})
+      %W[#{CRYPTO_LIB} enc -#{CIPHER} -k #{password}]
     end
 
     def raw_file_path(file)

lib/mac_setup/services_installer.rb

@@ -5,7 +5,7 @@
 module MacSetup
   class ServicesInstaller
     LAUNCH_AGENTS_PATH = File.expand_path("~/Library/LaunchAgents")
-    SERVICES_TAP = "homebrew/services"
+    SERVICES_TAP = "homebrew/services".freeze
 
     attr_reader :config, :status, :services, :running_services
 

lib/mac_setup/symlink_path_builder.rb

@@ -20,7 +20,7 @@ def each_child(dir, &block)
           if child.directory?
             each_child(child, &block)
           else
-            block.call(child)
+            yield(child)
           end
         end
       end

lib/mac_setup/version.rb

@@ -1,3 +1,3 @@
 module MacSetup
-  VERSION = "0.9.0"
+  VERSION = "0.9.0".freeze
 end

mac_setup.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "mac_setup/version"
 
@@ -20,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop", "~> 0.34.2"
+  spec.add_development_dependency "rubocop"
   spec.add_development_dependency "rubocop-rspec"
-  spec.add_development_dependency "pry"
 end