bcupgrade 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b04441667afbe6aa701b887cf5a55de828f99c9
-  data.tar.gz: 9a99269c171fe4524d980e084bf0be369d5c635e
+  metadata.gz: 0f6ea276e941fdf9a1c046ad95626ac191844e53
+  data.tar.gz: 7349da2bbac7d1e40dc3decafa74b3cd1bdf40f4
 SHA512:
-  metadata.gz: 1e651651d91a900334ff9cc4df52a7f389c0a81b0b95a11e65416d627ee25d504eea10c402a06ac260fc89cef815c084770b0ec6f44ee4ec8fb73953405bdb7b
-  data.tar.gz: f4a66c1959469b6495e1e114a22de0e9bc184a4fb7830ad9051dab88327814895d44cbe09df0e45e1b7d0ef84fa3a3c0546e0865946e9bfa609b3c7a64a18dfe
+  metadata.gz: ed4987fcaf4b95556df4e7f76c4fe2d27869191270fcea4a758c018445ff1f124530d3376e3b4950c21ad1a17ae6c60730fab1241181f2839d2e69b30e124100
+  data.tar.gz: 59291b4a0da5330bc6022fa72f0b17fc2fb28e72e02ccff7f6b3d0481ba95bb950d2a14376facd138c0f31ea24a3bcc8684a0852885bc40115a4f09266935b01

data/.rubocop.yml

@@ -6,3 +6,11 @@ AllCops:
 
 LineLength:
   Max: 120
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+
+RSpec/NestedGroups:
+  Max: 4

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-03-24 21:37:30 +0900 using RuboCop version 0.47.1.
+# on 2017-03-29 17:12:14 +0900 using RuboCop version 0.47.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
@@ -8,22 +8,18 @@
 
 # Offense count: 1
 Metrics/AbcSize:
-  Max: 19
-
-# Offense count: 2
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 92
+  Max: 16
 
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 23
+  Max: 17
 
-# Offense count: 2
+# Offense count: 3
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
     - 'test/**/*'
     - 'lib/bcupgrade.rb'
     - 'lib/bcupgrade/brew_cask.rb'
+    - 'lib/bcupgrade/cask.rb'

data/README.md

@@ -34,13 +34,18 @@ Atom.app (app)
 ## Usage
 
 ```
-% bcupgrade -h
+% bcupgrade --help
 Usage: bcupgrade [options]
+    -d, --dry-run                    Show output without running
+    -r, --remove                     Remove previous version casks with installing
+    -y, --yes                        Install cask without prompt
     -v, --version                    Show version number
-        --dry-run                    Show output without running
 ```
 
-`bcupgrade` displays a confirmation prompt `[y/n]` when it attempts to re-install.
+`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}`)
 
 ```
 % bcupgrade
@@ -55,7 +60,6 @@ atom / 1.10.2
 Upgrade 1password? [y/n] n
 
 Upgrade atom? [y/n] y
-remove atom
 install atom
 ==> Satisfying dependencies
 complete
@@ -70,48 +74,24 @@ complete
 🍺  atom was successfully installed!
 ```
 
-- Remove previous versions.
-  `rm -rf /usr/local/Caskroom/#{cask}`
-- Install latest version.
-  `brew cask install --force #{cask}`
+`bcupgrade` with arguments to check & upgrade selected casks.
 
 ```
-% brew cask info atom
-atom: 1.10.2
-https://atom.io/
-/usr/local/Caskroom/atom/1.10.2 (68B)
-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)
+% bcupgrade dropbox firefox
 ```
 
 
 ## Configuration File
 
-in the user's `~/.bcupgrade` (YAML syntax).
-
-If you want to ignore upgrade casks, you can add settings.
+If you want to ignore upgrade casks, you can add settings in the user's `~/.bcupgrade` (YAML syntax).
 
 ```
 ignore:
-  - omniplan1
+  - omniplan
   - sublime-text2
 ```
 
 
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies.
-Then, run `rake spec` to run the tests.
-You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`.
-To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/DriftwoodJP/bcupgrade.

data/exe/bcupgrade

@@ -6,18 +6,24 @@ require 'readline'
 
 OptionParser.new do |opt|
   begin
+    options = {}
+    opt.on('-d', '--dry-run', 'Show output without running') do |v|
+      options[:dry_run] = v
+    end
+    opt.on('-r', '--remove', 'Remove previous version casks with installing') do |v|
+      options[:remove] = v
+    end
+    opt.on('-y', '--yes', 'Install cask without prompt') do |v|
+      options[:install] = v
+    end
     opt.on('-v', '--version', 'Show version number') do
       puts Bcupgrade::VERSION
       exit
     end
-    opt.on('--dry-run', 'Show output without running') do
-      opt.parse!(ARGV)
-      Bcupgrade.run
-      exit
-    end
 
-    opt.parse!(ARGV)
-    Bcupgrade.run(true)
+    args = opt.parse!(ARGV)
+
+    Bcupgrade.run(options, args)
   rescue => e
     puts e.to_s
     exit

data/lib/bcupgrade/brew_cask.rb

@@ -1,19 +1,21 @@
 module Bcupgrade
-  CASKROOM_PATH = '/usr/local/Caskroom'.freeze
+  module BrewCask
+    CASKROOM_PATH = '/usr/local/Caskroom'.freeze
 
-  def self.brew_cask_list
-    `brew cask list`
-  end
+    def self.list
+      `brew cask list`
+    end
 
-  def self.brew_cask_info(cask)
-    `brew cask info #{cask}`
-  end
+    def self.info(cask)
+      `brew cask info #{cask}`
+    end
 
