brew-cask-tools 0.0.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03c8acc0d2ecf0c0b09bb6b60b74ff9aada6ca98
-  data.tar.gz: cc4a506d08cc5d54eb7761c74be7aa537f692c29
+  metadata.gz: 6010383f43797b4cf996aa39b7d1ee542200cfbc
+  data.tar.gz: 93df8f9712f6062702729593c33efd93532ed74a
 SHA512:
-  metadata.gz: 22ef0ce63826341906cb03f7af8594ae49732c2c1b188359beb5e2ead2cf51591b6fbf8bc7cc646f527fa88a8e666d037f073ff03b59a279c08347d18cb41b6c
-  data.tar.gz: 801178fa09cf322918e16c6b98ab0f4f5af70b29e39a5268de8b6f8bc7db2addf66056ca06ec3b8fea8988a4bbbb1f3b1f39a68c20f3e422429161dc1606622b
+  metadata.gz: f8fe057528b544f3cfa3b778cb7e18046ba8dcdef6ef9110df3de6d2abf78c722537fc057315486583bfa3d9f7d23603d606b3bc12bc18a6c0c2f448920ce90d
+  data.tar.gz: 9574fa4a9654cb204b6a7fb38c60cc6e6168cca18c3a0b119edd581bb3e5d420ef03e2c931cf3c33fcde95733c8b47f9d0e088a91d757e19dd63297e90fb43e5

data/lib/bct/cask/info.rb

@@ -0,0 +1,34 @@
+require 'pry'
+
+module BrewCaskTools
+  # Class to keep brittle parsing of `brew cask info #{cask}` localized.
+  class Info
+    def initialize(arr)
+      @info = arr.nil? ? [] : arr
+    end
+
+    def short_name
+      @info[0]
+    end
+
+    def url
+      @info[1]
+    end
+
+    def path
+      @info[2]
+    end
+
+    def cask_url
+      @info[3]
+    end
+
+    def name
+      @info[5]
+    end
+
+    def app_name
+      @info[7]
+    end
+  end
+end

data/lib/bct/cask.rb

@@ -1,113 +1,129 @@
 require 'fileutils'
 require 'thor'
 require 'open3'
+require 'pry'
+
+require_relative './cask/info'
 
 CASKROOM = '/usr/local/Caskroom'.freeze
 DIR_BLACKLIST = ['.', '..', '.metadata'].freeze
 
-# Cask control class. Implements operations on a single cask.
-class Cask < Thor::Shell::Basic
-  attr_reader :name, :dir
-
-  def initialize(name)
-    super()
-    @name = name
-    @info = deprecated? ? [] : `brew cask info #{name}`.split("\n")
-    @name = @name.delete(' (!)') if deprecated?
-    @deprecated = deprecated?
-    @dir = File.join(CASKROOM, @name)
-    # filter_info
-  end
+module BrewCaskTools
+  # Cask control class. Implements operations on a single cask.
+  class Cask < Thor::Shell::Basic
+    attr_reader :name, :dir
 
-  def filter_info
-    @info.select! { |i| !i.end_with?('(does not exist)') }
-  end
+    def initialize(name)
+      super()
 
-  def current_version
-    @info[0].sub("#{@name}: ", '')
-  end
+      @name = name
 
-  def installed_version
-    local_versions.last
-  end
+      if deprecated?
+        info = []
+        @name = name.delete(' (!)')
+      else
+        info = `brew cask info #{name}`.split("\n")
+      end
 
-  def local_versions
-    Dir.entries(@dir).reject { |i| DIR_BLACKLIST.include?(i) }.sort
-  end
+      @info = Info.new(info)
+      @deprecated = deprecated?
+      @dir = File.join(CASKROOM, @name)
+    end
 
-  def local_metadata_versions
-    Dir.entries(File.join(@dir, '.metadata')).reject do |i|
-      DIR_BLACKLIST.include?(i)
-    end.sort
-  end
+    def filter_info
+      @info.info.select! { |i| !i.end_with?('(does not exist)') }
+    end
 
-  def deprecated?
-    @deprecated ||= @name.include?('(!)')
-  end
+    def current_version
+      @info.short_name.sub("#{@name}: ", '')
+    end
 
-  def can_cleanup?
-    return if @deprecated
-    (local_versions.length > 1 || local_metadata_versions.length > 1)
-  end
+    def installed_version
+      local_versions.last
+    end
 
-  def outdated?
-    current_version != installed_version
-  end
+    def local_versions
+      Dir.entries(@dir)
+         .reject { |i| DIR_BLACKLIST.include?(i) }
+         .sort
+    end
+
+    def local_metadata_versions
+      Dir.entries(File.join(@dir, '.metadata'))
+         .reject { |i| DIR_BLACKLIST.include?(i) }
+         .sort
+    end
+
+    def deprecated?
+      @deprecated ||= @name.include?('(!)')
+    end
+
+    def can_cleanup?
+      return true if @deprecated
+      (local_versions.length > 1 || local_metadata_versions.length > 1)
+    end
+
+    def outdated?
+      current_version != installed_version
+    end
+
+    def upgrade
+      return say "You have the most recent version of #{@name}. " \
+      'It cannot be upgraded', :green unless outdated?
 
-  def upgrade
-    if outdated?
       say "Installing #{@name} (#{current_version})", :cyan
       cmd = "brew cask install #{@name} --force"
       Open3.popen2e(cmd) do |_stdin, stdout_err, _wait_thr|
-        line = stdout_err.gets
-        puts line while line
+        while line = stdout_err.gets
+          puts line
+        end
       end
       say "Upgraded #{@name} to version #{current_version}", :green
-    else
-      say "You have the most recent version of #{@name}. " \
-      'It cannot be upgraded', :green
     end
-  end
 
-  def old_versions
-    _, *previous = local_versions.reverse
-    previous
-  end
+    def old_versions
+      old(local_versions)
+    end
 
-  def old_metadata
-    _, *previous = local_metadata_versions.reverse
-    previous
-  end
+    def old_metadata
+      old(local_metadata_versions)
+    end
 
-  def cleanup
-    return unless can_cleanup?
-    if @deprecated == true
-      yield self, local_versions
-      # Delete the whole cask
-      rm(@dir)
-      return
+    def old(arr)
+      _, *previous = arr.reverse
+      previous
     end
 
-    yield self, old_versions
-    rm_old(old_versions, method(:rm_version))
-    rm_old(old_metadata, method(:rm_metadata))
-  end
+    def cleanup
+      return unless can_cleanup?
+      if @deprecated == true
+        yield self, local_versions
+        # Delete the whole cask
+        rm(@dir)
+        return
+      end
 
-  def rm_old(versions, method)
-    versions.each do |version|
-      method.call(version)
+      yield self, old_versions
+      rm_old(old_versions, method(:rm_version))
+      rm_old(old_metadata, method(:rm_metadata))
     end
-  end
 
-  def rm_version(version)
-    rm(File.join(@dir, version))
-  end
+    def rm_old(versions, method)
+      versions.each do |version|
+        method.call(version)
+      end
+    end
 
-  def rm_metadata(version)
-    rm(File.join(@dir, '.metadata', version))
-  end
+    def rm_version(version)
+      rm(File.join(@dir, version))
+    end
 
-  def rm(dir)
-    ::FileUtils.rm_rf(dir, secure: true, verbose: true)
+    def rm_metadata(version)
+      rm(File.join(@dir, '.metadata', version))
+    end
+
+    def rm(dir)
+      ::FileUtils.rm_rf(dir, secure: true, verbose: true)
+    end
   end
 end

data/lib/bct/caskroom.rb

@@ -1,31 +1,32 @@
-require_relative './cask'
 require 'thor'
+require 'pry'
+
+require_relative './cask'
 
 module BrewCaskTools
   # Represents a list of Casks.
   class Caskroom < Thor::Shell::Basic
-    attr_reader :casklist
-
     def initialize
       super
-      @casks = `brew cask ls`.split("\n")
-      @casklist = @casks.map { |cask| Cask.new(cask) }
     end
 
-    def deprecated
-      output = @casklist.select(&:deprecated?)
-      yield output
+    def casks
+      @casks ||= `brew cask ls`.split("\n")
+    end
+
+    def casklist
+      @casklist ||= casks.map { |cask| yield cask }
     end
 
-    def outdated
-      output = @casklist.select(&:outdated?).map do |cask|
-        [cask.name, cask.installed_version, cask.current_version]
+    def enumerate
+      casklist do |c|
+        yield Cask.new(c)
       end
-      yield output
     end
 
     def get(cask_name)
-      @casklist.select { |e| e.name == cask_name }.first
+      c = casks.select { |e| e == cask_name }.first
+      Cask.new(c)
     end
   end
 end

data/lib/bct/metadata.rb

@@ -1,7 +1,7 @@
-require_relative './util'
+require 'git-version-bump'
 
 # :nodoc:
 module BrewCaskTools
-  VERSION = Util.source_path('VERSION').read rescue '0.0.1'
+  VERSION = GVB.version
   DESCRIPTION = 'A tiny tool that provides some missing functionality in Homebrew Cask.'.freeze
 end

data/lib/bct/tasks/caskroom.rb

@@ -0,0 +1,19 @@
+require 'thor'
+require 'ruby-progressbar'
+
+require_relative '../caskroom'
+
+module BrewCaskTools
+  module Tasks
+    # Base class for Tasks that interact with the Caskroom
+    class Caskroom < Thor::Shell::Basic
+      def caskroom
+        @caskroom ||= BrewCaskTools::Caskroom.new
+      end
+
+      def progressbar
+        @progressbar ||= ProgressBar.create(title: '  Progress ')
+      end
+    end
+  end
+end

data/lib/bct/tasks/cleanup.rb

@@ -1,58 +1,59 @@
 require 'thor'
+require 'pry'
+
+require_relative './caskroom'
 
 module BrewCaskTools
   module Tasks
-    # Upgrade tasks
-    class Cleanup < Thor
-      desc 'cleanup CASK', 'clean up old versions of a specific cask. If a ' \
-      'cask name is omitted, this task will cleanup all outdated casks.'
-      def cleanup(cask_name, *args)
-        @caskroom = args.first
-        cask = @caskroom.get(cask_name) unless cask_name.nil?
-
-        if cask.nil? && !cask_name.nil?
-          return say 'Invalid cask specified', :red
-        end
+    # Cleanup tasks
+    class Cleanup < Caskroom
+      def initialize(cask_name)
+        super()
 
-        unless cask_name.nil?
-          clean_single_cask(cask)
-          return
+        if cask_name.nil?
+          progressbar.total = caskroom.casks.length
+          progressbar.log "\nLooking for outdated casks..."
+
+          return clean_all # Clean all casks
         end
 
-        clean_all_casks if cask_name.nil? # Cleanup everything
+        cask = caskroom.get(cask_name)
+        return say 'Invalid cask specified', :red if cask.nil?
+
+        clean_one(cask)
       end
 
-      no_tasks do
-        def clean_block
-          proc do |c, versions|
-            say "Cleaning up #{c.name}", :yellow
-            dep_q = "#{c.name} has been deprecated. Ok to remove all versions?"
-            if c.deprecated? && no?(dep_q, :red)
-              say 'No action taken.', :red
-              next
-            end
-            say "Removed #{versions.length} old version(s)", :yellow
-          end
-        end
+      def clean_one(cask)
+        return say "#{cask.name.capitalize} does not have any outdated " \
+          'versions. No cleanup operations are necessary', :green unless cask.can_cleanup?
 
-        def clean_single_cask(cask)
-          unless cask.can_cleanup?
-            say "#{cask.name.capitalize} does not have any outdated " \
-            'versions. No cleanup operations are necessary', :green
-            return
-          end
+        cask.cleanup(&clean_block)
+      end
+
+      def clean_all
+        cleaned_casks = []
+
+        caskroom.enumerate do |cask|
+          progressbar.title = "  #{cask.name.capitalize} "
+          progressbar.increment
 
-          cask.cleanup(&clean_block)
+          cleaned_casks << cask if cask.can_cleanup?
         end
 
-        def clean_all_casks
-          cleaned_casks = @caskroom.casklist.select(&:can_cleanup?)
+        return say "\nNo cleanup operations are necessary", :green if cleaned_casks.empty?
 
