bcupgrade 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e1ba7a4c41f23f3847b3d796af45417d2549e73
-  data.tar.gz: 2baf0fe4c779ce6bc0e19ec82333671def99559a
+  metadata.gz: 9b87f6da66f77ed4aa3c25152ecded951be8f1cf
+  data.tar.gz: d8a5dbd8f95d17baba2cc2014fb09d16d60de1fe
 SHA512:
-  metadata.gz: 99f770aa03f908d7a5d1c7a557c5370ed039324f9dbdecb2a08a5a8f365a007abcaffe93c6b8e45c31c601fd132ef8542f39ff3761490ed64eff0cc2a39995e0
-  data.tar.gz: b156cbb648afd5595fc435b66938b532bf3f1a7bd5d54cb0057f3a511bce66ede11c25ff5b01785281db7b3ab776934d7702ba03f77f5c937305dccd1baf4a01
+  metadata.gz: 4a7b72bb99b04e2c8e846900a72f3861bbcade80d47333b5e53aa7029aa5c521a3f6e5c9f898e3d32d9ec704c55b260fd6c28ab22a60aacb5e82e584e8e15e57
+  data.tar.gz: 24870992624b64013c6379c52846264143df4501b09047212845ca5050ecb28c1ac95250d7f49aa67f265ecec2bc2bce66eefa369f7a391302433281d681b6eb

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-01-06 13:26:21 +0900 using RuboCop version 0.52.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
@@ -9,9 +9,9 @@
 # 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/exe/bcupgrade

@@ -6,6 +6,8 @@ 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...]"
@@ -24,7 +26,7 @@ OptionParser.new do |opt|
 
     args = opt.parse!(ARGV)
 
-    Bcupgrade.run(options, args)
+    Bcupgrade.run(options, args, config)
   rescue StandardError => e
     puts "Error: #{e}.\nSee #{opt}"
     exit

data/lib/bcupgrade.rb

@@ -3,22 +3,23 @@
 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)
+  def self.run(options, args, config)
+    cask = Cask.new(options, args, config)
 
     unless cask.args.any?
       puts "\n==> Outdated cask...\n"
       BrewCask.output_outdated
 
-      ignore = cask.config['ignore']
-      puts "\nNot upgrading pinned package:\n#{ignore}" if ignore
+      ignore = cask.list_ignore
+      puts "\nNot upgrading pinned package:\n#{ignore}" unless ignore.empty?
     end
 
-    update_casks = cask.target
+    update_casks = cask.upgrade_target
     if update_casks.any?
-      cask.upgrade_version(update_casks)
+      cask.upgrade(update_casks)
     else
       puts "\nAlready up-to-date."
     end

data/lib/bcupgrade/cask.rb

@@ -4,16 +4,16 @@ require 'yaml'
 
 module Bcupgrade
   class Cask
-    attr_reader :config, :args, :target
+    attr_reader :args
 
-    def initialize(options, args)
-      @config  = load_config
-      @options = options
-      @args    = args.uniq
-      @target  = upgrade_target
+    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|
@@ -24,33 +24,22 @@ module Bcupgrade
       end
     end
 
-    private
-
-    def load_config
-      file = File.join(ENV['HOME'], '.bcupgrade')
-      if File.exist?(file)
-        YAML.load_file(file)
-      else
-        ''
-      end
+    def list_ignore
+      @config.ignore.join(' ')
     end
 
     def upgrade_target
       if @args.any?
         @args
       else
-        outdated = BrewCask.outdated.split(/\n/)
-        exclude_ignore_casks(outdated)
+        exclude_ignore_casks(@outdated)
       end
     end
 
+    private
+
     def exclude_ignore_casks(casks)
-      if @config.nil?
-        casks
-      else
-        ignore = Array(@config['ignore'])
-        casks - ignore
-      end
+      casks - @config.ignore
     end
 
     def prompt_answer_yes?(cask)

data/lib/bcupgrade/config_file.rb

@@ -0,0 +1,25 @@
+# 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 ignore
+      load['ignore'].map { |e| e ? e : '' }
+    rescue StandardError
+      ['']
+    end
+  end
+end

data/lib/bcupgrade/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bcupgrade
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcupgrade
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - DriftwoodJP
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-06 00:00:00.000000000 Z
+date: 2018-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,6 +134,7 @@ 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: