bcupgrade 0.3.4 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 62ef06e34dafb01a0e4408a4458b19fb3c499d01
-  data.tar.gz: 81798fc4f1c13b996eaffbf75fb81e5e1fa1e9d3
+SHA256:
+  metadata.gz: d798978501b3c7e88541cdd8b77e981a2efbb4ff796310539a7570b7fb2846ba
+  data.tar.gz: 533c27ebab14bbab5cff5a9dc2d0065dfb49daa055a2c6a1642d893956d3e0e0
 SHA512:
-  metadata.gz: 710305a629112018302a9726614b2c782b1b56e8a9c8197d33d2b1ceaa91cdff3f5ff6fb1a8db8bda185f65a9d2984ed5d3583ced33112b011b7ed59a7490da5
-  data.tar.gz: 8be95512d367c25931958720f3c4b9ed5f722b2cc5a28c430666d0919cd2227eec21757349fef4becefa6e47cd9724d57cce44bb26158fa10681d10483fe722f
+  metadata.gz: 90f619d38a63b914d32c591e5e2b7c58e320e493847f7581e14da0a58b78767439ac06c04b7aaf6dc6acc6f58f8b574a58df20204748a46bfc98173a3809c64f
+  data.tar.gz: 87188da3de8bbd2c48087fd1f78ad895a253fb89905fad3e29e1ea6a61e30e2138cffdb4baafe4ce77a7ae8ddca297384b157d98ab040120acfd78d35b3d3493

data/.rubocop.yml

@@ -2,7 +2,7 @@ require: rubocop-rspec
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6
   DisplayCopNames: true
 
 LineLength:

data/.rubocop_todo.yml

@@ -1,17 +1,17 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-04-18 20:35:19 +0900 using RuboCop version 0.48.1.
+# on 2018-01-07 18:51:23 +0900 using RuboCop version 0.52.1.
 # 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: 3
+# Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 15
+  Max: 13
 
-# Offense count: 3
+# Offense count: 4
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -19,3 +19,4 @@ Style/Documentation:
     - 'lib/bcupgrade.rb'
     - 'lib/bcupgrade/brew_cask.rb'
     - 'lib/bcupgrade/cask.rb'
+    - 'lib/bcupgrade/config_file.rb'

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.6.6

data/.travis.yml

@@ -1,5 +1,23 @@
+env:
+  global:
+    - CC_TEST_REPORTER_ID=350c717c2a49ca7b672bc8a554d621c8e753ddae3288ad9c241512f1900bd448
 sudo: false
 language: ruby
+os: osx
+osx_image: xcode12.2
+cache: bundler
 rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.13.0
+  - 2.6
+  - 2.7
+  - 3.0
+before_install:
+  - gem install bundler
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-darwin-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+script:
+  - brew --version
+  - bundle exec rspec
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/Gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in bcupgrade.gemspec

data/README.md