-  def self.brew_cask_remove(cask)
-    system "rm -rf #{CASKROOM_PATH}/#{cask}"
-  end
+    def self.remove(cask)
+      system "rm -rf #{CASKROOM_PATH}/#{cask}"
+    end
 
-  def self.brew_cask_install(cask)
-    system "brew cask install --force #{cask}"
+    def self.install(cask)
+      system "brew cask install --force #{cask}"
+    end
   end
 end

data/lib/bcupgrade/cask.rb

@@ -0,0 +1,100 @@
+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 = "#{BrewCask::CASKROOM_PATH}/#{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
+    end
+
+    def upgrade_version(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 "remove #{cask}"
+          BrewCask.remove(cask)
+        end
+
+        puts "install #{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
+      if @args.any?
+        trim_target_to_a(@args)
+      else
+        check_target = trim_target_to_a(BrewCask.list.split(/\n/))
+        [trim_ignore_casks(check_target[0]), check_target[1]]
+      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
+
+      [installed_casks, error_casks]
+    end
+
+    def trim_ignore_casks(casks)
+      if @config.nil?
+        casks
+      else
+        casks - Array(@config['ignore'])
+      end
+    end
+
+    def trim_latest_version(cask_info)
+      lines = cask_info.split(/\n/)
+      lines[0].gsub(/.+: (.+)/, '\1') if lines[0]
+    end
+  end
+end

data/lib/bcupgrade/version.rb

@@ -1,3 +1,3 @@
 module Bcupgrade
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/bcupgrade.rb

@@ -1,92 +1,30 @@
-require 'bcupgrade/version'
-require 'bcupgrade/brew_cask'
-require 'yaml'
+require_relative 'bcupgrade/version'
+require_relative 'bcupgrade/brew_cask'
+require_relative 'bcupgrade/cask'
 
 module Bcupgrade
-  def self.load_config
-    file = File.join(ENV['HOME'], '.bcupgrade')
-    YAML.load_file(file) if File.exist?(file)
-  end
-
-  def self.installed_casks(casks, config)
-    if config.nil?
-      casks
-    else
-      casks - Array(config['ignore'])
-    end
-  end
-
-  def self.check_list
-    cask_list = Bcupgrade.brew_cask_list.split("\n")
-
-    installed_casks = []
-    error_casks = []
-    cask_list.each do |cask|
-      if cask.include?(' (!)')
-        error_casks.push(cask.delete(' (!)'))
-      else
-        installed_casks.push(cask)
-      end
-    end
-
-    [installed_casks, error_casks]
-  end
-
-  def self.check_version(cask)
-    cask_info = Bcupgrade.brew_cask_info(cask)
-    lines = cask_info.split(/\n/)
-    latest_version = if lines[0].nil?
-                       'error'
-                     else
-                       lines[0].gsub(/.+: (.+)/, '\1')
-                     end
-    installed_path = "#{Bcupgrade::CASKROOM_PATH}/#{cask}/#{latest_version}"
-
-    cask_info.include?(installed_path) ? nil : latest_version
-  end
-
-  def self.upgrade(casks)
-    casks.each do |cask|
-      input = Readline.readline("\nUpgrade #{cask}? [y/n] ")
-      next unless input == 'y'
-      puts "remove #{cask}"
-      Bcupgrade.brew_cask_remove(cask)
-      puts "install #{cask}"
-      Bcupgrade.brew_cask_install(cask)
-    end
-  end
-
-  def self.run(option = false)
-    config = Bcupgrade.load_config
+  def self.run(options, args)
+    cask = Cask.new(options, args)
 
     # Check cask list
     puts "\n==> Check 'brew cask list'...\n"
 
-    cask_list = Bcupgrade.check_list
-    installed_casks = Bcupgrade.installed_casks(cask_list[0], config)
-    error_casks = cask_list[1]
+    installed_casks = cask.installed_casks
+    error_casks = cask.error_casks
 
     puts "#{installed_casks}\n"
-
-    unless error_casks == []
+    if error_casks.any?
       puts "\nSkip re-install: can't found brew cask info\n#{error_casks}\n"
     end
 
     # Check cask version
     puts "\n==> Check 'brew cask info' for the latest available version...\n"
 
-    update_casks = []
-    installed_casks.each do |cask|
-      latest_version = Bcupgrade.check_version(cask)
-      if latest_version
-        puts "#{cask} / #{latest_version}"
-        update_casks.push(cask)
-      end
-    end
+    update_casks = cask.check_version
 
     # Upgrade cask
     if update_casks.any?
-      Bcupgrade.upgrade(update_casks) if option
+      cask.upgrade_version(update_casks)
     else
       puts "\nAlready up-to-date."
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcupgrade
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - DriftwoodJP
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - exe/bcupgrade
 - lib/bcupgrade.rb
 - lib/bcupgrade/brew_cask.rb
+- lib/bcupgrade/cask.rb
 - lib/bcupgrade/version.rb
 homepage: https://github.com/DriftwoodJP/bcupgrade
 licenses: