fix-command 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c6c5c5575c6dfec515ac9016b879d47f9dd4abc
-  data.tar.gz: b0027bad8769a6aa488b79004ce6bf09c074221f
+  metadata.gz: 1f3073b26715f2c4f04fe8529c2f48057f9b1778
+  data.tar.gz: 2639e35f4e61cafe6ff9bfa8ddf98accd04c6af8
 SHA512:
-  metadata.gz: 4c62ca9e24b1668f1a3dd2b89e2e4a924db33dabd70be920b21bd184756d9b52a0bb8618c95df95da316882b730438659a8d9a0b59186ea2411d50c1c181e800
-  data.tar.gz: 3ba8e1d943b52d9f28c9d2e712343a970f9c7efa201f2b724354daa62b46c97c6d8e177eb5a7a8bad1ab5a732c1d59c13a43ebb54a3834648475f2d03c02bdbb
+  metadata.gz: 2f3a05bad3471355cc7e75dd904fe0982982d74a4f000ae50b85aaec39073ec1f49cfd1706c659cfbdce23e3a98241e6f2da2c17f47e36b95dd31c6c6d5f56a2
+  data.tar.gz: 7c4dcb3677a5a93a4f63c80affa06813a568b36910da397bdb483b152e6514efef6e641b2886a40d06d17d7c477a18614166622c3fe54b5a47f684e5c769ca9d

data/.rubocop_todo.yml

@@ -1,16 +1,32 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-10-31 15:20:34 +0100 using RuboCop version 0.34.2.
+# on 2016-01-25 00:29:24 +0100 using RuboCop version 0.36.0.
 # 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
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
+# Offense count: 4
 Metrics/AbcSize:
-  Max: 23
+  Max: 32
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 127
+
+# Offense count: 12
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 104
 
 # Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 30
+  Max: 49
+
+# Offense count: 1
+Style/NestedParenthesizedCalls:
+  Exclude:
+    - 'test/command/test_version.rb'

data/README.md

@@ -46,45 +46,47 @@ And then execute:
 
 First, let's see the API:
 
-    $ bundle exec fix --help
-    Usage: fix <files or directories> [options]
+    $ fix --help
+    Usage: fix <directory> [options]
 
     Specific options:
-            --debug                      Enable ruby debug
-            --warnings                   Enable ruby warnings
-            --random=[SEED]              Predictable randomization
-            --prefix=[PREFIX]            Prefix of the spec files
-            --suffix=[SUFFIX]            Suffix of the spec files
+            --[no-]debug                 Enable ruby debug
+            --[no-]warnings              Enable ruby warnings
+            --[no-]diff                  Regression test selection
+            --random [SEED]              Predictable randomization
+            --prefix [PREFIX]            Prefix of the spec files
+            --suffix [SUFFIX]            Suffix of the spec files
 
     Common options:
-            --help                       Show this message
-            --version                    Show the version
+        -h, --help                       Show this message
+        -v, --version                    Show the version
 
 And second, let's run a test:
 
-    $ bundle exec fix duck_fix.rb --warnings
-    > fix /Users/bob/code/duck_fix.rb --warnings
+    $ fix ./app/ --prefix test_ --suffix --diff
+    > fix /Users/bob/app/duck_fix.rb --diff --random 198142038504094374390860708229193114294 --prefix "test_" --suffix ""
 
-    /Users/bob/code/duck_fix.rb ..I
+    /Users/bob/app/duck_fix.rb ..
 
-    1. Info: undefined method `sings' for #<Duck:0x007fdbeb05c1d8> (NoMethodError).
-
-    Ran 3 tests in 0.000612 seconds
-    100% compliant - 1 infos, 0 failures, 0 errors
+    Ran 2 tests in 0.000382 seconds
+    100% compliant - 0 infos, 0 failures, 0 errors
 
 ### Store Command Line Options
 
-You can store command line options in a `.fix` file in the project's root directory, and the fix command will read them as though you typed them on the command line.
+You can store command-line configuration options in a `.fix` file in two different locations:
+
+* Local: "`./.fix`" (i.e. in the project's root directory)
+* Global: "`~/.fix`" (i.e. in the user's home directory)
+
+__Fix::Command__ will thus read them as though you typed them on the command-line.
+
+Options declared in the local file override those in the global file, while those declared in command-line will override any ".fix" file.
 
 ## Security
 
-As a basic form of security __Fix::Command__ provides a set of SHA512 checksums for
-every Gem release.  These checksums can be found in the `checksum/` directory.
-Although these checksums do not prevent malicious users from tampering with a
-built Gem they can be used for basic integrity verification purposes.
+As a basic form of security __Fix::Command__ provides a set of SHA512 checksums for every Gem release.  These checksums can be found in the `checksum/` directory.  Although these checksums do not prevent malicious users from tampering with a built Gem they can be used for basic integrity verification purposes.
 
-The checksum of a file can be checked using the `sha512sum` command.  For
-example:
+The checksum of a file can be checked using the `sha512sum` command.  For example:
 
     $ sha512sum pkg/fix-command-0.1.0.gem
     26198b7812a5ac118a5f2a1b63927871b3378efb071b37abb7e1ba87c1aac9f3a6b45eeae87d9dc647b194c15171b13f15e46503a9a1440b1233faf924381ff5  pkg/fix-command-0.1.0.gem

data/VERSION.semver

@@ -1 +1 @@
-0.4.0
+0.5.0

data/checksum/fix-command-0.4.0.gem.sha512

@@ -0,0 +1 @@
+4abcd3dc61a08e4d20b80ab1605e607b4c87e24c96cd82447a00db1a65d590b7f68750a1a37d378de204891a79c36d0238b15676ad53288a458244b0e1c50b8b

data/fix-command.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'fix',                    '~> 0.17.0'
 
-  spec.add_development_dependency 'bundler',    '~> 1.10'
-  spec.add_development_dependency 'rake',       '~> 10.4'
+  spec.add_development_dependency 'bundler',    '~> 1.11'
+  spec.add_development_dependency 'rake',       '~> 10.5'
   spec.add_development_dependency 'yard',       '~> 0.8'
-  spec.add_development_dependency 'simplecov',  '~> 0.10'
-  spec.add_development_dependency 'rubocop',    '~> 0.35'
+  spec.add_development_dependency 'simplecov',  '~> 0.11'
+  spec.add_development_dependency 'rubocop',    '~> 0.36'
   spec.add_development_dependency 'spectus',    '~> 3.0'
 
   spec.cert_chain   = ['certs/gem-fixrb-public_cert.pem']

data/lib/fix/command.rb

@@ -6,26 +6,16 @@ require 'set'
 #
 # @api public
 #
-# @example Let's test a duck's spec!
-#   Fix::Command.run('duck_fix.rb', '--warnings')
+# @example Let's test a duck!
+#   Fix::Command.run('./duck/', '--warnings')
 #
 module Fix
-  # Fix reads command line configuration options from files in two different
-  # locations:
-  #
-  # Local: "./.fix" (i.e. in the project's root directory)
-  # Global: "~/.fix" (i.e. in the user's home directory)
-  #
-  # Options declared in the local file override those in the global file, while
-  # those declared in command-line will override any ".fix" file.
-  COMMAND_LINE_OPTIONS_FILE = '.fix'
-
   # Open the command class.
   #
   # @api public
   #
-  # @example Let's test a duck's spec!
-  #   Command.run('duck_fix.rb', '--warnings')
+  # @example Let's test a duck!
+  #   Command.run('./duck/', '--warnings')
   #
   class Command
     # Handle the parameters passed to fix command from the console.
@@ -33,29 +23,31 @@ module Fix
     # @api public
     #
     # @example Let's test a duck's spec!
-    #   run('duck_fix.rb', '--warnings')
+    #   run('./duck/', '--warnings')
     #
     # @param args [Array] A list of files and options.
     #
     # @raise [SystemExit] The result of the tests.
     def self.run(*args)
-      config = process_args(args)
+      config = process_args(true, args)
+
+      if args.size > 1
+        fail ArgumentError, "wrong number of directories (given #{args.size})"
+      end
 
       file_paths = fetch_file_paths(
+        config.fetch(:diff),
         config.fetch(:prefix),
-        config.fetch(:suffix), *args
-      ).to_a.shuffle(random: Random.new(config.fetch(:random)))
+        config.fetch(:suffix),
+        (args.first || '.')
+      ).to_a.sort.shuffle(random: Random.new(config.fetch(:random)))
 
-      str  = "\e[37m"
-      str += '> fix '
-      str += file_paths.join(' ')
-      str += ' --debug'          if $DEBUG
-      str += ' --warnings'       if $VERBOSE
-      str += ' --random'         if config.fetch(:random)
-      str += ' --prefix'         if config.fetch(:prefix)
-      str += ' --suffix'         if config.fetch(:suffix)
+      puts report(config, *file_paths)
 
-      puts "#{str} \e[22m"
+      if file_paths.empty?
+        puts 'Specs not found.'
+        exit
+      end
 
       status = true
 
@@ -73,50 +65,73 @@ module Fix
     end
 
     # @private
-    def self.process_args(args)
+    #
+    # @return [String] Report the command-line.
+    def self.report(config, *file_paths)
+      str = '> fix ' + file_paths.join(' ')
+      str += ' --debug'     if $DEBUG
+      str += ' --warnings'  if $VERBOSE
+      str += ' --diff'      if config.fetch(:diff)
+      str += " --random #{config.fetch(:random)}"
+      str += " --prefix #{config.fetch(:prefix).inspect}"
+      str += " --suffix #{config.fetch(:suffix).inspect}"
+
+      ["\e[37m", str, "\e[0m"].join
+    end
+
+    # @private
+    #
+    # @param load_file  [Boolean] Preload configuration options from files.
+    # @param args       [Array]   List of parameters.
+    def self.process_args(load_file, args)
       options = {
-        debug:          false,
-        warnings:       false,
-        random:         Random.new_seed,
-        prefix:         '',
-        suffix:         '_fix'
+        debug:    false,
+        warnings: false,
+        diff:     false,
+        random:   Random.new_seed,
+        prefix:   '',
+        suffix:   '_fix'
       }
 
       opt_parser = OptionParser.new do |opts|
-        opts.banner = 'Usage: fix <files or directories> [options]'
+        opts.banner = 'Usage: fix <directory> [options]'
 
         opts.separator ''
         opts.separator 'Specific options:'
 
-        opts.on('--debug', 'Enable ruby debug') do
-          options[:debug] = $DEBUG = true
+        opts.on('--[no-]debug', 'Enable ruby debug') do |b|
+          options[:debug] = $DEBUG = b
         end
 
-        opts.on('--warnings', 'Enable ruby warnings') do
-          options[:warnings] = $VERBOSE = true
+        opts.on('--[no-]warnings', 'Enable ruby warnings') do |b|
+          options[:warnings] = $VERBOSE = b
         end
 
-        opts.on('--random=[SEED]', Integer, 'Predictable randomization') do |i|
-          options[:random] = i
+        opts.on('--[no-]diff', 'Regression test selection') do |b|
+          options[:diff] = b
         end
 
-        opts.on('--prefix=[PREFIX]', String, 'Prefix of the spec files') do |s|
-          options[:prefix] = s
+        opts.on('--random [SEED]', Integer, 'Predictable randomization') do |i|
+          options[:random] = Integer(i)
         end
 
-        opts.on('--suffix=[SUFFIX]', String, 'Suffix of the spec files') do |s|
-          options[:suffix] = s
+        opts.on('--prefix [PREFIX]', String, 'Prefix of the spec files') do |s|
+          options[:prefix] = s.to_s
+        end
+
+        opts.on('--suffix [SUFFIX]', String, 'Suffix of the spec files') do |s|
+          options[:suffix] = s.to_s
         end
 
         opts.separator ''
         opts.separator 'Common options:'
 
-        opts.on_tail '--help', 'Show this message' do
+        opts.on_tail '-h', '--help', 'Show this message' do
           puts opts
           exit
         end
 
-        opts.on_tail '--version', 'Show the version' do
+        opts.on_tail '-v', '--version', 'Show the version' do
           puts File.read(File.join(File.expand_path(File.dirname(__FILE__)),
                                    '..',
                                    '..',
@@ -126,9 +141,8 @@ module Fix
         end
       end
 
-      %w(~ .).each do |c|
-        config_path = File.join(File.expand_path(c), COMMAND_LINE_OPTIONS_FILE)
-        opt_parser.load(config_path)
+      if load_file
+        config_paths.each { |config_path| opt_parser.load(config_path) }
       end
 
       opt_parser.parse!(args)
@@ -136,30 +150,63 @@ module Fix
       options
     end
 
+    # @return [String] The configuration file.
+    def self.config_file
+      '.fix'
+    end
+
+    # @return [Array] Different locations of command-line configuration options.
+    def self.config_paths
+      %w(~ .).map { |char| File.join(File.expand_path(char), config_file) }
+    end
+
     # @private
     #
     # @return [Set] A list of absolute paths.
-    def self.fetch_file_paths(file_prefix, file_suffix, *args)
-      absolute_paths = Set.new
-
-      args << '.' if args.empty?
-      args.each do |s|
-        s = File.absolute_path(s) unless s.start_with?(File::SEPARATOR)
-
-        if File.directory?(s)
-          spec_files = File.join(s, '**', "#{file_prefix}*#{file_suffix}.rb")
-          Dir.glob(spec_files).each { |spec_f| absolute_paths.add(spec_f) }
-        else
-          absolute_paths.add(s)
-        end
+    def self.fetch_file_paths(diff, prefix, suffix, path)
+      unless File.directory?(path)
+        warn 'Sorry, invalid directory.'
+        exit false
       end
 
-      if absolute_paths.empty?
-        warn 'Sorry, files or directories not found.'
-        exit false
+      path = File.absolute_path(path) unless path.start_with?(File::SEPARATOR)
+
+      spec_paths = Dir.glob(File.join(path, '**', "#{prefix}*#{suffix}.rb")).to_set
+      return spec_paths unless diff
+
+      Dir.chdir(path) do
+        modified_paths = git_diff_paths
+
+        # select only modified specs
+        modified_spec_paths = spec_paths & modified_paths
+
+        # select only unmodified specs
+        unmodified_spec_paths = spec_paths - modified_spec_paths
+
+        # select only modified code
+        modified_code_paths = modified_paths - spec_paths
+        modified_code_filenames = modified_code_paths.map do |p|
+          p.split(File::SEPARATOR).last.gsub(/\.rb\z/, '')
+        end.to_set
+
+        # select only specs of the modified code
+        additional_spec_paths = unmodified_spec_paths.select do |unmodified_spec_path|
+          unmodified_spec_filename = unmodified_spec_path.split(File::SEPARATOR).last.gsub(/\.rb\z/, '')
+          modified_code_filenames.any? do |modified_code_filename|
+            unmodified_spec_filename.include?(modified_code_filename)
+          end
+        end
+
+        modified_spec_paths + additional_spec_paths
       end
+    end
 
-      absolute_paths
+    # @return [Set] The list of modified files.
+    def self.git_diff_paths
+      `git status --porcelain`
+        .split("\n")
+        .map { |p| File.absolute_path(p.split.last) }
+        .to_set
     end
   end
 end

data.tar.gz.sig

@@ -1 +1 @@
-$���M����Ą?��<�e@M�{x[��v�Q�{9\���'N��#	}�}v��T�oi<a������(}��
k�v��b�p�qMS"��i���u���n�v:���t�'O@�����vV�A�+�C�����ЦxR��(�O��a��Y��5�����������;4�M��9x������ǜn=؏������E)h��㕃3yI�GA����	J��<o=%b5�
eqެ�[���wW?j�R��'�C@^k
+&N��zЁa�<I	��LV{����[`I���<��ɞ�g;rX�;�*ŷ���ƪ�|��/,__�3C��U��E��țS[��{�On�is�|p��pϣ�ˤaj�k����y��&;ց��_��~8M�1U����x+�&��<3U��e�����l��m`bª����KM��=��H.z�9|��|���!Uș}�y�jVL�I.}��8����l?�p�W�i}r�#;j}��3����0��2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fix-command
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Cyril Wack
@@ -30,7 +30,7 @@ cert_chain:
   dzJvWzQ1+dJU6WQv75E9ddSkaQrK3nhdgQVu+/wgvGSrsMvOGNz+LXaSDxQqZuwX
   0KNQFuIukfrdk8URwRnHoAnvx4U93iUw
   -----END CERTIFICATE-----
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fix
@@ -52,28 +52,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -94,28 +94,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.36'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.36'
 - !ruby/object:Gem::Dependency
   name: spectus
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +158,7 @@ files:
 - checksum/fix-command-0.1.3.gem.sha512
 - checksum/fix-command-0.2.0.gem.sha512
 - checksum/fix-command-0.3.0.gem.sha512
+- checksum/fix-command-0.4.0.gem.sha512
 - fix-command.gemspec
 - lib/fix/command.rb
 - pkg_checksum

metadata.gz.sig

@@ -1 +1,3 @@
-DY� T�z�����Ӆ�5@��"��75�pqMg]��J����A���&V��_g�Z������ZuT&z���PP�ʋ
+�+0n��fdDZ����M��q���J܌\7��AWK������c��.�lqa�G����1�kd~;`����ju�l���
+~�ڙ�w�킹48�4Z'�17��W��Y�Q ����g�=�
+��mנ���[�%��D���XS����_�vHf�ނ��`����Z�:����l����\p~A}���^�O��)��Ya�ܮ�W{�R�PG�%M���F�����YEs�XҐE���
d*%������.��L��ߐ�	<耯hLH