-          cleaned_casks.each do |c|
-            c.cleanup(&clean_block)
-          end
+        cleaned_casks.each { |c| c.cleanup(&clean_block) }
+      end
 
-          say 'No cleanup operations are necessary', :green if cleaned_casks.empty?
+      def clean_block
+        proc do |c, versions|
+          say "Cleaning up #{c.name}", :yellow
+          dep_q = "#{c.name} has been deprecated. Ok to remove all versions?"
+          if c.deprecated? && no?(dep_q, :red)
+            say 'No action taken.', :red
+            next
+          end
+          say "Removed #{versions.length} old version(s)", :yellow
         end
       end
     end

data/lib/bct/tasks/outdated.rb

@@ -1,42 +1,60 @@
-require 'thor'
+require_relative './caskroom'
 
 module BrewCaskTools
   module Tasks
-    # Upgrade tasks
-    class Outdated < Thor
-      desc 'outdated', 'list outdated casks'
-      def outdated(*args)
-        @caskroom = args.first
-        @caskroom.outdated(&outdated_output)
-        @caskroom.deprecated(&deprecated_output)
+    # Outdated cask tasks
+    class Outdated < Caskroom
+      def initialize
+        super
+        progressbar.total = caskroom.casks.length
+        progressbar.log "\nLooking for outdated casks..."
+        outdated, deprecated = compile
+
+        outdated(outdated)
+        deprecated(deprecated)
       end
 
-      no_tasks do
-        def outdated_output
-          proc do |casks|
-            say 'There are no outdated casks', :yellow if casks.empty?
-            next if casks.empty?
-
-            puts "Outdated packages\n------------------"
-            headers = ['Package', 'Installed Version', 'New Version']
-            output = casks.unshift(headers)
-            print_table(output)
-            puts "\n"
-          end
-        end
+      def compile
+        outdated = []
+        deprecated = []
 
-        def deprecated_output
-          proc do |casks|
-            next if casks.empty?
+        caskroom.enumerate do |cask|
+          progressbar.title = "  #{cask.name.capitalize} "
+          progressbar.increment
+
+          outdated << cask if cask.outdated?
+          deprecated << cask if cask.deprecated?
+        end
+        [outdated, deprecated]
+      end
 
-            puts "Deprecated packages\n------------------"
-            casks.each do |cask|
-              puts cask.name
-            end
-            puts "\n"
+      def outdated(casks)
+        return say "\nThere are no outdated casks", :yellow if casks.empty?
+        handle(casks, 'outdated') do |outdated_casks|
+          outdated_casks.map! do |c|
+            [c.name, c.installed_version, c.current_version]
           end
+
+          headers = ['Package', 'Installed Version', 'New Version']
+          output = outdated_casks.unshift(headers)
+          print_table(output)
+        end
+      end
+
+      def deprecated(casks)
+        return if casks.empty?
+        handle(casks, 'deprecated') do |dep_casks|
+          dep_casks.map! { |c| [c.name] }
+          output = dep_casks.unshift(['Package'])
+          print_table(output)
         end
       end
+
+      def handle(casks, adverb)
+        puts "#{adverb.capitalize} packages\n------------------"
+        yield casks
+        puts "\n"
+      end
     end
   end
 end

data/lib/bct/tasks/upgrade.rb

@@ -1,45 +1,52 @@
 require 'thor'
 
+require_relative './caskroom'
 require_relative './cleanup'
 
 module BrewCaskTools
   module Tasks
     # Upgrade tasks
-    class Upgrade < Thor
-      desc 'upgrade CASK', 'Upgrade a specific cask.' \
-      ' If a cask name is omitted, this task will update all outdated casks.'
-      def upgrade(cask_name, *args)
-        @caskroom = args.first
-        cask = @caskroom.get(cask_name) unless cask_name.nil?
-
-        if cask.nil? && !cask_name.nil?
-          return say 'Invalid cask specified', :red
-        end
+    class Upgrade < Caskroom
+      def initialize(cask_name)
+        super()
+
+        if cask_name.nil?
+          progressbar.total = caskroom.casks.length
+          progressbar.log "\nLooking for outdated casks..."
 
-        if cask_name.nil? # Upgrade everything
-          upgrade_all
-        else # Upgrade one cask
-          upgrade_one(cask_name, cask)
+          return upgrade_all # Clean all casks
         end
+
+        cask = caskroom.get(cask_name)
+        return say 'Invalid cask specified', :red if cask.nil?
+
+        upgrade_one(cask)
       end
 
-      no_tasks do
-        def upgrade_one(cask_name, cask)
-          cask.upgrade
-          invoke Tasks::Cleanup, :cleanup, [cask_name]
-        end
+      def upgrade_all
+        to_upgrade = []
 
-        def upgrade_all
-          to_upgrade = @caskroom.casklist.select(&:outdated?)
+        caskroom.enumerate do |cask|
+          progressbar.title = "  #{cask.name.capitalize} "
+          progressbar.increment
 
-          if to_upgrade.empty?
-            say 'There are no casks to be upgraded', :green
-          else
-            to_upgrade.each(&:upgrade)
-          end
+          next unless cask.outdated?
 
-          invoke Tasks::Cleanup, :cleanup
+          to_upgrade << cask
+          progressbar.log "#{cask.info.name}: " \
+          "#{cask.installed_version} ==> #{cask.current_version}"
         end
+
+        return say 'There are no casks to be upgraded', :green if to_upgrade.empty?
+
+        to_upgrade.each(&:upgrade)
+
+        Tasks::Cleanup.new(nil)
+      end
+
+      def upgrade_one(cask)
+        cask.upgrade
+        Tasks::Cleanup.new(cask_name)
       end
     end
   end

data/lib/bct/tasks.rb

@@ -12,8 +12,8 @@ module BrewCaskTools
     class CLI < Thor
       def initialize(args, opts, config)
         super
-        @caskroom = Caskroom.new unless
-          %w(help version).include?(config[:current_command].name)
+        return if %w(help version).include?(config[:current_command].name)
+        `brew tap` # Update Caskroom tap so the latest formulae are pulled down
       end
 
       def self.exit_on_failure?
@@ -27,19 +27,19 @@ module BrewCaskTools
 
       desc 'outdated', 'list outdated casks'
       def outdated
-        invoke Tasks::Outdated, :outdated, [], [@caskroom]
+        Tasks::Outdated.new
       end
 
       desc 'upgrade CASK', 'Upgrade a specific cask.' \
       ' If a cask name is omitted, this task will update all outdated casks.'
       def upgrade(cask_name = nil)
-        invoke Tasks::Upgrade, :upgrade, [cask_name], [@caskroom]
+        Tasks::Upgrade.new(cask_name)
       end
 
       desc 'cleanup CASK', 'clean up old versions of a specific cask. If a ' \
       'cask name is omitted, this task will cleanup all outdated casks.'
       def cleanup(cask_name = nil)
-        invoke Tasks::Cleanup, :cleanup, [cask_name], [@caskroom]
+        Tasks::Cleanup.new(cask_name)
       end
     end
   end

data/lib/bct/util.rb

@@ -19,11 +19,11 @@ module BrewCaskTools
       # Relative path from working directory
       ##
       def relative_path(*relative)
-        Pathname.pwd.join(*(relative.flatten.map(&:to_s))).expand_path
+        Pathname.pwd.join(*relative.flatten.map(&:to_s)).expand_path
       end
 
       def source_path(*relative)
-        GEM_PATH.join(*(relative.flatten.map(&:to_s))).expand_path
+        GEM_PATH.join(*relative.flatten.map(&:to_s)).expand_path
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brew-cask-tools
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Dave Greene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-28 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: git-version-bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 description: A tiny tool that provides some missing functionality in Homebrew Cask.
 email:
 - davepgreene@gmail.com
@@ -93,9 +121,11 @@ files:
 - bin/bct
 - lib/bct.rb
 - lib/bct/cask.rb
+- lib/bct/cask/info.rb
 - lib/bct/caskroom.rb
 - lib/bct/metadata.rb
 - lib/bct/tasks.rb
+- lib/bct/tasks/caskroom.rb
 - lib/bct/tasks/cleanup.rb
 - lib/bct/tasks/outdated.rb
 - lib/bct/tasks/upgrade.rb