@@ -1,4 +1,9 @@
+[![license: MIT](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE.txt)
 [![Gem Version](https://badge.fury.io/rb/bcupgrade.svg)](https://badge.fury.io/rb/bcupgrade)
+[![Build Status](https://travis-ci.org/DriftwoodJP/bcupgrade.svg?branch=master)](https://travis-ci.org/DriftwoodJP/bcupgrade)
+[![Dependency Status](https://beta.gemnasium.com/badges/github.com/DriftwoodJP/bcupgrade.svg)](https://beta.gemnasium.com/projects/github.com/DriftwoodJP/bcupgrade)
+[![Maintainability](https://api.codeclimate.com/v1/badges/530785088f8f43bc075b/maintainability)](https://codeclimate.com/github/DriftwoodJP/bcupgrade/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/530785088f8f43bc075b/test_coverage)](https://codeclimate.com/github/DriftwoodJP/bcupgrade/test_coverage)
 
 # Bcupgrade - brew cask upgrade
 
@@ -7,6 +12,14 @@ Awesome `brew cask upgrade` command.
 
 
 
+## Requirement
+
+- [Homebrew Cask](https://caskroom.github.io/) v3.0 or later.
+- Ruby v2.6.6 or later.
+
+
+
+
 ## Installation
 
 ```
@@ -20,35 +33,32 @@ Awesome `brew cask upgrade` command.
 
 `bcupgrade` with no arguments to check & upgrade all casks. 
 
-- Displays a confirmation prompt `[y/n]` when it attempts to re-install.
-- Install latest version. (`brew cask install --force #{cask}`)
+- Displays confirmation prompts `[y/n]`.
+- Install latest version. (`brew cask reinstall #{cask}`)
 
 ```
 % bcupgrade
 
-==> Check 'brew cask list'...
-["1password", "alfred", "atom", "bartender"]
-
-==> Check 'brew cask info' for the latest available version...
-1password (6.3.2)
-atom (1.10.2)
+==> Outdated cask...
+omnioutliner (4.6.1) != 5.2
+scrivener (2.81.2,106) != 3.0.1,966
 
-Upgrade 1password? [y/n] n
+Not upgrading pinned package:
+["iterm2", "omniplan1", "omnioutliner", "sketch"]
 
-Upgrade atom? [y/n] y
+Upgrade scrivener? [y/n] yes
 
-==> Install atom
+==> Upgrade scrivener
 ==> Satisfying dependencies
-complete
-==> Downloading https://github.com/atom/atom/releases/download/v1.10.2/atom-mac.zip
-############################################################################################################################## 100.0%
-==> Verifying checksum for Cask atom
-==> It seems there is already an App at '/Applications/Atom.app'; overwriting.
-==> Removing App: '/Applications/Atom.app'
-==> Moving App 'Atom.app' to '/Applications/Atom.app'
-==> Symlinking Binary 'apm' to '/usr/local/bin/apm'
-==> Symlinking Binary 'atom.sh' to '/usr/local/bin/atom'
-🍺  atom was successfully installed!
+==> Downloading https://scrivener.s3.amazonaws.com/mac_updates/Scrivener_1012_966.zip
+######################################################################## 100.0%
+==> Verifying checksum for Cask scrivener
+==> Uninstalling Cask scrivener
+==> Moving App 'Scrivener.app' back to '/usr/local/Caskroom/scrivener/2.81.2,106/Scrivener.app'.
+==> Purging files for version 2.81.2,106 of Cask scrivener
+==> Installing Cask scrivener
+==> Moving App 'Scrivener.app' to '/Applications/Scrivener.app'.
+🍺  scrivener was successfully installed!
 ```
 
 `bcupgrade` with arguments to check & upgrade selected casks.
@@ -62,10 +72,9 @@ complete
 
 ```
 % bcupgrade --help
-Usage: bcupgrade [options] [cask1 cask2 ...]
-    -d, --dry-run                    Check version without installing
-    -r, --remove                     Remove previous version with installing
-    -y, --yes                        Install cask without prompt
+Usage: bcupgrade [options] [cask1 cask2...]
+    -d, --dry-run                    Check outdated cask without upgrading
+    -y, --yes                        Automatic yes to prompts
     -v, --version                    Show version number
 ```
 
@@ -77,34 +86,12 @@ If you want to ignore upgrade casks, you can add settings in the user's `~/.bcup
 ```
 ignore:
   - iterm2
+  - omniplan1
+  - omnioutliner
   - sketch
 ```
 
-
-
-
-## Requirement
-
-- [Homebrew Cask](https://caskroom.github.io/) v0.60.1+
-
-
-This script uses `brew cask info` result.
-
-```
-% brew cask info atom
-atom: 1.10.2
-https://atom.io/
-/usr/local/Caskroom/atom/1.7.3 (does not exist)
-/usr/local/Caskroom/atom/1.8.0 (68B)
-/usr/local/Caskroom/atom/1.9.0 (2,546 files, 224.9M)
-From: https://github.com/caskroom/homebrew-cask/blob/master/Casks/atom.rb
-==> Name
-Github Atom
-==> Artifacts
-Atom.app (app)
-/Applications/Atom.app/Contents/Resources/app/apm/node_modules/.bin/apm (binary)
-/Applications/Atom.app/Contents/Resources/app/atom.sh (binary)
-```
+To stop from being upgraded: like `brew cask pin`
 
 
 
@@ -119,5 +106,5 @@ This project is intended to be a safe, welcoming space for collaboration, and co
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](LICENSE.txt).
 

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
@@ -6,4 +7,4 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
-task default: %i(rubocop spec)
+task default: %i[rubocop spec]

data/bcupgrade.gemspec

@@ -1,7 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'bcupgrade/version'
 
@@ -15,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.description           = 'Upgrade all installed brew casks.'
   spec.homepage              = 'https://github.com/DriftwoodJP/bcupgrade'
   spec.license               = 'MIT'
-  spec.required_ruby_version = '>= 2.0.0.648'
+  spec.required_ruby_version = '>= 2.6.6'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -33,11 +32,11 @@ 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.16.0'
-  spec.add_development_dependency 'rake', '~> 12.3.0'
-  spec.add_development_dependency 'rspec', '~> 3.7.0'
-  spec.add_development_dependency 'rubocop', '~> 0.51.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.20.1'
-  spec.add_development_dependency 'pry', '~> 0.11.3'
-  spec.add_development_dependency 'pry-byebug', '~> 3.5.0'
+  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'pry', '~> 0.13'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.10'
+  spec.add_development_dependency 'rubocop', '~> 1.9'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.2'
+  spec.add_development_dependency 'simplecov', '~> 0.21'
 end

data/exe/bcupgrade

@@ -6,18 +6,17 @@ require 'optparse'
 require 'readline'
 
 OptionParser.new do |opt|
+  config = Bcupgrade::ConfigFile.new
+
   begin
     opt.program_name = File.basename($PROGRAM_NAME)
-    opt.banner = "Usage: #{opt.program_name} [options] [cask1 cask2 ...]"
+    opt.banner = "Usage: #{opt.program_name} [options] [cask1 cask2...]"
 
     options = {}
-    opt.on('-d', '--dry-run', 'Check version without installing') do |v|
+    opt.on('-d', '--dry-run', 'Check outdated cask without upgrading') do |v|
       options[:dry_run] = v
     end
-    opt.on('-r', '--remove', 'Remove previous version with installing') do |v|
-      options[:remove] = v
-    end
-    opt.on('-y', '--yes', 'Install cask without prompt') do |v|
+    opt.on('-y', '--yes', 'Automatic yes to prompts') do |v|
       options[:install] = v
     end
     opt.on('-v', '--version', 'Show version number') do
@@ -27,8 +26,8 @@ OptionParser.new do |opt|
 
     args = opt.parse!(ARGV)
 
-    Bcupgrade.run(options, args)
-  rescue => e
+    Bcupgrade.run(options, args, config)
+  rescue StandardError => e
     puts "Error: #{e}.\nSee #{opt}"
     exit
   end

data/lib/bcupgrade.rb

@@ -1,30 +1,25 @@
 # frozen_string_literal: true
+
 require_relative 'bcupgrade/version'
 require_relative 'bcupgrade/brew_cask'
 require_relative 'bcupgrade/cask'
+require_relative 'bcupgrade/config_file'
 
 module Bcupgrade
-  def self.run(options, args)
-    cask = Cask.new(options, args)
-
-    # Check cask list
-    puts "\n==> Check 'brew cask list'...\n"
+  def self.run(options, args, config)
+    cask = Cask.new(options, args, config)
 
-    installed_casks = cask.installed_casks
-    error_casks = cask.error_casks
+    unless args.uniq.any?
+      puts "\n==> Outdated cask...\n"
+      BrewCask.output_outdated
 
-    puts "#{installed_casks}\n"
-    if error_casks.any?
-      puts "\nSkip re-install: can't found brew cask info\n#{error_casks}\n"
+      ignore = config.list_ignored_casks
+      puts "\nNot upgrading pinned package:\n#{ignore}" unless ignore.empty?
     end
 
-    # Check cask version
-    puts "\n==> Check 'brew cask info'...\n"
-    update_casks = cask.check_version
-
-    # Upgrade cask
+    update_casks = cask.upgrade_targets
     if update_casks.any?
-      cask.upgrade_version(update_casks)
+      cask.upgrade(update_casks)
     else
       puts "\nAlready up-to-date."
     end

data/lib/bcupgrade/brew_cask.rb

@@ -1,20 +1,17 @@
 # frozen_string_literal: true
+
 module Bcupgrade
   module BrewCask
-    def self.list
-      `brew cask list`
-    end
-
-    def self.info(cask)
-      `brew cask info #{cask}`
+    def self.outdated
+      `brew outdated --quiet --cask`
     end
 
-    def self.remove(cask)
-      system "brew cask uninstall --force #{cask}"
+    def self.output_outdated
+      system 'brew outdated --cask'
     end
 
     def self.install(cask)
-      system "brew cask install --force #{cask}"
+      system "brew reinstall --cask #{cask}"
     end
   end
 end

data/lib/bcupgrade/cask.rb

@@ -1,101 +1,52 @@
 # frozen_string_literal: true
+
 require 'yaml'
 
 module Bcupgrade
   class Cask
-    attr_reader :installed_casks, :error_casks
-
-    def initialize(options, args)
-      @config = config
-      @options = options
-      @args = args.uniq
-      @list = upgrade_target
-      @installed_casks = @list[0]
-      @error_casks = @list[1]
-    end
-
-    def check_version
-      update_casks = []
-
-      @installed_casks.each do |name|
-        cask_info = BrewCask.info(name)
-        version_number = trim_latest_version(cask_info)
-
-        string = "/#{name}/#{version_number}"
-        latest_version = cask_info.include?(string) ? nil : version_number
-
-        if latest_version
-          puts "#{name} (#{latest_version})"
-          update_casks.push(name)
-        end
-      end
-
-      update_casks
+    def initialize(options, args, config)
+      @config   = config
+      @options  = options
+      @args     = args.uniq
+      @outdated = BrewCask.outdated.split(/\n/)
     end
 
-    def upgrade_version(casks)
+    def upgrade(casks)
       return if @options[:dry_run]
 
       casks.each do |cask|
-        input = if @options[:install]
-                  'y'
-                else
-                  Readline.readline("\nUpgrade #{cask}? [y/n] ")
-                end
-        next unless input == 'y'
-
-        if @options[:remove]
-          puts "\n==> Remove #{cask}"
-          BrewCask.remove(cask)
-        end
+        next unless prompt_answer_yes?(cask)
 
-        puts "\n==> Install #{cask}"
+        puts "\n==> Upgrade #{cask}"
         BrewCask.install(cask)
       end
     end
 
-    private
-
-    def config
-      file = File.join(ENV['HOME'], '.bcupgrade')
-      YAML.load_file(file) if File.exist?(file)
-    end
-
-    def upgrade_target
+    def upgrade_targets
       if @args.any?
-        trim_target_to_a(@args)
+        @args
       else
-        check_target = trim_target_to_a(BrewCask.list.split(/\n/))
-        [trim_ignore_casks(check_target[0]), check_target[1]]
+        exclude_ignored_casks(@outdated)
       end
     end
 
-    def trim_target_to_a(array)
-      installed_casks = []
-      error_casks = []
-
-      array.each do |cask|
-        if cask.include?(' (!)')
-          error_casks.push(cask.delete(' (!)'))
-        else
-          installed_casks.push(cask)
-        end
-      end
+    private
 
-      [installed_casks, error_casks]
+    def exclude_ignored_casks(casks)
+      casks - @config.ignored_casks
     end
 
-    def trim_ignore_casks(casks)
-      if @config.nil?
-        casks
+    def prompt_answer_yes?(cask)
+      input = if @options[:install]
+                'y'
+              else
+                Readline.readline("\nUpgrade #{cask}? [y/n] ")
+              end
+      if input.casecmp('y').zero? || input.casecmp('yes').zero?
+        true
       else
-        casks - Array(@config['ignore'])
+        false
       end
     end
-
-    def trim_latest_version(cask_info)
-      lines = cask_info.split(/\n/)
-      lines[0]&.gsub(/.+: (.+)/, '\1')
-    end
   end
 end

data/lib/bcupgrade/config_file.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+module Bcupgrade
+  class ConfigFile
+    def initialize
+      @file = File.join(ENV['HOME'], '.bcupgrade')
+    end
+
+    def load
+      if File.exist?(@file)
+        YAML.load_file(@file)
+      else
+        { 'ignore' => [''] }
+      end
+    end
+
+    def ignored_casks
+      load['ignore'].map { |e| e || '' }
+    rescue StandardError
+      ['']
+    end
+
+    def list_ignored_casks
+      ignored_casks.join(' ')
+    end
+  end
+end

data/lib/bcupgrade/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bcupgrade
-  VERSION = '0.3.4'
+  VERSION = '0.9.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcupgrade
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.9.4
 platform: ruby
 authors:
 - DriftwoodJP
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '0.13'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: '3.10'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.1
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.1
+        version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0.21'
 description: Upgrade all installed brew casks.
 email:
 - DriftwoodJP@users.noreply.github.com
@@ -134,12 +134,13 @@ files:
 - lib/bcupgrade.rb
 - lib/bcupgrade/brew_cask.rb
 - lib/bcupgrade/cask.rb
+- lib/bcupgrade/config_file.rb
 - lib/bcupgrade/version.rb
 homepage: https://github.com/DriftwoodJP/bcupgrade
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,16 +148,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0.648
+      version: 2.6.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Upgrade all installed brew casks.
 test_files: []