refinement 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cde77a0d0d41bfeebca40808c3053d38d9eff4ec7d09d82a9f29d8f9f3bed31b
-  data.tar.gz: 6d38e9cb3025c970513d80b18074e37eec4ad8edfec278c8c8eab9a4258310e8
+  metadata.gz: 23ec4c7c515278641dbd8dd7f8927a42126801d00d0963979a5deca88937382d
+  data.tar.gz: 10b9168d22d7853fbcbdc0d5a47127643a86f41a55bf6260b9f21c3a88457778
 SHA512:
-  metadata.gz: a878d3fc86e0c733da2fcbddc9da9a869ef56e035172e17b8ea63ada49cde2cceb4ead3c5d6b1024343ebd809368f096a77d50cd6464233c87e6d724cac33127
-  data.tar.gz: '09bd2a181cc8646d2f5a352a5b70bcf41681432a31588ee30502e40416f2641158fcaf59a3a8ad99b52abac383f1494f1804aaacaa97e9e286886fc4edc8afbb'
+  metadata.gz: d88a448b3f573e5f7441dd81b2fc818b928f61f4aeb7fcbbf4b31a9cbb33fd64cc0f91b9d9199a572017b1bde699595c694831368ac528d961d54f3e65f951d3
+  data.tar.gz: 7d9eddf6218a4f70d433a55e8fa1aef2b055dbe5d8f599c94e1496a407de45704e260808562dd2c8358991ca40054cb0eeeae52740c011d5d5384428e9124038

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Refinement Changes
 
+## 0.3.0 (2019-08-09)
+
+##### Bug Fixes
+
+* Multiple YAML used keys paths for the same file will no longer cause the YAML
+  to be parsed multiple times.  
+
+
 ## 0.2.2 (2019-04-08)
 
 No changes.  

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/exe/refine

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'refinement'
 require 'refinement/cli'

data/lib/cocoapods_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cocoapods'
 
 Pod::Installer
@@ -7,9 +9,7 @@ Pod::Installer
 
                return unless plugins.key?('refinement')
 
-               unless Gem::Version.create(Pod::VERSION) >= Gem::Version.create('1.6.0')
-                 raise Pod::Informative, 'Refinement requires a CocoaPods version >= 1.6.0'
-               end
+               raise Pod::Informative, 'Refinement requires a CocoaPods version >= 1.6.0' unless Gem::Version.create(Pod::VERSION) >= Gem::Version.create('1.6.0')
 
                require 'refinement/cocoapods_post_install_writer'
                Pod::UI.message 'Writing refinement file' do

data/lib/refinement/analyzer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Refinement
   # Analyzes changes in a repository
   # and determines how those changes impact the targets in Xcode projects in the workspace.
@@ -26,12 +28,12 @@ module Refinement
       @changeset = changeset
 
       raise ArgumentError, 'Can only specify one of workspace_path and projects' if workspace_path && projects
+
       @workspace_path = workspace_path
       @projects = projects
 
-      if augmenting_paths_yaml_files && augmenting_paths_by_target
-        raise ArgumentError, 'Can only specify one of augmenting_paths_yaml_files and augmenting_paths_by_target'
-      end
+      raise ArgumentError, 'Can only specify one of augmenting_paths_yaml_files and augmenting_paths_by_target' if augmenting_paths_yaml_files && augmenting_paths_by_target
+
       @augmenting_paths_yaml_files = augmenting_paths_yaml_files
       @augmenting_paths_by_target = augmenting_paths_by_target
     end
@@ -110,6 +112,7 @@ module Refinement
                                    .map do |annotated_target|
           change_reason = annotated_target.change_reason(level: change_level)
           next if !include_unchanged_targets && !change_reason
+
           change_reason ||= 'did not change'
           "\t#{annotated_target.xcode_target}: #{change_reason}"
         end.compact
@@ -152,6 +155,7 @@ module Refinement
       targets_by_name = Hash[targets.map { |t| [t.name, t] }]
       targets_by_product_name = Hash[targets.map do |t|
         next unless t.respond_to?(:product_reference)
+
         [File.basename(t.product_reference.path), t]
       end.compact]
 
@@ -166,7 +170,7 @@ module Refinement
         # yay auto-linking
         if (phase = target.frameworks_build_phases)
           phase.files_references.each do |fr|
-            if (dt = fr && fr.path && targets_by_product_name[File.basename(fr.path)])
+            if (dt = fr&.path && targets_by_product_name[File.basename(fr.path)])
               target_dependencies << dt
             end
           end
@@ -232,6 +236,7 @@ module Refinement
 
       expand_build_settings = lambda do |s|
         return [s] unless s =~ /\$(?:\{([_a-zA-Z0-0]+?)\}|\(([_a-zA-Z0-0]+?)\))/
+
         match, key = Regexp.last_match.values_at(0, 1, 2).compact
         substitutions = target.resolved_build_setting(key, true).values.compact.uniq
         substitutions.flat_map do |sub|
@@ -242,6 +247,7 @@ module Refinement
       target.build_configuration_list.build_configurations.each do |build_configuration|
         ref = build_configuration.base_configuration_reference
         next unless ref
+
         yield UsedPath.new(path: ref.real_path,
                            inclusion_reason: "base configuration reference for #{build_configuration}")
       end
@@ -249,6 +255,7 @@ module Refinement
       target.build_phases.each do |build_phase|
         build_phase.files_references.each do |fr|
           next unless fr
+
           yield UsedPath.new(path: fr.real_path,
                              inclusion_reason: "#{build_phase.display_name.downcase.chomp('s')} file")
         end
@@ -257,9 +264,11 @@ module Refinement
       target.shell_script_build_phases.each do |shell_script_build_phase|
         %w[input_file_list_paths output_file_list_paths input_paths output_paths].each do |method|
           next unless (paths = shell_script_build_phase.public_send(method))
+
           file_type = method.tr('_', ' ').chomp('s')
           paths.each do |config_path|
             next unless config_path
+
             expand_build_settings[config_path].each do |path|
               path = Pathname(path).expand_path(target.project.project_dir)
               yield UsedPath.new(path: path,
@@ -273,6 +282,7 @@ module Refinement
         target.resolved_build_setting(build_setting, true).each_value do |paths|
           Array(paths).each do |path|
             next unless path
+
             path = Pathname(path).expand_path(target.project.project_dir)
             yield UsedPath.new(path: path, inclusion_reason: "#{build_setting} value")
           end
@@ -301,6 +311,7 @@ module Refinement
       project.root_object.build_configuration_list.build_configurations.each do |build_configuration|
         ref = build_configuration.base_configuration_reference
         next unless ref
+
         yield UsedPath.new(path: ref.real_path,
                            inclusion_reason: "base configuration reference for #{build_configuration}")
       end

data/lib/refinement/annotated_target.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Refinement
   # A target, annotated with any changes
   class AnnotatedTarget
@@ -45,15 +47,18 @@ module Refinement
         when :full_transitive
           direct_change_reason || Refinement.map_find(dependencies) do |dependency|
             next unless (dependency_change_reason = dependency.change_reason(level: level))
+
             "dependency #{dependency} changed because #{dependency_change_reason}"
           end
         when proc { |symbol, int| (symbol == :at_most_n_away) && int.is_a?(Integer) }
           distance_from_target = level.last
-          raise ArgumentError, "level must be positive, not #{distance_from_target}" if distance_from_target < 0
+          raise ArgumentError, "level must be positive, not #{distance_from_target}" if distance_from_target.negative?
+
           change_reason = direct_change_reason
-          if distance_from_target > 0
+          if distance_from_target.positive?
             change_reason ||= Refinement.map_find(dependencies) do |dependency|
               next unless (dependency_change_reason = dependency.change_reason(level: [:at_most_n_away, level.last.pred]))
+
               "dependency #{dependency} changed because #{dependency_change_reason}"
             end
           end

data/lib/refinement/changeset/file_modification.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Refinement
   class Changeset
     # Represents a modification to a single file or directory on disk
@@ -51,12 +53,14 @@ module Refinement
       # @visibility private
       def ==(other)
         return unless other.is_a?(FileModification)
+
         (path == other.path) && (type == other.type) && prior_path == other.prior_path
       end
 
       # @visibility private
       def eql?(other)
         return unless other.is_a?(FileModification)
+
         path.eql?(other.path) && type.eql?(other.type) && prior_path.eql?(other.prior_path)
       end
 
@@ -68,9 +72,12 @@ module Refinement
       def yaml_diff(keypath)
         require 'yaml'
 
-        dig_yaml = lambda do |yaml|
+        @cached_yaml ||= {}
+
+        dig_yaml = lambda do |yaml, path|
           return yaml if DOES_NOT_EXIST == yaml
-          object = YAML.safe_load(yaml, [Symbol])
+
+          object = @cached_yaml[path] ||= YAML.safe_load(yaml, [Symbol])
           if keypath.empty?
             object
           elsif object.respond_to?(:dig)
@@ -82,8 +89,8 @@ module Refinement
           end
         end
 
-        prior = dig_yaml[prior_contents]
-        current = dig_yaml[contents]
+        prior = dig_yaml[prior_contents, :prior]
+        current = dig_yaml[contents, :current]
 
         require 'xcodeproj/differ'
 

data/lib/refinement/changeset.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cocoapods/executable'
 require 'set'
 
@@ -43,6 +45,7 @@ module Refinement
       dirs = Set.new
       add = lambda { |path|
         break unless dirs.add?(path)
+
         add[path.dirname]
       }
       modifications.each do |mod|
@@ -124,8 +127,10 @@ module Refinement
     # @param keypath [Array]
     def find_modification_for_yaml_keypath(absolute_path:, keypath:)
       return unless (file_modification = find_modification_for_path(absolute_path: absolute_path))
+
       diff = file_modification.yaml_diff(keypath)
       return unless diff
+
       [file_modification, diff]
     end
 
@@ -144,14 +149,14 @@ module Refinement
     end
 
     CHANGE_TYPES = {
-      :'was added' => 'A',
-      :'was copied' => 'C',
-      :'was deleted' => 'D',
-      :'was modified' => 'M',
-      :'was renamed' => 'R',
-      :'changed type' => 'T',
-      :'is unmerged' => 'U',
-      :'changed in an unknown way' => 'X'
+      'was added': 'A',
+      'was copied': 'C',
+      'was deleted': 'D',
+      'was modified': 'M',
+      'was renamed': 'R',
+      'changed type': 'T',
+      'is unmerged': 'U',
+      'changed in an unknown way': 'X'
     }.freeze
     private_constant :CHANGE_TYPES
 
@@ -206,9 +211,8 @@ module Refinement
     def self.git!(command, *args, chdir:)
       require 'open3'
       out, err, status = Open3.capture3('git', command, *args, chdir: chdir.to_s)
-      unless status.success?
-        raise GitError, "Running git #{command} failed (#{status.to_s.gsub(/pid \d+\s*/, '')}):\n\n#{err}"
-      end
+      raise GitError, "Running git #{command} failed (#{status.to_s.gsub(/pid \d+\s*/, '')}):\n\n#{err}" unless status.success?
+
       out
     end
     private_class_method :git!

data/lib/refinement/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'claide'
 
 module Refinement
@@ -48,6 +50,7 @@ module Refinement
       puts analyzer.format_changes if @print_changes
 
       return unless @scheme
+
       analyzer.filtered_scheme(scheme_path: @scheme, log_changes: @print_scheme_changes, filter_scheme_for_build_action: @filter_scheme_for_build_action)
               .save_as(@scheme.gsub(%r{\.(xcodeproj|xcworkspace)/.+}, '.\1'), File.basename(@scheme, '.xcscheme'), true)
     end

data/lib/refinement/cocoapods_post_install_writer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Refinement
   # Called after CocoaPods installation to write an augmenting file that
   # takes into account changes to Pod configuration,

data/lib/refinement/used_path.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Refinement
   # Represents a path that some target depends upon.
   class UsedPath

data/lib/refinement/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Refinement
   # @visibility private
   VERSION = File.read(File.expand_path('../../VERSION', __dir__)).strip.freeze

data/lib/refinement.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xcodeproj'
 
 # Generates a list of Xcode targets to build & test as a result of a git diff.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: refinement
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -78,14 +78,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Generates a list of Xcode targets to build & test as a result of a git diff.