bcupgrade 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab3c58c81ca7be4b743ff6e3ad5a64636e977ec
-  data.tar.gz: 01d91d4560d1a5f61ecfa60fb6cdc8396b824c13
+  metadata.gz: 340ebfae5d304dec32c1d4241b7c10e54ddba640
+  data.tar.gz: 9edaa6ed2d1b12a418a15f8636cd1e0a89550e48
 SHA512:
-  metadata.gz: 674fb0e0d0c7ce5688cc8443948fec868916adbfc633ce02e4d1a310b2af04c8b19a6f85c1549b7b709947f000f2798fb50360d847db623a7c8a087c097738b1
-  data.tar.gz: 83fac719ce85036f9f5bfe92186f27a18db6f0024a450e7f774b06daf8702f6df21486bcaa4a6430108edb83f6c9ab65f36084db8f0a27b0ab5cd46e914deac6
+  metadata.gz: 9811c99363f600c7d6e466d1c2088809e3f0fbad707549ed37a4c8107f1dc5a3371ac87c54470278e16556af848c98d6e59a9e177826aaeebdc78ffb412f6372
+  data.tar.gz: 566fcda0c43fa53ad4ead0cd4f8fda3203b0a0f4d438981a630520dffd497873f6faaa75cd477a5bd1a09916fa6d4f529849ba14578b62d33eed258405be31ed

data/README.md

@@ -1,4 +1,4 @@
-# Bcupgrade - brew cask upgrade
+# Bcupgrade - brew cask upgrade [![Gem Version](https://badge.fury.io/rb/bcupgrade.svg)](https://badge.fury.io/rb/bcupgrade)
 
 Upgrade all installed brew casks.
 
@@ -11,7 +11,7 @@ This script uses `brew cask info` result.
 
 ```
 % brew cask info atom
-atom: 1.10.1
+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)
@@ -31,18 +31,24 @@ Atom.app (app)
 
 ## Usage
 
-    % bcupgrade
+```
+% bcupgrade -h
+Usage: bcupgrade [options]
+    -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` displays a confirmation prompt `[y/n]` when it attempts to re-install.
 
 ```
 % bcupgrade
 
-Create cask list...
+Check brew cask list...
 ["1password", "alfred", "atom", "bartender"]
 
-Check update cask...
-["1password" "atom"]
+Check the latest available version...
+1password / 6.3.2
+atom / 1.10.2
 
 Upgrade 1password? [y/n] n
 
@@ -62,6 +68,25 @@ complete
 🍺  atom was successfully installed!
 ```
 
+- Remove previous versions.
+  `rm -rf /usr/local/Caskroom/#{cask}`
+- Install latest version.
+  `brew cask install --force #{cask}`
+
+```
+% 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)
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies.

data/exe/bcupgrade

@@ -4,36 +4,22 @@ require 'bcupgrade'
 require 'optparse'
 require 'readline'
 
-# Show version
-option_parser = OptionParser.new
-option_parser.on('-v', '--version',
-                 'Show version number') do
-  puts Bcupgrade::VERSION
-  exit
-end
-option_parser.parse!(ARGV)
-
-# Create cask list
-puts "\nCreate cask list...\n"
-list = `brew cask list`
-casks = list.delete(' (!)').split("\n")
-puts "#{casks}\n"
-
-# Check update cask
-puts "\nCheck update cask...\n"
-update_casks = Bcupgrade.check_update(casks)
-puts "#{update_casks}\n"
+OptionParser.new do |opt|
+  begin
+    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
 
-# Upgrade cask
-if update_casks.any?
-  update_casks.each do |cask|
-    input = Readline.readline("\nUpgrade #{cask}? [y/n] ")
-    next unless input == 'y'
-    puts "remove #{cask}"
-    system "rm -rf /usr/local/Caskroom/#{cask}"
-    puts "install #{cask}"
-    system "brew cask install --force #{cask}"
+    opt.parse!(ARGV)
+    Bcupgrade.run(true)
+  rescue => e
+    puts e.to_s
+    exit
   end
-else
-  puts "\nAlready up-to-date."
 end

data/lib/bcupgrade/brew_cask.rb

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

data/lib/bcupgrade/version.rb

@@ -1,3 +1,3 @@
 module Bcupgrade
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'.freeze
 end

data/lib/bcupgrade.rb

@@ -1,16 +1,55 @@
 require 'bcupgrade/version'
+require 'bcupgrade/brew_cask'
 
 module Bcupgrade
-  def self.check_update(casks)
-    update_casks = []
+  def self.check_list
+    Bcupgrade.brew_cask_list.delete(' (!)').split("\n")
+  end
+
+  def self.check_version(cask)
+    cask_info = Bcupgrade.brew_cask_info(cask)
+    lines = cask_info.split(/\n/)
+    latest_version = lines[0].gsub(/.+: (.+)/, '\1')
+    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|
-      info = `brew cask info #{cask}`
-      lines = info.split(/\n/)
-      version = lines[0].gsub(/.+: (.+)/, '\1')
+      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)
+    # Check cask list
+    puts "\nCheck brew cask list...\n"
+    installed_casks = Bcupgrade.check_list
+    puts "#{installed_casks}\n"
+
+    # Check cask version
+    puts "\nCheck 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
 
-      installed_path = "/usr/local/Caskroom/#{cask}/#{version}"
-      update_casks.push(cask) unless info.include?(installed_path)
+    if option
+      # Upgrade cask
+      if update_casks.any?
+        Bcupgrade.upgrade(update_casks)
+      else
+        puts "\nAlready up-to-date."
+      end
     end
-    update_casks
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcupgrade
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - DriftwoodJP
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ files:
 - bin/setup
 - exe/bcupgrade
 - lib/bcupgrade.rb
+- lib/bcupgrade/brew_cask.rb
 - lib/bcupgrade/version.rb
 homepage: https://github.com/DriftwoodJP/bcupgrade
 licenses: